feat(config): new loads from ~/.cz and working project .cz .cz.cfg and setup.cfg

Author: woile

commitizen/__init__.py

@@ -37,18 +37,39 @@ def registered(*args, **kwargs):
     logger.info(_r)
 
 
-def commiter(name=None):
+name = None
+
+
+def commiter():
     """Loaded commitizen.
 
     :rtype: instance of implemented BaseCommitizen
     """
-    if name is None:
-        logger.debug('Loading default commitizen')
-        name = 'cz_angular'
-
+    global name
     return registry[name]()
 
 
+def set_commiter(new_name):
+    global name
+    logger.debug('Updating commiter name')
+    name = new_name
+
+
+def show_example(args):
+    _commiter = commiter()
+    _commiter.show_example()
+
+
+def show_info(args):
+    _commiter = commiter()
+    _commiter.show_info()
+
+
+def show_schema(args):
+    _commiter = commiter()
+    _commiter.show_schema()
+
+
 def run(args):
-    _commiter = commiter(name=args.use_cz)
+    _commiter = commiter()
     _commiter.run()

commitizen/cli.py

@@ -1,9 +1,17 @@
+import os
+import io
 import logging
 import argparse
-from commitizen import commiter, registered, run
+from pathlib import Path
+from configparser import RawConfigParser
+from commitizen import (registered, run, set_commiter, show_example,
+                        show_info, show_schema)
 
 
-def get_parser():
+logger = logging.getLogger(__name__)
+
+
+def get_parser(config):
     description = (
         'Commitizen is a python cli tool to generate conventional commits.\n'
         'For more information about the topic go to '
@@ -14,9 +22,11 @@ def get_parser():
     parser = argparse.ArgumentParser(prog='cz',
                                      description=description,
                                      formatter_class=formater)
-    parser.set_defaults(func=commiter().run)
+    parser.set_defaults(func=run)
     parser.add_argument('--debug', action='store_true', default=False,
                         help='use debug mode')
+    parser.add_argument('-n', '--name', default=config.get('name'),
+                        help='use the given commitizen')
     subparser = parser.add_subparsers(title='commands')
     # subparser.add_argument('--debug', default=False)
 
@@ -26,24 +36,61 @@ def get_parser():
     commit = subparser.add_parser('commit', aliases=['c'],
                                   help='create new commit')
     commit.set_defaults(func=run)
-    commit.add_argument('-u', '--use_cz', help='use the given commitizen')
 
     example = subparser.add_parser('example', help='show commit example')
-    example.set_defaults(func=commiter().show_example)
+    example.set_defaults(func=show_example)
 
     info = subparser.add_parser('info', help='show information about the cz')
-    info.set_defaults(func=commiter().show_info)
+    info.set_defaults(func=show_info)
 
     schema = subparser.add_parser('schema', help='show commit schema')
-    schema.set_defaults(func=commiter().show_schema)
+    schema.set_defaults(func=show_schema)
 
     return parser
 
 
+def load_cfg():
+    defaults = {
+        'name': 'cz_angular'
+    }
+    config = RawConfigParser('')
+
+    home = str(Path.home())
+    config_file = '.cz'
+
+    # load cfg from home folder
+    global_cfg = os.path.join(home, config_file)
+    if os.path.exists(global_cfg):
+        config.readfp(io.open(global_cfg, 'rt', encoding='utf-8'))
+        log_config = io.StringIO()
+        config.write(log_config)
+        defaults.update(dict(config.items("commitizen")))
+
+    # load cfg from current project
+    configs = ['setup.cfg', '.cz.cfg']
+    for cfg in configs:
+        if not os.path.exists(config_file) and os.path.exists(cfg):
+            config_file = cfg
+            break
+
+    config_file_exists = os.path.exists(config_file)
+    if config_file_exists:
+        logger.debug('Reading file "%s"', config_file)
+        config.readfp(io.open(config_file, 'rt', encoding='utf-8'))
+        log_config = io.StringIO()
+        config.write(log_config)
+        defaults.update(dict(config.items("commitizen")))
+
+    return defaults
+
+
 def main():
-    parser = get_parser()
+    config = load_cfg()
+    parser = get_parser(config)
     args = parser.parse_args()
 
     if args.debug:
         logging.getLogger('commitizen').setLevel(logging.DEBUG)
+
+    set_commiter(args.name)
     args.func(args)