fix: raise NoVersionSpecifiedError if version is None, and adjust call sites of get_version

Author: bearomorphism

commitizen/commands/bump.py

@@ -23,7 +23,6 @@
     NoPatternMapError,
     NotAGitProjectError,
     NotAllowed,
-    NoVersionSpecifiedError,
 )
 from commitizen.providers import get_provider
 from commitizen.tags import TagRules
@@ -163,11 +162,7 @@ def _find_increment(self, commits: list[git.GitCommit]) -> Increment | None:
     def __call__(self) -> None:
         """Steps executed to bump."""
         provider = get_provider(self.config)
-
-        try:
-            current_version = self.scheme(provider.get_version())
-        except TypeError:
-            raise NoVersionSpecifiedError()
+        current_version = self.scheme(provider.get_version())
 
         increment = self.arguments["increment"]
         prerelease = self.arguments["prerelease"]

commitizen/commands/version.py

@@ -5,6 +5,7 @@
 from commitizen import out
 from commitizen.__version__ import __version__
 from commitizen.config import BaseConfig
+from commitizen.exceptions import NoVersionSpecifiedError
 from commitizen.providers import get_provider
 
 
@@ -28,19 +29,20 @@ def __call__(self) -> None:
             out.write(f"Commitizen Version: {__version__}")
             out.write(f"Python Version: {self.python_version}")
             out.write(f"Operating System: {self.operating_system}")
-        elif self.parameter.get("project"):
-            version = get_provider(self.config).get_version()
-            if version:
-                out.write(f"{version}")
-            else:
-                out.error("No project information in this project.")
-        elif self.parameter.get("verbose"):
-            out.write(f"Installed Commitizen Version: {__version__}")
-            version = get_provider(self.config).get_version()
-            if version:
-                out.write(f"Project Version: {version}")
-            else:
+            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.")
-        else:
-            # if no argument is given, show installed commitizen version
-            out.write(f"{__version__}")
+                return
+
+            out.write(("Project Version: " if verbose else "") + version)
+            return
+
+        # if no argument is given, show installed commitizen version
+        out.write(f"{__version__}")

commitizen/providers/commitizen_provider.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from commitizen.exceptions import NoVersionSpecifiedError
 from commitizen.providers.base_provider import VersionProvider
 
 
@@ -9,7 +10,9 @@ class CommitizenProvider(VersionProvider):
     """
 
     def get_version(self) -> str:
-        return self.config.settings["version"]  # type: ignore[return-value] # TODO: check if we can fix this by tweaking the `Settings` type
+        if ret := self.config.settings["version"]:
+            return ret
+        raise NoVersionSpecifiedError()
 
     def set_version(self, version: str) -> None:
         self.config.set_key("version", version)