feat(commands/version): add --verbose to show both versions

Author: Lee-W

commitizen/cli.py

@@ -134,6 +134,15 @@
                         "action": "store_true",
                         "exclusive_group": "group1",
                     },
+                    {
+                        "name": ["-v", "--verbose"],
+                        "help": (
+                            "get the version of both the installed commitizen "
+                            "and the current project"
+                        ),
+                        "action": "store_true",
+                        "exclusive_group": "group1",
+                    },
                 ],
             },
             {

commitizen/commands/version.py

@@ -12,11 +12,18 @@ def __init__(self, config: BaseConfig, *args):
 
     def __call__(self):
         if self.parameter.get("project"):
+            version = self.config.settings["version"]
+            if version:
+                out.write(f"{version}")
+            else:
+                out.error(f"No project information in this project.")
+        elif self.parameter.get("verbose"):
+            out.write(f"Installed Commitizen Version: {__version__}")
             version = self.config.settings["version"]
             if version:
                 out.write(f"Project Version: {version}")
             else:
                 out.error(f"No project information in this project.")
         else:
             # if no argument is given, show installed commitizen version
-            out.write(f"Installed Commitizen Version: {__version__}")
+            out.write(f"{__version__}")

tests/test_commands.py

@@ -173,20 +173,42 @@ def test_list_cz(config):
 
 def test_version_for_showing_project_version(config, capsys):
     # No version exist
-    commands.Version(config, {"project": True, "commitizen": False})()
+    commands.Version(config, {"project": True, "commitizen": False, "verbose": False})()
     captured = capsys.readouterr()
     assert "No project information in this project." in captured.err
 
     config.settings["version"] = "v0.0.1"
-    commands.Version(config, {"project": True, "commitizen": False})()
+    commands.Version(config, {"project": True, "commitizen": False, "verbose": False})()
     captured = capsys.readouterr()
-    assert "Project Version: v0.0.1" in captured.out
+    assert "v0.0.1" in captured.out
 
 
 def test_version_for_showing_commitizen_version(config, capsys):
-    commands.Version(config, {"project": False, "commitizen": True})()
+    commands.Version(config, {"project": False, "commitizen": True, "verbose": False})()
+    captured = capsys.readouterr()
+    assert f"{__version__}" in captured.out
+
+    # default showing commitizen version
+    commands.Version(
+        config, {"project": False, "commitizen": False, "verbose": False}
+    )()
+    captured = capsys.readouterr()
+    assert f"{__version__}" in captured.out
+
+
+def test_version_for_showing_both_versions(config, capsys):
+    commands.Version(config, {"project": False, "commitizen": False, "verbose": True})()
     captured = capsys.readouterr()
     assert f"Installed Commitizen Version: {__version__}" in captured.out
+    assert "No project information in this project." in captured.err
+
+    config.settings["version"] = "v0.0.1"
+    commands.Version(config, {"project": False, "commitizen": False, "verbose": True})()
+    captured = capsys.readouterr()
+    expected_out = (
+        f"Installed Commitizen Version: {__version__}\n" f"Project Version: v0.0.1"
+    )
+    assert expected_out in captured.out
 
 
 def test_check_no_conventional_commit(config, mocker):