fast-dev-cli 0.8.1__tar.gz → 0.8.3__tar.gz

{fast_dev_cli-0.8.1 → fast_dev_cli-0.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.8.1
+Version: 0.8.3
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -18,9 +18,8 @@ Classifier: Topic :: Software Development
 Classifier: Typing :: Typed
 Classifier: License :: OSI Approved :: MIT License
 Project-URL: Homepage, https://github.com/waketzheng/fast-dev-cli
-Requires-Python: <3.13,>=3.10
+Requires-Python: <4,>=3.10
 Requires-Dist: typer<0.13,>=0.12.3
-Requires-Dist: typing-extensions>=4.8.0
 Requires-Dist: coverage<8,>=7.5.1
 Requires-Dist: ruff<0.5,>=0.4.4
 Requires-Dist: mypy<2,>=1.10.0

fast_dev_cli-0.8.3/fast_dev_cli/__init__.py

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

fast_dev_cli-0.8.3/fast_dev_cli/__main__.py

@@ -0,0 +1,3 @@
+from .cli import main
+
+main()

{fast_dev_cli-0.8.1 → fast_dev_cli-0.8.3}/fast_dev_cli/cli.py

@@ -8,28 +8,30 @@ import sys
 from functools import cached_property
 from pathlib import Path
 from subprocess import CompletedProcess
-from typing import TYPE_CHECKING, Literal, Optional, Type
+from typing import Literal, Optional, Type
 
 import typer
 from typer import Exit, Option, echo, secho
-from typing_extensions import Annotated, Self
+from typer.models import OptionInfo
+
+try:
+    from . import __version__
+except ImportError:  # pragma: no cover
+    from fast_dev_cli import __version__
 
 if sys.version_info >= (3, 11):
     from enum import StrEnum
+    from typing import Annotated, Self
 else:  # pragma: no cover
     from enum import Enum
 
+    from typing_extensions import Annotated, Self
+
     class StrEnum(str, Enum):
         __str__ = str.__str__
 
 
-if TYPE_CHECKING:  # pragma: no cover
-    from typer.models import OptionInfo
-
-
-__version__ = "0.8.1"
-
-
+# TODO: use Optional Argument instead
 def parse_files(args: list[str] | tuple[str, ...]) -> list[str]:
     return [i for i in args if not i.startswith("-")]
 
@@ -96,7 +98,7 @@ def get_current_version(
     return capture_cmd_output(cmd)
 
 
-def _ensure_bool(value: bool | "OptionInfo") -> bool:
+def _ensure_bool(value: bool | OptionInfo) -> bool:
     if not isinstance(value, bool):
         value = getattr(value, "default", False)
     return value
@@ -202,7 +204,7 @@ class BumpUp(DryRun):
 @cli.command()
 def version() -> None:
     """Show the version of this tool"""
-    echo(__version__)
+    echo(f"Fast Dev Cli version: {__version__}")
 
 
 @cli.command(name="bump")
@@ -666,10 +668,23 @@ def upload(
 
 
 def dev(
-    port: int | None | "OptionInfo", host: str | None | "OptionInfo", dry=False
+    port: int | None | OptionInfo,
+    host: str | None | OptionInfo,
+    file: Optional[str] = None,
+    dry=False,
 ) -> None:
     cmd = "fastapi dev"
-    if (port := getattr(port, "default", port)) and port != 8000:
+    no_port_yet = True
+    if file is not None:
+        try:
+            port = int(file)  # type:ignore[arg-type]
+        except ValueError:
+            cmd += f" {file}"
+        else:
+            if port != 8000:
+                cmd += f" --{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",
@@ -681,16 +696,21 @@ def dev(
 
 @cli.command(name="dev")
 def runserver(
-    serve_port: Annotated[Optional[int], typer.Argument()] = None,
+    file_or_port: Annotated[Optional[str], typer.Argument()] = None,
     port: Optional[int] = Option(None, "-p", "--port"),
     host: Optional[str] = Option(None, "-h", "--host"),
     dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
 ) -> None:
     """Start a fastapi server(only for fastapi>=0.111.0)"""
-    if serve_port:
-        port = serve_port
-    dev(port, host, dry=dry)
+    if file_or_port:
+        dev(port, host, file=file_or_port, dry=dry)
+    else:
+        dev(port, host, dry=dry)
 
 
-if __name__ == "__main__":  # pragma: no cover
+def main() -> None:
     cli()
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()

{fast_dev_cli-0.8.1 → fast_dev_cli-0.8.3}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
     { name = "Waket Zheng", email = "waketzheng@gmail.com>" },
 ]
 readme = "README.md"
-requires-python = ">=3.10,<3.13"
+requires-python = ">=3.10,<4"
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
@@ -31,14 +31,13 @@ classifiers = [
 ]
 dependencies = [
     "typer>=0.12.3,<0.13",
-    "typing-extensions>=4.8.0",
     "coverage >=7.5.1,<8",
     "ruff >=0.4.4,<0.5",
     "mypy >=1.10.0,<2",
     "bumpversion >=0.6.0,<0.7",
     "pytest >=8.2.0,<9",
 ]
-version = "0.8.1"
+version = "0.8.3"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -50,14 +49,14 @@ all = [
 ]
 
 [project.scripts]
-fast = "fast_dev_cli:cli.cli"
+fast = "fast_dev_cli:cli.main"
 
 [tool.pdm]
 distribution = true
 
 [tool.pdm.version]
 source = "file"
-path = "fast_dev_cli/cli.py"
+path = "fast_dev_cli/__init__.py"
 
 [tool.pdm.build]
 source-includes = [
@@ -84,7 +83,7 @@ all = [
 ]
 
 [tool.waketzheng._internal-slim-build.packages.fast-dev-cli.project.scripts]
-fast = "fast_dev_cli:cli.cli"
+fast = "fast_dev_cli:cli.main"
 
 [tool.pytest.ini_options]
 testpaths = [
@@ -112,6 +111,7 @@ exclude_lines = [
 ]
 omit = [
     "tests/*",
+    "fast_dev_cli/__main__.py",
 ]
 
 [tool.mypy]

{fast_dev_cli-0.8.1 → fast_dev_cli-0.8.3}/tests/test_bump.py

@@ -62,7 +62,7 @@ def test_bump(
 ):
     version = get_current_version()
     patch_without_commit, patch_with_commit, minor_with_commit = _bump_commands(
-        version, "fast_dev_cli/cli.py"
+        version, "fast_dev_cli/__init__.py"
     )
     stream = StringIO()
     with redirect_stdout(stream):

fast_dev_cli-0.8.3/tests/test_runserver.py

@@ -0,0 +1,82 @@
+from fast_dev_cli.cli import dev, run_and_echo, runserver
+
+
+def test_runserver(capsys):
+    runserver(dry=True)
+    out = capsys.readouterr().out.strip()
+    assert "fastapi dev" == out.replace("--> ", "")
+    runserver(port=8000, dry=True)
+    out = capsys.readouterr().out.strip()
+    assert "fastapi dev" == out.replace("--> ", "")
+    runserver(port=9000, dry=True)
+    out = capsys.readouterr().out.strip()
+    assert "fastapi dev --port=9000" == out.replace("--> ", "")
+    runserver(host="0.0.0.0", dry=True)
+    out = capsys.readouterr().out.strip()
+    assert "fastapi dev --host=0.0.0.0" == out.replace("--> ", "")
+    runserver(port=9000, host="0.0.0.0", dry=True)
+    out = capsys.readouterr().out.strip()
+    assert "fastapi dev --port=9000 --host=0.0.0.0" == out.replace("--> ", "")
+
+
+def test_dev(capsys):
+    dev(None, None, dry=True)
+    out = capsys.readouterr().out.strip()
+    assert "fastapi dev" == out.replace("--> ", "")
+    dev(port=8000, host="", dry=True)
+    out = capsys.readouterr().out.strip()
+    assert "fastapi dev" == out.replace("--> ", "")
+    dev(port=9000, host=None, dry=True)
+    out = capsys.readouterr().out.strip()
+    assert "fastapi dev --port=9000" == out.replace("--> ", "")
+    dev(8000, host="0.0.0.0", dry=True)
+    out = capsys.readouterr().out.strip()
+    assert "fastapi dev --host=0.0.0.0" == out.replace("--> ", "")
+    dev(port=9000, host="0.0.0.0", dry=True)
+    out = capsys.readouterr().out.strip()
+    assert "fastapi dev --port=9000 --host=0.0.0.0" == out.replace("--> ", "")
+    dev(8001, host="0.0.0.0", dry=True)
+    out = capsys.readouterr().out.strip()
+    assert "fastapi dev --port=8001 --host=0.0.0.0" == out.replace("--> ", "")
+    dev(None, file="8001", host="0.0.0.0", dry=True)
+    out = capsys.readouterr().out.strip()
+    assert "fastapi dev --port=8001 --host=0.0.0.0" == out.replace("--> ", "")
+    dev(None, file="main.py", host="0.0.0.0", dry=True)
+    out = capsys.readouterr().out.strip()
+    assert "fastapi dev main.py --host=0.0.0.0" == out.replace("--> ", "")
+    dev(8001, file="main.py", host="0.0.0.0", dry=True)
+    out = capsys.readouterr().out.strip()
+    assert "fastapi dev main.py --port=8001 --host=0.0.0.0" == out.replace("--> ", "")
+
+
+def test_fast_dev(tmp_path):
+    out = tmp_path / "a.txt"
+    run_and_echo(f"fast dev 9000 --dry > {out}", verbose=False)
+    assert "fastapi dev --port=9000" in out.read_text()
+    run_and_echo(f"fast dev main.py --dry > {out}", verbose=False)
+    assert "fastapi dev main.py" in out.read_text()
+    run_and_echo(f"fast dev main.py --port=9000 --dry > {out}", verbose=False)
+    assert "fastapi dev main.py --port=9000" in out.read_text()
+    run_and_echo(
+        f"fast dev main.py --port=9000 --host=0.0.0.0 --dry > {out}", verbose=False
+    )
+    assert "fastapi dev main.py --port=9000 --host=0.0.0.0" in out.read_text()
+    run_and_echo(f"fast dev 9000 --host=0.0.0.0 --dry > {out}", verbose=False)
+    assert "fastapi dev --port=9000 --host=0.0.0.0" in out.read_text()
+
+
+def test_run_by_module(tmp_path):
+    out = tmp_path / "b.txt"
+    fast = "python -m fast_dev_cli"
+    run_and_echo(f"{fast} dev 9000 --dry > {out}", verbose=False)
+    assert "fastapi dev --port=9000" in out.read_text()
+    run_and_echo(f"{fast} dev main.py --dry > {out}", verbose=False)
+    assert "fastapi dev main.py" in out.read_text()
+    run_and_echo(f"{fast} dev main.py --port=9000 --dry > {out}", verbose=False)
+    assert "fastapi dev main.py --port=9000" in out.read_text()
+    run_and_echo(
+        f"{fast} dev main.py --port=9000 --host=0.0.0.0 --dry > {out}", verbose=False
+    )
+    assert "fastapi dev main.py --port=9000 --host=0.0.0.0" in out.read_text()
+    run_and_echo(f"{fast} dev 9000 --host=0.0.0.0 --dry > {out}", verbose=False)
+    assert "fastapi dev --port=9000 --host=0.0.0.0" in out.read_text()

fast_dev_cli-0.8.1/fast_dev_cli/__init__.py

@@ -1,31 +0,0 @@
-from .cli import (
-    __version__,
-    bump,
-    bump_version,
-    check,
-    lint,
-    make_style,
-    only_check,
-    sync,
-    tag,
-    test,
-    upgrade,
-    upload,
-    version,
-)
-
-__all__ = (
-    "__version__",
-    "version",
-    "bump_version",
-    "bump",
-    "lint",
-    "check",
-    "upload",
-    "test",
-    "sync",
-    "tag",
-    "upgrade",
-    "make_style",
-    "only_check",
-)

fast_dev_cli-0.8.1/fast_dev_cli/__main__.py

@@ -1,3 +0,0 @@
-from .cli import cli
-
-cli()

fast_dev_cli-0.8.1/tests/test_runserver.py

@@ -1,46 +0,0 @@
-from fast_dev_cli.cli import dev, run_and_echo, runserver
-
-
-def test_runserver(capsys):
-    runserver(dry=True)
-    out = capsys.readouterr().out.strip()
-    assert "fastapi dev" == out.replace("--> ", "")
-    runserver(port=8000, dry=True)
-    out = capsys.readouterr().out.strip()
-    assert "fastapi dev" == out.replace("--> ", "")
-    runserver(port=9000, dry=True)
-    out = capsys.readouterr().out.strip()
-    assert "fastapi dev --port=9000" == out.replace("--> ", "")
-    runserver(host="0.0.0.0", dry=True)
-    out = capsys.readouterr().out.strip()
-    assert "fastapi dev --host=0.0.0.0" == out.replace("--> ", "")
-    runserver(port=9000, host="0.0.0.0", dry=True)
-    out = capsys.readouterr().out.strip()
-    assert "fastapi dev --port=9000 --host=0.0.0.0" == out.replace("--> ", "")
-
-
-def test_dev(capsys):
-    dev(None, None, dry=True)
-    out = capsys.readouterr().out.strip()
-    assert "fastapi dev" == out.replace("--> ", "")
-    dev(port=8000, host="", dry=True)
-    out = capsys.readouterr().out.strip()
-    assert "fastapi dev" == out.replace("--> ", "")
-    dev(port=9000, host=None, dry=True)
-    out = capsys.readouterr().out.strip()
-    assert "fastapi dev --port=9000" == out.replace("--> ", "")
-    dev(8000, host="0.0.0.0", dry=True)
-    out = capsys.readouterr().out.strip()
-    assert "fastapi dev --host=0.0.0.0" == out.replace("--> ", "")
-    dev(port=9000, host="0.0.0.0", dry=True)
-    out = capsys.readouterr().out.strip()
-    assert "fastapi dev --port=9000 --host=0.0.0.0" == out.replace("--> ", "")
-    dev(8001, host="0.0.0.0", dry=True)
-    out = capsys.readouterr().out.strip()
-    assert "fastapi dev --port=8001 --host=0.0.0.0" == out.replace("--> ", "")
-
-
-def test_fast_dev(tmp_path):
-    out = tmp_path / "a.txt"
-    run_and_echo(f"fast dev 9000 --dry > {out}", verbose=False)
-    assert "fastapi dev --port=9000" in out.read_text()