dais-shell 0.1.9__tar.gz → 0.2.0__tar.gz

{dais_shell-0.1.9 → dais_shell-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dais-shell
-Version: 0.1.9
+Version: 0.2.0
 Summary: The shell tool for Dais.
 Author: BHznJNs
 Author-email: BHznJNs <441768875@qq.com>

{dais_shell-0.1.9 → dais_shell-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dais-shell"
-version = "0.1.9"
+version = "0.2.0"
 description = "The shell tool for Dais."
 readme = "README.md"
 authors = [{ name = "BHznJNs", email = "441768875@qq.com" }]

{dais_shell-0.1.9 → dais_shell-0.2.0}/src/dais_shell/runtimes/BashRuntime.py

@@ -1,4 +1,5 @@
 import asyncio
+import shlex
 import shutil
 from dataclasses import asdict, dataclass
 
@@ -15,7 +16,7 @@ class BashCommandStep(CommandStep):
         return cls(**asdict(step))
 
     def to_wrapper_script(self):
-        return 'exec "$1" "${@:2}"'
+        return f"exec {shlex.quote(self.command)} {self.args}"
 
 # --- --- --- --- --- ---
 
@@ -36,21 +37,13 @@ class BashRuntime(BaseShellRuntime):
             self._shell,
             "-c",
             step.to_wrapper_script(),
-            "--",
-            step.command,
-            *step.args
         ]
 
     def _prepare_cmd(self, step: CommandStep) -> list[str]:
         env_expander = EnvExpander(step.env or {})
-        step.args = [env_expander.expand(arg) for arg in step.args]
+        step.args = env_expander.expand(step.args)
         step = BashCommandStep.from_command_step(step)
-        resolved = shutil.which(step.command)
-        is_shell_command = resolved is None
-        if is_shell_command:
-            return self._make_bash_commands(step)
-        else:
-            return [resolved, *step.args]
+        return self._make_bash_commands(step)
 
     def run_sync(self,
                  step: CommandStep,

{dais_shell-0.1.9 → dais_shell-0.2.0}/src/dais_shell/runtimes/PowershellRuntime.py

@@ -20,25 +20,8 @@ class PowerShellCommandStep(CommandStep):
         return cls(**asdict(step))
 
     def to_wrapper_script(self):
-        def ps_encode(s: str) -> str:
-            return base64.b64encode(s.encode("utf-8")).decode("ascii")
-
-        cmd_json  = json.dumps(self.command)
-        args_json = json.dumps(self.args)
-
-        if len(self.args) > 0:
-            # encode to base64 and decode in script to prevent single quotes in the args
-            args_b64 = ps_encode(args_json)
-            args_line = f"""\
-            $args_json = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String('{args_b64}'))
-            $arguments = ,(ConvertFrom-Json $args_json)
-            """
-            invoke_line = "& $command @arguments"
-        else:
-            # when no arguments, PowerShell ConvertFrom-Json will parse as null
-            # which will cause error for some commands.
-            args_line = ""
-            invoke_line = "& $command"
+        def ps_quote(s: str) -> str:
+            return "'" + s.replace("'", "''") + "'"
 
         script = f"""
 $ErrorActionPreference = "Stop"
@@ -49,10 +32,10 @@ $OutputEncoding           = [System.Text.Encoding]::UTF8
 [Console]::OutputEncoding = [System.Text.Encoding]::UTF8
 [Console]::InputEncoding  = [System.Text.Encoding]::UTF8
 
-$command  = ConvertFrom-Json '{cmd_json}'
-{args_line}
+$command = {ps_quote(self.command)}
+
+& $command {self.args}
 
-{invoke_line}
 exit $LASTEXITCODE"""
         return script.strip()
 
@@ -121,7 +104,7 @@ class PowerShellRuntime(BaseShellRuntime):
 
     def _prepare_cmd(self, step: CommandStep) -> list[str]:
         env_expander = EnvExpander(step.env or {})
-        step.args = [env_expander.expand(arg) for arg in step.args]
+        step.args = env_expander.expand(step.args)
         step = PowerShellCommandStep.from_command_step(step)
         script = step.to_wrapper_script()
         encoded = self._encode(script)

{dais_shell-0.1.9 → dais_shell-0.2.0}/src/dais_shell/types/command_step.py

@@ -8,7 +8,7 @@ from .exceptions import ForbiddenShellTargetError
 @dataclass
 class CommandStep:
     command: str
-    args: list[str]
+    args: str
     cwd: str | Path
     env: dict[str, str] | None = None
     timeout: int | None = None