fast-dev-cli 0.25.1__tar.gz → 0.25.3__tar.gz

{fast_dev_cli-0.25.1 → fast_dev_cli-0.25.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.25.1
+Version: 0.25.3
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta

fast_dev_cli-0.25.3/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.25.1 → fast_dev_cli-0.25.3}/fast_dev_cli/cli.py

@@ -378,6 +378,36 @@ def _ensure_str(value: str | OptionInfo | None) -> str | None:
     return getattr(value, "default", "")
 
 
+def _quote_shell_arg(value: str | Path) -> str:
+    text = str(value)
+    if not is_windows():
+        return shlex.quote(text)
+    if text and not re.search(r'[\s"&|<>^()%!]', text):
+        return text
+
+    # Quote for the Windows C runtime while keeping cmd.exe metacharacters inert.
+    result = ['"']
+    backslashes = 0
+    for char in text:
+        if char == "\\":
+            backslashes += 1
+        elif char == '"':
+            result.append("\\" * (backslashes * 2 + 1))
+            result.append(char)
+            backslashes = 0
+        else:
+            result.append("\\" * backslashes)
+            result.append(char)
+            backslashes = 0
+    result.append("\\" * (backslashes * 2))
+    result.append('"')
+    return "".join(result)
+
+
+def _join_shell_args(args: list[str]) -> str:
+    return " ".join(_quote_shell_arg(arg) for arg in args)
+
+
 class DryRun:
     def __init__(self, _exit: bool = False, dry: bool = False) -> None:
         self.dry = _ensure_bool(dry)
@@ -563,6 +593,29 @@ class BumpUp(DryRun):
             echo(f"Invalid part: {s!r}")
             raise Exit(1) from e
 
+    @staticmethod
+    def parse_new_version(part: str, version: str) -> str:
+        version_parts = version.split(".")
+        if not version_parts[-1].isdigit():
+            try:
+                p1, p2, p3 = version_parts[:3]
+                p2i = int(p2)
+                p1i = int(p1)
+            except ValueError:
+                ...
+            else:
+                match part:
+                    case "patch":
+                        p3i = int(m.group()) if (m := re.match(r"\d+", p3)) else 0
+                        if len(version_parts) == 3:
+                            p3i += 1
+                        return f"{p1}.{p2}.{p3i}"
+                    case "minor":
+                        return f"{p1}.{p2i + 1}.0"
+                    case "major":
+                        return f"{p1i + 1}.0.0"
+        return ""
+
     def gen(self) -> str:
         should_sync, _version = get_current_version(check_version=True)
         filename = self.filename
@@ -575,7 +628,11 @@ class BumpUp(DryRun):
                 part = self.get_part(a)
         self.part = part
         parse = r'--parse "(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)"'
-        cmd = f'bumpversion {parse} --current-version="{_version}" {part} {filename}'
+        filename_arg = _quote_shell_arg(filename)
+        cmd = f'bumpversion {parse} --current-version="{_version}" '
+        if new_version := self.parse_new_version(part, _version):
+            cmd += f'--new-version="{new_version}" '
+        cmd += f"{part} {filename_arg}"
         if self.commit:
             if part != "patch":
                 cmd += " --tag"
@@ -641,15 +698,13 @@ def version() -> None:
 @cli.command(name="bump")
 def bump_version(
     part: BumpUp.PartChoices,
+    sync: bool = False,
     commit: bool = Option(
         False, "--commit", "-c", help="Whether run `git commit` after version changed"
     ),
     emoji: bool | None = Option(
         None, "--emoji", help="Whether add emoji prefix to commit message"
     ),
-    no_sync: bool = Option(
-        False, "--no-sync", help="Do not run sync command to update version"
-    ),
     dry: bool = DryOption,
 ) -> None:
     """Bump up version string in pyproject.toml"""
@@ -658,7 +713,7 @@ def bump_version(
     return BumpUp(
         _ensure_bool(commit),
         getattr(part, "value", part),
-        no_sync=_ensure_bool(no_sync),
+        no_sync=not _ensure_bool(sync),
         emoji=emoji,
         dry=dry,
     ).run()
@@ -1088,7 +1143,10 @@ class GitTag(DryRun):
         if self.has_v_prefix():
             # Add `v` at prefix to compare with bumpversion tool
             _version = "v" + _version
-        cmd = f"git tag -a {_version} -m {self.message!r} && git push --tags"
+        cmd = (
+            f"git tag -a {_quote_shell_arg(_version)} "
+            f"-m {_quote_shell_arg(self.message)} && git push --tags"
+        )
         if self.should_push():
             cmd += " && git push"
         if should_sync and not self._no_sync and (sync := Project.get_sync_command()):
@@ -1190,7 +1248,7 @@ class LintCode(DryRun):
     @classmethod
     def to_cmd(
         cls: type[Self],
-        paths: str = ".",
+        paths: str | list[str] = ".",
         check_only: bool = False,
         bandit: bool = False,
         skip_mypy: bool = False,
@@ -1203,8 +1261,12 @@ class LintCode(DryRun):
         prefer_ty: bool = False,
         ruff_check_fix: bool = True,
     ) -> str:
-        if paths != "." and all(i.endswith(".html") for i in paths.split()):
-            return f"prettier -w {paths}"
+        path_args = shlex.split(paths) if isinstance(paths, str) else paths
+        if not path_args:
+            path_args = ["."]
+        quoted_paths = _join_shell_args(path_args)
+        if path_args != ["."] and all(i.endswith(".html") for i in path_args):
+            return f"prettier -w {quoted_paths}"
         ruff_rules = ["I", "B"]
         if ruff_check_sim and not load_bool("FASTDEVCLI_NO_SIM"):
             ruff_rules.append("SIM")
@@ -1294,7 +1356,7 @@ class LintCode(DryRun):
                         prefix += "--no-sync "
                     elif Path(bin_dir := ".venv/bin/").exists():
                         prefix = bin_dir
-        if cls.prefer_dmypy(paths, tools, use_dmypy=use_dmypy):
+        if cls.prefer_dmypy(quoted_paths, tools, use_dmypy=use_dmypy):
             tools[-1] = "dmypy run"
         cmd = " && ".join(
             (
@@ -1308,7 +1370,7 @@ class LintCode(DryRun):
                 )
                 else prefix + tool
             )
-            + f" {paths}"
+            + f" {quoted_paths}"
             for tool in tools
         )
         if bandit or load_bool("FASTDEVCLI_BANDIT"):
@@ -1317,36 +1379,35 @@ class LintCode(DryRun):
                 toml_text = Project.load_toml_text()
                 if "[tool.bandit" in toml_text:
                     command += " -c pyproject.toml"
-            if paths == "." and " -c " not in command:
-                paths = cls.get_package_name()
-            command += f" -r {paths}"
+            if quoted_paths == "." and " -c " not in command:
+                quoted_paths = _quote_shell_arg(cls.get_package_name())
+            command += f" -r {quoted_paths}"
             cmd += " && " + command
         return cmd
 
     def gen(self) -> str:
-        paths = "."
+        paths = ["."]
         if args := self.args:
-            ps = args.split() if isinstance(args, str) else [str(i) for i in args]
+            ps = shlex.split(args) if isinstance(args, str) else [str(i) for i in args]
             if len(ps) == 1:
-                paths = ps[0]
+                path = ps[0]
                 if (
-                    paths != "."
+                    path != "."
                     # `Path("a.").suffix` got "." in py3.14 and got "" with py<3.14
-                    and (p := Path(paths)).suffix in ("", ".")
+                    and (p := Path(path)).suffix in ("", ".")
                     and not p.exists()
                 ):
                     # e.g.:
                     # stem -> stem.py
                     # me. -> me.py
-                    if paths.endswith("."):
-                        p = p.with_name(paths[:-1])
+                    if path.endswith("."):
+                        p = p.with_name(path[:-1])
                     for suffix in (".py", ".html"):
                         p = p.with_suffix(suffix)
                         if p.exists():
-                            paths = p.name
+                            ps[0] = p.name
                             break
-            else:
-                paths = " ".join(ps)
+            paths = ps
         return self.to_cmd(
             paths,
             self.check_only,
@@ -1517,10 +1578,11 @@ class Sync(DryRun):
     def gen(self) -> str:
         extras, save = self.extras, self._save
         should_remove = not Path.cwd().joinpath(self.filename).exists()
+        filename = _quote_shell_arg(self.filename)
         if not (tool := Project.get_manage_tool()):
             if should_remove or not is_venv():
                 raise EnvError("There project is not managed by uv/pdm/poetry!")
-            return f"python -m pip install -r {self.filename}"
+            return f"python -m pip install -r {filename}"
         prefix = ""
         if not is_venv():
             prefix = f"{tool} run " + "--no-sync " * (tool == "uv")
@@ -1533,7 +1595,7 @@ class Sync(DryRun):
                 if not UpgradeDependencies.should_with_dev():
                     export_cmd = export_cmd.replace(" --with=dev", "")
                 if extras and isinstance(extras, str | list):
-                    export_cmd += f" --{extras=}".replace("'", '"')
+                    export_cmd += f" --extras={_quote_shell_arg(str(extras))}"
             elif check_call(prefix + "python -m pip --version"):
                 ensure_pip = ""
         elif check_call(prefix + "python -m pip --version"):
@@ -1543,7 +1605,7 @@ class Sync(DryRun):
         )
         if should_remove and not save:
             install_cmd += " && rm -f {0}"
-        return install_cmd.format(self.filename, prefix, export_cmd)
+        return install_cmd.format(filename, prefix, export_cmd)
 
 
 @cli.command()
@@ -1573,11 +1635,11 @@ def test(dry: bool, ignore_script: bool = False) -> None:
     if not _ensure_bool(ignore_script) and (
         test_script := _should_run_test_script(script_dir)
     ):
-        cmd = test_script.relative_to(root).as_posix()
+        cmd = _quote_shell_arg(test_script.relative_to(root).as_posix())
         if test_script.suffix == ".py":
             cmd = "python " + cmd
         if cwd != root:
-            cmd = f"cd {root} && " + cmd
+            cmd = f"cd {_quote_shell_arg(root)} && " + cmd
     else:
         cmd = 'coverage run -m pytest -s && coverage report --omit="tests/*" -m'
         if not is_venv() or not check_call("coverage --version"):
@@ -1645,6 +1707,7 @@ def should_use_just() -> bool:
             return _prefer_just_dev(f)
         if d.joinpath("pyproject.toml").exists():
             break
+        d = d.parent
     return False
 
 
@@ -1654,10 +1717,22 @@ def _prefer_just_dev(f: Path) -> bool:
     dev_recipe = "dev *args:"
     re_import = re.compile(r"import[?]? ")
     has_import = False
+    total = len(lines)
     for i, line in enumerate(lines):
         if line.startswith(dev_recipe):
             # Avoid cycle callback
-            return "fast dev" not in lines[i + 1]
+            command_lines = []
+            for j in range(i + 1, total):
+                try:
+                    s = lines[j]
+                except IndexError:
+                    break
+                if not s.startswith(" "):
+                    break
+                command_lines.append(s)
+            if not command_lines:  # Invalid justfile
+                return False
+            return all("fast dev" not in i for i in command_lines)
         elif not has_import and re_import.match(line):
             has_import = True
     if has_import:
@@ -1669,6 +1744,17 @@ def _prefer_just_dev(f: Path) -> bool:
     return False
 
 
+def _load_fastapi_entrypoint() -> str:
+    with contextlib.suppress(FileNotFoundError, KeyError):
+        try:
+            toml_text = Project.load_toml_text()
+        except EnvError:
+            return ""
+        doc = tomllib.loads(toml_text)
+        return doc["tool"]["fastapi"]["entrypoint"]
+    return ""
+
+
 def _parse_serve_file(
     uvicorn: bool | None, filename: str, cmd: str, args: list[str]
 ) -> str:
@@ -1681,20 +1767,23 @@ def _parse_serve_file(
                 args.append(f"--host={h}")
         args.append(f"--port={p}")
         if uvicorn:
-            p = Path("main.py")
-            if p.exists():
-                cmd += " main:app"
-            elif Path("app", p.name).exists():
-                cmd += " app.main:app"
-            elif Path("app.py").exists():
-                cmd += " app:app"
+            if entrypoint := _load_fastapi_entrypoint():
+                cmd += " " + entrypoint
+            else:
+                p = Path("main.py")
+                if p.exists():
+                    cmd += " main:app"
+                elif Path("app", p.name).exists():
+                    cmd += " app.main:app"
+                elif Path("app.py").exists():
+                    cmd += " app:app"
         return cmd
     if uvicorn and ((filepath := Path(filename)).is_file() or filepath.suffix == ".py"):
         filename = filepath.stem + ":app"
         parent_names = [j for i in filepath.parents if (j := i.name)]
         if parent_names:
             filename = ".".join([*parent_names[::-1], filename])
-    cmd += " " + filename
+    cmd += " " + _quote_shell_arg(filename)
     return cmd
 
 
@@ -1722,6 +1811,8 @@ def _runserver(
             if port != 8000:
                 args.append(f"--port={port}")
                 no_port_yet = False
+    elif uvicorn and (entrypoint := _load_fastapi_entrypoint()):
+        cmd += " " + entrypoint
     if no_port_yet and (port := getattr(port, "default", port)) and str(port) != "8000":
         args.append(f"--port={port}")
     if shutil.which("pdm") is not None:
@@ -1746,7 +1837,7 @@ def dev(
     else:
         cmd, args = _runserver(uvicorn, host, port, file)
     if args:
-        cmd += " " + " ".join(args)
+        cmd += " " + _join_shell_args(args)
     exit_if_run_failed(cmd, dry=dry)
 
 
@@ -1835,9 +1926,13 @@ class MakeDeps(DryRun):
             if opt not in cmd:
                 cmd += opt
         if self._no_extra:
-            cmd += " " + " ".join(f"--no-extra {i}" for i in self._no_extra)
+            cmd += " " + " ".join(
+                f"--no-extra {_quote_shell_arg(i)}" for i in self._no_extra
+            )
         if self._no_group:
-            cmd += " " + " ".join(f"--no-group {i}" for i in self._no_group)
+            cmd += " " + " ".join(
+                f"--no-group {_quote_shell_arg(i)}" for i in self._no_group
+            )
         if self._frozen:
             cmd += " --frozen"
         if opts := os.getenv("FASTDEVCLI_DEPS_OPTS"):
@@ -1873,7 +1968,7 @@ class MakeDeps(DryRun):
         elif self._tool == "uv":
             uv_sync = "uv sync"
             if project := self.get_package_name():
-                uv_sync += f" --reinstall-package={project}"
+                uv_sync += " " + _quote_shell_arg(f"--reinstall-package={project}")
             uv_sync += " --inexact" * self._inexact + " --active" * self._active
             return uv_sync + (
                 " --no-dev" if self._prod else " --all-extras --all-groups"

{fast_dev_cli-0.25.1 → fast_dev_cli-0.25.3}/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "typer>=0.24.0,<1",
     "tomli >=2.0.1,<3; python_version < '3.11'",
 ]
-version = "0.25.1"
+version = "0.25.3"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

fast_dev_cli-0.25.1/fast_dev_cli/__init__.py

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