From e434a82ccb03a08fcdb51ea532e75f9df5b609a6 Mon Sep 17 00:00:00 2001 From: Joseph Manley Date: Fri, 13 Dec 2019 16:51:05 -0500 Subject: [PATCH] Update regex check to look at merged branch --- semver/__init__.py | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/semver/__init__.py b/semver/__init__.py index e413dfe..08c911a 100644 --- a/semver/__init__.py +++ b/semver/__init__.py @@ -64,25 +64,24 @@ class SemVer(object): def get_version_type(self): print('Merged branch is ' + self.merged_branch) - - #Get GitHub repo's owner from url - repoOwner = None - remoteUrl = subprocess.Popen(['git', 'config', '--get', 'remote.origin.url'], stdout=subprocess.PIPE).stdout.read().decode('utf-8').rstrip() - if "github.com" in remoteUrl: - repoOwner = re.search("(?<=github.com(:|\/))(.*)(?=\/.*.git)", remoteUrl).group(0) + merged_prefix = None + matches = re.findall("[\/][^\/]+[\/]", self.merged_branch) + if len(matches > 1): + merged_prefix = matches[1][1:-1] - for prefix in self.major_branches: - if self.merged_branch.startswith(prefix + '/') or self.merged_branch.startswith(str(repoOwner) + '/' + prefix + '/'): - self.version_type = 'major' - return True - for prefix in self.minor_branches: - if self.merged_branch.startswith(prefix + '/') or self.merged_branch.startswith(str(repoOwner) + '/' + prefix + '/'): - self.version_type = 'minor' - return True - for prefix in self.patch_branches: - if self.merged_branch.startswith(prefix + '/') or self.merged_branch.startswith(str(repoOwner) + '/' + prefix + '/'): - self.version_type = 'patch' - return True + if merged_prefix: + for prefix in self.major_branches: + if prefix == merged_prefix: + self.version_type = 'major' + return True + for prefix in self.minor_branches: + if prefix == merged_prefix: + self.version_type = 'minor' + return True + for prefix in self.patch_branches: + if prefix == merged_prefix: + self.version_type = 'patch' + return True return False # setup git settings so we can commit and tag