feat(test1): PEG111 PEG222 PEG333 test2

test3

BREAKING CHANGE: break1 break2

Author: [email protected]

commitizen/cli.py

@@ -2,7 +2,7 @@
 import io
 import logging
 import argparse
-from pathlib import Path
+# from pathlib import Path
 from configparser import RawConfigParser
 from commitizen import (registered, run, set_commiter, show_example,
                         show_info, show_schema)
@@ -33,7 +33,10 @@ def get_parser(config):
     lscz = subparser.add_parser('ls', help='show available commitizens')
     lscz.set_defaults(func=registered)
 
-    commit = subparser.add_parser('commit', aliases=['c'],
+    # commit = subparser.add_parser('commit', aliases=['c'],
+    #                               help='create new commit')
+
+    commit = subparser.add_parser('commit',
                                   help='create new commit')
     commit.set_defaults(func=run)
 
@@ -55,7 +58,7 @@ def load_cfg():
     }
     config = RawConfigParser('')
 
-    home = str(Path.home())
+    home = str(os.path.expanduser("~"))
     config_file = '.cz'
 
     # load cfg from home folder

commitizen/cz/cz_base.py

@@ -10,8 +10,8 @@
 logger = logging.getLogger(__name__)
 
 
-class BaseCommitizen(metaclass=ABCMeta):
-
+class BaseCommitizen(object):
+    __metaclass__ = ABCMeta
     style = style_from_dict({
         Token.Separator: '#6C6C6C',
         Token.QuestionMark: '#FF9D00 bold',

commitizen/cz/cz_conventional_changelog.py

@@ -1,12 +1,12 @@
 import os
 from commitizen.cz.cz_base import BaseCommitizen
-
+import re
+import textwrap
 
 __all__ = ['ConventionalChangelogCz']
 
 
 class ConventionalChangelogCz(BaseCommitizen):
-
     def questions(self):
         questions = [
             {
@@ -57,49 +57,75 @@ def questions(self):
             {
                 'type': 'input',
                 'name': 'scope',
-                'message': ('Scope. Could be anything specifying place of the '
-                            'commit change (users, db, poll):\n')
+                'message': ('What is the scope of this change (e.g. component or file name)? (press enter to skip)\n')
             },
             {
                 'type': 'input',
                 'name': 'subject',
-                'message': ('Subject. Concise description of the changes. '
-                            'Imperative, lower case and no final dot:\n')
+                'message': ('Write a short, imperative tense description of the change:\n')
             },
             {
                 'type': 'input',
                 'name': 'body',
-                'message': ('Body. Motivation for the change and contrast this '
-                            'with previous behavior:\n')
+                'message': ('Provide a longer description of the change: (press enter to skip)\n')
             },
             {
-                'type': 'input',
-                'name': 'footer',
-                'message': ('Footer. Information about Breaking Changes and '
-                            'reference issues that this commit closes:\n')
+                'type': 'confirm',
+                'name': 'isBreaking',
+                'message': 'Are there any breaking changes?',
+                'default': False
+            },
+            {
+                "type": "input",
+                "name": "breaking",
+                "message": "Describe the breaking changes:\n",
+                "when": self.is_breaking_answers
+            },
+            {
+                "type": 'confirm',
+                "name": 'isIssueAffected',
+                "message": 'Does this change affect any open issues?',
+                "default": False
+            },
+            {
+                "type": 'input',
+                "name": 'issues',
+                "message": 'Add issue refere nces (e.g. "fix #123", "re #123".):\n',
+                "when": self.is_issued_affected
             }
         ]
         return questions
 
     def message(self, answers):
+        wrapper = textwrap.TextWrapper(width=100)
         prefix = answers['prefix']
         scope = answers['scope']
+        issues = ' '.join(wrapper.wrap(answers.get('issues'))) if 'issues' in answers else ''
         subject = answers['subject']
         body = answers['body']
-        footer = answers['footer']
+        # footer = answers['footer']
+        breaking = answers['breaking'] if 'breaking' in answers else ''
+        if len(breaking) > 0:
+            breaking = 'BREAKING CHANGE: ' + re.sub(r'/^BREAKING CHANGE: /', '', breaking)
+        breaking = ' '.join(wrapper.wrap(breaking))
+        # breaking = wrapper.fill(breaking)
+        footer = '{}\n\n'.format(breaking)
         message = ''
 
         if prefix:
             message += '{0}'.format(prefix)
             if scope:
                 message += '({0})'.format(scope)
             message += ': '
+        if issues:
+            message += '{} '.format(issues)
         if subject:
             message += '{0}'.format(subject)
         if body:
             message += '\n\n{0}'.format(body)
         if footer:
             message += '\n\n{0}'.format(footer)
+        print message
         return message
 
     def example(self):
@@ -124,3 +150,9 @@ def info(self):
         with open(filepath, 'r') as f:
             content = f.read()
         return content
+
+    def is_breaking_answers(self, answers):
+        return answers.get('isBreaking')
+
+    def is_issued_affected(self, answers):
+        return answers.get('isIssueAffected')

setup.py

@@ -85,10 +85,8 @@ def run(self):
         # Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy'
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: Implementation :: CPython'
     ],
     # $ setup.py publish support.
     cmdclass={