<add> : final custom commit convention

Author: andre-filho

…conventions/custom_convention_handler.py …_helper/conventions/custom_convention.pycommit_helper/conventions/custom_convention_handler.py renamed to commit_helper/conventions/custom_convention.py commit_helper/conventions/custom_convention_handler.py renamed to commit_helper/conventions/custom_convention.py

@@ -9,17 +9,16 @@ def custom_convention(tag, message, config_file, debug_mode):
     debug('pattern from file', config_file['commit_pattern'], debug_mode)
 
     pattern = str(config_file['commit_pattern'] or '')
-    debug('pattern processed', pattern, debug_mode)
+    debug('pattern acquired', pattern, debug_mode)
 
     context = ''
-
     pattern = pattern.replace('tag', str(tag))
     pattern = pattern.replace('message', str(message))
-    debug('pattern post replace', pattern, debug_mode)
 
     if config_file['context']:
         context = get_context()
-        pattern.replace('context', context)
+        pattern = pattern.replace('context', context)
 
+    debug('pattern post replace', pattern, debug_mode)
     pattern += '\n'
     return pattern

commit_helper/utils/file_handler.py

@@ -3,6 +3,7 @@
 from yaml import YAMLError
 # utils imports
 from .utils import gen_co_author
+from .utils import dump_convention
 from .utils import validate_commiter_file
 from .text_utils import debug
 from .text_utils import get_text
@@ -12,31 +13,32 @@
 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
+from commit_helper.conventions.custom_convention import custom_convention
 
 
 def handle_file_based_commit(file_path, debug_mode, args):
     with open(str(file_path), 'r') as stream:
         try:
             config = safe_load(stream)
             debug('convention from file', config['convention'], debug_mode)
-            convention = dump_convention(config_file)
+            convention = dump_convention(config)
 
             if convention == 'none':
                 print('You are not using a convention')
-                commit_message = just_message()
+                commit_msg = just_message()
 
             elif convention == 'custom':
                 print('You are using your custom convention')
                 validate_commiter_file(config)
                 tag, msg = get_text()
-                commit_message = custom_convention(tag, msg, config)
+                commit_msg = custom_convention(tag, msg, config, debug_mode)
 
             else:
-                commit_message = handle_conventioned_commit(convention)
+                commit_msg = handle_conventioned_commit(convention)
 
-            commit_message += gen_co_author(args.co_author)
-            debug('commit message', commit_message, debug_mode)
-            system('git commit -m "%s"' % commit_message)
+            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)

setup.py

@@ -12,7 +12,7 @@
     long_description_content_type='text/markdown',
     author='Andre de Sousa Costa Filho',
     author_email='andre.filho001@outlook.com',
-    version='3.0.2',
+    version='3.1.2',
     packages=find_packages(),
     entry_points={
         'console_scripts': [

test/test_conventions.py

@@ -3,7 +3,7 @@
 import commit_helper.conventions.changelog as changelog
 import commit_helper.conventions.symphony_cmf as symphony
 import commit_helper.conventions.no_convention as no_convention
-import commit_helper.conventions.custom_convention_handler as custom
+import commit_helper.conventions.custom_convention as custom
 
 
 def test_angular_convention_with_context():
@@ -30,7 +30,7 @@ def test_symphony_convention():
         raise AssertionError()
 
 
-def test_custom_convention_handler():
+def test_custom_convention():
     fyle = yaml.safe_load("""
     convention: custom
     commit_pattern: tag..:..message