bear-utils 0.7.18__tar.gz → 0.7.20__tar.gz

{bear_utils-0.7.18 → bear_utils-0.7.20}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.7.18
+current_version = 0.7.20
 
 [bumpversion:file:pyproject.toml]
 

{bear_utils-0.7.18 → bear_utils-0.7.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bear-utils
-Version: 0.7.18
+Version: 0.7.20
 Summary: Various utilities for Bear programmers, including a rich logging utility, a disk cache, and a SQLite database wrapper amongst other things.
 Author-email: chaz <bright.lid5647@fastmail.com>
 Requires-Python: >=3.12
@@ -20,7 +20,7 @@ Requires-Dist: sqlalchemy<3.0.0,>=2.0.40
 Requires-Dist: toml>=0.10.2
 Description-Content-Type: text/markdown
 
-# Bear Utils v# Bear Utils v0.7.18
+# Bear Utils v# Bear Utils v0.7.20
 
 Personal set of tools and utilities for Python projects, focusing on modularity and ease of use. This library includes components for caching, database management, logging, time handling, file operations, CLI prompts, image processing, clipboard interaction, gradient utilities, event systems, and async helpers.
 

{bear_utils-0.7.18 → bear_utils-0.7.20}/README.md

@@ -1,4 +1,4 @@
-# Bear Utils v# Bear Utils v0.7.18
+# Bear Utils v# Bear Utils v0.7.20
 
 Personal set of tools and utilities for Python projects, focusing on modularity and ease of use. This library includes components for caching, database management, logging, time handling, file operations, CLI prompts, image processing, clipboard interaction, gradient utilities, event systems, and async helpers.
 

{bear_utils-0.7.18 → bear_utils-0.7.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bear-utils"
-version = "0.7.18"
+version = "0.7.20"
 description = "Various utilities for Bear programmers, including a rich logging utility, a disk cache, and a SQLite database wrapper amongst other things."
 authors = [{ name = "chaz", email = "bright.lid5647@fastmail.com" }]
 readme = "README.md"

{bear_utils-0.7.18 → bear_utils-0.7.20}/src/bear_utils/cli/shell/_base_shell.py

@@ -73,7 +73,15 @@ class CommandList(deque[CompletedProcess[str]]):
 class SimpleShellSession:
     """Simple shell session using subprocess with command chaining"""
 
-    def __init__(self, env=None, cwd=None, shell: str = DEFAULT_SHELL, logger=None, verbose: bool = False):
+    def __init__(
+        self,
+        env=None,
+        cwd=None,
+        shell: str = DEFAULT_SHELL,
+        logger=None,
+        verbose: bool = False,
+        use_shell: bool = True,
+    ) -> None:
         self.shell: str = shell
         self.cwd: Path = Path.cwd() if cwd is None else Path(cwd)
         self.env: dict[str, str] = os.environ.copy() if env is None else env
@@ -81,6 +89,7 @@ class SimpleShellSession:
         self.previous_commands: CommandList = CommandList()
         self.result: CompletedProcess[str] | None = None
         self.verbose: bool = verbose
+        self.use_shell: bool = use_shell
         self.logger = self.set_logger(logger)
 
     def set_logger(self, passed_logger=None):
@@ -93,7 +102,7 @@ class SimpleShellSession:
         if BaseLogger.has_instance():
             logger = BaseLogger.get_instance().get_sub_logger(namespace="shell_session")
         else:
-            temp = BaseLogger.get_instance(init=True)
+            temp: BaseLogger = BaseLogger.get_instance(init=True)
             logger: SubConsoleLogger[BaseLogger] = temp.get_sub_logger(namespace="shell_session")
         if self.verbose:
             logger.set_sub_level(VERBOSE)
@@ -137,14 +146,27 @@ class SimpleShellSession:
         """Internal method to run the accumulated command"""
         self.logger.verbose(f"Executing: {command}")
         self.next_cmd()
-        self.result = subprocess.run(
-            command,
-            shell=True,
-            cwd=self.cwd,
-            env=self.env,
-            capture_output=True,
-            text=True,
-        )
+
+        if self.use_shell:
+            self.result = subprocess.run(
+                args=command,
+                shell=True,
+                cwd=self.cwd,
+                env=self.env,
+                capture_output=True,
+                text=True,
+            )
+        else:
+            command_args: list[str] = shlex.split(command)
+            self.result = subprocess.run(
+                args=command_args,
+                shell=False,
+                cwd=self.cwd,
+                env=self.env,
+                capture_output=True,
+                text=True,
+            )
+
         if self.result.returncode != 0:
             self.logger.error(f"Command failed with return code {self.result.returncode} {self.result.stderr.strip()}")
 
@@ -162,12 +184,12 @@ class SimpleShellSession:
             )
 
         if self.has_history and cmd is None:
-            result = self._run(self.cmd)
+            result: CompletedProcess[str] | Process = self._run(self.cmd)
         elif self.empty_history and cmd is not None:
             self.cmd_buffer.write(f"{cmd} ")
             if args:
                 self.cmd_buffer.write(" ".join(map(str, args)))
-            result = self._run(self.cmd)
+            result: CompletedProcess[str] | Process = self._run(self.cmd)
         else:
             raise ValueError("Unexpected state")
         self.reset_buffer()
@@ -188,7 +210,14 @@ class SimpleShellSession:
         """Return the combined command as a string"""
         if not self.cmd_buffer:
             raise ValueError("No commands have been run yet")
-        full_command: str = f"{self.shell} -c {shlex.quote(self.cmd_buffer.getvalue())}"
+
+        if self.use_shell:
+            # Original behavior: wrap in shell command
+            full_command: str = f"{self.shell} -c {shlex.quote(self.cmd_buffer.getvalue())}"
+        else:
+            # New behavior: return raw command for argument parsing
+            full_command: str = self.cmd_buffer.getvalue().strip()
+
         return full_command
 
     @property
@@ -259,8 +288,16 @@ class SimpleShellSession:
 class AsyncShellSession(SimpleShellSession):
     """Shell session using Popen for more control over the subprocess"""
 
-    def __init__(self, env=None, cwd=None, shell: str = DEFAULT_SHELL, logger=None, verbose: bool = False):
-        super().__init__(env=env, cwd=cwd, shell=shell, logger=logger, verbose=verbose)
+    def __init__(
+        self,
+        env=None,
+        cwd=None,
+        shell: str = DEFAULT_SHELL,
+        logger=None,
+        verbose: bool = False,
+        use_shell: bool = True,
+    ) -> None:
+        super().__init__(env=env, cwd=cwd, shell=shell, logger=logger, verbose=verbose, use_shell=use_shell)
         self.process: Process | None = None
         self._callbacks: list[Callable[[CompletedProcess], None]] = []
 
@@ -269,14 +306,27 @@ class AsyncShellSession(SimpleShellSession):
         """Run the command using Popen for better control"""
         self.logger.verbose(f"Executing: {command}")
         self.next_cmd()
-        self.process = await asyncio.create_subprocess_shell(
-            command,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-            cwd=self.cwd,
-            env=self.env,
-            **kwargs,
-        )
+
+        if self.use_shell:
+            self.process = await asyncio.create_subprocess_shell(
+                command,
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.PIPE,
+                cwd=self.cwd,
+                env=self.env,
+                **kwargs,
+            )
+        else:
+            command_args: list[str] = shlex.split(command)
+            self.process = await asyncio.create_subprocess_exec(
+                *command_args,
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.PIPE,
+                cwd=self.cwd,
+                env=self.env,
+                **kwargs,
+            )
+
         return self.process
 
     @override
@@ -303,10 +353,10 @@ class AsyncShellSession(SimpleShellSession):
         """Communicate with the process, sending input and waiting for completion"""
         if self.process is None:
             raise ValueError("No process has been started yet")
-        bytes_stdin = stdin.encode("utf-8") if isinstance(stdin, str) else stdin
+        bytes_stdin: bytes = stdin.encode("utf-8") if isinstance(stdin, str) else stdin
 
         stdout, stderr = await self.process.communicate(input=bytes_stdin)
-        return_code = await self.process.wait()
+        return_code: int = await self.process.wait()
 
         self.result = FancyCompletedProcess(
             args=self.cmd,