create-awesome-python-app 0.2.8__py3-none-any.whl → 0.2.10__py3-none-any.whl

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/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.dist-info → create_awesome_python_app-0.2.10.dist-info}/METADATA

@@ -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.10.dist-info/RECORD

@@ -0,0 +1,9 @@
+create_awesome_python_app/__init__.py,sha256=bi_KnqAleIdsMEwUjb0fOKqFtc6xP93QD5OPMGuYTtk,61
+create_awesome_python_app/cache.py,sha256=eHKUlunGexZKYJo0HDNoBoOVq0DjLyRYgEe_wUh4Fk0,11812
+create_awesome_python_app/catalog.py,sha256=ZB-ieyEn_TBqVBbCbFkK9h3VJoYtifvvOxs_BM2tDEw,22754
+create_awesome_python_app/cli.py,sha256=sEGWsw1gz1ayQcv2p0VNl2NKZeZJvU_WdSkv8tVyqaY,29229
+create_awesome_python_app/prompt_style.py,sha256=pERX1qPQSLZXeJvPVFC7z85dvte73ZV4iuENPQduheE,3463
+create_awesome_python_app-0.2.10.dist-info/METADATA,sha256=3FZrfWHw86Qrqb0IdSzoE4tMdaIlTbgzJUm4pi5Ksns,23273
+create_awesome_python_app-0.2.10.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+create_awesome_python_app-0.2.10.dist-info/entry_points.txt,sha256=rszFbUjY-lvMDZ96zX1lALJwgD1mI3CkUuNyF2qqjYo,81
+create_awesome_python_app-0.2.10.dist-info/RECORD,,

create_awesome_python_app-0.2.8.dist-info/RECORD

@@ -1,9 +0,0 @@
-create_awesome_python_app/__init__.py,sha256=bpha_GXZNmruh0uP4KvEZzHYZOOzyqluLF2ediJjcdo,60
-create_awesome_python_app/cache.py,sha256=eHKUlunGexZKYJo0HDNoBoOVq0DjLyRYgEe_wUh4Fk0,11812
-create_awesome_python_app/catalog.py,sha256=ZB-ieyEn_TBqVBbCbFkK9h3VJoYtifvvOxs_BM2tDEw,22754
-create_awesome_python_app/cli.py,sha256=bSmivzm4lUOcDtoyNT-t3PL_Xb1O8msAUl_XFczeNkQ,27555
-create_awesome_python_app/prompt_style.py,sha256=pERX1qPQSLZXeJvPVFC7z85dvte73ZV4iuENPQduheE,3463
-create_awesome_python_app-0.2.8.dist-info/METADATA,sha256=YcMQFDgWXeK0jT77VqBV6LOYNBxfTWOhhYRWpZ1A9W0,23271
-create_awesome_python_app-0.2.8.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-create_awesome_python_app-0.2.8.dist-info/entry_points.txt,sha256=rszFbUjY-lvMDZ96zX1lALJwgD1mI3CkUuNyF2qqjYo,81
-create_awesome_python_app-0.2.8.dist-info/RECORD,,