refactor: change the default behaviour in "ap bump" to always bump the dev version (different from "cz bump")

Author: softwareentrepreneer

afterpython/cli/commands/bump.py

@@ -11,6 +11,54 @@
     ),
 )
 @click.pass_context
-def bump(ctx):
-    """Run 'cz bump'"""
-    subprocess.run(["ap", "cz", "bump", *ctx.args])
+@click.option(
+    "--pre",
+    is_flag=True,
+    help="bump to pre-release version (e.g., dev3 -> rc0, a1 -> a2)",
+)
+@click.option(
+    "--release", is_flag=True, help="bump to stable release (uses cz bump default)"
+)
+def bump(ctx, release: bool, pre: bool):
+    """Bump project version with granular control.
+
+    By default, stays within current release phase:
+    - Dev releases (e.g., 0.1.0.dev3) -> increment dev number (0.1.0.dev4)
+    - Pre-releases (e.g., 0.1.0a1) -> increment pre-release (0.1.0a2)
+
+    Use --pre to transition from dev to pre-release, or pre-release to next pre-release.
+    Use --release to bump to next stable version (cz bump default behavior).
+    """
+    from afterpython.tools.pyproject import read_metadata
+
+    if release and pre:
+        raise click.ClickException("Only one of --release or --pre can be specified")
+
+    # bump using cz bump's default behavior
+    if release:
+        subprocess.run(["ap", "cz", "bump", *ctx.args])
+    else:
+        metadata = read_metadata()
+        version = metadata.version
+
+        if version is None:
+            raise click.ClickException("Unable to read version from pyproject.toml")
+
+        args = ctx.args  # default: pass through all extra args
+
+        # by default, bump dev-release version
+        if version.is_devrelease and not pre:
+            devrelease_number = int(version.dev)
+            if "--devrelease" not in ctx.args:
+                args = ["--devrelease", str(devrelease_number + 1), *ctx.args]
+        # exclude e.g. 0.1.0.dev1 which is both dev-release and pre-release (with version.pre = None)
+        elif version.is_prerelease:
+            prerelease_type = version.pre[0] if version.pre is not None else "rc"
+            if prerelease_type == "a":
+                prerelease_type = "alpha"
+            elif prerelease_type == "b":
+                prerelease_type = "beta"
+            if "--prerelease" not in ctx.args:
+                args = ["--prerelease", prerelease_type, *ctx.args]
+
+        subprocess.run(["ap", "cz", "bump", *args])

afterpython/cli/commands/commitizen.py

@@ -1,6 +1,7 @@
 import subprocess
 
 import click
+from click.exceptions import Exit
 
 
 @click.command(
@@ -15,4 +16,8 @@ def commitizen(ctx):
     """Run commitizen"""
     paths = ctx.obj["paths"]
     cz_toml_path = paths.afterpython_path / "cz.toml"
-    subprocess.run(["cz", "--config", str(cz_toml_path), *ctx.args])
+    result = subprocess.run(
+        ["cz", "--config", str(cz_toml_path), *ctx.args], check=False
+    )
+    if result.returncode != 0:
+        raise Exit(result.returncode)

afterpython/cli/commands/pre_commit.py

@@ -1,6 +1,7 @@
 import subprocess
 
 import click
+from click.exceptions import Exit
 
 
 def _command_supports_config(command: str) -> bool:
@@ -51,4 +52,6 @@ def pre_commit(ctx):
         args.insert(command_idx + 1, "--config")
         args.insert(command_idx + 2, str(pre_commit_path))
 
-    subprocess.run(["pre-commit", *args], check=True)
+    result = subprocess.run(["pre-commit", *args], check=False)
+    if result.returncode != 0:
+        raise Exit(result.returncode)