fix(version): fix the behavior of cz version --major

Author: bearomorphism

commitizen/commands/version.py

@@ -11,6 +11,7 @@
 
 
 class VersionArgs(TypedDict, total=False):
+    commitizen: bool
     report: bool
     project: bool
     verbose: bool
@@ -19,46 +20,52 @@ class VersionArgs(TypedDict, total=False):
 
 
 class Version:
-    """Get the version of the installed commitizen or the current project."""
+    """Get the version of the installed commitizen or the current project.
+    Precedence:
+    1. commitizen
+    2. report
+    3. verbose, project
+    """
 
     def __init__(self, config: BaseConfig, arguments: VersionArgs) -> None:
         self.config: BaseConfig = config
         self.parameter = arguments
-        self.operating_system = platform.system()
-        self.python_version = sys.version
 
     def __call__(self) -> None:
+        if self.parameter.get("commitizen") or not any(self.parameter.values()):
+            # Enter this block if commitizen is explicitly requested or no argument is given
+            out.write(f"{__version__}")
+            return
+
         if self.parameter.get("report"):
             out.write(f"Commitizen Version: {__version__}")
-            out.write(f"Python Version: {self.python_version}")
-            out.write(f"Operating System: {self.operating_system}")
+            out.write(f"Python Version: {sys.version}")
+            out.write(f"Operating System: {platform.system()}")
             return
 
-        if (verbose := self.parameter.get("verbose")) or self.parameter.get("project"):
-            if verbose:
-                out.write(f"Installed Commitizen Version: {__version__}")
-
-            try:
-                version = get_provider(self.config).get_version()
-            except NoVersionSpecifiedError:
-                out.error("No project information in this project.")
-                return
+        if self.parameter.get("verbose"):
+            out.write(f"Installed Commitizen Version: {__version__}")
 
-            try:
-                version_scheme = get_version_scheme(self.config.settings)
-            except VersionSchemeUnknown:
-                out.error("Unknown version scheme.")
-                return
+        try:
+            version = get_provider(self.config).get_version()
+        except NoVersionSpecifiedError:
+            out.error("No project information in this project.")
+            return
 
-            _version = version_scheme(version)
+        try:
+            version_scheme = get_version_scheme(self.config.settings)
+        except VersionSchemeUnknown:
+            out.error("Unknown version scheme.")
+            return
 
-            if self.parameter.get("major"):
-                version = f"{_version.major}"
-            elif self.parameter.get("minor"):
-                version = f"{_version.minor}"
+        _version = version_scheme(version)
 
-            out.write(f"Project Version: {version}" if verbose else version)
-            return
+        if self.parameter.get("major"):
+            version = f"{_version.major}"
+        elif self.parameter.get("minor"):
+            version = f"{_version.minor}"
 
-        # if no argument is given, show installed commitizen version
-        out.write(f"{__version__}")
+        out.write(
+            f"Project Version: {version}" if self.parameter.get("verbose") else version
+        )
+        return

tests/commands/test_version_command.py

@@ -135,16 +135,21 @@ def test_version_command_shows_description_when_use_help_option(
 
 
 @pytest.mark.parametrize(
-    "version, expected_version", (("1.0.0", "1\n"), ("2.1.3", "2\n"), ("0.0.1", "0\n"))
+    "project, version, expected_version",
+    [
+        (proj, ver, exp)
+        for proj in [True, False]
+        for ver, exp in [("1.0.0", "1\n"), ("2.1.3", "2\n"), ("0.0.1", "0\n")]
+    ],
 )
-def test_version_just_major(config, capsys, version: str, expected_version: str):
+def test_version_just_major(
+    config, capsys, project: bool, version: str, expected_version: str
+):
     config.settings["version"] = version
     commands.Version(
         config,
         {
-            "report": False,
-            "project": True,
-            "verbose": False,
+            "project": project,
             "major": True,
         },
     )()
@@ -153,17 +158,26 @@ def test_version_just_major(config, capsys, version: str, expected_version: str)
 
 
 @pytest.mark.parametrize(
-    "version, expected_version",
-    (("1.0.0", "0\n"), ("2.1.3", "1\n"), ("0.0.1", "0\n"), ("0.1.0", "1\n")),
+    "project, version, expected_version",
+    [
+        (proj, ver, exp)
+        for proj in [True, False]
+        for ver, exp in [
+            ("1.0.0", "0\n"),
+            ("2.1.3", "1\n"),
+            ("0.0.1", "0\n"),
+            ("0.1.0", "1\n"),
+        ]
+    ],
 )
-def test_version_just_minor(config, capsys, version: str, expected_version: str):
+def test_version_just_minor(
+    config, capsys, project: bool, version: str, expected_version: str
+):
     config.settings["version"] = version
     commands.Version(
         config,
         {
-            "report": False,
-            "project": True,
-            "verbose": False,
+            "project": project,
             "minor": True,
         },
     )()