create-awesome-python-app 0.2.8__tar.gz → 0.2.10__tar.gz

{create_awesome_python_app-0.2.8 → create_awesome_python_app-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: create-awesome-python-app
-Version: 0.2.8
+Version: 0.2.10
 Summary: Composable scaffolding CLI for production-ready Python apps
 Project-URL: Homepage, https://github.com/Create-Python-App/create-python-app
 Project-URL: Repository, https://github.com/Create-Python-App/create-python-app
@@ -8,7 +8,7 @@ Project-URL: Issues, https://github.com/Create-Python-App/create-python-app/issu
 Project-URL: Changelog, https://github.com/Create-Python-App/create-python-app/blob/main/CHANGELOG.md
 License-Expression: MIT
 Requires-Python: >=3.12
-Requires-Dist: create-python-app-core>=0.2.6
+Requires-Dist: create-python-app-core>=0.2.10
 Requires-Dist: questionary>=2.1.1
 Requires-Dist: rich>=15.0.0
 Requires-Dist: typer>=0.27.0

{create_awesome_python_app-0.2.8 → create_awesome_python_app-0.2.10}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "create-awesome-python-app"
-version = "0.2.8"
+version = "0.2.10"
 description = "Composable scaffolding CLI for production-ready Python apps"
 readme = "README.md"
 requires-python = ">=3.12"
 license = "MIT"
 dependencies = [
-    "create-python-app-core>=0.2.6",
+    "create-python-app-core>=0.2.10",
     "questionary>=2.1.1",
     "rich>=15.0.0",
     "typer>=0.27.0",

{create_awesome_python_app-0.2.8 → create_awesome_python_app-0.2.10}/src/create_awesome_python_app/__init__.py

@@ -1,3 +1,3 @@
 """Create Awesome Python App CLI."""
 
-__version__ = "0.2.8"
+__version__ = "0.2.10"

{create_awesome_python_app-0.2.8 → create_awesome_python_app-0.2.10}/src/create_awesome_python_app/cli.py

@@ -12,6 +12,8 @@ import typer
 from create_python_app_core import (
     ConfigParseError,
     CpaCustomOption,
+    NonEmptyTargetDirectoryError,
+    assert_directory_is_empty,
     check_for_latest_version,
     check_python_version,
     create_python_app,
@@ -76,10 +78,15 @@ def _expand_variadic_option(argv: list[str], option: str) -> list[str]:
 
     Typer's ``list[str]`` Option only accepts one value per flag. Commander uses
     ``--addons [extensions...]``, so users naturally write space-separated lists.
+
+    When ``project_directory`` comes *after* options and no positional was seen
+    yet, peel the final trailing token at EOS back as the directory so that
+    ``--addons a --addons b /tmp/app`` does not treat ``/tmp/app`` as an addon.
     """
     out: list[str] = []
     i = 0
     prefix = option + "="
+    saw_positional = False
     while i < len(argv):
         arg = argv[i]
         if arg == option:
@@ -88,17 +95,26 @@ def _expand_variadic_option(argv: list[str], option: str) -> list[str]:
             while i < len(argv) and not argv[i].startswith("-"):
                 values.append(argv[i])
                 i += 1
+            ended_at_eos = i >= len(argv)
+            trailing: str | None = None
+            if ended_at_eos and not saw_positional and len(values) >= 2:
+                trailing = values.pop()
             if not values:
                 out.append(option)
             else:
                 for value in values:
                     out.extend([option, value])
+            if trailing is not None:
+                out.append(trailing)
+                saw_positional = True
             continue
         if arg.startswith(prefix):
             value = arg[len(prefix) :]
             out.extend([option, value] if value else [option])
             i += 1
             continue
+        if i > 0 and not arg.startswith("-"):
+            saw_positional = True
         out.append(arg)
         i += 1
     return out
@@ -106,7 +122,9 @@ def _expand_variadic_option(argv: list[str], option: str) -> list[str]:
 
 def _preprocess_cli_argv(argv: list[str] | None = None) -> list[str]:
     """Apply argv rewrites needed before Typer parses the CLI."""
-    out = _preprocess_fixture_argv(argv)
+    raw = list(sys.argv if argv is None else argv)
+    # Pass an explicit list so fixture preprocess does not mutate sys.argv early.
+    out = _preprocess_fixture_argv(raw)
     out = _expand_variadic_option(out, "--addons")
     out = _expand_variadic_option(out, "--extend")
     if argv is None:
@@ -307,6 +325,18 @@ def scaffold(
             la(template)
         raise typer.Exit(0)
 
+    target_directory = project_directory or "my-project"
+    # Fail before the interactive wizard so a leftover `my-project/` does not
+    # waste a full prompt session (and so we exit cleanly, not with a traceback).
+    if not force:
+        try:
+            assert_directory_is_empty(
+                Path(target_directory).expanduser().resolve(), force=False
+            )
+        except NonEmptyTargetDirectoryError as err:
+            console.print(f"[red]{err}[/red]")
+            raise typer.Exit(1) from err
+
     effective_refresh = _normalize_refresh(refresh)
     if refresh and effective_refresh is None:
         console.print(
@@ -524,25 +554,31 @@ def scaffold(
             raise typer.Exit(1)
         console.print(f"[yellow]{msg}[/yellow]")
 
-    asyncio.run(
-        create_python_app(
-            project_directory or "my-project",
-            {
-                "template": template,
-                "addons": addons or [],
-                "extend": extend or [],
-                "install": not no_install,
-                "force": force,
-                "verbose": verbose,
-                "offline": offline,
-                "refresh": effective_refresh,
-                "keep_on_failure": keep_on_failure,
-                "cache_dir": str(cache_dir) if cache_dir else None,
-                "set": set_map,
-            },
+    try:
+        asyncio.run(
+            create_python_app(
+                target_directory,
+                {
+                    "template": template,
+                    "addons": addons or [],
+                    "extend": extend or [],
+                    "install": not no_install,
+                    "force": force,
+                    "verbose": verbose,
+                    "offline": offline,
+                    "refresh": effective_refresh,
+                    "keep_on_failure": keep_on_failure,
+                    "cache_dir": str(cache_dir) if cache_dir else None,
+                    "set": set_map,
+                },
+            )
         )
-    )
-    console.print(f"[green]Created[/green] {project_directory}")
+    except NonEmptyTargetDirectoryError as err:
+        # Safety net if the target fills up after the early check (e.g. during
+        # a long interactive session).
+        console.print(f"[red]{err}[/red]")
+        raise typer.Exit(1) from err
+    console.print(f"[green]Created[/green] {target_directory}")
 
 
 @cache_app.command("dir")

{create_awesome_python_app-0.2.8 → create_awesome_python_app-0.2.10}/tests/test_cli.py

@@ -320,6 +320,59 @@ def test_expand_variadic_addons_and_extend() -> None:
     ]
 
 
+def test_expand_preserves_trailing_project_directory() -> None:
+    """Repeated ``--addons`` with directory last must not swallow the path."""
+    from create_awesome_python_app.cli import _preprocess_cli_argv
+
+    assert _preprocess_cli_argv(
+        [
+            "cpa",
+            "--addons",
+            "github-setup",
+            "--addons",
+            "fastapi-docker",
+            "/tmp/app",
+        ]
+    ) == [
+        "cpa",
+        "--addons",
+        "github-setup",
+        "--addons",
+        "fastapi-docker",
+        "/tmp/app",
+    ]
+    # CI-shaped argv: flags between last addon and directory.
+    assert (
+        _preprocess_cli_argv(
+            [
+                "cpa",
+                "--template",
+                "fastapi-starter",
+                "--addons",
+                "fastapi-docker",
+                "--addons",
+                "github-setup",
+                "--no-interactive",
+                "--no-install",
+                "--force",
+                "/tmp/app",
+            ]
+        )[-1]
+        == "/tmp/app"
+    )
+    # Space-separated addons with directory last (no prior positional).
+    assert _preprocess_cli_argv(
+        ["cpa", "--addons", "fastapi-docker", "github-setup", "/tmp/app"]
+    ) == [
+        "cpa",
+        "--addons",
+        "fastapi-docker",
+        "--addons",
+        "github-setup",
+        "/tmp/app",
+    ]
+
+
 def test_space_separated_addons_after_project_directory(
     tmp_path: Path, monkeypatch
 ) -> None:
@@ -373,6 +426,57 @@ def test_space_separated_addons_after_project_directory(
     assert any("github-setup" in a for a in addons)
 
 
+def test_repeated_addons_with_directory_last(tmp_path: Path, monkeypatch) -> None:
+    """``--addons a --addons b <dir>`` must keep ``<dir>`` as project_directory."""
+    from create_awesome_python_app.cli import _preprocess_cli_argv
+
+    tpl = tmp_path / "tpl"
+    tpl.mkdir()
+    target = tmp_path / "app"
+    captured: dict[str, object] = {}
+
+    async def fake_check_for_latest_version(_package_name):
+        return None
+
+    async def fake_create_python_app(project_directory, options, *_args, **_kwargs):
+        captured["project_directory"] = project_directory
+        captured["options"] = options
+
+    monkeypatch.setattr(
+        "create_awesome_python_app.cli.check_for_latest_version",
+        fake_check_for_latest_version,
+    )
+    monkeypatch.setattr(
+        "create_awesome_python_app.cli.create_python_app",
+        fake_create_python_app,
+    )
+
+    argv = _preprocess_cli_argv(
+        [
+            "cpa",
+            "--template",
+            f"file://{tpl}",
+            "--addons",
+            "fastapi-docker",
+            "--addons",
+            "github-setup",
+            "--no-install",
+            "--no-interactive",
+            str(target),
+        ]
+    )
+    result = runner.invoke(app, argv[1:])
+    text = (result.stdout or "") + (result.stderr or "")
+    assert result.exit_code == 0, text
+    assert captured["project_directory"] == str(target)
+    options = captured["options"]
+    assert isinstance(options, dict)
+    addons = options["addons"]
+    assert isinstance(addons, list)
+    assert len(addons) == 2
+    assert not any(str(target) in a for a in addons)
+
+
 def test_preprocess_fixture_argv_bare_and_with_dir() -> None:
     from create_awesome_python_app.cli import _FIXTURE_AUTO, _preprocess_fixture_argv
 
@@ -437,3 +541,91 @@ def test_list_templates_with_fixture_dir(
     assert result.exit_code == 0, text
     assert "fixture-only" in text
     assert os.environ.get("CPA_CATALOG_FIXTURE") == "1"
+
+
+def test_non_empty_target_fails_before_scaffold(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """Leftover target dir must fail immediately — not after interactive work."""
+    target = tmp_path / "existing"
+    target.mkdir()
+    (target / "leftover.txt").write_text("already here", encoding="utf-8")
+    tpl = tmp_path / "tpl"
+    tpl.mkdir()
+    called: dict[str, bool] = {"create": False}
+
+    async def fake_check_for_latest_version(_package_name):
+        return None
+
+    async def fake_create_python_app(*_args, **_kwargs):
+        called["create"] = True
+
+    monkeypatch.setattr(
+        "create_awesome_python_app.cli.check_for_latest_version",
+        fake_check_for_latest_version,
+    )
+    monkeypatch.setattr(
+        "create_awesome_python_app.cli.create_python_app",
+        fake_create_python_app,
+    )
+
+    result = runner.invoke(
+        app,
+        [
+            "--template",
+            f"file://{tpl}",
+            "--no-install",
+            "--no-interactive",
+            str(target),
+        ],
+    )
+    text = (result.stdout or "") + (result.stderr or "")
+    assert result.exit_code == 1, text
+    assert "not empty" in text.lower()
+    assert "--force" in text
+    assert called["create"] is False
+
+
+def test_non_empty_target_allows_force(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    target = tmp_path / "existing"
+    target.mkdir()
+    (target / "leftover.txt").write_text("already here", encoding="utf-8")
+    tpl = tmp_path / "tpl"
+    tpl.mkdir()
+    captured: dict[str, object] = {}
+
+    async def fake_check_for_latest_version(_package_name):
+        return None
+
+    async def fake_create_python_app(project_directory, options, *_args, **_kwargs):
+        captured["project_directory"] = project_directory
+        captured["options"] = options
+
+    monkeypatch.setattr(
+        "create_awesome_python_app.cli.check_for_latest_version",
+        fake_check_for_latest_version,
+    )
+    monkeypatch.setattr(
+        "create_awesome_python_app.cli.create_python_app",
+        fake_create_python_app,
+    )
+
+    result = runner.invoke(
+        app,
+        [
+            "--template",
+            f"file://{tpl}",
+            "--force",
+            "--no-install",
+            "--no-interactive",
+            str(target),
+        ],
+    )
+    text = (result.stdout or "") + (result.stderr or "")
+    assert result.exit_code == 0, text
+    assert captured["project_directory"] == str(target)
+    options = captured["options"]
+    assert isinstance(options, dict)
+    assert options["force"] is True