added logic to decide if minor or patch versioning should be done based on last commit message

semver.py

@@ -1,34 +1,80 @@
+import re
 import subprocess
 
 
-def semver():
+class SemVer(object):
-    # setup git user
-    p = subprocess.Popen(['git', 'config', 'user.email',
-                          '"versioner@semver.com"'], cwd='/application_repo')
-    p = subprocess.Popen(['git', 'config', 'user.name', '"Semantic Versioner"'],
-                          cwd='/application_repo')
-    p.wait()
 
-    # version repo
+    GET_COMMIT_MESSAGE = re.compile(r"Merge branch '(.+)' into ([^\n]+)")
-    p = subprocess.Popen(['bumpversion', 'patch'], cwd='/application_repo')
-    p.wait()
 
-    '''
+    def __init__(self):
-    ' this will be difficult to do because we'd need to setup credentials in
+        self.merged_branch = None
-    '  docker container for git remote repo access
+        self.main_branch = None
-    '
+        self.version_type = None
-    # push versioning commit
-    p = subprocess.Popen(['git', 'push', 'origin', 'develop'],
-                         cwd='/application_repo')
-    p.wait()
 
-    # push versioning tag
+    def get_branches(self):
-    p = subprocess.Popen(['git', 'push', 'origin', '--tags'],
+        p = subprocess.Popen(['git', 'log', '-1'], stdout=subprocess.PIPE,
-                         cwd='/application_repo')
+                             cwd='/application_repo')
-    p.wait()
+        message = p.stdout.read()
-    '''
+        matches = self.GET_COMMIT_MESSAGE.search(message)
-    return None
+        if matches:
+            self.merged_branch = matches.group(1)
+            self.main_branch = matches.group(2)
+        return bool(matches)
+
+    def get_version_type(self):
+        if self.merged_branch.startswith('feature/'):
+            self.version_type = 'minor'
+        elif self.merged_branch.startswith('hotfix/'):
+            self.version_type = 'patch'
+        return bool(self.version_type)
+
+    def setup_git_user(self):
+        # setup git user
+        p = subprocess.Popen(['git', 'config', 'user.email',
+                              '"versioner@semver.com"'],
+                             cwd='/application_repo')
+        p = subprocess.Popen(['git', 'config', 'user.name',
+                              '"Semantic Versioner"'],
+                             cwd='/application_repo')
+        p.wait()
+        return self
+
+    def version_repo(self):
+        # version repo
+        p = subprocess.Popen(['bumpversion', self.version_type],
+                             cwd='/application_repo')
+        p.wait()
+        return self
+
+    def commit_and_push(self):
+        '''
+        ' this will be difficult to do because we'd need to setup credentials in
+        '  docker container for git remote repo access
+        '
+        # push versioning commit
+        p = subprocess.Popen(['git', 'push', 'origin', 'develop'],
+                             cwd='/application_repo')
+        p.wait()
+
+        # push versioning tag
+        p = subprocess.Popen(['git', 'push', 'origin', '--tags'],
+                             cwd='/application_repo')
+        p.wait()
+        '''
+        return self
+
+    def run(self):
+        if not self.get_branches():
+            raise Exception('No merge found')
+        if self.main_branch not in \
+         ['develop', 'env-test', 'env-stage', 'env-prod']:
+            raise Exception('Not merging into a main branch')
+        if not self.get_version_type():
+            raise Exception('No git flow branch found')
+        self.setup_git_user()
+        self.version_repo()
+        return self
 
 
 if __name__ == '__main__':
-    semver()
+    SemVer().run()