shelltastic 0.4.3__tar.gz → 0.4.4__tar.gz

{shelltastic-0.4.3 → shelltastic-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shelltastic
-Version: 0.4.3
+Version: 0.4.4
 Summary: A fantastic shell command runner for python
 Author: Bearmine
 License-Expression: MPL-2.0

{shelltastic-0.4.3 → shelltastic-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shelltastic"
-version = "0.4.3"
+version = "0.4.4"
 description = "A fantastic shell command runner for python"
 readme = "README.md"
 authors = [

{shelltastic-0.4.3 → shelltastic-0.4.4}/src/shelltastic/backend/default/remote.py

@@ -6,6 +6,7 @@ from typing import TYPE_CHECKING
 
 from shelltastic.backend.base import RemoteShellBackend
 from shelltastic.backend.default.common import CommonDefaultBackend
+from shelltastic.enum import CaptureMode
 from shelltastic.exception import ShellException, SSHConnectionError
 
 if TYPE_CHECKING:
@@ -44,6 +45,11 @@ class DefaultRemoteBackend(CommonDefaultBackend, RemoteShellBackend):
         if subshell:
             cmd = shlex.join(["bash", "-c", cmd])
 
+        # If we're redirecting stderr to stdout,
+        # add the same redirect inside the ssh command.
+        if kwargs.get("stderr") == CaptureMode.STDOUT:
+            cmd = cmd + " 2>&1"
+
         # cd into cwd first if cwd is set
         if cwd:
             cmd = shlex.join(["cd", str(cwd)]) + " && " + cmd

{shelltastic-0.4.3 → shelltastic-0.4.4}/src/shelltastic/display.py

@@ -1,43 +1,41 @@
 import logging
 import sys
+import threading
 from abc import ABC, abstractmethod
 
 from shelltastic.enum import DisplayMode
 
 LOGGER = logging.getLogger(__name__)
 
+_io_display_lock = threading.RLock()
+
 
 class IODisplay(ABC):
-    @abstractmethod
     def printbytes(self, line: bytes):
-        raise NotImplementedError
+        with _io_display_lock:
+            self._emit_line(line.decode().rstrip())
 
-    @abstractmethod
     def printline(self, msg: object, *args: object):
+        with _io_display_lock:
+            self._emit_line(msg, *args)
+
+    @abstractmethod
+    def _emit_line(self, msg: object, *args: object):
         raise NotImplementedError
 
 
 class DevNullDisplay(IODisplay):
-    def printbytes(self, line: bytes):
-        pass
-
-    def printline(self, msg, *args):
+    def _emit_line(self, msg: object, *args: object):
         pass
 
 
 class StdoutDisplay(IODisplay):
-    def printbytes(self, line: bytes):
-        print(line.decode(), end="", flush=True)
-
-    def printline(self, msg, *args):
+    def _emit_line(self, msg: object, *args: object):
         print(str(msg) % args, flush=True)
 
 
 class StderrDisplay(IODisplay):
-    def printbytes(self, line: bytes):
-        print(line.decode(), end="", file=sys.stderr, flush=True)
-
-    def printline(self, msg, *args):
+    def _emit_line(self, msg: object, *args: object):
         print(str(msg) % args, file=sys.stderr, flush=True)
 
 
@@ -46,10 +44,7 @@ class LogDisplay(IODisplay):
         super().__init__()
         self.log_level = log_level
 
-    def printbytes(self, line: bytes):
-        LOGGER.log(self.log_level, line.decode().rstrip(), stacklevel=2)
-
-    def printline(self, msg: object, *args: object):
+    def _emit_line(self, msg: object, *args: object):
         LOGGER.log(self.log_level, msg, *args, stacklevel=2)