fast-dev-cli 0.19.1__tar.gz → 0.19.3__tar.gz

{fast_dev_cli-0.19.1 → fast_dev_cli-0.19.3}/PKG-INFO

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

fast_dev_cli-0.19.3/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.19.1 → fast_dev_cli-0.19.3}/fast_dev_cli/cli.py

@@ -12,16 +12,7 @@ import subprocess  # nosec:B404
 import sys
 from functools import cached_property
 from pathlib import Path
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Literal,
-    # Optional is required by Option generated by typer
-    Optional,
-    cast,
-    get_args,
-    overload,
-)
+from typing import TYPE_CHECKING, Any, Literal, cast, get_args, overload
 
 import typer
 from click import UsageError
@@ -148,14 +139,25 @@ class Shell:
     @property
     def command(self) -> list[str] | str:
         command: list[str] | str = self._cmd
-        if (
-            isinstance(command, str)
-            and "shell" not in self._kw
-            and not (set(self._cmd) & {"|", ">", "&"})
-        ):
-            command = shlex.split(command)
+        if isinstance(command, str):
+            cs = shlex.split(command)
+            if "shell" not in self._kw and not (set(self._cmd) & {"|", ">", "&"}):
+                command = self.extend_user(cs)
+            elif any(i.startswith("~") for i in cs):
+                command = re.sub(r" ~", " " + os.path.expanduser("~"), command)
+        else:
+            command = self.extend_user(command)
         return command
 
+    @staticmethod
+    def extend_user(cs: list[str]) -> list[str]:
+        if cs[0] == "echo":
+            return cs
+        for i, c in enumerate(cs):
+            if c.startswith("~"):
+                cs[i] = os.path.expanduser(c)
+        return cs
+
     def _run(self) -> subprocess.CompletedProcess[str]:
         return self.run_by_subprocess(self.command, **self._kw)
 
@@ -391,7 +393,36 @@ class BumpUp(DryRun):
             return is_emoji(first_char)
 
     @staticmethod
+    def parse_dynamic_version(
+        toml_text: str,
+        context: dict,
+        work_dir: Path | None = None,
+    ) -> str | None:
+        if work_dir is None:
+            work_dir = Project.get_work_dir()
+        for tool in ("pdm", "hatch"):
+            with contextlib.suppress(KeyError):
+                version_path = cast(str, context["tool"][tool]["version"]["path"])
+                if (
+                    Path(version_path).exists()
+                    or work_dir.joinpath(version_path).exists()
+                ):
+                    return version_path
+        # version = { source = "file", path = "fast_dev_cli/__init__.py" }
+        v_key = "version = "
+        p_key = 'path = "'
+        for line in toml_text.splitlines():
+            if not line.startswith(v_key):
+                continue
+            if p_key in (value := line.split(v_key, 1)[-1].split("#")[0]):
+                filename = value.split(p_key, 1)[-1].split('"')[0]
+                if work_dir.joinpath(filename).exists():
+                    return filename
+        return None
+
+    @classmethod
     def parse_filename(
+        cls,
         toml_text: str | None = None,
         work_dir: Path | None = None,
         package_name: str | None = None,
@@ -414,74 +445,55 @@ class BumpUp(DryRun):
             try:
                 version_value = context["tool"]["poetry"]["version"]
             except KeyError:
-                if not Project.manage_by_poetry():
-                    if work_dir is None:
-                        work_dir = Project.get_work_dir()
-                    for tool in ("pdm", "hatch"):
-                        with contextlib.suppress(KeyError):
-                            version_path = cast(
-                                str, context["tool"][tool]["version"]["path"]
-                            )
-                            if (
-                                Path(version_path).exists()
-                                or work_dir.joinpath(version_path).exists()
-                            ):
-                                return version_path
-                    # version = { source = "file", path = "fast_dev_cli/__init__.py" }
-                    v_key = "version = "
-                    p_key = 'path = "'
-                    for line in toml_text.splitlines():
-                        if not line.startswith(v_key):
-                            continue
-                        if p_key in (value := line.split(v_key, 1)[-1].split("#")[0]):
-                            filename = value.split(p_key, 1)[-1].split('"')[0]
-                            if work_dir.joinpath(filename).exists():
-                                return filename
+                if not Project.manage_by_poetry() and (
+                    filename := cls.parse_dynamic_version(toml_text, context, work_dir)
+                ):
+                    return filename
             else:
                 by_version_plugin = version_value in ("0", "0.0.0", "init")
         if by_version_plugin:
+            return cls.parse_plugin_version(context, package_name)
+
+        return TOML_FILE
+
+    @staticmethod
+    def parse_plugin_version(context: dict, package_name: str | None) -> str:
+        try:
+            package_item = context["tool"]["poetry"]["packages"]
+        except KeyError:
             try:
-                package_item = context["tool"]["poetry"]["packages"]
+                project_name = context["project"]["name"]
             except KeyError:
-                try:
-                    project_name = context["project"]["name"]
-                except KeyError:
-                    packages = []
-                else:
-                    packages = [(poetry_module_name(project_name), "")]
+                packages = []
             else:
-                packages = [
-                    (j, i.get("from", ""))
-                    for i in package_item
-                    if (j := i.get("include"))
-                ]
-            # In case of managed by `poetry-plugin-version`
-            cwd = Path.cwd()
-            pattern = re.compile(r"__version__\s*=\s*['\"]")
-            ds: list[Path] = []
-            if package_name is not None:
-                packages.insert(0, (package_name, ""))
-            for package_name, source_dir in packages:
-                ds.append(cwd / package_name)
-                ds.append(cwd / "src" / package_name)
-                if source_dir and source_dir != "src":
-                    ds.append(cwd / source_dir / package_name)
-            module_name = poetry_module_name(cwd.name)
-            ds.extend([cwd / module_name, cwd / "src" / module_name, cwd])
-            for d in ds:
-                init_file = d / "__init__.py"
-                if (
-                    init_file.exists() and pattern.search(init_file.read_text("utf8"))
-                ) or (
-                    (init_file := init_file.with_name("__version__.py")).exists()
-                    and pattern.search(init_file.read_text("utf8"))
-                ):
-                    break
-            else:
-                raise ParseError("Version file not found! Where are you now?")
-            return os.path.relpath(init_file, cwd)
-
-        return TOML_FILE
+                packages = [(poetry_module_name(project_name), "")]
+        else:
+            packages = [
+                (j, i.get("from", "")) for i in package_item if (j := i.get("include"))
+            ]
+        # In case of managed by `poetry-plugin-version`
+        cwd = Path.cwd()
+        pattern = re.compile(r"__version__\s*=\s*['\"]")
+        ds: list[Path] = []
+        if package_name is not None:
+            packages.insert(0, (package_name, ""))
+        for package_name, source_dir in packages:
+            ds.append(cwd / package_name)
+            ds.append(cwd / "src" / package_name)
+            if source_dir and source_dir != "src":
+                ds.append(cwd / source_dir / package_name)
+        module_name = poetry_module_name(cwd.name)
+        ds.extend([cwd / module_name, cwd / "src" / module_name, cwd])
+        for d in ds:
+            init_file = d / "__init__.py"
+            if (init_file.exists() and pattern.search(init_file.read_text("utf8"))) or (
+                (init_file := init_file.with_name("__version__.py")).exists()
+                and pattern.search(init_file.read_text("utf8"))
+            ):
+                break
+        else:
+            raise ParseError("Version file not found! Where are you now?")
+        return os.path.relpath(init_file, cwd)
 
     def get_part(self, s: str) -> str:
         choices: dict[str, str] = {}
@@ -517,7 +529,11 @@ class BumpUp(DryRun):
                 cmd += " && git push && git push --tags && git log -1"
         else:
             cmd += " --allow-dirty"
-        if should_sync and not self._no_sync and (sync := Project.get_sync_command()):
+        if (
+            should_sync
+            and not self._no_sync
+            and (sync := Project.get_sync_command(only_me=True))
+        ):
             cmd = f"{sync} && " + cmd
         return cmd
 
@@ -561,7 +577,7 @@ def bump_version(
     commit: bool = Option(
         False, "--commit", "-c", help="Whether run `git commit` after version changed"
     ),
-    emoji: Optional[bool] = Option(
+    emoji: bool | None = Option(
         None, "--emoji", help="Whether add emoji prefix to commit message"
     ),
     no_sync: bool = Option(
@@ -744,9 +760,12 @@ class Project:
         return True
 
     @classmethod
-    def get_sync_command(cls, prod: bool = True, doc: dict | None = None) -> str:
+    def get_sync_command(
+        cls, prod: bool = True, doc: dict | None = None, only_me: bool = False
+    ) -> str:
+        pdm_i = "pdm install --frozen" + " --prod" * prod
         if cls.is_pdm_project():
-            return "pdm install --frozen" + " --prod" * prod
+            return pdm_i
         elif cls.manage_by_poetry(cache=True):
             cmd = "poetry install"
             if prod:
@@ -761,7 +780,17 @@ class Project:
                     cmd += " --only=main"
             return cmd
         elif cls.get_manage_tool(cache=True) == "uv":
-            return "uv sync --inexact" + " --no-dev" * prod
+            install_me = "uv pip install -e ."
+            if doc is None:
+                doc = tomllib.loads(cls.load_toml_text())
+            is_distribution = (
+                doc.get("tool", {}).get("pdm", {}).get("distribution") is not False
+            )
+            if only_me:
+                return install_me if is_distribution else pdm_i
+            cmd = "uv sync --inexact" + " --no-dev" * prod
+            if is_distribution:
+                cmd += f" && {install_me}"
         return ""
 
     @classmethod
@@ -1251,7 +1280,7 @@ def check(
 
 @cli.command(name="lint")
 def make_style(
-    files: Optional[list[str]] = typer.Argument(default=None),  # noqa:B008
+    files: list[str] | None = typer.Argument(default=None),  # noqa:B008
     check_only: bool = Option(False, "--check-only", "-c"),
     bandit: bool = Option(False, "--bandit", help="Run `bandit -r <package_dir>`"),
     prefix: bool = Option(
@@ -1434,9 +1463,9 @@ def dev(
 
 @cli.command(name="dev")
 def runserver(
-    file_or_port: Optional[str] = typer.Argument(default=None),
-    port: Optional[int] = Option(None, "-p", "--port"),
-    host: Optional[str] = Option(None, "-h", "--host"),
+    file_or_port: str | None = typer.Argument(default=None),
+    port: int | None = Option(None, "-p", "--port"),
+    host: str | None = Option(None, "-h", "--host"),
     dry: bool = DryOption,
 ) -> None:
     """Start a fastapi server(only for fastapi>=0.111.0)"""
@@ -1624,7 +1653,7 @@ class UvPypi(DryRun):
 
 @cli.command()
 def pypi(
-    file: Optional[str] = typer.Argument(default=None),
+    file: str | None = typer.Argument(default=None),
     dry: bool = DryOption,
     verbose: bool = False,
     quiet: bool = False,

{fast_dev_cli-0.19.1 → fast_dev_cli-0.19.3}/pyproject.toml

@@ -41,7 +41,7 @@ dependencies = [
     "bumpversion2 >=1.4.3",
     "pytest >=8.2.0",
 ]
-version = "0.19.1"
+version = "0.19.3"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -57,7 +57,7 @@ fast = "fast_dev_cli:cli.main"
 [dependency-groups]
 dev = [
     "twine>=6.1.0",
-    "asynctor>=0.8.6",
+    "asynctor>=0.10.0",
 ]
 
 [tool.pdm]

{fast_dev_cli-0.19.1 → fast_dev_cli-0.19.3}/tests/test_exec.py

@@ -1,3 +1,5 @@
+import os
+
 import pytest
 
 from fast_dev_cli.cli import Exit, capture_cmd_output, run_by_subprocess
@@ -15,6 +17,8 @@ def test_exec_dry():
     )
     assert "success" in out
     assert "failed" not in out
+    out = capture_cmd_output('fast exec "python ~/0.py" --dry')
+    assert "--> python ~/0.py" in out
 
 
 def test_exec():
@@ -29,6 +33,12 @@ def test_exec():
     )
     assert "failed" in out
     assert "success" not in out
+    out = capture_cmd_output('fast exec "ls -a ~/"')
+    assert "--> ls -a ~" in out
+    assert ".bashrc" in out
+    home = os.path.expanduser("~")
+    expected = capture_cmd_output(f"ls {home}")
+    assert not (set(expected.splitlines()) - set(out.splitlines()))
 
 
 def test_run_by_subprocess(capsys):

{fast_dev_cli-0.19.1 → fast_dev_cli-0.19.3}/tests/test_sync.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import functools
 from pathlib import Path
 
 import pytest
@@ -30,6 +31,16 @@ build-backend = "poetry.core.masonry.api"
 """
 
 
+@functools.cache
+def is_pip_installed() -> bool:
+    try:
+        import pip  # NOQA
+    except ImportError:
+        return False
+    else:
+        return True
+
+
 def test_sync_not_in_venv(mocker, capsys):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=False)
     test_dir = Path(__file__).parent
@@ -44,10 +55,15 @@ def test_sync_not_in_venv(mocker, capsys):
     mocker.patch(
         "fast_dev_cli.cli.UpgradeDependencies.should_with_dev", return_value=True
     )
-    assert (
-        Sync("req.txt", "", True, dry=True).gen()
-        == "pdm export --without-hashes --with=dev -o req.txt && pdm run python -m pip install -r req.txt"
-    )
+    pdm_export = "pdm export --without-hashes --with=dev -o req.txt"
+    installing = "pdm run python -m pip install -r req.txt"
+    if not is_pip_installed():
+        installing = (
+            "pdm run python -m ensurepip && pdm run python -m pip install -U pip && "
+            + installing
+        )
+    expected = f"{pdm_export} && {installing}"
+    assert Sync("req.txt", "", True, dry=True).gen() == expected
 
 
 def test_sync(mocker):
@@ -62,10 +78,12 @@ def test_sync(mocker):
     mocker.patch(
         "fast_dev_cli.cli.UpgradeDependencies.should_with_dev", return_value=True
     )
-    assert (
-        Sync("req.txt", "", True, dry=True).gen()
-        == "pdm export --without-hashes --with=dev -o req.txt && python -m pip install -r req.txt"
-    )
+    pdm_export = "pdm export --without-hashes --with=dev -o req.txt"
+    if is_pip_installed():
+        expected = f"{pdm_export} && python -m pip install -r req.txt"
+    else:
+        expected = f"{pdm_export} && python -m ensurepip && python -m pip install -U pip && python -m pip install -r req.txt"
+    assert Sync("req.txt", "", True, dry=True).gen() == expected
 
 
 UV_TOML_EXAMPLE = """

fast_dev_cli-0.19.1/fast_dev_cli/__init__.py

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