Skip to content

Commit

Permalink
feat(ConventionalCommitsCz): allow to override defaults from config
Browse files Browse the repository at this point in the history
As addressed on #535, when using customize commitizen, if we want to
customize a small attribute, we need to redefine all commitizens options
to make our custom class work.

For example:

```diff
diff --git a/cz.yaml b/cz.yaml
index f2e19a9..302e961 100644
--- a/cz.yaml
+++ b/cz.yaml
@@ -1,6 +1,18 @@
 commitizen:
   annotated_tag: true
   bump_message: 'bump: $current_version -> $new_version [skip ci]'
-  name: cz_conventional_commits
+  name: cz_customize
   update_changelog_on_bump: true
   version: 0.11.0
+
+  customize:
+    bump_pattern: '^(fix|feat|docs|style|refactor|test|build|ci)'
+    bump_map:
+      fix: PATCH
+      feat: PATCH
+      docs: PATCH
+      style: PATCH
+      refactor: PATCH
+      test: PATCH
+      build: PATCH
+      ci: PATCH
diff --git a/t b/t
new file mode 100644
index 0000000..e69de29
diff --git a/t2 b/t2
new file mode 100644
index 0000000..e69de29
```

making the following change on a repo would cause an unexpected
behavior:

```python
+ bash -c cz commit

Traceback (most recent call last):
  File "/home/amit/.local/bin/cz", line 8, in <module>
    sys.exit(main())
  File "/home/amit/.local/lib/python3.10/site-packages/commitizen/cli.py", line 382, in main
    args.func(conf, vars(args))()
  File "/home/amit/.local/lib/python3.10/site-packages/commitizen/commands/commit.py", line 74, in __call__
    m = self.prompt_commit_questions()
  File "/home/amit/.local/lib/python3.10/site-packages/commitizen/commands/commit.py", line 49, in prompt_commit_questions
    for question in filter(lambda q: q["type"] == "list", questions):
  File "/home/amit/.local/lib/python3.10/site-packages/commitizen/commands/commit.py", line 49, in <lambda>
    for question in filter(lambda q: q["type"] == "list", questions):
KeyError: 'type'
```

From my best understanding, this error happens because I didn't defined
question section in config, though I'm ok with using
ConventionalCommitsCz default ones.

This commit extends ConventionalCommitsCz to read from config and
fallbacks to defaults if some are not provided.

By adding this change, potentially customize commitizen can be
deprecated.

Closes #535.
  • Loading branch information
amitlevy21 committed Aug 9, 2022
1 parent 2ff9f15 commit 2b903f9
Show file tree
Hide file tree
Showing 7 changed files with 136 additions and 74 deletions.
72 changes: 36 additions & 36 deletions commitizen/cz/base.py
Original file line number Diff line number Diff line change
@@ -1,37 +1,14 @@
from abc import ABCMeta, abstractmethod
from typing import Callable, Dict, List, Optional, Tuple
from typing import Callable, Dict, List, Optional

from prompt_toolkit.styles import Style, merge_styles
from prompt_toolkit.styles import Style

from commitizen import git
from commitizen import defaults, git
from commitizen.config.base_config import BaseConfig
from commitizen.defaults import Questions


class BaseCommitizen(metaclass=ABCMeta):
bump_pattern: Optional[str] = None
bump_map: Optional[Dict[str, str]] = None
default_style_config: List[Tuple[str, str]] = [
("qmark", "fg:#ff9d00 bold"),
("question", "bold"),
("answer", "fg:#ff9d00 bold"),
("pointer", "fg:#ff9d00 bold"),
("highlighted", "fg:#ff9d00 bold"),
("selected", "fg:#cc5454"),
("separator", "fg:#cc5454"),
("instruction", ""),
("text", ""),
("disabled", "fg:#858585 italic"),
]

# The whole subject will be parsed as message by default
# This allows supporting changelog for any rule system.
# It can be modified per rule
commit_parser: Optional[str] = r"(?P<message>.*)"
changelog_pattern: Optional[str] = r".*"
change_type_map: Optional[Dict[str, str]] = None
change_type_order: Optional[List[str]] = None

# Executed per message parsed by the commitizen
changelog_message_builder_hook: Optional[
Callable[[Dict, git.GitCommit], Dict]
Expand All @@ -40,10 +17,33 @@ class BaseCommitizen(metaclass=ABCMeta):
# Executed only at the end of the changelog generation
changelog_hook: Optional[Callable[[str, Optional[str]], str]] = None

# style = defaults.style

def __init__(self, config: BaseConfig):
self.config = config
if not self.config.settings.get("style"):
self.config.settings.update({"style": BaseCommitizen.default_style_config})
self.style = Style(self.config.settings.get("style", defaults.style))

self.bump_pattern: Optional[str] = self.config.settings.get(
"bump_pattern", defaults.bump_pattern
)
self.bump_map: Optional[Dict[str, str]] = self.config.settings.get(
"bump_map", defaults.bump_map
)
self.change_type_order: Optional[List[str]] = self.config.settings.get(
"change_type_order", defaults.change_type_order
)
self.change_type_map: Optional[Dict[str, str]] = self.config.settings.get(
"change_type_map", defaults.change_type_map
)
self.commit_parser: Optional[str] = self.config.settings.get(
"commit_parser", defaults.commit_parser
)
self.changelog_pattern: Optional[str] = self.config.settings.get(
"changelog_pattern", defaults.changelog_pattern
)
self.version_parser = self.config.settings.get(
"version_parser", defaults.version_parser
)

@abstractmethod
def questions(self) -> Questions:
Expand All @@ -53,14 +53,14 @@ def questions(self) -> Questions:
def message(self, answers: dict) -> str:
"""Format your git message."""

@property
def style(self):
return merge_styles(
[
Style(BaseCommitizen.default_style_config),
Style(self.config.settings["style"]),
]
)
# @property
# def style(self):
# return merge_styles(
# [
# Style(BaseCommitizen.style),
# Style(self.style),
# ]
# )

def example(self) -> Optional[str]:
"""Example of the commit message."""
Expand Down
55 changes: 31 additions & 24 deletions commitizen/cz/conventional_commits/conventional_commits.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import os
import re

from commitizen import defaults
try:
from jinja2 import Template
except ImportError:
from string import Template # type: ignore

from commitizen.cz.base import BaseCommitizen
from commitizen.cz.utils import multiple_line_breaker, required_validator
from commitizen.defaults import Questions
Expand All @@ -28,18 +32,6 @@ def parse_subject(text):


class ConventionalCommitsCz(BaseCommitizen):
bump_pattern = defaults.bump_pattern
bump_map = defaults.bump_map
commit_parser = defaults.commit_parser
version_parser = defaults.version_parser
change_type_map = {
"feat": "Feat",
"fix": "Fix",
"refactor": "Refactor",
"perf": "Perf",
}
changelog_pattern = defaults.bump_pattern

def questions(self) -> Questions:
questions: Questions = [
{
Expand Down Expand Up @@ -148,9 +140,20 @@ def questions(self) -> Questions:
),
},
]
return questions

return self.config.settings.get("questions", questions)

def message(self, answers: dict) -> str:
custom_message = self.config.settings.get("message_template")
if custom_message:
message_template = Template(
str(self.config.settings.get("message_template", ""))
)
if getattr(Template, "substitute", None):
return message_template.substitute(**answers) # type: ignore
else:
return message_template.render(**answers)

prefix = answers["prefix"]
scope = answers["scope"]
subject = answers["subject"]
Expand All @@ -172,32 +175,36 @@ def message(self, answers: dict) -> str:
return message

def example(self) -> str:
return (
"fix: correct minor typos in code\n"
"\n"
"see the issue for details on the typos fixed\n"
"\n"
"closes issue #12"
return str(
self.config.settings.get(
"example",
"fix: correct minor typos in code\n"
"\n"
"see the issue for details on the typos fixed\n"
"\n"
"closes issue #12",
)
)

def schema(self) -> str:
return (
return self.config.settings.get(
"schema",
"<type>(<scope>): <subject>\n"
"<BLANK LINE>\n"
"<body>\n"
"<BLANK LINE>\n"
"(BREAKING CHANGE: )<footer>"
"(BREAKING CHANGE: )<footer>",
)

def schema_pattern(self) -> str:
PATTERN = (
r"(?s)" # To explictly make . match new line
r"(?s)" # To explicitly make . match new line
r"(build|ci|docs|feat|fix|perf|refactor|style|test|chore|revert|bump)" # type
r"(\(\S+\))?!?:" # scope
r"( [^\n\r]+)" # subject
r"((\n\n.*)|(\s*))?$"
)
return PATTERN
return self.config.settings.get("schema_pattern", PATTERN)

def info(self) -> str:
dir_path = os.path.dirname(os.path.realpath(__file__))
Expand Down
8 changes: 8 additions & 0 deletions commitizen/cz/jira/jira.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
import os

from commitizen.config.base_config import BaseConfig
from commitizen.cz.base import BaseCommitizen
from commitizen.defaults import Questions

__all__ = ["JiraSmartCz"]


class JiraSmartCz(BaseCommitizen):
def __init__(self, config: BaseConfig):
super().__init__(config)
self.bump_map = None
self.bump_pattern = None
self.commit_parser = r"(?P<message>.*)"
self.changelog_pattern = r".*"

def questions(self) -> Questions:
questions = [
{
Expand Down
35 changes: 33 additions & 2 deletions commitizen/defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,23 @@ class Settings(TypedDict, total=False):
version_files: List[str]
tag_format: Optional[str]
bump_message: Optional[str]
bump_pattern: Optional[str]
bump_map: Optional[Dict[str, str]]
allow_abort: bool
changelog_file: str
changelog_incremental: bool
changelog_start_rev: Optional[str]
changelog_pattern: Optional[str]
update_changelog_on_bump: bool
use_shortcuts: bool
style: Optional[List[Tuple[str, str]]]
style: List[Tuple[str, str]]
customize: CzSettings
change_type_order: Optional[List[str]]
change_type_map: Optional[Dict[str, str]]
commit_parser: Optional[str]
schema: str
schema_pattern: str
questions: Questions


name: str = "cz_conventional_commits"
Expand Down Expand Up @@ -80,10 +89,32 @@ class Settings(TypedDict, total=False):
(r"^perf", PATCH),
)
)
change_type_order = ["BREAKING CHANGE", "feat", "fix", "refactor", "perf"]
change_type_order: Optional[List[str]] = None

bump_message = "bump: version $current_version → $new_version"


commit_parser = r"^(?P<change_type>feat|fix|refactor|perf|BREAKING CHANGE)(?:\((?P<scope>[^()\r\n]*)\)|\()?(?P<breaking>!)?:\s(?P<message>.*)?" # noqa
version_parser = r"(?P<version>([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?(\w+)?)"

change_type_map = {
"feat": "Feat",
"fix": "Fix",
"refactor": "Refactor",
"perf": "Perf",
}

changelog_pattern = bump_pattern

style: List[Tuple[str, str]] = [
("qmark", "fg:#ff9d00 bold"),
("question", "bold"),
("answer", "fg:#ff9d00 bold"),
("pointer", "fg:#ff9d00 bold"),
("highlighted", "fg:#ff9d00 bold"),
("selected", "fg:#cc5454"),
("separator", "fg:#cc5454"),
("instruction", ""),
("text", ""),
("disabled", "fg:#858585 italic"),
]
8 changes: 8 additions & 0 deletions tests/commands/test_changelog_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ def test_changelog_with_different_cz(mocker, capsys):


@pytest.mark.usefixtures("tmp_commitizen_project")
# @pytest.mark.skip(reason="order")
def test_changelog_from_start(mocker, capsys, changelog_path):
create_file_and_commit("feat: new file")
create_file_and_commit("refactor: is in changelog")
Expand All @@ -86,6 +87,7 @@ def test_changelog_from_start(mocker, capsys, changelog_path):


@pytest.mark.usefixtures("tmp_commitizen_project")
# @pytest.mark.skip(reason="possible order")
def test_changelog_replacing_unreleased_using_incremental(
mocker, capsys, changelog_path
):
Expand Down Expand Up @@ -394,6 +396,7 @@ def test_changelog_in_non_git_project(tmpdir, config, mocker):


@pytest.mark.usefixtures("tmp_commitizen_project")
# @pytest.mark.skip(reason="order - bc - feat")
def test_breaking_change_content_v1_beta(mocker, capsys):
commit_message = (
"feat(users): email pattern corrected\n\n"
Expand All @@ -414,6 +417,7 @@ def test_breaking_change_content_v1_beta(mocker, capsys):


@pytest.mark.usefixtures("tmp_commitizen_project")
# @pytest.mark.skip(reason="order - bc - feat")
def test_breaking_change_content_v1(mocker, capsys):
commit_message = (
"feat(users): email pattern corrected\n\n"
Expand All @@ -434,6 +438,7 @@ def test_breaking_change_content_v1(mocker, capsys):


@pytest.mark.usefixtures("tmp_commitizen_project")
# @pytest.mark.skip(reason="order -bc - feat")
def test_breaking_change_content_v1_multiline(mocker, capsys):
commit_message = (
"feat(users): email pattern corrected\n\n"
Expand Down Expand Up @@ -532,6 +537,9 @@ def test_changelog_incremental_keep_a_changelog_sample_with_annotated_tag(
@pytest.mark.parametrize("test_input", ["rc", "alpha", "beta"])
@pytest.mark.usefixtures("tmp_commitizen_project")
@pytest.mark.freeze_time("2021-06-11")
# @pytest.mark.skip(
# reason="this fails since default order used to be None, now its not so Feat comes before Fix"
# )
def test_changelog_incremental_with_release_candidate_version(
mocker, changelog_path, file_regression, test_input
):
Expand Down
6 changes: 4 additions & 2 deletions tests/test_bump_find_increment.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import pytest

from commitizen import bump
from commitizen.config.base_config import BaseConfig
from commitizen.cz import ConventionalCommitsCz
from commitizen.git import GitCommit

Expand Down Expand Up @@ -72,11 +73,12 @@
),
)
def test_find_increment(messages, expected_type):
cz = ConventionalCommitsCz(BaseConfig())
commits = [GitCommit(rev="test", title=message) for message in messages]
increment_type = bump.find_increment(
commits,
regex=ConventionalCommitsCz.bump_pattern,
increments_map=ConventionalCommitsCz.bump_map,
regex=cz.bump_pattern,
increments_map=cz.bump_map,
)
assert increment_type == expected_type

Expand Down
Loading

0 comments on commit 2b903f9

Please sign in to comment.