pyallel 1.3.7__tar.gz → 1.3.8__tar.gz

{pyallel-1.3.7 → pyallel-1.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyallel
-Version: 1.3.7
+Version: 1.3.8
 Summary: Run and handle the output of multiple executables in pyallel (as in parallel)
 Home-page: https://github.com/Danthewaann/pyallel
 License: MIT

{pyallel-1.3.7 → pyallel-1.3.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyallel"
-version = "1.3.7"
+version = "1.3.8"
 description = "Run and handle the output of multiple executables in pyallel (as in parallel)"
 authors = ["Daniel Black <danielcrblack@gmail.com>"]
 license = "MIT"

pyallel-1.3.8/src/pyallel/errors.py

@@ -0,0 +1,10 @@
+class PyallelError(Exception):
+    """Base error for issues raised by pyallel"""
+
+
+class InvalidLinesModifierError(PyallelError):
+    """Raised when the lines modifier is invalid"""
+
+
+class NoCommandsForProcessGroupError(PyallelError):
+    """Raised when no commands have been provided for a process group"""

{pyallel-1.3.7 → pyallel-1.3.8}/src/pyallel/main.py

@@ -7,7 +7,7 @@ import traceback
 
 from pyallel import constants
 from pyallel.colours import Colours
-from pyallel.errors import InvalidLinesModifierError
+from pyallel.errors import PyallelError
 from pyallel.parser import Arguments, create_parser
 from pyallel.printer import (
     InteractiveConsolePrinter,
@@ -40,7 +40,7 @@ def entry_point(*args: str) -> int:
 
     try:
         process_group_manager = ProcessGroupManager.from_args(*parsed_args.commands)
-    except InvalidLinesModifierError as e:
+    except PyallelError as e:
         print(f"{colours.red_bold}Error: {str(e)}{colours.reset_colour}")
         return 1
 

{pyallel-1.3.7 → pyallel-1.3.8}/src/pyallel/process_group_manager.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import signal
 from typing import Any
 
+from pyallel.errors import NoCommandsForProcessGroupError
 from pyallel.process import ProcessOutput
 from pyallel.process_group import ProcessGroupOutput, ProcessGroup
 
@@ -113,39 +114,31 @@ class ProcessGroupManager:
 
     @classmethod
     def from_args(cls, *args: str) -> ProcessGroupManager:
-        last_separator_index = 0
         commands: list[str] = []
         process_groups: list[ProcessGroup] = []
         progress_group_id = 1
         process_id = 1
 
-        for i, arg in enumerate(args):
-            if arg == ":::":
-                if i - 1 == 0:
-                    pg = ProcessGroup.from_commands(
-                        progress_group_id, process_id, args[0]
-                    )
-                else:
-                    pg = ProcessGroup.from_commands(
-                        progress_group_id, process_id, *commands[last_separator_index:]
-                    )
-
-                process_groups.append(pg)
-                process_id += len(pg.processes)
-                last_separator_index = i
-                progress_group_id += 1
+        for arg in args:
+            if arg != ":::":
+                commands.append(arg)
                 continue
 
-            commands.append(arg)
+            if not commands:
+                raise NoCommandsForProcessGroupError(
+                    f"no commands provided for process group {progress_group_id}, did you forgot to provide them before the ::: symbol?"
+                )
 
-        if len(process_groups) > 1:
-            last_separator_index -= 1
+            pg = ProcessGroup.from_commands(progress_group_id, process_id, *commands)
+            process_groups.append(pg)
+            process_id += len(pg.processes)
+            progress_group_id += 1
+            commands.clear()
 
-        process_groups.append(
-            ProcessGroup.from_commands(
-                progress_group_id, process_id, *commands[last_separator_index:]
+        if commands:
+            process_groups.append(
+                ProcessGroup.from_commands(progress_group_id, process_id, *commands)
             )
-        )
 
         process_group_manager = cls(process_groups=process_groups)
 

pyallel-1.3.7/src/pyallel/errors.py

@@ -1,2 +0,0 @@
-class InvalidLinesModifierError(Exception):
-    """Raised when the lines modifier is invalid"""