rlsbl 0.8.0 → 0.8.1

package/package.json

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

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/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/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