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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.19.2
+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.2 → fast_dev_cli-0.19.3}/fast_dev_cli/cli.py

@@ -139,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)
 

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

@@ -41,7 +41,7 @@ dependencies = [
     "bumpversion2 >=1.4.3",
     "pytest >=8.2.0",
 ]
-version = "0.19.2"
+version = "0.19.3"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

{fast_dev_cli-0.19.2 → 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.2/fast_dev_cli/__init__.py

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