chore(fast-paced commit): refactoring workflow to allow faster commits

Author: andre-filho

commit_helper/utils/file_handler.py

@@ -5,6 +5,7 @@
 from .utils import gen_co_author
 from .utils import dump_convention
 from .utils import validate_commiter_file
+from .utils import handle_conventioned_commit
 from .colors import RESET
 from .colors import NOTIFY_COLOR
 from .text_utils import debug
@@ -37,28 +38,12 @@ def handle_file_based_commit(file_path, debug_mode, args):
                 commit_msg = custom_convention(tag, msg, config, debug_mode)
 
             else:
-                commit_msg = handle_conventioned_commit(convention)
+                notify('You are using the %s convention' % convention)
+                commit_msg = handle_conventioned_commit(convention, args)
 
             commit_msg += gen_co_author(args.co_author)
             debug('commit message', commit_msg, debug_mode)
             system('git commit -m "%s"' % commit_msg)
 
         except YAMLError as err:
             print(err)
-
-
-def handle_conventioned_commit(convention):
-    notify('You are using the %s convention' % convention)
-    tag, msg = get_text()
-
-    if convention == 'angular' or convention == 'karma':
-        context = get_context()
-        commit_message = angular_convention(tag, msg, context)
-
-    elif convention == 'changelog':
-        commit_message = changelog_convention(tag, msg)
-
-    elif convention == 'symphony':
-        commit_message = symphony_convention(tag, msg)
-
-    return commit_message

commit_helper/utils/flag_commit_handler.py

@@ -2,6 +2,7 @@
 # utils imports
 from .utils import create_file
 from .utils import gen_co_author
+from .utils import handle_conventioned_commit
 from .text_utils import debug
 from .text_utils import get_text
 from .text_utils import get_context
@@ -27,21 +28,9 @@ def convention_flag_handler(args, debug_mode):
         create_file('none', args.no_file)
 
     else:
-        tag, msg = handle_tag_message_args(args.tag, args.message)
-
-        if convention == 'angular' or convention == 'karma':
-            context = handle_context_arg(args.context)
-            commit_message = angular_convention(tag, msg, context)
-            create_file(convention, args.no_file)
-
-        elif convention == 'changelog':
-            commit_message = changelog_convention(tag, msg)
-            create_file(convention, args.no_file)
-
-        elif convention == 'symphony':
-            commit_message = symphony_convention(tag, msg)
-            create_file(convention, args.no_file)
+        commit_message = handle_conventioned_commit(convention, args)
 
+    create_file(convention, args.no_file)
     commit_message += gen_co_author(args.co_author)
     debug('commit message', commit_message, debug_mode)
     system('git commit -m "%s"' % commit_message)

commit_helper/utils/utils.py

@@ -1,6 +1,13 @@
 import sys
 import argparse
 from yaml import dump
+from .text_utils import handle_context_arg
+from .text_utils import handle_tag_message_args
+from commit_helper.conventions.karma_angular import angular_convention
+from commit_helper.conventions.changelog import changelog_convention
+from commit_helper.conventions.symphony_cmf import symphony_convention
+from commit_helper.conventions.no_convention import just_message
+
 
 supported_conventions = [
     "angular",
@@ -82,3 +89,19 @@ def validate_commiter_file(stream_file):    # pragma: no cover
     if stream_file['commit_pattern'] is None or stream_file['context'] is None:
         print("Error: Your commiter file lacks a commit_pattern or context!")
         sys.exit(0)
+
+
+def handle_conventioned_commit(convention, args):
+    tag, msg = handle_tag_message_args(args.tag, args.message)
+
+    if convention == 'angular' or convention == 'karma':
+        context = handle_context_arg(args.context)
+        commit_message = angular_convention(tag, msg, context)
+
+    elif convention == 'changelog':
+        commit_message = changelog_convention(tag, msg)
+
+    elif convention == 'symphony':
+        commit_message = symphony_convention(tag, msg)
+
+    return commit_message