refactor: refactoring gitMergeFlow

Author: OneMoreJack

gitMergeFlow.py

@@ -1,39 +1,14 @@
 #!usr/bin/env python
 
-import sys
+import argparse
 
 from git import Repo
 from termcolor import cprint
 
-args = sys.argv[1:]
 
-repo = Repo()
-git = repo.git
-# cache current branch
-currentBranchName = repo.head.ref.name
-
-# check if working tree is clean
-isDirty = repo.is_dirty(untracked_files=True)
-if (isDirty):
-    cprint('Unclean working tree. Commit or stash changes first', 'red')
-    exit(1)
-
-
-if len(args) == 0:
-    cprint('No branch name provided', 'red')
-    print(' - Usage: python3 <path_to_this_file> <branch1_name> <branch2_name> ...')
-    exit(1)
-
-# check if all branches exist
-branchNames = [x.name for x in repo.branches]
-invalidBranches = [x for x in args if x not in branchNames]
-if len(invalidBranches) > 0:
-    cprint('Branch does not exist: {}'.format(invalidBranches), 'red')
-    exit(1)
-
-
-def mergeFlow(branches):
-    print('\nSTART MERGE FLOW...')
+def mergeFlow(branches, currentBranchName):
+    print('\n' + '=' * 40 + '\n')
+    print('START MERGE GIT BRANCHES...' + '\n')
 
     for idx, branch in enumerate(branches):
         git.checkout(branch)
@@ -43,11 +18,45 @@ def mergeFlow(branches):
             continue
         git.merge('-')
         git.push()
-        print('  ✅ {} -> {}'.format(branches[idx - 1], branch))
+        print(' ✅ {} -> {}'.format(branches[idx - 1], branch))
 
     git.checkout(currentBranchName)
     print()
     cprint('🎉 COMPLETED: {}'.format(' -> '.join(branches)), 'green')
 
 
-mergeFlow(args)
+def checkWorkingTree(repo):
+    # check if working tree is clean
+    isDirty = repo.is_dirty(untracked_files=True)
+    if (isDirty):
+        cprint('Unclean working tree. Commit or stash changes first', 'red')
+        exit(1)
+
+
+def validateBranches(repo, targetBranches):
+    # check if all branches exist
+    branches = repo.branches
+    branchNames = list(map(lambda x: x.name, branches))
+    invalidBranches = list(
+        filter(lambda x: x not in branchNames, targetBranches))
+    if len(invalidBranches) > 0:
+        cprint('Branch does not exist: {}'.format(invalidBranches), 'red')
+        exit(1)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="Merge git branches")
+    parser.add_argument(
+        'targetBranches', help="branches to be merged", nargs='+')
+    args = parser.parse_args()
+    targetBranches = args.targetBranches
+
+    repo = Repo()
+    git = repo.git
+    # cache current branch
+    currentBranchName = repo.head.ref.name
+
+    # check if working tree is clean
+    checkWorkingTree(repo)
+    validateBranches(repo, targetBranches)
+    mergeFlow(targetBranches, currentBranchName)