rlsbl 0.8.0 → 0.8.2

package/package.json

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

package/rlsbl/__init__.py

@@ -56,7 +56,8 @@ Usage:
   rlsbl discover [--mine]                                   List rlsbl ecosystem projects
   rlsbl watch [<commit-sha>]                                Watch CI runs for a commit
   rlsbl pre-push-check                                     Verify CHANGELOG entry for current version
-  rlsbl record-gif                                         Record a demo GIF with vhs
+  rlsbl record-gif [--width N] [--height N] [--font-size N] [--duration N]
+                                                            Record a demo GIF with vhs
 
 Options:
   --registry <npm|pypi|go>  Target a specific registry (auto-detected if omitted)
@@ -86,7 +87,7 @@ def parse_args(argv):
     Flags listed in VALUE_FLAGS consume the next token as their value
     (e.g. --registry npm). All other --flags are boolean.
     """
-    VALUE_FLAGS = ("registry",)
+    VALUE_FLAGS = ("registry", "width", "height", "font-size", "duration")
     raw = argv[1:]
     positional = []
     flags = {}
@@ -166,6 +167,11 @@ def main():
     args = positional[1:]
     registry = flags.get("registry")
 
+    # --registry was the last arg with no value following it
+    if registry is True:
+        print("Error: --registry requires a value (npm, pypi, or go).", file=sys.stderr)
+        sys.exit(1)
+
     # Validate --registry if provided
     if registry and registry not in REGISTRIES:
         print(

package/rlsbl/commands/config.py

@@ -1,7 +1,7 @@
 """Config command: show resolved project configuration."""
 
 import os
-from ..config import PROJECT_CONFIG, USER_CONFIG, read_json_config, should_tag
+from ..config import _project_config, USER_CONFIG, read_json_config, should_tag
 from ..registries import REGISTRIES
 
 
@@ -50,12 +50,12 @@ def run_cmd(registry, args, flags):
     print("\nEcosystem tagging:")
     enabled = should_tag(flags)
     # Determine why it's enabled/disabled
-    project_cfg = read_json_config(PROJECT_CONFIG)
+    project_cfg = read_json_config(_project_config())
     user_cfg = read_json_config(USER_CONFIG)
     if flags.get("no-tag"):
         source = "CLI flag"
     elif "tag" in project_cfg:
-        source = f"project config ({PROJECT_CONFIG})"
+        source = f"project config ({_project_config()})"
     elif "tag" in user_cfg:
         source = f"user config ({USER_CONFIG})"
     else:

package/rlsbl/commands/discover.py

@@ -47,10 +47,12 @@ def _parse_next_link(headers):
         return None
     for part in link.split(","):
         if 'rel="next"' in part:
-            # Extract URL between < and >
             start = part.index("<") + 1
             end = part.index(">")
-            return part[start:end]
+            url = part[start:end]
+            if not url.startswith("https://api.github.com/"):
+                return None
+            return url
     return None
 
 

package/rlsbl/commands/init_cmd.py

@@ -480,7 +480,7 @@ def run_cmd_multi(registries_list, args, flags):
 
     # Process merged publish workflow template
     merged_tpl_dir = os.path.join(os.path.dirname(os.path.dirname(__file__)),
-                                  "..", "templates", "merged")
+                                  "templates", "merged")
     merged_created, merged_skipped, merged_warnings, merged_hashes = process_mappings(
         merged_tpl_dir,
         [{"template": "publish.yml.tpl", "target": ".github/workflows/publish.yml"}],

package/rlsbl/commands/pre_push_check.py

@@ -1,52 +1,21 @@
 """Pre-push-check command: verify CHANGELOG.md has an entry for the current version."""
 
-import json
 import os
 import re
 import sys
 
+from ..registries import REGISTRIES
+
 
 def _detect_version():
-    """Detect project type and read the current version.
+    """Detect version using registry adapters.
 
-    Returns (version_string, project_type) or (None, None) if undetectable.
+    Returns (version_string, registry_name) or (None, None) if undetectable.
     """
-    if os.path.exists("go.mod"):
-        # Go projects store version in a VERSION file
-        version_path = "VERSION"
-        if os.path.exists(version_path):
-            with open(version_path, "r", encoding="utf-8") as f:
-                version = f.read().strip()
-            if version:
-                return version, "go"
-        return None, None
-
-    if os.path.exists("package.json"):
-        try:
-            with open("package.json", "r", encoding="utf-8") as f:
-                data = json.load(f)
-            version = data.get("version", "")
-            if version:
-                return version, "npm"
-        except Exception:
-            pass
-        return None, None
-
-    if os.path.exists("pyproject.toml"):
-        try:
-            try:
-                import tomllib
-            except ModuleNotFoundError:
-                import tomli as tomllib  # type: ignore[no-redef]
-            with open("pyproject.toml", "rb") as f:
-                data = tomllib.load(f)
-            version = data.get("project", {}).get("version", "")
-            if version:
-                return version, "pypi"
-        except Exception:
-            pass
-        return None, None
-
+    for name in ("go", "npm", "pypi"):
+        reg = REGISTRIES[name]
+        if reg.check_project_exists("."):
+            return reg.read_version("."), name
     return None, None
 
 

package/rlsbl/commands/record_gif.py

@@ -43,19 +43,25 @@ def run_cmd(registry, args, flags):
         print("Ensure package.json, pyproject.toml, or go.mod exists with a CLI entry point.", file=sys.stderr)
         sys.exit(1)
 
+    # Parse configurable VHS parameters from flags
+    width = int(flags.get("width", 1200))
+    height = int(flags.get("height", 600))
+    font_size = int(flags.get("font-size", 24))
+    duration = int(flags.get("duration", 10))
+
     assets_dir = "assets"
     os.makedirs(assets_dir, exist_ok=True)
 
     # Create a temporary VHS tape file in the project directory
     tape_content = (
         'Set FontFamily "monospace"\n'
-        "Set FontSize 24\n"
-        "Set Width 1200\n"
-        "Set Height 600\n"
+        f"Set FontSize {font_size}\n"
+        f"Set Width {width}\n"
+        f"Set Height {height}\n"
         "Set TypingSpeed 50ms\n"
         f'Type "{bin_command} --help"\n'
         "Enter\n"
-        "Sleep 3s\n"
+        f"Sleep {duration}s\n"
     )
 
     tape_fd, tape_path = tempfile.mkstemp(suffix=".tape", dir=".")

package/rlsbl/commands/release.py

@@ -210,6 +210,18 @@ def run_cmd(registry, args, flags):
         except Exception:
             pass
 
+    # Update .rlsbl/version marker so it's included in the release commit
+    rlsbl_version_marker = os.path.join(".rlsbl", "version")
+    if os.path.exists(os.path.dirname(rlsbl_version_marker)):
+        try:
+            from .. import __version__ as rlsbl_ver
+            with open(rlsbl_version_marker, "w") as f:
+                f.write(rlsbl_ver + "\n")
+            if rlsbl_version_marker not in files_to_commit:
+                files_to_commit.append(rlsbl_version_marker)
+        except Exception:
+            pass
+
     # Commit if anything was actually modified (version bump or tagging)
     needs_commit = new_version != current_version or not is_clean_tree()
     if files_to_commit and needs_commit:

package/rlsbl/commands/undo.py

@@ -2,12 +2,20 @@
 
 import sys
 
-from ..utils import run, check_gh_installed, check_gh_auth, get_push_timeout
+from ..utils import run, check_gh_installed, check_gh_auth, get_push_timeout, is_clean_tree
 
 
 def run_cmd(registry, args, flags):
-    check_gh_installed()
-    check_gh_auth()
+    if not check_gh_installed():
+        print("Error: gh CLI is not installed.", file=sys.stderr)
+        sys.exit(1)
+    if not check_gh_auth():
+        print("Error: gh CLI is not authenticated.", file=sys.stderr)
+        sys.exit(1)
+
+    if not is_clean_tree():
+        print("Error: working tree is not clean. Commit your changes first.", file=sys.stderr)
+        sys.exit(1)
 
     # Find the latest tag
     try:

package/rlsbl/commands/watch.py

@@ -13,9 +13,12 @@ def _notify(title, body):
     """Send a desktop notification. Non-fatal if unavailable."""
     try:
         if sys.platform == "darwin":
+            # Escape double quotes to prevent AppleScript injection
+            escaped_title = title.replace('"', '\\"')
+            escaped_body = body.replace('"', '\\"')
             subprocess.run(
                 ["osascript", "-e",
-                 f'display notification "{body}" with title "{title}"'],
+                 f'display notification "{escaped_body}" with title "{escaped_title}"'],
                 timeout=5, capture_output=True,
             )
         elif shutil.which("notify-send"):
@@ -33,83 +36,87 @@ def run_cmd(registry, args, flags):
     Usage: rlsbl watch [<commit-sha>]
     Defaults to HEAD if no commit SHA is provided.
     """
-    # Get commit SHA
-    if args:
-        commit_sha = args[0]
-    else:
+    try:
+        # Get commit SHA
+        if args:
+            commit_sha = args[0]
+        else:
+            try:
+                commit_sha = run("git", ["rev-parse", "HEAD"])
+            except Exception:
+                print("Error: not a git repository and no commit SHA provided.", file=sys.stderr)
+                sys.exit(1)
+
+        # Get repo info for display and URLs
         try:
-            commit_sha = run("git", ["rev-parse", "HEAD"])
+            repo_info = run("gh", ["repo", "view", "--json", "nameWithOwner,name"])
+            info = json.loads(repo_info)
+            repo_slug = info.get("nameWithOwner", "")
+            repo_name = info.get("name", "")
         except Exception:
-            print("Error: not a git repository and no commit SHA provided.", file=sys.stderr)
+            print("Error: could not get repo info. Is gh installed and authenticated?", file=sys.stderr)
             sys.exit(1)
 
-    # Get repo info for display and URLs
-    try:
-        repo_info = run("gh", ["repo", "view", "--json", "nameWithOwner,name"])
-        info = json.loads(repo_info)
-        repo_slug = info.get("nameWithOwner", "")
-        repo_name = info.get("name", "")
-    except Exception:
-        print("Error: could not get repo info. Is gh installed and authenticated?", file=sys.stderr)
-        sys.exit(1)
-
-    # Try to find a tag for this commit for nicer display
-    try:
-        tag = run("git", ["describe", "--tags", "--exact-match", commit_sha])
-    except Exception:
-        tag = commit_sha[:12]
-
-    label = f"{repo_name} {tag}" if repo_name else tag
-
-    # Poll until at least one run appears (retry up to 30s)
-    runs = []
-    for _ in range(15):
+        # Try to find a tag for this commit for nicer display
         try:
-            raw = run("gh", ["run", "list", "--commit", commit_sha,
-                             "--json", "databaseId,name,status"])
-            parsed = json.loads(raw)
-            if parsed:
-                runs = parsed
-                break
+            tag = run("git", ["describe", "--tags", "--exact-match", commit_sha])
         except Exception:
-            pass
-        time.sleep(2)
-
-    if not runs:
-        print(f"rlsbl: {label}: no CI runs found after 30s", file=sys.stderr)
-        sys.exit(1)
-
-    print(f"rlsbl: {label}: found {len(runs)} CI run(s), watching...", file=sys.stderr)
-
-    # Watch each run sequentially, collecting results
-    any_failed = False
-    for ci_run in runs:
-        run_id = str(ci_run["databaseId"])
-        workflow_name = ci_run.get("name", f"run {run_id}")
+            tag = commit_sha[:12]
+
+        label = f"{repo_name} {tag}" if repo_name else tag
+
+        # Poll until at least one run appears (retry up to 30s)
+        runs = []
+        for _ in range(15):
+            try:
+                raw = run("gh", ["run", "list", "--commit", commit_sha,
+                                 "--json", "databaseId,name,status"])
+                parsed = json.loads(raw)
+                if parsed:
+                    runs = parsed
+                    break
+            except Exception:
+                pass
+            time.sleep(2)
+
+        if not runs:
+            print(f"rlsbl: {label}: no CI runs found after 30s", file=sys.stderr)
+            sys.exit(1)
 
-        try:
-            # gh run watch blocks until the run completes;
-            # --exit-status makes it exit 1 on failure; check=True raises
-            # CalledProcessError so we can distinguish pass from fail
-            subprocess.run(
-                ["gh", "run", "watch", run_id, "--exit-status"],
-                capture_output=True, text=True, timeout=3600, check=True,
-            )
-            print(f"rlsbl: {label}: {workflow_name} passed", file=sys.stderr)
-        except subprocess.CalledProcessError:
-            any_failed = True
-            print(f"rlsbl: {label}: {workflow_name} FAILED", file=sys.stderr)
-            if repo_slug:
-                print(f"rlsbl: https://github.com/{repo_slug}/actions/runs/{run_id}",
-                      file=sys.stderr)
-        except subprocess.TimeoutExpired:
-            any_failed = True
-            print(f"rlsbl: {label}: {workflow_name} timed out after 1h", file=sys.stderr)
-
-    # Desktop notification for overall result
-    if any_failed:
-        _notify(f"{label}: CI FAILED", "One or more workflows failed")
-    else:
-        _notify(f"{label}: CI passed", "All workflows passed")
-
-    sys.exit(1 if any_failed else 0)
+        print(f"rlsbl: {label}: found {len(runs)} CI run(s), watching...", file=sys.stderr)
+
+        # Watch each run sequentially, collecting results
+        any_failed = False
+        for ci_run in runs:
+            run_id = str(ci_run["databaseId"])
+            workflow_name = ci_run.get("name", f"run {run_id}")
+
+            try:
+                # gh run watch blocks until the run completes;
+                # --exit-status makes it exit 1 on failure; check=True raises
+                # CalledProcessError so we can distinguish pass from fail
+                subprocess.run(
+                    ["gh", "run", "watch", run_id, "--exit-status"],
+                    capture_output=True, text=True, timeout=3600, check=True,
+                )
+                print(f"rlsbl: {label}: {workflow_name} passed", file=sys.stderr)
+            except subprocess.CalledProcessError:
+                any_failed = True
+                print(f"rlsbl: {label}: {workflow_name} FAILED", file=sys.stderr)
+                if repo_slug:
+                    print(f"rlsbl: https://github.com/{repo_slug}/actions/runs/{run_id}",
+                          file=sys.stderr)
+            except subprocess.TimeoutExpired:
+                any_failed = True
+                print(f"rlsbl: {label}: {workflow_name} timed out after 1h", file=sys.stderr)
+
+        # Desktop notification for overall result
+        if any_failed:
+            _notify(f"{label}: CI FAILED", "One or more workflows failed")
+        else:
+            _notify(f"{label}: CI passed", "All workflows passed")
+
+        sys.exit(1 if any_failed else 0)
+    except KeyboardInterrupt:
+        print("\nWatch cancelled.", file=sys.stderr)
+        sys.exit(130)

package/rlsbl/config.py

@@ -11,7 +11,10 @@ import json
 import os
 
 
-PROJECT_CONFIG = os.path.join(".rlsbl", "config.json")
+def _project_config():
+    """Resolve project config path at call time (respects cwd changes)."""
+    return os.path.join(".rlsbl", "config.json")
+
 USER_CONFIG = os.path.expanduser("~/.rlsbl/config.json")
 
 
@@ -31,7 +34,7 @@ def should_tag(flags):
         return False
 
     # Project-level config
-    project = read_json_config(PROJECT_CONFIG)
+    project = read_json_config(_project_config())
     if "tag" in project:
         return bool(project["tag"])
 
@@ -46,9 +49,9 @@ def should_tag(flags):
 
 def write_project_config(key, value):
     """Write or update a key in .rlsbl/config.json (creates dir if needed)."""
-    os.makedirs(os.path.dirname(PROJECT_CONFIG), exist_ok=True)
-    existing = read_json_config(PROJECT_CONFIG)
+    os.makedirs(os.path.dirname(_project_config()), exist_ok=True)
+    existing = read_json_config(_project_config())
     existing[key] = value
-    with open(PROJECT_CONFIG, "w", encoding="utf-8") as f:
+    with open(_project_config(), "w", encoding="utf-8") as f:
         json.dump(existing, f, indent=2)
         f.write("\n")

package/rlsbl/registries/go.py

@@ -39,12 +39,12 @@ def get_version_file():
 
 def get_template_dir():
     """Returns path to the go-specific template directory."""
-    return os.path.join(os.path.dirname(__file__), "..", "..", "templates", "go")
+    return os.path.join(os.path.dirname(__file__), "..", "templates", "go")
 
 
 def get_shared_template_dir():
     """Returns path to the shared template directory."""
-    return os.path.join(os.path.dirname(__file__), "..", "..", "templates", "shared")
+    return os.path.join(os.path.dirname(__file__), "..", "templates", "shared")
 
 
 def get_template_vars(dir_path):

package/rlsbl/registries/npm.py

@@ -32,7 +32,7 @@ def write_version(dir_path, version):
 
     # Preserve trailing newline if present
     trailing_newline = "\n" if raw.endswith("\n") else ""
-    output = json.dumps(pkg, indent=indent) + trailing_newline
+    output = json.dumps(pkg, indent=indent, ensure_ascii=False) + trailing_newline
     # Atomic write: write to temp file, then rename
     tmp_path = pkg_path + ".tmp"
     with open(tmp_path, "w", encoding="utf-8") as f:
@@ -47,12 +47,12 @@ def get_version_file():
 
 def get_template_dir():
     """Returns path to the npm-specific template directory."""
-    return os.path.join(os.path.dirname(__file__), "..", "..", "templates", "npm")
+    return os.path.join(os.path.dirname(__file__), "..", "templates", "npm")
 
 
 def get_shared_template_dir():
     """Returns path to the shared template directory."""
-    return os.path.join(os.path.dirname(__file__), "..", "..", "templates", "shared")
+    return os.path.join(os.path.dirname(__file__), "..", "templates", "shared")
 
 
 def get_template_vars(dir_path):

package/rlsbl/registries/pypi.py

@@ -67,12 +67,12 @@ def get_version_file():
 
 def get_template_dir():
     """Returns path to the pypi-specific template directory."""
-    return os.path.join(os.path.dirname(__file__), "..", "..", "templates", "pypi")
+    return os.path.join(os.path.dirname(__file__), "..", "templates", "pypi")
 
 
 def get_shared_template_dir():
     """Returns path to the shared template directory."""
-    return os.path.join(os.path.dirname(__file__), "..", "..", "templates", "shared")
+    return os.path.join(os.path.dirname(__file__), "..", "templates", "shared")
 
 
 def get_template_vars(dir_path):

package/rlsbl/tagging.py

@@ -32,7 +32,7 @@ def ensure_npm_keyword(dir_path=".", quiet=False):
 
     # Preserve trailing newline if present
     trailing_newline = "\n" if raw.endswith("\n") else ""
-    output = json.dumps(pkg, indent=indent) + trailing_newline
+    output = json.dumps(pkg, indent=indent, ensure_ascii=False) + trailing_newline
 
     # Atomic write: write to temp file, then rename
     tmp_path = pkg_path + ".tmp"
@@ -82,11 +82,16 @@ def ensure_pypi_keyword(dir_path=".", quiet=False):
             # Find the indent used for existing items
             item_indent_match = re.search(r'\n( +)"', array_content)
             item_indent = item_indent_match.group(1) if item_indent_match else "    "
-            new_array_content = array_content.rstrip() + f',\n{item_indent}"rlsbl"\n'
+            # Strip trailing comma to avoid double comma when the list
+            # already has a trailing comma before the closing bracket
+            stripped = array_content.rstrip()
+            stripped = stripped.rstrip(",")
+            new_array_content = stripped + f',\n{item_indent}"rlsbl"\n'
         else:
             # Single-line
             if array_content.strip():
-                new_array_content = array_content.rstrip() + ', "rlsbl"'
+                stripped_sl = array_content.rstrip().rstrip(",")
+                new_array_content = stripped_sl + ', "rlsbl"'
             else:
                 new_array_content = '"rlsbl"'
         new_field = prefix + new_array_content + "]"

package/{templates → rlsbl/templates}/shared/hooks/pre-release.sh.tpl

@@ -8,15 +8,19 @@ set -euo pipefail
 echo "Running pre-release checks..."
 
 if [ -f go.mod ]; then
-  echo "Detected Go project"
+  echo "  Go: vet + build + test"
   go vet ./...
   go build ./...
   go test ./... -race -short -count=1
-elif [ -f package.json ]; then
-  echo "Detected npm project"
+fi
+
+if [ -f package.json ] && node -e "process.exit(require('./package.json').scripts?.test ? 0 : 1)" 2>/dev/null; then
+  echo "  npm: test"
   npm test
-elif [ -f pyproject.toml ]; then
-  echo "Detected Python project"
+fi
+
+if [ -f pyproject.toml ]; then
+  echo "  Python: pytest"
   if command -v uv &>/dev/null; then
     uv run pytest
   elif command -v pytest &>/dev/null; then