rpr-cli 0.1.3__tar.gz → 0.1.6__tar.gz

{rpr_cli-0.1.3 → rpr_cli-0.1.6}/.github/workflows/publish-pypi.yml

@@ -9,20 +9,26 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+    environment:
+      name: pypi
+      url: https://pypi.org/p/rpr-cli
     permissions:
       contents: read
+      id-token: write
 
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.14"
 
       - name: Set up uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v8.1.0
 
       - name: Validate tag matches package version
         run: |
@@ -50,5 +56,4 @@ jobs:
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
+          attestations: true

{rpr_cli-0.1.3 → rpr_cli-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rpr-cli
-Version: 0.1.3
+Version: 0.1.6
 Summary: RPR CLI -- React Python Rust monorepo scaffolding orchestrator
 License-Expression: MIT
 License-File: LICENSE
@@ -55,6 +55,8 @@ uv add ../project-getting-started/dist/rpr_cli-*.whl
 
 Create a new NX + UV monorepo, then add apps and packages as needed.
 
+> NX monorepo uses integrated mode.
+
 ```bash
 rpr init my-app              # Create/init my-app with root NX + UV tooling and AI instructions
 cd my-app
@@ -67,12 +69,13 @@ rpr generate storybook       # Add Storybook for UI component development
 
 `rpr init <project-name>` creates the project directory when it does not exist. If the directory already exists and is not an NX workspace, RPR initializes Git and runs `nx init` inside that directory.
 
-By default, `rpr init` scaffolds the root workspace and AI instructions only. To create project components during initialization, repeat `--scaffold`:
+By default, `rpr init` scaffolds the root workspace and AI instructions only. To create project components during initialization, repeat `--scaffold` or pass a comma-separated list:
 
 ```bash
 rpr init todo-list --scaffold domain
 rpr init todo-list --scaffold api --domain-migrations
 rpr init todo-list --scaffold api --scaffold web --domain-migrations
+rpr init todo-list --scaffold instructions, domain, api, ui, web, storybook
 ```
 
 Available scaffolds are:
@@ -227,7 +230,9 @@ This repo is set up to publish the package `rpr-cli` to PyPI from GitHub Actions
 One-time setup:
 
 1. Create the PyPI project `rpr-cli`.
-2. Add a repository secret named `PYPI_API_TOKEN` with an API token that can upload that project.
+2. Create a PyPI Trusted Publisher for this repository using workflow `.github/workflows/publish-pypi.yml` and environment `pypi`.
+
+No `PYPI_API_TOKEN` secret is required when publishing through GitHub Actions OIDC.
 
 Release flow:
 

{rpr_cli-0.1.3 → rpr_cli-0.1.6}/README.md

@@ -40,6 +40,8 @@ uv add ../project-getting-started/dist/rpr_cli-*.whl
 
 Create a new NX + UV monorepo, then add apps and packages as needed.
 
+> NX monorepo uses integrated mode.
+
 ```bash
 rpr init my-app              # Create/init my-app with root NX + UV tooling and AI instructions
 cd my-app
@@ -52,12 +54,13 @@ rpr generate storybook       # Add Storybook for UI component development
 
 `rpr init <project-name>` creates the project directory when it does not exist. If the directory already exists and is not an NX workspace, RPR initializes Git and runs `nx init` inside that directory.
 
-By default, `rpr init` scaffolds the root workspace and AI instructions only. To create project components during initialization, repeat `--scaffold`:
+By default, `rpr init` scaffolds the root workspace and AI instructions only. To create project components during initialization, repeat `--scaffold` or pass a comma-separated list:
 
 ```bash
 rpr init todo-list --scaffold domain
 rpr init todo-list --scaffold api --domain-migrations
 rpr init todo-list --scaffold api --scaffold web --domain-migrations
+rpr init todo-list --scaffold instructions, domain, api, ui, web, storybook
 ```
 
 Available scaffolds are:
@@ -212,7 +215,9 @@ This repo is set up to publish the package `rpr-cli` to PyPI from GitHub Actions
 One-time setup:
 
 1. Create the PyPI project `rpr-cli`.
-2. Add a repository secret named `PYPI_API_TOKEN` with an API token that can upload that project.
+2. Create a PyPI Trusted Publisher for this repository using workflow `.github/workflows/publish-pypi.yml` and environment `pypi`.
+
+No `PYPI_API_TOKEN` secret is required when publishing through GitHub Actions OIDC.
 
 Release flow:
 

rpr_cli-0.1.6/src/rpr/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.6"

{rpr_cli-0.1.3 → rpr_cli-0.1.6}/src/rpr/commands/init.py

@@ -106,6 +106,25 @@ def _normalize_scaffold_name(value: str) -> ScaffoldName:
     return normalized  # type: ignore[return-value]
 
 
+def _parse_scaffold_values(
+    values: list[str] | None,
+    extra_args: list[str],
+) -> list[ScaffoldName]:
+    raw_values = values or []
+    if extra_args and not raw_values:
+        raise typer.BadParameter(
+            "Unexpected extra arguments. Use --scaffold to select components."
+        )
+
+    scaffolds: list[ScaffoldName] = []
+    for raw_value in [*raw_values, *extra_args]:
+        for value in raw_value.split(","):
+            value = value.strip()
+            if value:
+                scaffolds.append(_normalize_scaffold_name(value))
+    return scaffolds
+
+
 def _resolve_scaffolds(scaffolds: list[ScaffoldName] | None) -> list[ScaffoldName]:
     requested = scaffolds or ["instructions"]
     resolved: list[ScaffoldName] = []
@@ -675,8 +694,9 @@ API_BASE_URL=http://localhost:8000
 # ---------------------------------------------------------------------------
 
 
-@app.command()
+@app.command(context_settings={"allow_extra_args": True})
 def init(
+    ctx: typer.Context,
     project_name: Annotated[
         str | None, typer.Argument(help="Name of the project to create.")
     ] = None,
@@ -691,8 +711,9 @@ def init(
         typer.Option(
             "--scaffold",
             help=(
-                "Repeat to scaffold additional components: instructions, domain, "
-                "api, ui, web, storybook, engine. Defaults to instructions only."
+                "Repeat or pass a comma-separated list to scaffold additional "
+                "components: instructions, domain, api, ui, web, storybook, "
+                "engine. Defaults to instructions only."
             ),
         ),
     ] = None,
@@ -712,7 +733,7 @@ def init(
         project_name = typer.prompt("Project name")
 
     selected_scaffolds = _resolve_scaffolds(
-        [_normalize_scaffold_name(value) for value in scaffold or []]
+        _parse_scaffold_values(scaffold, list(ctx.args))
     )
     if domain_migrations and "domain" not in selected_scaffolds:
         raise typer.BadParameter(

{rpr_cli-0.1.3 → rpr_cli-0.1.6}/src/rpr/dependency_manifest_data.py

@@ -6,59 +6,37 @@ from __future__ import annotations
 MANIFEST = {
     "root_node_dev_dependencies": {
         "@eslint/js": {
-            "registry": "npm",
-            "specifier": "latest",
-            "strategy": "caret",
+            "specifier": "^9.39.4",
         },
         "@nx/eslint": {
-            "registry": "npm",
-            "specifier": "latest",
-            "strategy": "caret",
+            "specifier": "^22.7.1",
         },
         "@nx/eslint-plugin": {
-            "registry": "npm",
-            "specifier": "latest",
-            "strategy": "caret",
+            "specifier": "^22.7.1",
         },
         "eslint": {
-            "registry": "npm",
-            "specifier": "latest",
-            "strategy": "caret",
+            "specifier": "^9.39.4",
         },
         "eslint-plugin-import": {
-            "registry": "npm",
-            "specifier": "latest",
-            "strategy": "caret",
+            "specifier": "^2.32.0",
         },
         "eslint-plugin-jsx-a11y": {
-            "registry": "npm",
-            "specifier": "latest",
-            "strategy": "caret",
+            "specifier": "^6.10.2",
         },
         "eslint-plugin-react": {
-            "registry": "npm",
-            "specifier": "latest",
-            "strategy": "caret",
+            "specifier": "^7.37.5",
         },
         "eslint-plugin-react-hooks": {
-            "registry": "npm",
-            "specifier": "latest",
-            "strategy": "caret",
+            "specifier": "^7.1.1",
         },
         "globals": {
-            "registry": "npm",
-            "specifier": "latest",
-            "strategy": "caret",
+            "specifier": "^15.15.0",
         },
         "prettier": {
-            "registry": "npm",
-            "specifier": "latest",
-            "strategy": "caret",
+            "specifier": "^3.7.4",
         },
         "typescript-eslint": {
-            "registry": "npm",
-            "specifier": "latest",
-            "strategy": "caret",
+            "specifier": "^8.59.2",
         },
     },
     "root_storybook_dev_dependencies": {

{rpr_cli-0.1.3 → rpr_cli-0.1.6}/tests/test_init.py

@@ -74,8 +74,17 @@ def test_init_new_workspace_disables_nx_cloud(monkeypatch):
         package_json = json.loads((project_dir / "package.json").read_text())
         assert package_json["scripts"]["lint"] == "npx nx run-many --target=lint --all"
         assert package_json["workspaces"] == ["apps/*", "packages/node/*"]
-        assert "eslint" in package_json["devDependencies"]
-        assert "prettier" in package_json["devDependencies"]
+        dev_dependencies = package_json["devDependencies"]
+        assert "eslint" in dev_dependencies
+        assert "prettier" in dev_dependencies
+        assert dev_dependencies["eslint"] == "^9.39.4"
+        assert dev_dependencies["@eslint/js"] == "^9.39.4"
+        assert dev_dependencies["eslint-plugin-import"] == "^2.32.0"
+        assert dev_dependencies["eslint-plugin-jsx-a11y"] == "^6.10.2"
+        assert dev_dependencies["eslint-plugin-react"] == "^7.37.5"
+        assert not any(
+            version == "latest" for version in dev_dependencies.values()
+        )
 
         assert (project_dir / "eslint.config.mjs").exists()
         assert (project_dir / ".prettierrc").exists()
@@ -210,6 +219,83 @@ def test_init_scaffold_selection_runs_requested_generators_in_dependency_order(
         ]
 
 
+def test_init_accepts_comma_separated_scaffold_values(monkeypatch):
+    scaffold_calls: list[str] = []
+    instructions_calls: list[dict[str, object]] = []
+
+    def fake_run_command(
+        self, cmd, *, cwd=None, env=None, capture=False, supports_dry_run=False
+    ):
+        return _completed(cmd)
+
+    def fake_domain(*, name, dry_run, migrations=False):
+        scaffold_calls.append(f"domain:{name}:{dry_run}:{migrations}")
+
+    def fake_api(*, name, dry_run):
+        scaffold_calls.append(f"api:{name}:{dry_run}")
+
+    def fake_ui(*, name, dry_run, include_library=True, include_web=True):
+        scaffold_calls.append(
+            f"ui:{name}:{dry_run}:{include_library}:{include_web}"
+        )
+
+    def fake_storybook(*, ui_package=None, dry_run):
+        scaffold_calls.append(f"storybook:{ui_package}:{dry_run}")
+
+    monkeypatch.setattr("rpr.context.RunContext.run_command", fake_run_command)
+    monkeypatch.setattr(
+        "rpr.commands.init._scaffold_ai_instructions",
+        lambda *args, **kwargs: instructions_calls.append({"args": args, "kwargs": kwargs}),
+    )
+    monkeypatch.setattr("rpr.commands.generate.domain.domain", fake_domain)
+    monkeypatch.setattr("rpr.commands.generate.api.api", fake_api)
+    monkeypatch.setattr("rpr.commands.generate.ui.ui", fake_ui)
+    monkeypatch.setattr("rpr.commands.generate.storybook.storybook", fake_storybook)
+
+    commands = [
+        [
+            "init",
+            "comma-space",
+            "--scaffold",
+            "instructions,",
+            "domain,",
+            "api,",
+            "ui,",
+            "web,",
+            "storybook",
+        ],
+        [
+            "init",
+            "comma-tight",
+            "--scaffold",
+            "instructions,domain,api,ui,web,storybook",
+        ],
+        [
+            "init",
+            "comma-quoted",
+            "--scaffold",
+            "instructions, domain, api, ui, web, storybook",
+        ],
+    ]
+
+    with runner.isolated_filesystem():
+        for command in commands:
+            scaffold_calls.clear()
+            instructions_calls.clear()
+
+            result = runner.invoke(app, command)
+
+            project_name = command[1]
+            assert result.exit_code == 0, result.stdout
+            assert len(instructions_calls) == 1
+            assert scaffold_calls == [
+                f"domain:{project_name}:False:False",
+                f"api:{project_name}:False",
+                f"ui:{project_name}:False:True:True",
+                f"storybook:{project_name}-ui:False",
+            ]
+
+
 def test_init_forwards_domain_migrations(monkeypatch):
     recorded_calls: list[dict[str, object]] = []
     scaffold_calls: list[str] = []

{rpr_cli-0.1.3 → rpr_cli-0.1.6}/tests/test_refresh.py

@@ -27,6 +27,8 @@ def test_refresh_manifest_updates_manifest_data_file(monkeypatch, tmp_path: Path
     assert result.exit_code == 0, result.stdout
     assert "uvicorn[standard]: uvicorn[standard]>=0.34 -> uvicorn[standard]>=9.9.9" in result.stdout
     updated = manifest_path.read_text()
+    assert "'eslint': {'specifier': '^9.39.4'}" in updated
+    assert "'eslint-plugin-import': {'specifier': '^2.32.0'}" in updated
     assert "'specifier': '^9.9.9'" in updated
     assert "'specifier': 'fastapi>=9.9.9'" in updated
     assert "'specifier': 'uvicorn[standard]>=9.9.9'" in updated

rpr_cli-0.1.3/src/rpr/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.3"