python3-cyberfusion-queue-support 2.4__tar.gz → 2.5.1__tar.gz

{python3_cyberfusion_queue_support-2.4 → python3_cyberfusion_queue_support-2.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-queue-support
-Version: 2.4
+Version: 2.5.1
 Summary: Library to queue actions.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-queue-support

{python3_cyberfusion_queue_support-2.4 → python3_cyberfusion_queue_support-2.5.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-cyberfusion-queue-support"
-version = "2.4"
+version = "2.5.1"
 description = "Library to queue actions."
 readme = "README.md"
 authors = [

{python3_cyberfusion_queue_support-2.4 → python3_cyberfusion_queue_support-2.5.1}/src/cyberfusion/QueueSupport/encoders.py

@@ -4,11 +4,15 @@ from typing import Any
 
 from cyberfusion.SystemdSupport import Unit
 
+from cyberfusion.QueueSupport.sentinels import UNKNOWN
+
 
 class CustomEncoder(JSONEncoder):
     def default(self, o: Any) -> Any:
         if isinstance(o, Unit):
             return {"name": o.name}
+        elif o == UNKNOWN:
+            return "unknown"
 
         return super().default(o)
 

{python3_cyberfusion_queue_support-2.4 → python3_cyberfusion_queue_support-2.5.1}/src/cyberfusion/QueueSupport/items/command.py

@@ -45,11 +45,12 @@ class CommandItem(_Item):
                     outcome.command,
                     check=True,
                     text=True,
-                    capture_output=True,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
                 )
 
-                logger.info("Command stdout: %s", output.stdout)
-                logger.info("Command stderr: %s", output.stderr)
+                outcome.stdout = output.stdout
+                outcome.stderr = output.stderr
             except subprocess.CalledProcessError as e:
                 raise CommandQueueFulfillFailed(
                     self, command=outcome.command, stdout=e.stdout, stderr=e.stderr

{python3_cyberfusion_queue_support-2.4 → python3_cyberfusion_queue_support-2.5.1}/src/cyberfusion/QueueSupport/outcomes.py

@@ -9,6 +9,8 @@ from cyberfusion.DatabaseSupport.databases import Database
 from cyberfusion.QueueSupport.interfaces import OutcomeInterface
 from cyberfusion.SystemdSupport.units import Unit
 
+from cyberfusion.QueueSupport.sentinels import UNKNOWN
+
 
 class CopyItemCopyOutcome(OutcomeInterface):
     """Represents outcome."""
@@ -147,9 +149,17 @@ class RmTreeItemRemoveOutcome(OutcomeInterface):
 class CommandItemRunOutcome(OutcomeInterface):
     """Represents outcome."""
 
-    def __init__(self, *, command: List[str]) -> None:
+    def __init__(
+        self,
+        *,
+        command: List[str],
+        stdout: str | UNKNOWN = UNKNOWN,
+        stderr: str | UNKNOWN = UNKNOWN,
+    ) -> None:
         """Set attributes."""
         self.command = command
+        self.stdout = stdout
+        self.stderr = stderr
 
     def __str__(self) -> str:
         """Get human-readable string."""
@@ -160,7 +170,11 @@ class CommandItemRunOutcome(OutcomeInterface):
         if not isinstance(other, CommandItemRunOutcome):
             return False
 
-        return other.command == self.command
+        return (
+            other.command == self.command
+            and other.stdout == self.stdout
+            and other.stderr == self.stderr
+        )
 
 
 class ChmodItemModeChangeOutcome(OutcomeInterface):

python3_cyberfusion_queue_support-2.5.1/src/cyberfusion/QueueSupport/sentinels.py

@@ -0,0 +1,3 @@
+from typing import TypeVar
+
+UNKNOWN = TypeVar("UNKNOWN")

{python3_cyberfusion_queue_support-2.4 → python3_cyberfusion_queue_support-2.5.1}/src/python3_cyberfusion_queue_support.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-queue-support
-Version: 2.4
+Version: 2.5.1
 Summary: Library to queue actions.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-queue-support

{python3_cyberfusion_queue_support-2.4 → python3_cyberfusion_queue_support-2.5.1}/src/python3_cyberfusion_queue_support.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ src/cyberfusion/QueueSupport/database.py
 src/cyberfusion/QueueSupport/encoders.py
 src/cyberfusion/QueueSupport/interfaces.py
 src/cyberfusion/QueueSupport/outcomes.py
+src/cyberfusion/QueueSupport/sentinels.py
 src/cyberfusion/QueueSupport/settings.py
 src/cyberfusion/QueueSupport/utilities.py
 src/cyberfusion/QueueSupport/exceptions/__init__.py