fast-dev-cli 0.9.9__tar.gz → 0.10.0__tar.gz

{fast_dev_cli-0.9.9 → fast_dev_cli-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.9.9
+Version: 0.10.0
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -24,13 +24,13 @@ Requires-Dist: typer<0.13,>=0.12.3
 Requires-Dist: emoji<3,>=2.12.1
 Requires-Dist: tomli<3,>=2.0.1; python_version < "3.11"
 Requires-Dist: coverage<8,>=7.5.1
-Requires-Dist: ruff<0.7,>=0.4.4
+Requires-Dist: ruff<0.8,>=0.4.4
 Requires-Dist: mypy<2,>=1.10.0
 Requires-Dist: bumpversion2<2,>=1.4.2
 Requires-Dist: pytest<9,>=8.2.0
+Provides-Extra: all
 Requires-Dist: ipython<9,>=8.24.0; extra == "all"
 Requires-Dist: pytest-mock<4,>=3.14.0; extra == "all"
-Provides-Extra: all
 Description-Content-Type: text/markdown
 
 <p align="center">

fast_dev_cli-0.10.0/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.9.9 → fast_dev_cli-0.10.0}/fast_dev_cli/cli.py

@@ -44,7 +44,12 @@ cli = typer.Typer()
 def load_bool(name: str, default=False) -> bool:
     if not (v := os.getenv(name)):
         return default
-    return v.lower() not in ("0", "false", "off", "no", "n")
+    if (lower := v.lower()) in ("0", "false", "f", "off", "no", "n"):
+        return False
+    elif lower in ("1", "true", "t", "on", "yes", "y"):
+        return True
+    secho(f"WARNING: can not convert value({v!r}) of {name} to bool!")
+    return default
 
 
 def is_venv() -> bool:
@@ -228,8 +233,9 @@ class BumpUp(DryRun):
                 cmd += " --tag"
             cmd += " --commit"
             if self.should_add_emoji():
-                cmd += " --commit-emoji=1"
-            cmd += " && git push && git push --tags && git log -1"
+                cmd += " --message-emoji=1"
+            if not load_bool("DONT_GIT_PUSH"):
+                cmd += " && git push && git push --tags && git log -1"
         else:
             cmd += " --allow-dirty"
         return cmd
@@ -543,7 +549,9 @@ class GitTag(DryRun):
         return capture_cmd_output("git status")
 
     def mark_tag(self: Self) -> bool:
-        if not re.search(r"working (tree|directory) clean", self.git_status):
+        if not re.search(r"working (tree|directory) clean", self.git_status) and (
+            "无文件要提交，干净的工作区" not in self.git_status
+        ):
             run_and_echo("git status")
             echo("ERROR: Please run git commit to make sure working tree is clean!")
             return False
@@ -564,9 +572,12 @@ def tag(
 
 
 class LintCode(DryRun):
-    def __init__(self: Self, args, check_only=False, _exit=False, dry=False) -> None:
+    def __init__(
+        self: Self, args, check_only=False, _exit=False, dry=False, bandit=False
+    ) -> None:
         self.args = args
         self.check_only = check_only
+        self._bandit = bandit
         super().__init__(_exit, dry)
 
     @staticmethod
@@ -576,11 +587,13 @@ class LintCode(DryRun):
     @staticmethod
     def prefer_dmypy(paths: str, tools: list[str]) -> bool:
         return (
-            paths == "." and tools[-1].startswith("mypy") and not load_bool("NO_DMYPY")
+            paths == "."
+            and any(t.startswith("mypy") for t in tools)
+            and not load_bool("NO_DMYPY")
         )
 
     @classmethod
-    def to_cmd(cls: Type[Self], paths=".", check_only=False) -> str:
+    def to_cmd(cls: Type[Self], paths=".", check_only=False, bandit=False) -> str:
         cmd = ""
         tools = ["ruff format", "ruff check --extend-select=I,B,SIM --fix", "mypy"]
         if check_only:
@@ -609,11 +622,24 @@ class LintCode(DryRun):
         if cls.prefer_dmypy(paths, tools):
             tools[-1] = "dmypy run"
         cmd += lint_them.format(prefix, paths, *tools)
+        if bandit or load_bool("FASTDEVCLI_BANDIT"):
+            command = prefix + "bandit"
+            if paths == ".":  # fast check --bandit
+                command += " -r"
+                root = Project.get_work_dir(allow_cwd=True)
+                package_maybe = (root.name.replace("-", "_"), "src")
+                for name in package_maybe:
+                    if root.joinpath(name).is_dir():
+                        command += " " + name
+                        break
+                else:
+                    command += " ."
+                cmd += " && " + command
         return cmd
 
     def gen(self: Self) -> str:
         paths = " ".join(map(str, self.args)) if self.args else "."
-        return self.to_cmd(paths, self.check_only)
+        return self.to_cmd(paths, self.check_only, self._bandit)
 
 
 def parse_files(args: list[str] | tuple[str, ...]) -> list[str]:
@@ -628,8 +654,8 @@ def lint(files=None, dry=False) -> None:
     LintCode(files, dry=dry).run()
 
 
-def check(files=None, dry=False) -> None:
-    LintCode(files, check_only=True, _exit=True, dry=dry).run()
+def check(files=None, dry=False, bandit=False) -> None:
+    LintCode(files, check_only=True, _exit=True, dry=dry, bandit=bandit).run()
 
 
 @cli.command(name="lint")
@@ -651,10 +677,11 @@ def make_style(
 
 @cli.command(name="check")
 def only_check(
+    bandit: bool = Option(False, "--bandit", help="Run `bandit -r <package_dir>`"),
     dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
 ) -> None:
     """Check code style without reformat"""
-    check(dry=dry)
+    check(dry=dry, bandit=bandit)
 
 
 class Sync(DryRun):
@@ -694,7 +721,7 @@ def sync(
     Sync(filename, extras, save, dry=dry).run()
 
 
-def _should_run_test_script(path: Path) -> bool:
+def _should_run_test_script(path: Path = Path("scripts/test.sh")) -> bool:
     return path.exists()
 
 

{fast_dev_cli-0.9.9 → fast_dev_cli-0.10.0}/pyproject.toml

@@ -35,12 +35,12 @@ dependencies = [
     "emoji >=2.12.1,<3",
     "tomli>=2.0.1,<3; python_version < '3.11'",
     "coverage >=7.5.1,<8",
-    "ruff >=0.4.4,<0.7",
+    "ruff >=0.4.4,<0.8",
     "mypy >=1.10.0,<2",
     "bumpversion2 >=1.4.2,<2",
     "pytest >=8.2.0,<9",
 ]
-version = "0.9.9"
+version = "0.10.0"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

{fast_dev_cli-0.9.9 → fast_dev_cli-0.10.0}/scripts/check.sh

@@ -3,7 +3,7 @@
 set -e
 set -x
 
-[ -f ../pyproject.toml ] && cd ..
+[ -f pyproject.toml ] || ([ -f ../pyproject.toml ] && cd ..)
 
 pdm run fast check || \
   echo -e "\033[1m Please run './scripts/format.sh' to auto-fix style issues \033[0m"

fast_dev_cli-0.10.0/scripts/format.sh

@@ -0,0 +1,6 @@
+#!/bin/sh -e
+set -x
+
+[ -f pyproject.toml ] || ([ -f ../pyproject.toml ] && cd ..)
+
+SKIP_MYPY=1 pdm run fast lint

{fast_dev_cli-0.9.9 → fast_dev_cli-0.10.0}/tests/test_bump.py

@@ -1,3 +1,4 @@
+import subprocess
 from contextlib import redirect_stdout
 from io import StringIO
 from pathlib import Path
@@ -14,11 +15,11 @@ from fast_dev_cli.cli import (
     StrEnum,
     bump,
     bump_version,
+    capture_cmd_output,
     get_current_version,
 )
-from tests.utils import mock_sys_argv
 
-from .utils import chdir
+from .utils import chdir, mock_sys_argv
 
 
 def test_enum():
@@ -40,7 +41,7 @@ def _bump_commands(
     cmd = rf'bumpversion --parse "(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)" --current-version="{version}"'
     suffix = " --commit && git push && git push --tags && git log -1"
     if emoji:
-        suffix = suffix.replace("--commit", "--commit --commit-emoji=1")
+        suffix = suffix.replace("--commit", "--commit --message-emoji=1")
     patch_without_commit = cmd + f" patch {filename} --allow-dirty"
     patch_with_commit = cmd + f" patch {filename}" + suffix
     minor_with_commit = cmd + f" minor {filename} --tag" + suffix
@@ -136,16 +137,34 @@ def test_bump_with_poetry(mocker, tmp_poetry_project, tmp_path):
     assert work_dir == work_dir2 == tmp_path
 
 
-def test_bump_with_emoji(mocker):
+def test_bump_with_emoji(mocker, tmp_path, monkeypatch):
     mocker.patch("fast_dev_cli.cli.Project.manage_by_poetry", return_value=True)
     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="📝 Update release notes",
+        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
+    # 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

{fast_dev_cli-0.9.9 → fast_dev_cli-0.10.0}/tests/test_fast_test.py

@@ -2,7 +2,12 @@ import pathlib
 
 from pytest_mock import MockerFixture
 
-from fast_dev_cli.cli import Project, capture_cmd_output, coverage_test
+from fast_dev_cli.cli import (
+    Project,
+    _should_run_test_script,
+    capture_cmd_output,
+    coverage_test,
+)
 from fast_dev_cli.cli import test as unitcase
 
 
@@ -60,6 +65,7 @@ def test_test_not_in_venv(mocker: MockerFixture, capsys):
 
 
 def test_run_script(mocker: MockerFixture, capsys):
+    assert _should_run_test_script()
     mocker.patch("fast_dev_cli.cli._should_run_test_script", return_value=True)
     unitcase(dry=True)
     assert "sh scripts/test.sh" in capsys.readouterr().out

{fast_dev_cli-0.9.9 → fast_dev_cli-0.10.0}/tests/test_functions.py

@@ -16,7 +16,7 @@ from fast_dev_cli.cli import (
 )
 
 
-def test_utils():
+def test_utils(capsys):
     # parse files
     assert parse_files([]) == []
     assert parse_files(["-a", "--a"]) == []
@@ -52,6 +52,11 @@ def test_utils():
     assert load_bool(name) is True
     os.environ.pop(name)
     assert load_bool(name) is False
+    os.environ[name] = "yeah"
+    assert load_bool(name) is False
+    assert load_bool(name, True) is True
+    out = capsys.readouterr().out.strip()
+    assert "WARNING" in out
 
 
 def test_run_shell():

{fast_dev_cli-0.9.9 → fast_dev_cli-0.10.0}/tests/test_lint.py

@@ -56,10 +56,18 @@ LINT_CMD = _CMD.format("", " --fix")
 CHECK_CMD = _CMD.format(" --check", "")
 
 
-def test_check(mock_no_dmypy):
+def test_check(mock_no_dmypy, monkeypatch):
     command = capture_cmd_output("fast check --dry")
     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"
+    monkeypatch.setenv("FASTDEVCLI_BANDIT", "1")
+    command3 = capture_cmd_output("fast check --dry")
+    assert command3 == command2
+    monkeypatch.setenv("FASTDEVCLI_BANDIT", "0")
+    command4 = capture_cmd_output("fast check --dry")
+    assert command4 == command
 
 
 def test_fast_check():
@@ -110,9 +118,15 @@ def test_lint_with_prefix(mocker):
 
 def test_make_style(mocker, mock_no_dmypy):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
+    with capture_stdout() as stream:
+        make_style(check_only=False, dry=True)
+    assert LINT_CMD in stream.getvalue()
     with capture_stdout() as stream:
         make_style([Path(".")], check_only=False, dry=True)
     assert LINT_CMD in stream.getvalue()
+    with capture_stdout() as stream:
+        make_style(".", check_only=False, dry=True)  # type:ignore[arg-type]
+    assert LINT_CMD in stream.getvalue()
     with capture_stdout() as stream:
         make_style([Path(".")], check_only=True, dry=True)
     assert CHECK_CMD in stream.getvalue()
@@ -138,6 +152,10 @@ def test_lint_func(mocker, mock_no_dmypy):
     with mock_sys_argv(["tests"]), capture_stdout() as stream:
         lint(dry=True)
     assert LINT_CMD.replace(" .", " tests") in stream.getvalue()
+    with capture_stdout() as stream:
+        lint(["lint"], dry=True)
+    assert LINT_CMD in stream.getvalue()
+    assert LINT_CMD in capture_cmd_output("python -m fast_dev_cli lint --dry")
 
 
 def test_lint_without_ruff_installed(mocker, mock_no_dmypy):

{fast_dev_cli-0.9.9 → fast_dev_cli-0.10.0}/tests/test_runserver.py

@@ -1,4 +1,5 @@
-from fast_dev_cli.cli import dev, run_and_echo, runserver
+import fast_dev_cli
+from fast_dev_cli.cli import dev, main, run_and_echo, runserver
 
 
 def test_runserver(capsys):
@@ -17,6 +18,12 @@ def test_runserver(capsys):
     runserver(port=9000, host="0.0.0.0", dry=True)
     out = capsys.readouterr().out.strip()
     assert out.replace("--> ", "") == "fastapi dev --port=9000 --host=0.0.0.0"
+    runserver("9000", host="0.0.0.0", dry=True)
+    out = capsys.readouterr().out.strip()
+    assert out.replace("--> ", "") == "fastapi dev --port=9000 --host=0.0.0.0"
+    runserver("app.py", host="0.0.0.0", dry=True)
+    out = capsys.readouterr().out.strip()
+    assert out.replace("--> ", "") == "fastapi dev app.py --host=0.0.0.0"
 
 
 def test_dev(capsys):
@@ -80,3 +87,9 @@ def test_run_by_module(tmp_path):
     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_main(mocker):
+    mocker.patch("fast_dev_cli.cli.cli")
+    main()
+    fast_dev_cli.cli.cli.assert_called_once()  # type:ignore[attr-defined]

fast_dev_cli-0.9.9/fast_dev_cli/__init__.py

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

fast_dev_cli-0.9.9/scripts/format.sh

@@ -1,6 +0,0 @@
-#!/bin/sh -e
-set -x
-
-[ -f ../pyproject.toml ] && cd ..
-
-SKIP_MYPY=1 pdm run fast lint