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

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

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

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

@@ -12,15 +12,13 @@ from typing import TYPE_CHECKING, Literal, Optional, Type
 
 import typer
 from typer import Exit, Option, echo, secho
+from typing_extensions import Annotated, Self
 
 if sys.version_info >= (3, 11):
     from enum import StrEnum
-    from typing import Self
 else:  # pragma: no cover
     from enum import Enum
 
-    from typing_extensions import Self
-
     class StrEnum(str, Enum):
         __str__ = str.__str__
 
@@ -29,7 +27,7 @@ if TYPE_CHECKING:  # pragma: no cover
     from typer.models import OptionInfo
 
 
-__version__ = "0.8.0"
+__version__ = "0.8.1"
 
 
 def parse_files(args: list[str] | tuple[str, ...]) -> list[str]:
@@ -239,27 +237,33 @@ class Project:
     path_depth = 5
 
     @staticmethod
-    def work_dir(name: str, parent: Path, depth: int) -> Path | None:
+    def work_dir(name: str, parent: Path, depth: int, be_file=False) -> Path | None:
         for _ in range(depth):
-            if parent.joinpath(name).exists():
+            if (f := parent.joinpath(name)).exists():
+                if be_file:
+                    return f
                 return parent
             parent = parent.parent
         return None
 
     @classmethod
     def get_work_dir(
-        cls: Type[Self], name=TOML_FILE, cwd: Path | None = None, allow_cwd=False
+        cls: Type[Self],
+        name=TOML_FILE,
+        cwd: Path | None = None,
+        allow_cwd=False,
+        be_file=False,
     ) -> Path:
         cwd = cwd or Path.cwd()
-        if d := cls.work_dir(name, cwd, cls.path_depth):
+        if d := cls.work_dir(name, cwd, cls.path_depth, be_file):
             return d
         if allow_cwd:
             return cls.get_root_dir(cwd)
         raise EnvError(f"{name} not found! Make sure this is a poetry project.")
 
     @classmethod
-    def load_toml_text(cls: Type[Self]) -> str:
-        toml_file = cls.get_work_dir().resolve() / TOML_FILE  # to be optimize
+    def load_toml_text(cls: Type[Self], name=TOML_FILE) -> str:
+        toml_file = cls.get_work_dir(name, be_file=True)
         return toml_file.read_text("utf8")
 
     @classmethod
@@ -677,11 +681,14 @@ def dev(
 
 @cli.command(name="dev")
 def runserver(
+    serve_port: Annotated[Optional[int], 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)
 
 

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

@@ -38,7 +38,7 @@ dependencies = [
     "bumpversion >=0.6.0,<0.7",
     "pytest >=8.2.0,<9",
 ]
-version = "0.8.0"
+version = "0.8.1"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -66,7 +66,7 @@ source-includes = [
 
 [tool.pdm.dev-dependencies]
 dev = [
-    "-e file:///${PROJECT_ROOT}/#egg=fast-dev-cli[standard,all]",
+    "-e file:///${PROJECT_ROOT}/#egg=fast-dev-cli[all]",
 ]
 
 [tool.waketzheng._internal-slim-build.packages.fastdevcli-slim.project]

fast_dev_cli-0.8.1/scripts/test.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+pdm run coverage run -m pytest
+pdm run coverage combine .coverage*
+pdm run coverage report -m

{fast_dev_cli-0.8.0 → fast_dev_cli-0.8.1}/tests/test_runserver.py

@@ -1,4 +1,4 @@
-from fast_dev_cli.cli import dev, runserver
+from fast_dev_cli.cli import dev, run_and_echo, runserver
 
 
 def test_runserver(capsys):
@@ -35,3 +35,12 @@ def test_dev(capsys):
     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()

fast_dev_cli-0.8.0/scripts/test.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-pdm run fast test --ignore-script