chore(conventions_formatting): Refatorates convention formatter (#37)

* chore(karma/angular): refatorates karma/angular convention

* UPDATE: refatorates changelog convention

* [Update] refatorates symphony convention

* Refatorates just message convention

* Fixes get_text test

Co-authored-by: arthur assis <[email protected]>

Author: arthur0496

conventions/changelog.py

@@ -1,12 +1,4 @@
-from os import system
-from utils import get_text
-from utils import sanitize_as_empty_string
-from utils import gen_co_author
-
-
-def changelog_convention(co_author):
-    tag, msg = get_text()
+def changelog_convention(tag,msg):
     tag = tag.upper()
     composed_message = "%s: %s\n" % (tag, msg)
-    composed_message += gen_co_author(co_author)
-    system("git commit -m '%s'" % composed_message)
+    return composed_message

conventions/karma_angular.py

@@ -1,15 +1,6 @@
-from os import system
-from utils import get_text
-from utils import sanitize_as_empty_string
-from utils import gen_co_author
-
-
-def angular_convention(co_author):
-    tag, msg, context = get_text(context=True)
+def angular_convention(tag,msg,context):
     tag = tag.lower()
-    co_author = sanitize_as_empty_string(co_author)
     if context is '':
-        composed_message = composed_message = "%s: %s\n" % (tag, msg)
+        composed_message = "%s: %s\n" % (tag, msg)
     composed_message = "%s(%s): %s\n" % (tag, context, msg)
-    composed_message += gen_co_author(co_author)
-    system('git commit -m "%s"' % composed_message)
+    return composed_message

conventions/no_convention.py

@@ -1,10 +1,4 @@
-from os import system
-from utils import sanitize_as_empty_string
-from utils import gen_co_author
-
-
-def just_message(co_author):
+def just_message():
     msg = str(input("commit message: "))
     composed = "%s\n" % msg.capitalize()
-    composed += gen_co_author(co_author)
-    system("git commit -m '%s'" % composed)
+    return composed

conventions/symphony_cmf.py

@@ -1,12 +1,3 @@
-from os import system
-from utils import get_text
-from utils import sanitize_as_empty_string
-from utils import gen_co_author
-
-
-def symphony_convention(co_author):
-    tag, msg = get_text()
+def symphony_convention(tag,msg):
     tag = tag.capitalize()
     composed = "[%s] %s\n" % (tag, msg)
-    composed += gen_co_author(co_author)
-    system("git commit -m '%s'" % composed)

generator.py

@@ -4,6 +4,7 @@
 from pathlib import Path
 from yaml import safe_load
 from yaml import YAMLError
+from os import system
 
 # conventions imports
 from conventions.karma_angular import angular_convention
@@ -15,6 +16,9 @@
 from utils import parser_cli
 from utils import create_file
 from utils import debug
+from utils import get_text
+from utils import get_context
+from utils import gen_co_author
 
 
 def main(debug_mode=False):
@@ -29,36 +33,56 @@ def main(debug_mode=False):
                     convention = str(config['convention']).lower()
                 else:
                     convention = 'none'
-                if convention == 'angular' or convention == 'karma':
-                    print('You are using the %s convention' % convention)
-                    angular_convention(args.co_author)
-                elif convention == 'changelog':
-                    print('You are using the %s convention' % convention)
-                    changelog_convention(args.co_author)
-                elif convention == 'symphony':
-                    print('You are using the %s convention' % convention)
-                    symphony_convention(args.co_author)
-                elif convention == 'none':
-                    just_message(args.co_author)
+
+                if convention == 'none':
+                    commit_message = just_message()
+
+                else:
+                    tag, msg = get_text()
+                    if convention == 'angular' or convention == 'karma':
+                        print('You are using the %s convention' % convention)
+                        context = get_context()
+                        commit_message = angular_convention(tag, msg, context)
+                    elif convention == 'changelog':
+                        print('You are using the %s convention' % convention)
+                        commit_message = changelog_convention(tag, msg)
+                    elif convention == 'symphony':
+                        print('You are using the %s convention' % convention)
+                        commit_message = symphony_convention(tag, msg)
+
+                commit_message += gen_co_author(args.co_author)
+                debug('commit message', commit_message, debug_mode)
+                system('git commit -m "%s"' % commit_message)
+
             except YAMLError as exc:
                 print(exc)
 
     elif args.convention is not '':
         convention = str(args.convention)
         debug('convention flag', convention, debug_mode)
-        if convention == 'angular' or convention == 'karma':
-            angular_convention(args.co_author)
-            create_file(convention, args.no_file)
-        elif convention == 'changelog':
-            changelog_convention(args.co_author)
-            create_file(convention, args.no_file)
-        elif convention == 'symphony':
-            symphony_convention(args.co_author)
-            create_file(convention, args.no_file)
-        elif convention == 'message':
-            just_message(convention)
+
+        if convention == 'message':
+            commit_message = just_message()
             create_file('none', args.no_file)
 
+        else:
+            tag, msg = get_text()
+
+            if convention == 'angular' or convention == 'karma':
+                context = get_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 += gen_co_author(args.co_author)
+        debug('commit message', commit_message, debug_mode)
+        system('git commit -m "%s"' % commit_message)
+
     else:
         debug('parser full return', parser.parse_args(), debug_mode)
         parser.print_help()

test/test_utils.py

@@ -2,7 +2,8 @@
 # import yaml
 
 
-def test_get_text_no_context():
+
+def test_get_text():
     inputs = [
         "tag",
         "message",
@@ -18,24 +19,17 @@ def mock_input(s):
         raise AssertionError()
 
 
-def test_get_text_context():
+def test_get_context():
     inputs = [
-        "tag",
-        "message",
         "context",
     ]
 
     def mock_input(s):
         return inputs.pop(0)
     utils.input = mock_input
-    a, b, c = utils.get_text(context=True)
-    if not a == 'tag':
+    a = utils.get_context()
+    if not a == 'context':
         raise AssertionError()
-    if not b == 'message':
-        raise AssertionError()
-    if not c == 'context':
-        raise AssertionError()
-
 
 def test_sanitize_as_empty_string():
     string = 'asopdfha'

utils.py

@@ -20,16 +20,15 @@
     """
 
 
-def get_text(context=False):
-    if context:
-        tag = str(input("type the tag: "))
-        msg = str(input("type the commit message: ")).lower()
+def get_text():
+    tag = str(input("type the tag: "))
+    msg = str(input("type the commit message: ")).lower()
+    return tag, msg
+
+
+def get_context():
         context = str(input('type the context: ') or '').lower()
-        return tag, msg, context
-    else:
-        tag = str(input("type the tag: "))
-        msg = str(input("type the commit message: ")).lower()
-        return tag, msg
+        return context
 
 
 def gen_co_author(co_author):