refactor(defaults): move bump_map, bump_pattern, commit_parser from defaults to ConventionalCommitsCz

These defaults are not defaults for other cz

Author: Lee-W

commitizen/bump.py

@@ -6,22 +6,13 @@
 
 from packaging.version import Version
 
-from commitizen.defaults import (
-    MAJOR,
-    MINOR,
-    PATCH,
-    bump_map,
-    bump_message,
-    bump_pattern,
-)
+from commitizen.defaults import MAJOR, MINOR, PATCH, bump_message
 from commitizen.exceptions import CurrentVersionNotFoundError
 from commitizen.git import GitCommit
 
 
 def find_increment(
-    commits: List[GitCommit],
-    regex: str = bump_pattern,
-    increments_map: Union[dict, OrderedDict] = bump_map,
+    commits: List[GitCommit], regex: str, increments_map: Union[dict, OrderedDict]
 ) -> Optional[str]:
 
     if isinstance(increments_map, dict):

commitizen/changelog.py

@@ -69,7 +69,7 @@ def generate_tree_from_commits(
     commits: List[GitCommit],
     tags: List[GitTag],
     commit_parser: str,
-    changelog_pattern: str = defaults.bump_pattern,
+    changelog_pattern: str,
     unreleased_version: Optional[str] = None,
     change_type_map: Optional[Dict[str, str]] = None,
     changelog_message_builder_hook: Optional[Callable] = None,

commitizen/cz/conventional_commits/conventional_commits.py

@@ -1,5 +1,6 @@
 import os
 import re
+from collections import OrderedDict
 from typing import Any, Dict, List
 
 from commitizen import defaults
@@ -28,10 +29,19 @@ def parse_subject(text):
 
 
 class ConventionalCommitsCz(BaseCommitizen):
-    bump_pattern = defaults.bump_pattern
-    bump_map = defaults.bump_map
-    commit_parser = defaults.commit_parser
-    changelog_pattern = defaults.bump_pattern
+    bump_pattern = r"^(BREAKING[\-\ ]CHANGE|feat|fix|refactor|perf)(\(.+\))?(!)?"
+    bump_map = OrderedDict(
+        (
+            (r"^.+!$", defaults.MAJOR),
+            (r"^BREAKING[\-\ ]CHANGE", defaults.MAJOR),
+            (r"^feat", defaults.MINOR),
+            (r"^fix", defaults.PATCH),
+            (r"^refactor", defaults.PATCH),
+            (r"^perf", defaults.PATCH),
+        )
+    )
+    commit_parser = r"^(?P<change_type>feat|fix|refactor|perf|BREAKING CHANGE)(?:\((?P<scope>[^()\r\n]*)\)|\()?(?P<breaking>!)?:\s(?P<message>.*)?"  # noqa
+    version_parser = defaults.version_parser
     change_type_map = {
         "feat": "Feat",
         "fix": "Fix",

tests/commands/conftest.py

@@ -9,7 +9,7 @@
 @pytest.fixture()
 def config():
     _config = BaseConfig()
-    _config.settings.update({"name": defaults.name})
+    _config.settings.update({"name": defaults.DEFAULT_SETTINGS["name"]})
     return _config
 
 

tests/test_bump_find_increment.py

@@ -5,6 +5,7 @@
 import pytest
 
 from commitizen import bump
+from commitizen.cz import ConventionalCommitsCz
 from commitizen.git import GitCommit
 
 NONE_INCREMENT_CC = ["docs(README): motivation", "ci: added travis"]
@@ -72,7 +73,11 @@
 )
 def test_find_increment(messages, expected_type):
     commits = [GitCommit(rev="test", title=message) for message in messages]
-    increment_type = bump.find_increment(commits)
+    increment_type = bump.find_increment(
+        commits,
+        regex=ConventionalCommitsCz.bump_pattern,
+        increments_map=ConventionalCommitsCz.bump_map,
+    )
     assert increment_type == expected_type
 
 

tests/test_changelog.py

@@ -1,6 +1,9 @@
 import pytest
 
 from commitizen import changelog, defaults, git
+from commitizen.cz.conventional_commits.conventional_commits import (
+    ConventionalCommitsCz,
+)
 from commitizen.exceptions import InvalidConfigurationError
 
 COMMITS_DATA = [
@@ -841,8 +844,8 @@ def test_order_changelog_tree_raises():
 
 
 def test_render_changelog(gitcommits, tags, changelog_content):
-    parser = defaults.commit_parser
-    changelog_pattern = defaults.bump_pattern
+    parser = ConventionalCommitsCz.commit_parser
+    changelog_pattern = ConventionalCommitsCz.bump_pattern
     tree = changelog.generate_tree_from_commits(
         gitcommits, tags, parser, changelog_pattern
     )
@@ -852,8 +855,8 @@ def test_render_changelog(gitcommits, tags, changelog_content):
 
 def test_render_changelog_unreleased(gitcommits):
     some_commits = gitcommits[:7]
-    parser = defaults.commit_parser
-    changelog_pattern = defaults.bump_pattern
+    parser = ConventionalCommitsCz.commit_parser
+    changelog_pattern = ConventionalCommitsCz.bump_pattern
     tree = changelog.generate_tree_from_commits(
         some_commits, [], parser, changelog_pattern
     )
@@ -867,8 +870,8 @@ def test_render_changelog_tag_and_unreleased(gitcommits, tags):
         tag for tag in tags if tag.rev == "56c8a8da84e42b526bcbe130bd194306f7c7e813"
     ]
 
-    parser = defaults.commit_parser
-    changelog_pattern = defaults.bump_pattern
+    parser = ConventionalCommitsCz.commit_parser
+    changelog_pattern = ConventionalCommitsCz.bump_pattern
     tree = changelog.generate_tree_from_commits(
         some_commits, single_tag, parser, changelog_pattern
     )
@@ -881,8 +884,8 @@ def test_render_changelog_tag_and_unreleased(gitcommits, tags):
 def test_render_changelog_with_change_type(gitcommits, tags):
     new_title = ":some-emoji: feature"
     change_type_map = {"feat": new_title}
-    parser = defaults.commit_parser
-    changelog_pattern = defaults.bump_pattern
+    parser = ConventionalCommitsCz.commit_parser
+    changelog_pattern = ConventionalCommitsCz.bump_pattern
     tree = changelog.generate_tree_from_commits(
         gitcommits, tags, parser, changelog_pattern, change_type_map=change_type_map
     )
@@ -897,8 +900,8 @@ def changelog_message_builder_hook(message: dict, commit: git.GitCommit) -> dict
         ] = f"{message['message']} [link](github.com/232323232) {commit.author} {commit.author_email}"
         return message
 
-    parser = defaults.commit_parser
-    changelog_pattern = defaults.bump_pattern
+    parser = ConventionalCommitsCz.commit_parser
+    changelog_pattern = ConventionalCommitsCz.bump_pattern
     tree = changelog.generate_tree_from_commits(
         gitcommits,
         tags,

tests/test_cz_base.py

@@ -8,7 +8,7 @@
 @pytest.fixture()
 def config():
     _config = BaseConfig()
-    _config.settings.update({"name": defaults.name})
+    _config.settings.update({"name": defaults.DEFAULT_SETTINGS["name"]})
     return _config
 
 

tests/test_cz_conventional_commits.py

@@ -23,7 +23,7 @@
 @pytest.fixture()
 def config():
     _config = BaseConfig()
-    _config._settings["name"] = defaults.name
+    _config._settings["name"] = defaults.DEFAULT_SETTINGS["name"]
     return _config
 
 

tests/test_cz_jira.py

@@ -8,7 +8,7 @@
 @pytest.fixture()
 def config():
     _config = BaseConfig()
-    _config.settings.update({"name": defaults.name})
+    _config.settings.update({"name": defaults.DEFAULT_SETTINGS["name"]})
     return _config
 
 

tests/test_factory.py

@@ -7,7 +7,7 @@
 
 def test_factory():
     config = BaseConfig()
-    config.settings.update({"name": defaults.name})
+    config.settings.update({"name": defaults.DEFAULT_SETTINGS["name"]})
     r = factory.commiter_factory(config)
     assert isinstance(r, BaseCommitizen)