Merge remote-tracking branch 'origin/main' into readme-badges

Author: smkent

cookie_python/manage/main.py

@@ -9,6 +9,7 @@
 from loguru import logger
 
 from .release import release_action
+from .repo import RepoSandbox
 from .update import update_action
 
 
@@ -75,4 +76,6 @@ def main() -> None:
         help="Dry run",
     )
     args = ap.parse_args()
-    args.action.func(args)
+    for repo_arg in args.repo:
+        with RepoSandbox(repo_arg, args.dry_run) as repo:
+            args.action.func(repo)

cookie_python/manage/release.py

@@ -1,11 +1,9 @@
-from argparse import Namespace
-
 import semver
 
 from .repo import RepoSandbox
 
 
-def release_patch_version(repo: RepoSandbox) -> None:
+def release_action(repo: RepoSandbox) -> None:
     if not repo.latest_release:
         repo.logger.warning("Unable to find latest release version")
         return
@@ -30,9 +28,3 @@ def release_patch_version(repo: RepoSandbox) -> None:
         return
     repo.create_release(new_tag)
     repo.logger.success(f"Released new version {new_tag}")
-
-
-def release_action(args: Namespace) -> None:
-    for repo_url in args.repo:
-        with RepoSandbox(repo_url, args.dry_run) as repo:
-            release_patch_version(repo)

cookie_python/manage/update.py

@@ -1,5 +1,4 @@
 import os
-from argparse import Namespace
 from pathlib import Path
 from typing import Optional
 
@@ -101,25 +100,23 @@ def update_dependencies(repo: RepoSandbox) -> Optional[str]:
     )
 
 
-def update_action(args: Namespace) -> None:
-    for repo_url in args.repo:
-        with RepoSandbox(repo_url, args.dry_run) as repo:
-            repo.logger.info("Starting update")
-            actions = []
-            msg_body = ""
-            cruft_msg = update_cruft(repo)
-            if cruft_msg:
-                msg_body += cruft_msg
-                actions.append("project template cruft")
-            deps_msg = update_dependencies(repo)
-            if deps_msg:
-                msg_body += deps_msg
-                actions.append("dependencies")
-            if not msg_body:
-                repo.logger.info("Already up to date")
-                continue
-            actions_str = ", ".join(actions)
-            message = f"Update {actions_str}\n\n{msg_body}"
-            repo.logger.info(f"Updated {actions_str}")
-            repo.commit_changes(message)
-            repo.open_pr(message)
+def update_action(repo: RepoSandbox) -> None:
+    repo.logger.info("Starting update")
+    actions = []
+    msg_body = ""
+    cruft_msg = update_cruft(repo)
+    if cruft_msg:
+        msg_body += cruft_msg
+        actions.append("project template cruft")
+    deps_msg = update_dependencies(repo)
+    if deps_msg:
+        msg_body += deps_msg
+        actions.append("dependencies")
+    if not msg_body:
+        repo.logger.info("Already up to date")
+        return
+    actions_str = ", ".join(actions)
+    message = f"Update {actions_str}\n\n{msg_body}"
+    repo.logger.info(f"Updated {actions_str}")
+    repo.commit_changes(message)
+    repo.open_pr(message)