pyallel 0.3.3__tar.gz → 0.4.0__tar.gz

{pyallel-0.3.3 → pyallel-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyallel
-Version: 0.3.3
+Version: 0.4.0
 Summary: Run and handle the output of multiple executables in pyallel (as in parallel)
 Home-page: https://github.com/Danthewaann/pyallel
 License: MIT
@@ -53,6 +53,7 @@ pyallel "black --color --check --diff ." "mypy ." "ruff check --no-fix ."
 - [ ] Allow a single main command output to be streamed to stdout, while all other
       commands will only get outputted after the main command has completed (such as running
       `pytest` as the main command, whilst running `mypy`, `ruff` etc. as other commands)
+- [x] Provide a way to set environment variables for each command to run with
 - [ ] Allow list of files to be provided to supply as input arguments to each command
 - [ ] Allow input to be piped into `pyallel` via stdin to supply as standard input to each
       command
@@ -63,6 +64,6 @@ pyallel "black --color --check --diff ." "mypy ." "ruff check --no-fix ."
 - [ ] Maybe allow command dependencies to be defined in a python file where commands are
       decorated with info that details it's dependencies?
 - [x] Add test suite
-- [ ] Improve error handling when parsing provided commands (check they are valid executables)
+- [x] Improve error handling when parsing provided commands (check they are valid executables)
 - [ ] Add visual examples of `pyallel` in action
 

{pyallel-0.3.3 → pyallel-0.4.0}/README.md

@@ -32,6 +32,7 @@ pyallel "black --color --check --diff ." "mypy ." "ruff check --no-fix ."
 - [ ] Allow a single main command output to be streamed to stdout, while all other
       commands will only get outputted after the main command has completed (such as running
       `pytest` as the main command, whilst running `mypy`, `ruff` etc. as other commands)
+- [x] Provide a way to set environment variables for each command to run with
 - [ ] Allow list of files to be provided to supply as input arguments to each command
 - [ ] Allow input to be piped into `pyallel` via stdin to supply as standard input to each
       command
@@ -42,5 +43,5 @@ pyallel "black --color --check --diff ." "mypy ." "ruff check --no-fix ."
 - [ ] Maybe allow command dependencies to be defined in a python file where commands are
       decorated with info that details it's dependencies?
 - [x] Add test suite
-- [ ] Improve error handling when parsing provided commands (check they are valid executables)
+- [x] Improve error handling when parsing provided commands (check they are valid executables)
 - [ ] Add visual examples of `pyallel` in action

{pyallel-0.3.3 → pyallel-0.4.0}/pyproject.toml

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

{pyallel-0.3.3 → pyallel-0.4.0}/src/pyallel/main.py

@@ -1,16 +1,12 @@
 from __future__ import annotations
 
-import os
 import sys
 import time
-import shutil
-from dataclasses import dataclass
-import shlex
 import importlib.metadata
-import subprocess
 
 from pyallel.errors import InvalidExecutableErrors, InvalidExecutableError
 from pyallel.parser import Arguments, create_parser
+from pyallel.process import Process
 
 IN_TTY = sys.__stdin__.isatty()
 
@@ -40,46 +36,22 @@ TICK = "\u2713"
 X = "\u2717"
 
 
-@dataclass
-class Process:
-    name: str
-    args: list[str]
-    start: float
-    process: subprocess.Popen[bytes]
-
-
-def run_command(command: str) -> Process:
-    executable, *args = command.split(maxsplit=1)
-    if not shutil.which(executable):
-        raise InvalidExecutableError(executable)
-    args = shlex.split(" ".join(args))
-    env = os.environ.copy()
-    # TODO: need to provide a way to supply environment variables
-    # for each provided command
-    env["MYPY_FORCE_COLOR"] = "1" if IN_TTY else "0"
-    start = time.perf_counter()
-    process = subprocess.Popen(
-        [executable, *args],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT,
-        env=env,
-    )
-    return Process(name=executable, args=args, start=start, process=process)
-
-
 def run_commands(commands: list[str]) -> list[Process]:
     processes: list[Process] = []
     errors: list[InvalidExecutableError] = []
 
     for command in commands:
         try:
-            processes.append(run_command(command))
+            processes.append(Process.from_command(command))
         except InvalidExecutableError as e:
             errors.append(e)
 
     if errors:
         raise InvalidExecutableErrors(*errors)
 
+    for process in processes:
+        process.run()
+
     return processes
 
 
@@ -135,10 +107,9 @@ def print_command_status(process: Process, passed: bool, debug: bool = False) ->
 
 
 def print_command_output(process: Process) -> None:
-    if process.process.stdout:
-        output = process.process.stdout.read()
-        if output:
-            print(f"{indent(output.decode())}")
+    output = process.stdout().read()
+    if output:
+        print(f"{indent(output.decode())}")
     print()
 
 
@@ -164,13 +135,13 @@ def main_loop(
                 time.sleep(0.1)
 
         for process in processes:
-            if process.name in completed_processes or process.process.poll() is None:
+            if process.name in completed_processes or process.poll() is None:
                 continue
 
             print(f"{CLEAR_LINE}{CR}", end="")
             completed_processes.add(process.name)
 
-            if process.process.returncode != 0:
+            if process.return_code() != 0:
                 print_command_status(process, passed=False, debug=debug)
                 print_command_output(process)
                 passed = False
@@ -236,3 +207,7 @@ def run(*args: str) -> int:
 
 def entry_point() -> None:
     sys.exit(run(*sys.argv[1:]))
+
+
+if __name__ == "__main__":
+    entry_point()

pyallel-0.4.0/src/pyallel/process.py

@@ -0,0 +1,63 @@
+from __future__ import annotations
+
+import time
+import subprocess
+import shlex
+import io
+import shutil
+import os
+from typing import IO
+
+from dataclasses import dataclass, field
+from pyallel.errors import InvalidExecutableError
+
+
+@dataclass
+class Process:
+    name: str
+    args: list[str]
+    env: dict[str, str] = field(default_factory=dict)
+    start: float = 0.0
+    process: subprocess.Popen[bytes] | None = None
+
+    def run(self) -> None:
+        self.start = time.perf_counter()
+        self.process = subprocess.Popen(
+            [self.name, *self.args],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            env=self.env,
+        )
+
+    def poll(self) -> int | None:
+        if self.process:
+            return self.process.poll()
+        return None
+
+    def stdout(self) -> IO[bytes]:
+        if self.process and self.process.stdout:
+            return self.process.stdout
+        return io.BytesIO(b"")
+
+    def return_code(self) -> int | None:
+        if self.process:
+            return self.process.returncode
+        return None
+
+    @classmethod
+    def from_command(cls, command: str) -> Process:
+        env = os.environ.copy()
+        args = command.split()
+        parsed_args: list[str] = []
+        for arg in args:
+            if "=" in arg:
+                name, value = arg.split("=")
+                env[name] = value
+            else:
+                parsed_args.append(arg)
+
+        if not shutil.which(parsed_args[0]):
+            raise InvalidExecutableError(parsed_args[0])
+
+        args = shlex.split(" ".join(parsed_args[1:]))
+        return Process(name=parsed_args[0], args=args, env=env)