fast-dev-cli 0.14.0__tar.gz → 0.14.2__tar.gz

{fast_dev_cli-0.14.0 → fast_dev_cli-0.14.2}/PKG-INFO

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

fast_dev_cli-0.14.2/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.14.0 → fast_dev_cli-0.14.2}/fast_dev_cli/cli.py

@@ -38,6 +38,7 @@ else:  # pragma: no cover
 
 
 cli = typer.Typer()
+DryOption = Option(False, "--dry", help="Only print, not really run shell command")
 TOML_FILE = "pyproject.toml"
 ToolName = Literal["poetry", "pdm", "uv"]
 
@@ -258,7 +259,12 @@ class BumpUp(DryRun):
             try:
                 package_item = context["tool"]["poetry"]["packages"]
             except KeyError:
-                packages = []
+                try:
+                    project_name = context["project"]["name"]
+                except KeyError:
+                    packages = []
+                else:
+                    packages = [(poetry_module_name(project_name), "")]
             else:
                 packages = [
                     (j, i.get("from", ""))
@@ -343,7 +349,7 @@ def bump_version(
     commit: bool = Option(
         False, "--commit", "-c", help="Whether run `git commit` after version changed"
     ),
-    dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
+    dry: bool = DryOption,
 ) -> None:
     """Bump up version string in pyproject.toml"""
     return BumpUp(_ensure_bool(commit), getattr(part, "value", part), dry=dry).run()
@@ -607,7 +613,7 @@ class UpgradeDependencies(Project, DryRun):
 
 @cli.command()
 def upgrade(
-    dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
+    dry: bool = DryOption,
 ) -> None:
     """Upgrade dependencies in pyproject.toml to latest versions"""
     if (tool := Project.get_manage_tool()) == "uv":
@@ -661,7 +667,7 @@ class GitTag(DryRun):
 @cli.command()
 def tag(
     message: str = Option("", "-m", "--message"),
-    dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
+    dry: bool = DryOption,
 ) -> None:
     """Run shell command: git tag -a <current-version-in-pyproject.toml> -m {message}"""
     GitTag(message, dry=dry).run()
@@ -709,19 +715,21 @@ class LintCode(DryRun):
     @classmethod
     def to_cmd(
         cls: type[Self],
-        paths=".",
-        check_only=False,
-        bandit=False,
-        skip_mypy=False,
-        use_dmypy=False,
+        paths: str = ".",
+        check_only: bool = False,
+        bandit: bool = False,
+        skip_mypy: bool = False,
+        use_dmypy: bool = False,
     ) -> str:
+        if paths != "." and all(i.endswith(".html") for i in paths.split()):
+            return f"prettier -w {paths}"
         cmd = ""
         tools = ["ruff format", "ruff check --extend-select=I,B,SIM --fix", "mypy"]
         if check_only:
             tools[0] += " --check"
         if check_only or load_bool("NO_FIX"):
             tools[1] = tools[1].replace(" --fix", "")
-        if skip_mypy or load_bool("SKIP_MYPY"):
+        if skip_mypy or load_bool("SKIP_MYPY") or load_bool("FASTDEVCLI_NO_MYPY"):
             # Sometimes mypy is too slow
             tools = tools[:-1]
         elif load_bool("IGNORE_MISSING_IMPORTS"):
@@ -731,11 +739,11 @@ class LintCode(DryRun):
         )
         prefix = ""
         should_run_by_tool = False
-        if is_venv():
+        if is_venv() and Path(sys.argv[0]).parent != Path.home().joinpath(".local/bin"):
             if not cls.check_lint_tool_installed():
                 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 "fast-dev-cli"'
                     tip = "You may need to run following command to install lint tools:"
                     secho(f"{tip}\n\n  {command}\n", fg="yellow")
         else:
@@ -747,9 +755,14 @@ class LintCode(DryRun):
         cmd += lint_them.format(prefix, paths, *tools)
         if bandit or load_bool("FASTDEVCLI_BANDIT"):
             command = prefix + "bandit"
-            if paths == ".":  # fast check --bandit
-                command += " -r " + cls.get_package_name()
-                cmd += " && " + command
+            if Path("pyproject.toml").exists():
+                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}"
+            cmd += " && " + command
         return cmd
 
     def gen(self: Self) -> str:
@@ -763,12 +776,12 @@ def parse_files(args: list[str] | tuple[str, ...]) -> list[str]:
     return [i for i in args if not i.startswith("-")]
 
 
-def lint(files=None, dry=False, skip_mypy=False, dmypy=False) -> None:
+def lint(files=None, dry=False, bandit=False, skip_mypy=False, dmypy=False) -> None:
     if files is None:
         files = parse_files(sys.argv[1:])
     if files and files[0] == "lint":
         files = files[1:]
-    LintCode(files, dry=dry, skip_mypy=skip_mypy, dmypy=dmypy).run()
+    LintCode(files, dry=dry, skip_mypy=skip_mypy, bandit=bandit, dmypy=dmypy).run()
 
 
 def check(files=None, dry=False, bandit=False, skip_mypy=False, dmypy=False) -> None:
@@ -787,11 +800,12 @@ def check(files=None, dry=False, bandit=False, skip_mypy=False, dmypy=False) ->
 def make_style(
     files: Optional[list[Path]] = 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>`"),
     skip_mypy: bool = Option(False, "--skip-mypy"),
     use_dmypy: bool = Option(
         False, "--dmypy", help="Use `dmypy run` instead of `mypy`"
     ),
-    dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
+    dry: bool = DryOption,
 ) -> None:
     """Run: ruff check/format to reformat code and then mypy to check"""
     if getattr(files, "default", files) is None:
@@ -800,17 +814,18 @@ def make_style(
         files = [files]
     skip = _ensure_bool(skip_mypy)
     dmypy = _ensure_bool(use_dmypy)
+    bandit = _ensure_bool(bandit)
     if _ensure_bool(check_only):
-        check(files, dry=dry, skip_mypy=skip, dmypy=dmypy)
+        check(files, dry=dry, skip_mypy=skip, dmypy=dmypy, bandit=bandit)
     else:
-        lint(files, dry=dry, skip_mypy=skip, dmypy=dmypy)
+        lint(files, dry=dry, skip_mypy=skip, dmypy=dmypy, bandit=bandit)
 
 
 @cli.command(name="check")
 def only_check(
     bandit: bool = Option(False, "--bandit", help="Run `bandit -r <package_dir>`"),
     skip_mypy: bool = Option(False, "--skip-mypy"),
-    dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
+    dry: bool = DryOption,
 ) -> None:
     """Check code style without reformat"""
     check(dry=dry, bandit=bandit, skip_mypy=_ensure_bool(skip_mypy))
@@ -861,7 +876,7 @@ def sync(
     save: bool = Option(
         False, "--save", "-s", help="Whether save the requirement file"
     ),
-    dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
+    dry: bool = DryOption,
 ) -> None:
     """Export dependencies by poetry to a txt file then install by pip."""
     Sync(filename, extras, save, dry=dry).run()
@@ -895,7 +910,7 @@ def test(dry: bool, ignore_script=False) -> None:
 
 @cli.command(name="test")
 def coverage_test(
-    dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
+    dry: bool = DryOption,
     ignore_script: bool = Option(False, "--ignore-script", "-i"),
 ) -> None:
     """Run unittest by pytest and report coverage"""
@@ -918,7 +933,7 @@ class Publish:
 
 @cli.command()
 def upload(
-    dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
+    dry: bool = DryOption,
 ) -> None:
     """Shortcut for package publish"""
     cmd = Publish.gen()
@@ -957,7 +972,7 @@ 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"),
-    dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
+    dry: bool = DryOption,
 ) -> None:
     """Start a fastapi server(only for fastapi>=0.111.0)"""
     if getattr(file_or_port, "default", file_or_port):

{fast_dev_cli-0.14.0 → fast_dev_cli-0.14.2}/pyproject.toml

@@ -41,7 +41,7 @@ dependencies = [
     "pytest >=8.2.0,<9",
     "packaging>=20.5",
 ]
-version = "0.14.0"
+version = "0.14.2"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -154,3 +154,11 @@ extend-select = [
 "fast_dev_cli/cli.py" = [
     "UP007",
 ]
+
+[tool.bandit]
+exclude_dirs = [
+    "tests",
+    "scripts",
+    "examples",
+    ".venv",
+]

{fast_dev_cli-0.14.0 → fast_dev_cli-0.14.2}/scripts/test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding:utf-8 -*-
 import os
 import shlex

{fast_dev_cli-0.14.0 → fast_dev_cli-0.14.2}/tests/test_bump.py

@@ -17,10 +17,11 @@ from fast_dev_cli.cli import (
     StrEnum,
     bump,
     bump_version,
+    capture_cmd_output,
     get_current_version,
 )
 
-from .utils import chdir, mock_sys_argv
+from .utils import chdir, mock_sys_argv, prepare_poetry_project
 
 
 def test_enum():
@@ -53,12 +54,14 @@ def test_bump_dry(mocker):
     mocker.patch("fast_dev_cli.cli.Project.manage_by_poetry", return_value=True)
     with pytest.raises(ShellCommandError):
         get_current_version()
-    # TODO:
-    # version = get_current_version()
-    # patch_without_commit, patch_with_commit, minor_with_commit = _bump_commands(version)
-    # assert BumpUp(part="patch", commit=False, dry=True).gen() == patch_without_commit
-    # assert BumpUp(part="patch", commit=True, dry=True).gen() == patch_with_commit
-    # assert BumpUp(part="minor", commit=True, dry=True).gen() == minor_with_commit
+    mocker.patch("fast_dev_cli.cli.Project.manage_by_poetry", return_value=False)
+    version = get_current_version()
+    patch_without_commit, patch_with_commit, minor_with_commit = _bump_commands(
+        version, filename="fast_dev_cli/__init__.py"
+    )
+    assert BumpUp(part="patch", commit=False, dry=True).gen() == patch_without_commit
+    assert BumpUp(part="patch", commit=True, dry=True).gen() == patch_with_commit
+    assert BumpUp(part="minor", commit=True, dry=True).gen() == minor_with_commit
 
 
 def test_bump(
@@ -145,36 +148,46 @@ def test_bump_with_emoji(mocker, tmp_path, monkeypatch):
     mocker.patch("fast_dev_cli.cli.Project.manage_by_poetry", return_value=True)
     with pytest.raises(ShellCommandError):
         get_current_version()
-    # TODO:
-    # version = get_current_version()
-    # patch_without_commit, patch_with_commit, minor_with_commit = _bump_commands(
-    #     version, emoji=True
-    # )
-    # last_commit = "📝 Update release notes"
-    # mocker.patch(
-    #     "fast_dev_cli.cli.BumpUp.get_last_commit_message",
-    #     return_value=last_commit,
-    # )
-    # assert BumpUp(part="patch", commit=False, dry=True).gen() == patch_without_commit
-    # assert BumpUp(part="patch", commit=True, dry=True).gen() == patch_with_commit
-    # assert BumpUp(part="minor", commit=True, dry=True).gen() == minor_with_commit
+    mocker.patch("fast_dev_cli.cli.Project.manage_by_poetry", return_value=False)
+    version = get_current_version()
+    patch_without_commit, patch_with_commit, minor_with_commit = _bump_commands(
+        version, filename="fast_dev_cli/__init__.py", emoji=True
+    )
+    last_commit = "📝 Update release notes"
+    mocker.patch(
+        "fast_dev_cli.cli.BumpUp.get_last_commit_message",
+        return_value=last_commit,
+    )
+    assert BumpUp(part="patch", commit=False, dry=True).gen() == patch_without_commit
+    assert BumpUp(part="patch", commit=True, dry=True).gen() == patch_with_commit
+    assert BumpUp(part="minor", commit=True, dry=True).gen() == minor_with_commit
+
+
+def test_bump_with_emoji_in_poetry_project(mocker, tmp_path, monkeypatch):
     # real bump
-    # with chdir(tmp_path):
-    #     project = "foo"
-    #     subprocess.run(["poetry", "new", project])
-    #     with chdir(tmp_path / project):
-    #         subprocess.run(["git", "init"])
-    #         subprocess.run(["git", "add", "."])
-    #         subprocess.run(["git", "commit", "-m", last_commit])
-    #         monkeypatch.setenv("DONT_GIT_PUSH", "1")
-    #         command = BumpUp(part="patch", commit=True).gen()
-    #         expected = patch_with_commit.split("&&")[0].strip().replace('""', '"0.1.0"')
-    #         assert expected == command
-    #         subprocess.run(["poetry", "run", "pip", "install", "bumpversion2"])
-    #         subprocess.run(["fast", "bump", "patch", "--commit"])
-    #         out = capture_cmd_output(["git", "log"])
-    # new_commit = "⬆️  Bump version: 0.1.0 → 0.1.1"
-    # assert new_commit in out
+    last_commit = "📝 Update release notes"
+    _, patch_with_commit, __ = _bump_commands("0.1.0", emoji=True)
+    with prepare_poetry_project(tmp_path):
+        subprocess.run(["git", "init"])
+        subprocess.run(["git", "add", "."])
+        subprocess.run(["git", "config", "user.name", "sb"])
+        subprocess.run(["git", "config", "user.email", "sb@foo.com"])
+        assert BumpUp.should_add_emoji() is False
+        subprocess.run(["git", "commit", "-m", last_commit])
+        monkeypatch.setenv("DONT_GIT_PUSH", "1")
+        command = BumpUp(part="patch", commit=True).gen()
+        expected = patch_with_commit.split("&&")[0].strip().replace('""', '"0.1.0"')
+        assert expected == command
+        subprocess.run(["poetry", "run", "pip", "install", "bumpversion2"])
+        subprocess.run(["fast", "bump", "patch", "--commit"])
+        out = capture_cmd_output(["git", "log"])
+        assert BumpUp.should_add_emoji()
+        Path("a.txt").touch()
+        subprocess.run(["git", "add", "."])
+        subprocess.run(["git", "commit", "-m", "no emoji"])
+        assert BumpUp.should_add_emoji() is False
+    new_commit = "⬆️  Bump version: 0.1.0 → 0.1.1"
+    assert new_commit in out
 
 
 def test_bump_with_uv(tmp_path):

{fast_dev_cli-0.14.0 → fast_dev_cli-0.14.2}/tests/test_functions.py

@@ -1,6 +1,7 @@
 import os
 from contextlib import redirect_stdout
 from io import StringIO
+from pathlib import Path
 
 import pytest
 import typer
@@ -16,6 +17,8 @@ from fast_dev_cli.cli import (
     run_and_echo,
 )
 
+from .utils import prepare_poetry_project
+
 
 def test_utils(capsys):
     # parse files
@@ -64,12 +67,6 @@ def test_run_shell():
     # current version
     with pytest.raises(ShellCommandError):
         get_current_version(True, is_poetry=True)
-    # TODO: add [tool.poetry] to pyproject.toml
-    # stream = StringIO()
-    # write_to_stream = redirect_stdout(stream)
-    # with write_to_stream:
-    #     get_current_version(True, is_poetry=True)
-    # assert "poetry version -s" in stream.getvalue()
 
     name = "TEST_EXIT_IF_RUN_FAILED"
     value = "foo"
@@ -92,6 +89,15 @@ def test_run_shell():
         A().run()
 
 
+def test_get_version_in_poetry_project(tmp_path: Path):
+    with prepare_poetry_project(tmp_path):
+        stream = StringIO()
+        write_to_stream = redirect_stdout(stream)
+        with write_to_stream:
+            get_current_version(True, is_poetry=True)
+    assert "poetry version -s" in stream.getvalue()
+
+
 def test_ensure_bool():
     assert _ensure_bool(True) is True
     assert _ensure_bool(False) is False

{fast_dev_cli-0.14.0 → fast_dev_cli-0.14.2}/tests/test_lint.py

@@ -65,7 +65,7 @@ def test_check(mock_no_dmypy, monkeypatch, mocker):
     for cmd in CHECK_CMD.split(SEP):
         assert cmd in command
     command2 = capture_cmd_output("fast check --bandit --dry")
-    assert command2 == command + " && bandit -r fast_dev_cli"
+    assert command2 == command + " && bandit -c pyproject.toml -r ."
     monkeypatch.setenv("FASTDEVCLI_BANDIT", "1")
     command3 = capture_cmd_output("fast check --dry")
     assert command3 == command2
@@ -84,6 +84,7 @@ def test_check_bandit(tmp_path):
         src_dir = src_dir.parent / package_path.name
     shutil.rmtree(src_dir)
     with chdir(package_path):
+        assert LintCode.get_package_name() == "."
         command = capture_cmd_output("fast check --bandit --dry")
     assert "bandit -r ." in command
 
@@ -132,6 +133,23 @@ def test_lint_cmd(mock_no_dmypy):
     )
 
 
+def test_lint_html():
+    run = "pdm run "
+    lint_cmd = f"{run}python fast_dev_cli/cli.py lint"
+    command = capture_cmd_output(f"{lint_cmd} index.html --dry")
+    assert "prettier -w index.html" in command
+    command = capture_cmd_output(f"{lint_cmd} index.html flv.html --dry")
+    assert "prettier -w index.html flv.html" in command
+
+
+def test_lint_by_global_fast():
+    run = "pdm run "
+    fast = Path.home() / ".local" / "bin" / "fast"
+    command = capture_cmd_output(f"{fast} lint --dry")
+    for cmd in command.split(SEP):
+        assert run in cmd
+
+
 def test_with_dmypy():
     command = capture_cmd_output("fast lint --dmypy --dry .")
     assert "dmypy run ." in command
@@ -200,7 +218,7 @@ def test_lint_without_ruff_installed(mocker, mock_no_dmypy):
     with capture_stdout() as stream:
         lint(".", dry=True)
     output = stream.getvalue()
-    cmd = 'python -m pip install -U "fast_dev_cli"'
+    cmd = 'python -m pip install -U "fast-dev-cli"'
     assert cmd in output
     tip = "You may need to run following command to install lint tools"
     assert tip in output

{fast_dev_cli-0.14.0 → fast_dev_cli-0.14.2}/tests/utils.py

@@ -1,4 +1,5 @@
 import os
+import subprocess
 import sys
 from contextlib import contextmanager, redirect_stdout
 from io import StringIO
@@ -66,3 +67,12 @@ def temp_file(name: str, text=""):
     yield
     if path.exists():
         path.unlink()
+
+
+@contextmanager
+def prepare_poetry_project(tmp_path: Path):
+    with chdir(tmp_path):
+        project = "foo"
+        subprocess.run(["poetry", "new", project])
+        with chdir(tmp_path / project):
+            yield

fast_dev_cli-0.14.0/fast_dev_cli/__init__.py

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