fast-dev-cli 0.9.8__tar.gz → 0.9.10__tar.gz

{fast_dev_cli-0.9.8 → fast_dev_cli-0.9.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.9.8
+Version: 0.9.10
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -21,13 +21,13 @@ Classifier: License :: OSI Approved :: MIT License
 Project-URL: Homepage, https://github.com/waketzheng/fast-dev-cli
 Requires-Python: <4,>=3.10
 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: mypy<2,>=1.10.0
 Requires-Dist: bumpversion2<2,>=1.4.2
 Requires-Dist: pytest<9,>=8.2.0
-Requires-Dist: emoji<3,>=2.12.1
 Requires-Dist: ipython<9,>=8.24.0; extra == "all"
 Requires-Dist: pytest-mock<4,>=3.14.0; extra == "all"
 Provides-Extra: all

fast_dev_cli-0.9.10/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.9.8 → fast_dev_cli-0.9.10}/fast_dev_cli/cli.py

@@ -228,8 +228,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 +544,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

{fast_dev_cli-0.9.8 → fast_dev_cli-0.9.10}/pyproject.toml

@@ -32,15 +32,15 @@ classifiers = [
 ]
 dependencies = [
     "typer>=0.12.3,<0.13",
+    "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",
     "mypy >=1.10.0,<2",
     "bumpversion2 >=1.4.2,<2",
     "pytest >=8.2.0,<9",
-    "emoji >=2.12.1,<3",
 ]
-version = "0.9.8"
+version = "0.9.10"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

{fast_dev_cli-0.9.8 → fast_dev_cli-0.9.10}/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.8/fast_dev_cli/__init__.py

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