Merge branch 'v4-9-0-test' into feat/Add-config-option-for-line-length-warning

Author: Narwhal-fish

commitizen/cli.py

@@ -578,20 +578,19 @@ def parse_no_raise(comma_separated_no_raise: str) -> list[int]:
     Receives digits and strings and outputs the parsed integer which
     represents the exit code found in exceptions.
     """
-    no_raise_items: list[str] = comma_separated_no_raise.split(",")
-    no_raise_codes: list[int] = []
-    for item in no_raise_items:
-        if item.isdecimal():
-            no_raise_codes.append(int(item))
-            continue
+
+    def exit_code_from_str_or_skip(s: str) -> ExitCode | None:
         try:
-            exit_code = ExitCode[item.strip()]
-        except KeyError:
-            out.warn(f"WARN: no_raise key `{item}` does not exist. Skipping.")
-            continue
-        else:
-            no_raise_codes.append(exit_code.value)
-    return no_raise_codes
+            return ExitCode.from_str(s)
+        except (KeyError, ValueError):
+            out.warn(f"WARN: no_raise value `{s}` is not a valid exit code. Skipping.")
+            return None
+
+    return [
+        code.value
+        for s in comma_separated_no_raise.split(",")
+        if (code := exit_code_from_str_or_skip(s)) is not None
+    ]
 
 
 if TYPE_CHECKING:

commitizen/commands/init.py

@@ -210,23 +210,20 @@ def _ask_tag(self) -> str:
         return latest_tag
 
     def _ask_tag_format(self, latest_tag: str) -> str:
-        is_correct_format = False
         if latest_tag.startswith("v"):
-            tag_format = r"v$version"
-            is_correct_format = questionary.confirm(
-                f'Is "{tag_format}" the correct tag format?', style=self.cz.style
-            ).unsafe_ask()
+            v_tag_format = r"v$version"
+            if questionary.confirm(
+                f'Is "{v_tag_format}" the correct tag format?', style=self.cz.style
+            ).unsafe_ask():
+                return v_tag_format
 
         default_format = DEFAULT_SETTINGS["tag_format"]
-        if not is_correct_format:
-            tag_format = questionary.text(
-                f'Please enter the correct version format: (default: "{default_format}")',
-                style=self.cz.style,
-            ).unsafe_ask()
+        tag_format: str = questionary.text(
+            f'Please enter the correct version format: (default: "{default_format}")',
+            style=self.cz.style,
+        ).unsafe_ask()
 
-            if not tag_format:
-                tag_format = default_format
-        return tag_format
+        return tag_format or default_format
 
     def _ask_version_provider(self) -> str:
         """Ask for setting: version_provider"""

commitizen/exceptions.py

@@ -1,10 +1,12 @@
-import enum
+from __future__ import annotations
+
+from enum import IntEnum
 from typing import Any
 
 from commitizen import out
 
 
-class ExitCode(enum.IntEnum):
+class ExitCode(IntEnum):
     EXPECTED_EXIT = 0
     NO_COMMITIZEN_FOUND = 1
     NOT_A_GIT_PROJECT = 2
@@ -39,6 +41,12 @@ class ExitCode(enum.IntEnum):
     CONFIG_FILE_IS_EMPTY = 31
     COMMIT_MESSAGE_LENGTH_LIMIT_EXCEEDED = 32
 
+    @classmethod
+    def from_str(cls, value: str) -> ExitCode:
+        if value.isdecimal():
+            return cls(int(value))
+        return cls[value.strip()]
+
 
 class CommitizenException(Exception):
     def __init__(self, *args: str, **kwargs: Any) -> None:

tests/commands/test_init_command.py

@@ -255,6 +255,38 @@ def test_pre_commit_exec_failed(
                 commands.Init(config)()
 
 
+class TestAskTagFormat:
+    def test_confirm_v_tag_format(self, mocker: MockFixture, config):
+        init = commands.Init(config)
+        mocker.patch("questionary.confirm", return_value=FakeQuestion(True))
+
+        result = init._ask_tag_format("v1.0.0")
+        assert result == r"v$version"
+
+    def test_reject_v_tag_format(self, mocker: MockFixture, config):
+        init = commands.Init(config)
+        mocker.patch("questionary.confirm", return_value=FakeQuestion(False))
+        mocker.patch("questionary.text", return_value=FakeQuestion("custom-$version"))
+
+        result = init._ask_tag_format("v1.0.0")
+        assert result == "custom-$version"
+
+    def test_non_v_tag_format(self, mocker: MockFixture, config):
+        init = commands.Init(config)
+        mocker.patch("questionary.text", return_value=FakeQuestion("custom-$version"))
+
+        result = init._ask_tag_format("1.0.0")
+        assert result == "custom-$version"
+
+    def test_empty_input_returns_default(self, mocker: MockFixture, config):
+        init = commands.Init(config)
+        mocker.patch("questionary.confirm", return_value=FakeQuestion(False))
+        mocker.patch("questionary.text", return_value=FakeQuestion(""))
+
+        result = init._ask_tag_format("v1.0.0")
+        assert result == "$version"  # This is the default format from DEFAULT_SETTINGS
+
+
 @skip_below_py_3_10
 def test_init_command_shows_description_when_use_help_option(
     mocker: MockFixture, capsys, file_regression

tests/test_exceptions.py

@@ -0,0 +1,38 @@
+import pytest
+
+from commitizen.exceptions import ExitCode
+
+
+def test_from_str_with_decimal():
+    """Test from_str with decimal values."""
+    assert ExitCode.from_str("0") == ExitCode.EXPECTED_EXIT
+    assert ExitCode.from_str("1") == ExitCode.NO_COMMITIZEN_FOUND
+    assert ExitCode.from_str("32") == ExitCode.COMMIT_MESSAGE_LENGTH_LIMIT_EXCEEDED
+
+
+def test_from_str_with_enum_name():
+    """Test from_str with enum names."""
+    assert ExitCode.from_str("EXPECTED_EXIT") == ExitCode.EXPECTED_EXIT
+    assert ExitCode.from_str("NO_COMMITIZEN_FOUND") == ExitCode.NO_COMMITIZEN_FOUND
+    assert (
+        ExitCode.from_str("COMMIT_MESSAGE_LENGTH_LIMIT_EXCEEDED")
+        == ExitCode.COMMIT_MESSAGE_LENGTH_LIMIT_EXCEEDED
+    )
+
+
+def test_from_str_with_whitespace():
+    """Test from_str with whitespace in enum names."""
+    assert ExitCode.from_str("  EXPECTED_EXIT  ") == ExitCode.EXPECTED_EXIT
+    assert ExitCode.from_str("\tNO_COMMITIZEN_FOUND\t") == ExitCode.NO_COMMITIZEN_FOUND
+
+
+def test_from_str_with_invalid_values():
+    """Test from_str with invalid values."""
+    with pytest.raises(KeyError):
+        ExitCode.from_str("invalid_name")
+    with pytest.raises(ValueError):
+        ExitCode.from_str("999")  # Out of range decimal
+    with pytest.raises(KeyError):
+        ExitCode.from_str("")
+    with pytest.raises(KeyError):
+        ExitCode.from_str(" ")