- Writing custom git flow scripts - finishing up without extensive testing

scripts/git/commands/release.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from ..core import config, git_api, output
+from ..core import config, git_api, hooks, output
 
 
 def _release_branch_name(version: str) -> str:
@@ -31,6 +31,16 @@ def handle_release_start(args) -> int:
         output.info(f"Aanmaken van release branch '{branch_name}' vanaf '{cfg.develop_branch}'")
         git_api.create_branch(branch_name, cfg.develop_branch)
         output.success(f"Release branch '{branch_name}' is aangemaakt en gecheckt out.")
+
+        # Hooks na succesvol aanmaken van een release branch
+        hooks.run_hooks(
+            "release_start",
+            {
+                "branch": branch_name,
+                "base_branch": cfg.develop_branch,
+                "version": version,
+            },
+        )
         return 0
     except git_api.GitError as exc:
         output.error(str(exc))
@@ -41,6 +51,7 @@ def handle_release_finish(args) -> int:
     cfg = config.CONFIG
     try:
         version_arg = getattr(args, "version", None)
+        env_arg = getattr(args, "env", None)
         git_api.ensure_clean_working_tree()
         git_api.fetch_remote(cfg.remote_name)
 
@@ -64,7 +75,11 @@ def handle_release_finish(args) -> int:
         git_api.ensure_not_behind_remote(cfg.main_branch, cfg.remote_name)
         git_api.ensure_not_behind_remote(cfg.develop_branch, cfg.remote_name)
 
-        tag_name = cfg.tag_format.format(version=version)
+        # Bepaal omgeving en uiteindelijke tagnaam
+        env = env_arg or cfg.release_default_env
+        suffix = cfg.environments.get(env, "")
+        base_tag = cfg.tag_format.format(version=version)
+        tag_name = f"{base_tag}{suffix}"
 
         # Merge naar main
         output.info(f"Mergen van '{release_branch}' naar '{cfg.main_branch}' en tag '{tag_name}' aanmaken")
@@ -100,6 +115,26 @@ def handle_release_finish(args) -> int:
         output.success(
             f"Release '{version}' is voltooid: gemerged naar '{cfg.main_branch}' en '{cfg.develop_branch}' en getagd als '{tag_name}'."
         )
+
+        # Optionele cleanup van release branch
+        if cfg.delete_release_after_finish:
+            output.info(f"Opruimen van lokale release branch '{release_branch}'")
+            try:
+                git_api._run_git(["branch", "-d", release_branch])  # type: ignore[attr-defined]
+            except git_api.GitError as exc:
+                output.warning(f"Kon release branch '{release_branch}' niet verwijderen: {exc}")
+
+        # Hooks na succesvolle release-finish
+        hooks.run_hooks(
+            "release_finish",
+            {
+                "branch": release_branch,
+                "base_branch": cfg.main_branch,
+                "version": version,
+                "env": env,
+                "tag": tag_name,
+            },
+        )
         return 0
     except git_api.GitError as exc:
         output.error(str(exc))