fast-dev-cli 0.21.1__tar.gz → 0.23.0__tar.gz

{fast_dev_cli-0.21.1 → fast_dev_cli-0.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.21.1
+Version: 0.23.0
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -23,10 +23,15 @@ Project-URL: Homepage, https://github.com/waketzheng/fast-dev-cli
 Requires-Python: >=3.10
 Requires-Dist: typer<1,>=0.24.0
 Requires-Dist: tomli<3,>=2.0.1; python_version < "3.11"
-Requires-Dist: coverage>=7.5.1
-Requires-Dist: pytest>=8.2.0
-Provides-Extra: include-optional-dependencies
-Requires-Dist: all; extra == "include-optional-dependencies"
+Provides-Extra: standard
+Requires-Dist: coverage>=7.5.1; extra == "standard"
+Requires-Dist: pytest>=8.2.0; extra == "standard"
+Provides-Extra: all
+Requires-Dist: emoji>=2.12.1; extra == "all"
+Requires-Dist: packaging>=20.5; extra == "all"
+Requires-Dist: bandit>=1.7.9; extra == "all"
+Requires-Dist: pytest-mock>=3.14.0; extra == "all"
+Requires-Dist: fast-dev-cli[standard]; extra == "all"
 Description-Content-Type: text/markdown
 
 <p align="center">
@@ -90,8 +95,8 @@ Python 3.10+
 <div class="termy">
 
 ```bash
-uv tool install --python 3.14 fastdevcli-slim
-# Or: pipx install fastdevcli-slim
+uv tool install fast-dev-cli
+# Or: pipx install fast-dev-cli
 ```
 *Will create a `fast` command in ~/.local/bin
 
@@ -102,7 +107,7 @@ uv tool install --python 3.14 fastdevcli-slim
 <div class="termy">
 
 ```bash
-pip install fast-dev-cli
+pip install "fast-dev-cli[standard]"
 ```
 *Will install: fast-dev-cli emoji typer packaging pytest coverage*
 
@@ -118,7 +123,7 @@ fast lint [/path/to/file-or-directory]
 ```bash
 fast check
 ```
-- Bump up version in pyproject.toml
+- Bump up version in pyproject.toml(or package.json)
 ```bash
 fast bump patch  # 0.1.0 -> 0.1.1
 fast bump minor  # 0.1.0 -> 0.2.0
@@ -146,7 +151,7 @@ fast pypi
 ## Use it without installed
 
 ```bash
-uvx --from fastdevcli-slim fast
+uvx --from fast-dev-cli fast
 ```
 
 ## Lint/Check by ty instead of mypy

{fast_dev_cli-0.21.1 → fast_dev_cli-0.23.0}/README.md

@@ -59,8 +59,8 @@ Python 3.10+
 <div class="termy">
 
 ```bash
-uv tool install --python 3.14 fastdevcli-slim
-# Or: pipx install fastdevcli-slim
+uv tool install fast-dev-cli
+# Or: pipx install fast-dev-cli
 ```
 *Will create a `fast` command in ~/.local/bin
 
@@ -71,7 +71,7 @@ uv tool install --python 3.14 fastdevcli-slim
 <div class="termy">
 
 ```bash
-pip install fast-dev-cli
+pip install "fast-dev-cli[standard]"
 ```
 *Will install: fast-dev-cli emoji typer packaging pytest coverage*
 
@@ -87,7 +87,7 @@ fast lint [/path/to/file-or-directory]
 ```bash
 fast check
 ```
-- Bump up version in pyproject.toml
+- Bump up version in pyproject.toml(or package.json)
 ```bash
 fast bump patch  # 0.1.0 -> 0.1.1
 fast bump minor  # 0.1.0 -> 0.2.0
@@ -115,7 +115,7 @@ fast pypi
 ## Use it without installed
 
 ```bash
-uvx --from fastdevcli-slim fast
+uvx --from fast-dev-cli fast
 ```
 
 ## Lint/Check by ty instead of mypy

fast_dev_cli-0.23.0/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.21.1 → fast_dev_cli-0.23.0}/fast_dev_cli/cli.py

@@ -15,7 +15,6 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal, cast, get_args, overload
 
 import typer
-from click import UsageError
 from typer import Exit, Option, echo, secho
 from typer.models import ArgumentInfo, OptionInfo
 
@@ -98,6 +97,14 @@ def is_windows() -> bool:
     return platform.system() == "Windows"
 
 
+@functools.cache
+def prefer_uv_tool() -> bool:
+    if shutil.which("uv") is None:
+        return False
+    cmd = "uv tool list"
+    return Shell(cmd).capture_output() != "No tools installed"
+
+
 def yellow_warn(msg: str) -> None:
     if is_windows() and (encoding := sys.stdout.encoding) != "utf-8":
         msg = msg.encode(encoding, errors="ignore").decode(encoding)
@@ -281,7 +288,7 @@ def _get_frontend_version() -> tuple[Path, str] | None:
     except ImportError:
         from json import loads as json_loads  # type:ignore[assignment]
     content = frontend_version_file.read_bytes()
-    metadata: dict[str, str] = json_loads(content)  # type:ignore[assignment]
+    metadata: dict[str, str] = json_loads(content)  # type:ignore
     try:
         current_version = metadata["version"]
     except (KeyError, TypeError):
@@ -1078,7 +1085,7 @@ class GitTag(DryRun):
 
     def run(self) -> None:
         if self.mark_tag() and not self.dry:
-            echo("You may want to publish package:\n poetry publish --build")
+            echo("You may want to publish package:\n pdm publish")
 
 
 @cli.command()
@@ -1173,17 +1180,21 @@ class LintCode(DryRun):
     ) -> str:
         if paths != "." and all(i.endswith(".html") for i in paths.split()):
             return f"prettier -w {paths}"
-        cmd = ""
-        ruff_check = "ruff check --extend-select=I,B,SIM" + " --fix" * ruff_check_fix
+        ruff_rules = ["I", "B"]
+        if ruff_check_sim and not load_bool("FASTDEVCLI_NO_SIM"):
+            ruff_rules.append("SIM")
+        if ruff_check_up or load_bool("FASTDEVCLI_UP"):
+            ruff_rules.append("UP")
+        ruff_check = "ruff check --extend-select=" + ",".join(ruff_rules)
+        if (
+            ruff_check_fix
+            and not check_only
+            and (not load_bool("NO_FIX") and not load_bool("FASTDEVCLI_NO_FIX"))
+        ):
+            ruff_check += " --fix"
         tools = ["ruff format", ruff_check, "mypy"]
         if check_only:
             tools[0] += " --check"
-        if check_only or load_bool("NO_FIX"):
-            tools[1] = tools[1].replace(" --fix", "")
-        if ruff_check_up or load_bool("FASTDEVCLI_UP"):
-            tools[1] = tools[1].replace(",SIM", ",SIM,UP")
-        if not ruff_check_sim or load_bool("FASTDEVCLI_NO_SIM"):
-            tools[1] = tools[1].replace(",SIM", "")
         if skip_mypy or load_bool("SKIP_MYPY") or load_bool("FASTDEVCLI_NO_MYPY"):
             # Sometimes mypy is too slow
             tools = tools[:-1]
@@ -1195,23 +1206,11 @@ class LintCode(DryRun):
                     tools[-1] += " --ignore-missing-imports"
                 if mypy_strict or load_bool("FASTDEVCLI_STRICT"):
                     tools[-1] += " --strict"
-        lint_them = " && ".join(
-            "{0}{" + str(i) + "} {1}" for i in range(2, len(tools) + 2)
-        )
-        if ruff_exists := cls.check_lint_tool_installed():
-            # `ruff <command>` get the same result with `pdm run ruff <command>`
-            # While `mypy .`(installed global and env not activated),
-            #   does not the same as `pdm run mypy .`
-            lint_them = " && ".join(
-                ("" if tool.startswith("ruff") else "{0}")
-                + (
-                    "{%d} {1}" % i  # noqa: UP031
-                )
-                for i, tool in enumerate(tools, 2)
-            )
+        ruff_exists = cls.check_lint_tool_installed()
         prefix = ""
         should_run_by_tool = with_prefix
-        if not should_run_by_tool and "mypy" in str(tools):
+        requires_mypy = any(tool.startswith("mypy") for tool in tools)
+        if requires_mypy and not should_run_by_tool:
             if is_venv() and Path(sys.argv[0]).parent != Path.home().joinpath(
                 ".local/bin"
             ):  # Virtual environment activated and fast-dev-cli is installed in it
@@ -1221,6 +1220,8 @@ class LintCode(DryRun):
                     if shutil.which("pipx") is None:
                         ensure_pipx = "pip install --user pipx\n  pipx ensurepath\n  "
                         command = ensure_pipx + command
+                    elif prefer_uv_tool():
+                        command = "uv tool install ruff"
                     yellow_warn(
                         "You may need to run the following command"
                         f" to install ruff:\n\n  {command}\n"
@@ -1228,7 +1229,7 @@ class LintCode(DryRun):
                 elif cls.missing_mypy_exec():
                     should_run_by_tool = True
                     if check_call('python -c "import fast_dev_cli"'):
-                        command = 'python -m pip install -U "fast-dev-cli"'
+                        command = "python -m pip install -U mypy"
                         yellow_warn(
                             "You may need to run the following command"
                             f" to install lint tools:\n\n  {command}\n"
@@ -1255,7 +1256,17 @@ class LintCode(DryRun):
                         prefix = bin_dir
         if cls.prefer_dmypy(paths, tools, use_dmypy=use_dmypy):
             tools[-1] = "dmypy run"
-        cmd += lint_them.format(prefix, paths, *tools)
+        cmd = " && ".join(
+            (
+                tool
+                # `ruff <command>` get the same result with `pdm run ruff <command>`.
+                # Other tools should run inside the selected environment.
+                if ruff_exists and tool.startswith("ruff")
+                else prefix + tool
+            )
+            + f" {paths}"
+            for tool in tools
+        )
         if bandit or load_bool("FASTDEVCLI_BANDIT"):
             command = prefix + "bandit"
             if Path("pyproject.toml").exists():
@@ -1453,7 +1464,9 @@ class Sync(DryRun):
             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}"
-        prefix = "" if is_venv() else f"{tool} run "
+        prefix = ""
+        if not is_venv():
+            prefix = f"{tool} run " + "--no-sync " * (tool == "uv")
         ensure_pip = " {1}python -m ensurepip && {1}python -m pip install -U pip &&"
         export_cmd = "uv export --no-hashes --all-extras --all-groups --frozen"
         if tool in ("poetry", "pdm"):
@@ -1549,30 +1562,86 @@ def upload(
     exit_if_run_failed(cmd, dry=dry)
 
 
+def should_use_just() -> bool:
+    if shutil.which("just") is None:
+        return False
+    d = Path.cwd()
+    for _ in range(5):
+        f = d / "justfile"
+        if f.exists():
+            text = f.read_text(encoding="utf-8")
+            return any(i.startswith("dev *args:") for i in text.splitlines())
+        if d.joinpath("pyproject.toml").exists():
+            break
+    return False
+
+
 def dev(
     port: int | None | OptionInfo,
     host: str | None | OptionInfo,
+    fastapi: bool | None = None,
+    uvicorn: bool | None = None,
+    prod: bool | None = None,
+    reload: bool | None = None,
     file: str | None | ArgumentInfo = None,
     dry: bool = False,
 ) -> None:
-    cmd = "fastapi dev"
-    no_port_yet = True
-    if file is not None:
-        try:
-            port = int(str(file))
-        except ValueError:
-            cmd += f" {file}"
-        else:
-            if port != 8000:
-                cmd += f" --port={port}"
-                no_port_yet = False
-    if no_port_yet and (port := getattr(port, "default", port)) and str(port) != "8000":
-        cmd += f" --port={port}"
-    if (host := getattr(host, "default", host)) and host not in (
-        "localhost",
-        "127.0.0.1",
-    ):
-        cmd += f" --host={host}"
+    if should_use_just():
+        args = [i for i in sys.argv[2:] if i != "--dry"]
+        cmd = "just dev"
+    else:
+        cmd = "uvicorn" if uvicorn else "fastapi dev"
+        args = []
+        if (host := getattr(host, "default", host)) and host not in (
+            "localhost",
+            "127.0.0.1",
+        ):
+            args.append(f"--host={host}")
+        no_port_yet = True
+        if file is not None:
+            try:
+                port = int(str(file))
+            except ValueError:
+                if m := re.search(r"(.*):(\d+)$", str(file)):
+                    h, p = m.group(1), m.group(2)
+                    if h and "--host" not in str(args):
+                        if h == "0":
+                            args.append("--host=0.0.0.0")
+                        else:
+                            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"
+                else:
+                    if uvicorn and (
+                        (filepath := Path(str(file))).is_file()
+                        or filepath.suffix == ".py"
+                    ):
+                        file = filepath.stem + ":app"
+                        parent_names = [j for i in filepath.parents if (j := i.name)]
+                        if parent_names:
+                            file = ".".join([*parent_names[::-1], file])
+                    cmd += f" {file}"
+            else:
+                if port != 8000:
+                    args.append(f"--port={port}")
+                    no_port_yet = False
+        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:
+            cmd = "pdm run " + cmd
+    if args:
+        cmd += " " + " ".join(args)
     exit_if_run_failed(cmd, dry=dry)
 
 
@@ -1581,13 +1650,18 @@ def runserver(
     file_or_port: str | None = typer.Argument(default=None),
     port: int | None = Option(None, "-p", "--port"),
     host: str | None = Option(None, "-h", "--host"),
+    fastapi: bool | None = None,
+    uvicorn: bool | None = None,
+    prod: bool | None = None,
+    reload: bool | None = None,
     dry: bool = DryOption,
 ) -> None:
     """Start a fastapi server(only for fastapi>=0.111.0)"""
+    f = functools.partial(dev, port, host, fastapi, uvicorn, prod, reload, dry=dry)
     if getattr(file_or_port, "default", file_or_port):
-        dev(port, host, file=file_or_port, dry=dry)
+        f(file=file_or_port)
     else:
-        dev(port, host, dry=dry)
+        f()
 
 
 @cli.command(name="exec")
@@ -1654,7 +1728,7 @@ class MakeDeps(DryRun):
             if self.should_ensure_pip():
                 cmd = f"python -m ensurepip && {upgrade} && {cmd}"
             elif self.should_upgrade_pip():
-                cmd = "{upgrade} && {cmd}"
+                cmd = f"{upgrade} && {cmd}"
             return cmd
 
 
@@ -1680,7 +1754,10 @@ def make_deps(
 ) -> None:
     """Run: ruff check/format to reformat code and then mypy to check"""
     if use_uv + use_pdm + use_pip + use_poetry > 1:
-        raise UsageError("`--uv/--pdm/--pip/--poetry` can only choose one!")
+        raise typer.BadParameter(
+            "can only choose one",
+            param_hint=("--uv", "--pdm", "--pip", "--poetry"),
+        )
     if use_uv:
         tool = "uv"
     elif use_pdm:

{fast_dev_cli-0.21.1 → fast_dev_cli-0.23.0}/pyproject.toml

@@ -1,9 +1,3 @@
-[build-system]
-requires = [
-    "pdm-backend",
-]
-build-backend = "pdm.backend"
-
 [project]
 name = "fast-dev-cli"
 dynamic = []
@@ -34,28 +28,39 @@ classifiers = [
 dependencies = [
     "typer>=0.24.0,<1",
     "tomli >=2.0.1,<3; python_version < '3.11'",
-    "coverage >=7.5.1",
-    "pytest >=8.2.0",
 ]
-version = "0.21.1"
+version = "0.23.0"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
 
 [project.optional-dependencies]
-include-optional-dependencies = [
-    "all",
+standard = [
+    "coverage >=7.5.1",
+    "pytest >=8.2.0",
+]
+all = [
+    "emoji >=2.12.1",
+    "packaging >=20.5",
+    "bandit>=1.7.9",
+    "pytest-mock >=3.14.0",
+    "fast-dev-cli[standard]",
 ]
 
 [project.scripts]
-fast = "fast_dev_cli:cli.main"
+fast = "fast_dev_cli.cli:main"
 
 [dependency-groups]
 dev = [
-    "twine>=6.1.0",
     "asynctor>=0.10.0",
 ]
 
+[build-system]
+requires = [
+    "pdm-backend",
+]
+build-backend = "pdm.backend"
+
 [tool.pdm]
 distribution = true
 
@@ -63,24 +68,14 @@ distribution = true
 source = "file"
 path = "fast_dev_cli/__init__.py"
 
-[tool.pdm.build]
-source-includes = [
-    "scripts/",
-]
-
-[tool.pdm.dev-dependencies]
-dev = [
-    "-e file:///${PROJECT_ROOT}/#egg=fast-dev-cli[all]",
-]
-
 [tool.pdm.scripts]
-up = "pdm update -G :all"
+up = "just up {args}"
 tree = "pdm list --tree {args}"
-deps = "pdm run python scripts/deps.py {args}"
+deps = "just deps {args}"
 prod = "pdm install --prod --frozen {args}"
 test = "pdm run fast test {args}"
-lint = "pdm run fast lint {args}"
-check = "pdm run fast check {args}"
+lint = "just lint {args}"
+check = "just check {args}"
 tag = "pdm run fast tag {args}"
 bump = "pdm run fast bump patch --commit {args}"
 
@@ -99,7 +94,7 @@ composite = [
 
 [tool.pdm.scripts.start]
 composite = [
-    "pre-commit install",
+    "prek install",
     "deps",
 ]
 
@@ -109,25 +104,6 @@ composite = [
     "ruff check --fix --unsafe-fixes {args}",
 ]
 
-[tool.waketzheng._internal-slim-build.packages.fastdevcli-slim.project]
-name = "fastdevcli-slim"
-
-[tool.waketzheng._internal-slim-build.packages.fastdevcli-slim.project.scripts]
-fast = "fast_dev_cli:cli.main"
-
-[tool.waketzheng._internal-slim-build.packages.fast-dev-cli]
-include-optional-dependencies = [
-    "standard",
-]
-
-[tool.waketzheng._internal-slim-build.packages.fast-dev-cli.project.optional-dependencies]
-include-optional-dependencies = [
-    "all",
-]
-
-[tool.waketzheng._internal-slim-build.packages.fast-dev-cli.project.scripts]
-fast = "fast_dev_cli:cli.main"
-
 [tool.pytest.ini_options]
 testpaths = [
     "tests",

{fast_dev_cli-0.21.1 → fast_dev_cli-0.23.0}/tests/test_deps.py

@@ -1,7 +1,19 @@
-from fast_dev_cli.cli import MakeDeps, capture_cmd_output
+import re
+
+from fast_dev_cli.cli import MakeDeps, capture_cmd_output, run_and_echo
+
+ANSI_RE = re.compile(r"\x1b\[[0-9;]*m")
+
+
+def strip_ansi(text: str) -> str:
+    return ANSI_RE.sub("", text)
 
 
 def test_make_deps_class():
+    class PipDepsWithoutEnsure(MakeDeps):
+        def should_ensure_pip(self) -> bool:
+            return False
+
     assert (
         MakeDeps("uv", prod=False).gen()
         == "uv sync --inexact --active --all-extras --all-groups"
@@ -27,10 +39,14 @@ def test_make_deps_class():
         MakeDeps("pip", prod=True).gen()
         == "python -m ensurepip && python -m pip install --upgrade pip && python -m pip install -e ."
     )
+    assert (
+        PipDepsWithoutEnsure("pip", prod=False).gen()
+        == "python -m pip install --upgrade pip && python -m pip install -e . --group dev"
+    )
 
 
 def test_fast_deps():
-    out = capture_cmd_output("fast deps --dry")
+    out = capture_cmd_output("fast deps --pdm --dry")
     assert out == "--> pdm install --frozen -G :all"
     out = capture_cmd_output("fast deps --uv --prod --dry")
     assert out == "--> uv sync --inexact --active"
@@ -50,6 +66,14 @@ def test_fast_deps():
     assert out == "--> uv sync --all-extras --all-groups"
 
 
+def test_fast_deps_mutually_exclusive_options():
+    cmd = "fast deps --uv --pdm --dry"
+    assert run_and_echo(cmd, verbose=False) == 2
+    out = strip_ansi(capture_cmd_output(cmd))
+    assert "Invalid value for '--uv' / '--pdm' / '--pip' / '--poetry'" in out
+    assert "can only choose" in out
+
+
 def test_smart_fast_deps(tmp_work_dir, monkeypatch):
     toml_file = tmp_work_dir.joinpath("pyproject.toml")
     if toml_file.exists():

{fast_dev_cli-0.21.1 → fast_dev_cli-0.23.0}/tests/test_fast_test.py

@@ -42,6 +42,7 @@ def test_cli_test(mocker, capsys):
 def test_test_with_pdm_run(mocker: MockerFixture, capsys):
     mocker.patch("fast_dev_cli.cli.check_call", return_value=False)
     mocker.patch("fast_dev_cli.cli._should_run_test_script", return_value=None)
+    mocker.patch("fast_dev_cli.cli.Project.get_manage_tool", return_value="pdm")
     unitcase(dry=True)
     assert (
         '--> pdm run coverage run -m pytest -s && pdm run coverage report --omit="tests/*" -m'

{fast_dev_cli-0.21.1 → fast_dev_cli-0.23.0}/tests/test_functions.py

@@ -4,7 +4,8 @@ from io import StringIO
 from pathlib import Path
 
 import pytest
-import typer
+from typer import Exit as TyperExit
+from typer import Option
 
 from fast_dev_cli.cli import (
     DryRun,
@@ -85,7 +86,7 @@ def test_run_shell():
         )
     with pytest.raises(FileNotFoundError):
         exit_if_run_failed("in_valid_command", _exit=True, capture_output=True)
-    with pytest.raises(typer.Exit):
+    with pytest.raises(TyperExit):
         exit_if_run_failed(
             "in_valid_command", _exit=False, capture_output=True, shell=True
         )
@@ -111,8 +112,8 @@ def test_get_version_in_poetry_project(tmp_path: Path):
 def test_ensure_bool():
     assert _ensure_bool(True) is True
     assert _ensure_bool(False) is False
-    opt = typer.Option(False, "--check-only", "-c")
+    opt = Option(False, "--check-only", "-c")
     assert opt
     assert _ensure_bool(opt) is False
-    opt = typer.Option(True, "--check-only", "-c")
+    opt = Option(True, "--check-only", "-c")
     assert _ensure_bool(opt) is True