rlsbl 0.1.1 → 0.2.0

package/README.md

@@ -25,7 +25,7 @@ rlsbl release minor
 
 ## Commands
 
-All commands work at the top level -- registries are auto-detected from project files (`package.json`, `pyproject.toml`). Use the registry-specific form (`rlsbl <registry> <command>`) only when you need to target a single registry.
+All commands work at the top level -- registries are auto-detected from project files (`package.json`, `pyproject.toml`). Use `--registry <npm|pypi>` when you need to target a specific registry.
 
 ### scaffold [--force] [--update]
 
@@ -33,8 +33,8 @@ Scaffolds CI/CD infrastructure and release tooling for all detected registries.
 
 ```
 rlsbl scaffold
-rlsbl npm scaffold          # target npm only
-rlsbl pypi scaffold --force # overwrite existing files
+rlsbl scaffold --registry npm          # target npm only
+rlsbl scaffold --registry pypi --force # overwrite existing files
 ```
 
 Context-aware behavior when files already exist (without `--force`):
@@ -52,7 +52,7 @@ Bumps version, commits, pushes, and creates a GitHub Release. Defaults to `patch
 
 ```
 rlsbl release minor
-rlsbl npm release major --dry-run
+rlsbl release major --dry-run --registry npm
 ```
 
 The version is synced across all detected project files (`package.json`, `pyproject.toml`) regardless of which registry is primary.
@@ -65,16 +65,16 @@ Shows project status: package name, version (per registry), git branch, last tag
 
 ```
 rlsbl status
-rlsbl pypi status
+rlsbl status --registry pypi
 ```
 
-### check-name \<name\>
+### check \<name\>
 
 Checks name availability on both npm and PyPI, and warns about confusingly similar names.
 
 ```
-rlsbl check-name my-cool-lib
-rlsbl npm check-name my-cool-lib   # npm only
+rlsbl check my-cool-lib
+rlsbl check my-cool-lib --registry npm   # npm only
 ```
 
 npm checks variant spellings (hyphens, underscores, dots, no separator). PyPI normalizes per PEP 503 and checks common alternatives.

package/package.json

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

package/rlsbl/__init__.py

@@ -10,7 +10,7 @@ except Exception:
     __version__ = "unknown"
 
 REGISTRIES = ("npm", "pypi")
-COMMANDS = ("release", "status", "scaffold", "check-name")
+COMMANDS = ("release", "status", "scaffold", "check")
 COMMAND_ALIASES = {"init": "scaffold"}
 
 HELP = f"""\
@@ -18,14 +18,14 @@ rlsbl v{__version__} -- Release orchestration and project scaffolding for npm an
 
 Usage:
   rlsbl release [patch|minor|major] [--dry-run] [--quiet]  Orchestrate a release
-  rlsbl status                                             Show project status
+  rlsbl status                                              Show project status
   rlsbl scaffold [--force] [--update]                       Scaffold release infrastructure
-  rlsbl check-name <name>                                  Check name availability
+  rlsbl check <name>                                        Check name availability
 
-  Registry-specific (when you need to target one):
-  rlsbl <registry> <command> [args...]
-
-Registries: {', '.join(REGISTRIES)}"""
+Options:
+  --registry <npm|pypi>  Target a specific registry (auto-detected if omitted)
+  --help, -h             Show this help
+  --version, -v          Show version"""
 
 
 def detect_registries():
@@ -42,19 +42,33 @@ def detect_registries():
 
 
 def parse_args(argv):
-    """Parse sys.argv into positional args and flags."""
+    """Parse sys.argv into positional args and flags.
+
+    Flags listed in VALUE_FLAGS consume the next token as their value
+    (e.g. --registry npm). All other --flags are boolean.
+    """
+    VALUE_FLAGS = ("registry",)
     raw = argv[1:]
     positional = []
     flags = {}
-
-    for arg in raw:
+    i = 0
+    while i < len(raw):
+        arg = raw[i]
         if arg.startswith("--"):
-            flags[arg[2:]] = True
+            key = arg[2:]
+            if "=" in key:
+                k, v = key.split("=", 1)
+                flags[k] = v
+            elif key in VALUE_FLAGS and i + 1 < len(raw) and not raw[i + 1].startswith("-"):
+                flags[key] = raw[i + 1]
+                i += 1
+            else:
+                flags[key] = True
         elif arg.startswith("-") and len(arg) == 2:
             flags[arg[1:]] = True
         else:
             positional.append(arg)
-
+        i += 1
     return positional, flags
 
 
@@ -65,7 +79,7 @@ def _get_command_module(command):
         "release": "release",
         "status": "status",
         "scaffold": "init_cmd",
-        "check-name": "check_name",
+        "check": "check",
     }
     module_name = module_map.get(command)
     if not module_name:
@@ -88,49 +102,31 @@ def main():
         print(__version__)
         sys.exit(0)
 
-    first = positional[0] if positional else None
+    command = positional[0] if positional else None
 
     # Resolve command aliases (e.g. "init" -> "scaffold")
-    if first in COMMAND_ALIASES:
-        first = COMMAND_ALIASES[first]
+    if command in COMMAND_ALIASES:
+        command = COMMAND_ALIASES[command]
 
-    if not first:
+    if not command:
         print("Error: missing command.\n", file=sys.stderr)
         print(HELP, file=sys.stderr)
         sys.exit(1)
 
-    registry = None
-    command = None
-    args = []
-
-    if first in COMMANDS:
-        # Top-level: rlsbl <command> ... -- auto-detect registry
-        command = first
-        args = positional[1:]
-    elif first in REGISTRIES:
-        # Registry-prefixed: rlsbl <registry> <command> ...
-        registry = first
-        command = positional[1] if len(positional) > 1 else None
-        if command and command in COMMAND_ALIASES:
-            command = COMMAND_ALIASES[command]
-
-        if not command:
-            print(f'Error: missing command for registry "{registry}".\n', file=sys.stderr)
-            print(HELP, file=sys.stderr)
-            sys.exit(1)
+    if command not in COMMANDS:
+        print(f'Error: unknown command "{command}".\n', file=sys.stderr)
+        print(HELP, file=sys.stderr)
+        sys.exit(1)
 
-        if command not in COMMANDS:
-            print(
-                f'Error: unknown command "{command}". Valid commands: {", ".join(COMMANDS)}\n',
-                file=sys.stderr,
-            )
-            print(HELP, file=sys.stderr)
-            sys.exit(1)
+    args = positional[1:]
+    registry = flags.get("registry")
 
-        args = positional[2:]
-    else:
-        print(f'Error: unknown command or registry "{first}".\n', file=sys.stderr)
-        print(HELP, file=sys.stderr)
+    # Validate --registry if provided
+    if registry and registry not in REGISTRIES:
+        print(
+            f"Error: unknown registry '{registry}'. Valid: {', '.join(REGISTRIES)}",
+            file=sys.stderr,
+        )
         sys.exit(1)
 
     try:
@@ -139,36 +135,37 @@ def main():
             print(f'Error: command "{command}" is not yet implemented.', file=sys.stderr)
             sys.exit(1)
 
-        if registry:
-            # Explicit registry -- single invocation
-            handler.run_cmd(registry, args, flags)
-        elif command == "check-name":
-            # Top-level check-name: check ALL registries
-            regs = ["npm", "pypi"]
-            for i, r in enumerate(regs):
-                handler.run_cmd(r, args, flags)
-                if i < len(regs) - 1:
-                    print("")
+        if command == "check":
+            # check: if registry given, check that one; otherwise check all
+            if registry:
+                handler.run_cmd(registry, args, flags)
+            else:
+                for i, r in enumerate(["npm", "pypi"]):
+                    handler.run_cmd(r, args, flags)
+                    if i < 1:
+                        print("")
         elif command == "scaffold":
-            # Top-level scaffold: scaffold for each detected registry
-            regs = detect_registries()
-            if not regs:
-                print("Error: no package.json or pyproject.toml found.", file=sys.stderr)
-                sys.exit(1)
-            if len(regs) > 1:
-                # Multi-registry: only scaffold for the primary registry
-                # (CI/publish workflows conflict when both registries target the same paths)
-                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)
+            if registry:
+                handler.run_cmd(registry, args, flags)
+            else:
+                regs = detect_registries()
+                if not regs:
+                    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)
         else:
-            # Top-level release/status: use primary detected registry
-            regs = detect_registries()
-            if not regs:
-                print("Error: no package.json or pyproject.toml found.", file=sys.stderr)
-                sys.exit(1)
-            handler.run_cmd(regs[0], args, flags)
+            # release, status: use explicit registry or auto-detect primary
+            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)
     except Exception as e:
         print(f"Error: {e}", file=sys.stderr)
         sys.exit(1)

package/rlsbl/commands/{check_name.py → check.py}

@@ -1,4 +1,4 @@
-"""Check-name command: check package name availability on npm or PyPI."""
+"""Check command: check package name availability on npm or PyPI."""
 
 import re
 import subprocess
@@ -166,14 +166,14 @@ def _check_name_pypi(name):
 
 
 def run_cmd(registry, args, flags):
-    """Check-name command handler.
+    """Check command handler.
 
     Checks package name availability on npm or PyPI, and warns about similar names.
     """
     name = args[0] if args else None
     if not name:
         print(
-            "Error: missing package name. Usage: rlsbl check-name <name>",
+            "Error: missing package name. Usage: rlsbl check <name>",
             file=sys.stderr,
         )
         sys.exit(1)

package/rlsbl/commands/init_cmd.py

@@ -53,12 +53,12 @@ NEXT_STEPS = {
     "npm": [
         "Add an NPM_TOKEN secret to your GitHub repo (Settings > Secrets > Actions)",
         "Push to GitHub to activate the CI workflow",
-        "Run rlsbl npm release [patch|minor|major]",
+        "Run rlsbl release [patch|minor|major]",
     ],
     "pypi": [
         "Push to GitHub",
         "Configure Trusted Publishing on pypi.org",
-        "Run rlsbl pypi release [patch|minor|major]",
+        "Run rlsbl release [patch|minor|major]",
     ],
 }
 

package/templates/shared/CLAUDE.md.tpl

@@ -5,11 +5,11 @@
 This project uses [rlsbl](https://github.com/smm-h/rlsbl) for release orchestration.
 
 - Update CHANGELOG.md with a `## X.Y.Z` entry describing changes
-- Run `rlsbl <registry> release [patch|minor|major]` to bump version and create a GitHub Release
+- Run `rlsbl release [patch|minor|major]` to bump version and create a GitHub Release
 - CI handles publishing automatically via the publish workflow
-- Never publish manually — always use `rlsbl <registry> release`
+- Never publish manually — always use `rlsbl release`
 - Requires `NPM_TOKEN` secret on GitHub (for npm projects)
-- Use `rlsbl <registry> release --dry-run` to preview a release without making changes
+- Use `rlsbl release --dry-run` to preview a release without making changes
 
 ## Conventions