rlsbl 0.2.0 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rlsbl",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Release orchestration and project scaffolding for npm and PyPI",
   "license": "MIT",
   "bin": {

package/rlsbl/__init__.py

@@ -10,17 +10,19 @@ except Exception:
     __version__ = "unknown"
 
 REGISTRIES = ("npm", "pypi")
-COMMANDS = ("release", "status", "scaffold", "check")
+COMMANDS = ("release", "status", "scaffold", "check", "config", "undo")
 COMMAND_ALIASES = {"init": "scaffold"}
 
 HELP = f"""\
 rlsbl v{__version__} -- Release orchestration and project scaffolding for npm and PyPI
 
 Usage:
-  rlsbl release [patch|minor|major] [--dry-run] [--quiet]  Orchestrate a release
+  rlsbl release [patch|minor|major] [--dry-run] [--yes] [--quiet]  Orchestrate a release
   rlsbl status                                              Show project status
   rlsbl scaffold [--force] [--update]                       Scaffold release infrastructure
   rlsbl check <name>                                        Check name availability
+  rlsbl config                                              Show project configuration
+  rlsbl undo [--yes]                                        Revert the last release
 
 Options:
   --registry <npm|pypi>  Target a specific registry (auto-detected if omitted)
@@ -80,6 +82,8 @@ def _get_command_module(command):
         "status": "status",
         "scaffold": "init_cmd",
         "check": "check",
+        "config": "config",
+        "undo": "undo",
     }
     module_name = module_map.get(command)
     if not module_name:
@@ -153,10 +157,22 @@ def main():
                     print("Error: no package.json or pyproject.toml found.", file=sys.stderr)
                     sys.exit(1)
                 if len(regs) > 1:
-                    print(f"Multiple registries detected: {', '.join(regs)}")
-                    print(f"Scaffolding for primary registry: {regs[0]}")
-                    print("For dual-registry projects, manually configure workflows with both jobs.")
-                handler.run_cmd(regs[0], args, flags)
+                    handler.run_cmd_multi(regs, args, flags)
+                else:
+                    handler.run_cmd(regs[0], args, flags)
+        elif command == "config":
+            # config: auto-detect, pass first registry or fallback
+            regs = detect_registries()
+            handler.run_cmd(registry or (regs[0] if regs else "npm"), args, flags)
+        elif command == "undo":
+            # undo: auto-detect like release
+            if not registry:
+                regs = detect_registries()
+                if not regs:
+                    print("Error: no package.json or pyproject.toml found.", file=sys.stderr)
+                    sys.exit(1)
+                registry = regs[0]
+            handler.run_cmd(registry, args, flags)
         else:
             # release, status: use explicit registry or auto-detect primary
             if not registry:

package/rlsbl/commands/config.py

@@ -0,0 +1,48 @@
+"""Config command: show resolved project configuration."""
+
+import os
+from ..registries import REGISTRIES
+
+
+def run_cmd(registry, args, flags):
+    print("Detected registries:")
+    for name, reg in REGISTRIES.items():
+        if reg.check_project_exists("."):
+            version = reg.read_version(".")
+            print(f"  {name}: {reg.get_version_file()} (v{version})")
+        else:
+            print(f"  {name}: not found")
+
+    print("\nScaffolding:")
+    rlsbl_dir = os.path.join(".", ".rlsbl")
+    if os.path.isdir(rlsbl_dir):
+        version_file = os.path.join(rlsbl_dir, "version")
+        if os.path.exists(version_file):
+            with open(version_file) as f:
+                scaffold_ver = f.read().strip()
+            print(f"  Version marker: {scaffold_ver}")
+        hashes_file = os.path.join(rlsbl_dir, "hashes.json")
+        if os.path.exists(hashes_file):
+            import json
+            with open(hashes_file) as f:
+                hashes = json.load(f)
+            print(f"  Tracked files: {len(hashes)}")
+            for path in sorted(hashes):
+                print(f"    {path}")
+    else:
+        print("  Not scaffolded (run 'rlsbl scaffold')")
+
+    print("\nWorkflows:")
+    for wf in ["ci.yml", "publish.yml", "workflow.yml"]:
+        path = os.path.join(".github", "workflows", wf)
+        print(f"  {wf}: {'yes' if os.path.exists(path) else 'no'}")
+
+    print("\nHooks:")
+    pre_release = os.path.join("scripts", "pre-release.sh")
+    print(f"  pre-release.sh: {'yes' if os.path.exists(pre_release) else 'no'}")
+    pre_push = os.path.join(".git", "hooks", "pre-push")
+    print(f"  pre-push hook: {'installed' if os.path.exists(pre_push) else 'not installed'}")
+
+    print("\nFiles:")
+    for f in ["CHANGELOG.md", "LICENSE", ".gitignore", "CLAUDE.md"]:
+        print(f"  {f}: {'yes' if os.path.exists(f) else 'no'}")

package/rlsbl/commands/init_cmd.py

@@ -208,52 +208,12 @@ def process_mappings(template_dir, mappings, vars_dict, force, update=False,
     return created, skipped, warnings, new_hashes
 
 
-def run_cmd(registry, args, flags):
-    """Init command handler.
+def _finalize_scaffold(existing_hashes, all_hash_dicts, created, skipped, warnings,
+                       registry=None):
+    """Shared post-processing for scaffold: chmod, hooks, version marker, hashes, summary.
 
-    Scaffolds release infrastructure (CI, publish workflows, changelog, etc.)
-    from templates.
+    all_hash_dicts is a list of dicts to merge into existing_hashes.
     """
-    reg = REGISTRIES[registry]
-
-    # Check that a project file exists
-    if not reg.check_project_exists("."):
-        print(f"Error: no {registry} project found in current directory.", file=sys.stderr)
-        print(reg.get_project_init_hint(), file=sys.stderr)
-        sys.exit(1)
-
-    # Gather template variables
-    vars_dict = reg.get_template_vars(".")
-    from datetime import datetime
-    vars_dict["year"] = str(datetime.now().year)
-
-    force = flags.get("force", False)
-    update = flags.get("update", False)
-
-    existing_hashes = load_hashes()
-
-    # Process registry-specific templates
-    reg_created, reg_skipped, reg_warnings, reg_hashes = process_mappings(
-        reg.get_template_dir(),
-        reg.get_template_mappings(),
-        vars_dict,
-        force,
-        update,
-        existing_hashes,
-    )
-
-    # Process shared templates (skip if another registry already handled them)
-    shared_created, shared_skipped, shared_warnings, shared_hashes = [], [], [], {}
-    if not flags.get("skip-shared"):
-        shared_created, shared_skipped, shared_warnings, shared_hashes = process_mappings(
-            reg.get_shared_template_dir(),
-            reg.get_shared_template_mappings(),
-            vars_dict,
-            force,
-            update,
-            existing_hashes,
-        )
-
     # Make all shell scripts in scripts/ executable
     scripts_dir = os.path.join(".", "scripts")
     if os.path.isdir(scripts_dir):
@@ -282,16 +242,11 @@ def run_cmd(registry, args, flags):
 
     # Persist file hashes for future --update customization detection
     all_new_hashes = {}
-    all_new_hashes.update(reg_hashes)
-    all_new_hashes.update(shared_hashes)
+    for h in all_hash_dicts:
+        all_new_hashes.update(h)
     existing_hashes.update(all_new_hashes)
     save_hashes(existing_hashes)
 
-    # Merge results
-    created = reg_created + shared_created
-    skipped = reg_skipped + shared_skipped
-    warnings = reg_warnings + shared_warnings
-
     # Print summary
     if created:
         print("Created:")
@@ -314,8 +269,139 @@ def run_cmd(registry, args, flags):
         print("\nNote: Existing CI workflow preserved. Review and merge manually if needed.")
 
     # Next steps
-    steps = NEXT_STEPS.get(registry)
-    if steps:
-        print("\nNext steps:")
-        for i, step in enumerate(steps, 1):
-            print(f"  {i}. {step}")
+    if registry:
+        steps = NEXT_STEPS.get(registry)
+        if steps:
+            print("\nNext steps:")
+            for i, step in enumerate(steps, 1):
+                print(f"  {i}. {step}")
+
+
+def run_cmd(registry, args, flags):
+    """Init command handler.
+
+    Scaffolds release infrastructure (CI, publish workflows, changelog, etc.)
+    from templates.
+    """
+    reg = REGISTRIES[registry]
+
+    # Check that a project file exists
+    if not reg.check_project_exists("."):
+        print(f"Error: no {registry} project found in current directory.", file=sys.stderr)
+        print(reg.get_project_init_hint(), file=sys.stderr)
+        sys.exit(1)
+
+    # Gather template variables
+    vars_dict = reg.get_template_vars(".")
+    from datetime import datetime
+    vars_dict["year"] = str(datetime.now().year)
+
+    force = flags.get("force", False)
+    update = flags.get("update", False)
+
+    existing_hashes = load_hashes()
+
+    # Process registry-specific templates
+    reg_created, reg_skipped, reg_warnings, reg_hashes = process_mappings(
+        reg.get_template_dir(),
+        reg.get_template_mappings(),
+        vars_dict,
+        force,
+        update,
+        existing_hashes,
+    )
+
+    # Process shared templates (skip if another registry already handled them)
+    shared_created, shared_skipped, shared_warnings, shared_hashes = [], [], [], {}
+    if not flags.get("skip-shared"):
+        shared_created, shared_skipped, shared_warnings, shared_hashes = process_mappings(
+            reg.get_shared_template_dir(),
+            reg.get_shared_template_mappings(),
+            vars_dict,
+            force,
+            update,
+            existing_hashes,
+        )
+
+    created = reg_created + shared_created
+    skipped = reg_skipped + shared_skipped
+    warnings = reg_warnings + shared_warnings
+
+    _finalize_scaffold(
+        existing_hashes, [reg_hashes, shared_hashes],
+        created, skipped, warnings, registry=registry,
+    )
+
+
+def run_cmd_multi(registries_list, args, flags):
+    """Scaffold for multiple registries with a merged publish workflow.
+
+    Uses the primary registry for template vars and CI, then writes a merged
+    publish.yml that contains jobs for all detected registries.
+    """
+    primary = registries_list[0]
+    reg = REGISTRIES[primary]
+
+    if not reg.check_project_exists("."):
+        print(f"Error: no {primary} project found in current directory.", file=sys.stderr)
+        sys.exit(1)
+
+    print(f"Multiple registries detected: {', '.join(registries_list)}")
+    print("Scaffolding with merged publish workflow.")
+
+    vars_dict = reg.get_template_vars(".")
+    from datetime import datetime
+    vars_dict["year"] = str(datetime.now().year)
+
+    force = flags.get("force", False)
+    update = flags.get("update", False)
+    existing_hashes = load_hashes()
+
+    # Process primary registry CI template only (publish will come from merged)
+    ci_mappings = [m for m in reg.get_template_mappings() if "publish" not in m["template"]]
+    ci_created, ci_skipped, ci_warnings, ci_hashes = process_mappings(
+        reg.get_template_dir(),
+        ci_mappings,
+        vars_dict,
+        force,
+        update,
+        existing_hashes,
+    )
+
+    # Process merged publish workflow template
+    merged_tpl_dir = os.path.join(os.path.dirname(os.path.dirname(__file__)),
+                                  "..", "templates", "merged")
+    merged_created, merged_skipped, merged_warnings, merged_hashes = process_mappings(
+        merged_tpl_dir,
+        [{"template": "publish.yml.tpl", "target": ".github/workflows/publish.yml"}],
+        vars_dict,
+        force,
+        update,
+        existing_hashes,
+    )
+
+    # Process shared templates (once)
+    shared_created, shared_skipped, shared_warnings, shared_hashes = process_mappings(
+        reg.get_shared_template_dir(),
+        reg.get_shared_template_mappings(),
+        vars_dict,
+        force,
+        update,
+        existing_hashes,
+    )
+
+    created = ci_created + merged_created + shared_created
+    skipped = ci_skipped + merged_skipped + shared_skipped
+    warnings = ci_warnings + merged_warnings + shared_warnings
+
+    _finalize_scaffold(
+        existing_hashes, [ci_hashes, merged_hashes, shared_hashes],
+        created, skipped, warnings,
+    )
+
+    # Show combined next steps for dual-registry
+    print("\nNext steps:")
+    print("  1. Add an NPM_TOKEN secret to your GitHub repo (Settings > Secrets > Actions)")
+    print("  2. Configure Trusted Publishing on pypi.org")
+    print("  3. Push to GitHub to activate the CI workflow")
+    print("  4. Run rlsbl release [patch|minor|major]")

package/rlsbl/commands/release.py

@@ -127,21 +127,40 @@ def run_cmd(registry, args, flags):
         log("--- No changes made ---")
         return
 
-    # Write new version to the primary registry file
+    # Pre-compute which files will be modified
     version_file = reg.get_version_file()
+    files_to_commit = [version_file]
+    for name, other_reg in REGISTRIES.items():
+        if name == registry:
+            continue
+        if other_reg.check_project_exists("."):
+            files_to_commit.append(other_reg.get_version_file())
+
+    # Confirmation prompt (skip with --yes)
+    if not flags.get("yes"):
+        print(f"\nAbout to release {new_version} ({bump_type}) on {branch}")
+        print(f"  Tag: {tag}")
+        print(f"  Files: {', '.join(files_to_commit)}")
+        try:
+            answer = input("Proceed? [y/N] ").strip().lower()
+        except (EOFError, KeyboardInterrupt):
+            print("\nAborted.")
+            sys.exit(1)
+        if answer != "y":
+            print("Aborted.")
+            sys.exit(0)
+
+    # Write new version to the primary registry file
     reg.write_version(".", new_version)
     log(f"Updated version in {version_file}")
 
     # Sync version to all other recognized version files
-    files_to_commit = [version_file]
     for name, other_reg in REGISTRIES.items():
         if name == registry:
             continue
         if other_reg.check_project_exists("."):
             other_reg.write_version(".", new_version)
-            other_file = other_reg.get_version_file()
-            files_to_commit.append(other_file)
-            log(f"Synced version to {other_file}")
+            log(f"Synced version to {other_reg.get_version_file()}")
 
     # Commit all bumped version files together
     commit_tool = find_commit_tool()

package/rlsbl/commands/undo.py

@@ -0,0 +1,66 @@
+"""Undo command: revert the last release."""
+
+import sys
+
+from ..utils import run, run_silent, check_gh_installed, check_gh_auth
+
+
+def run_cmd(registry, args, flags):
+    check_gh_installed()
+    check_gh_auth()
+
+    # Find the latest tag
+    try:
+        tag = run("git", ["describe", "--tags", "--abbrev=0"])
+    except Exception:
+        print("Error: no tags found. Nothing to undo.", file=sys.stderr)
+        sys.exit(1)
+
+    print(f"This will undo release {tag}:")
+    print(f"  - Delete git tag {tag} (local + remote)")
+    print(f"  - Revert the version bump commit")
+    print(f"  - Delete the GitHub Release for {tag}")
+
+    if not flags.get("yes"):
+        try:
+            answer = input("\nThis is destructive. Proceed? [y/N] ").strip().lower()
+        except (EOFError, KeyboardInterrupt):
+            print("\nAborted.")
+            sys.exit(1)
+        if answer != "y":
+            print("Aborted.")
+            sys.exit(0)
+
+    # Delete GitHub Release
+    try:
+        run("gh", ["release", "delete", tag, "--yes"])
+        print(f"Deleted GitHub Release: {tag}")
+    except Exception as e:
+        print(f"Warning: could not delete GitHub Release: {e}")
+
+    # Delete remote tag
+    try:
+        run("git", ["push", "origin", f":{tag}"])
+        print(f"Deleted remote tag: {tag}")
+    except Exception as e:
+        print(f"Warning: could not delete remote tag: {e}")
+
+    # Delete local tag
+    try:
+        run("git", ["tag", "-d", tag])
+        print(f"Deleted local tag: {tag}")
+    except Exception as e:
+        print(f"Warning: could not delete local tag: {e}")
+
+    # Revert the version bump commit (should be HEAD)
+    try:
+        head_msg = run("git", ["log", "-1", "--format=%s"])
+        if head_msg == tag:
+            run("git", ["revert", "--no-edit", "HEAD"])
+            print(f"Reverted commit: {head_msg}")
+        else:
+            print(f"Warning: HEAD commit ({head_msg}) doesn't match tag ({tag}). Skipping revert.")
+    except Exception as e:
+        print(f"Warning: could not revert commit: {e}")
+
+    print(f"\nUndo complete. Run 'git push' to sync the revert.")

package/templates/merged/publish.yml.tpl

@@ -0,0 +1,30 @@
+name: Publish
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  npm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v5
+        with:
+          node-version: 22
+          registry-url: https://registry.npmjs.org
+      - run: npm publish --provenance --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  pypi:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - uses: astral-sh/setup-uv@v7
+      - run: uv build
+      - uses: pypa/gh-action-pypi-publish@release/v1