spl-core 7.6.1__tar.gz → 7.7.0__tar.gz

{spl_core-7.6.1 → spl_core-7.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: spl-core
-Version: 7.6.1
+Version: 7.7.0
 Summary: Software Product Line Support for CMake
 License: MIT
 Author: Avengineers

{spl_core-7.6.1 → spl_core-7.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spl-core"
-version = "7.6.1"
+version = "7.7.0"
 description = "Software Product Line Support for CMake"
 authors = ["Avengineers <karsten.guenther@kamg.de>"]
 license = "MIT"

spl_core-7.7.0/src/spl_core/__init__.py

@@ -0,0 +1 @@
+__version__ = "7.7.0"

{spl_core-7.6.1 → spl_core-7.7.0}/src/spl_core/test_utils/spl_build.py

@@ -6,8 +6,7 @@ from pathlib import Path
 from typing import Callable, ClassVar, List, Optional
 
 from py_app_dev.core.logging import time_it
-
-from spl_core.common.command_line_executor import CommandLineExecutor
+from py_app_dev.core.subprocess import SubprocessExecutor
 
 
 @dataclass
@@ -110,7 +109,7 @@ class SplBuild:
             target = self.target if self.target else "all"
         return_code = -1
         while True:
-            cmd = [
+            cmd: list[str | Path] = [
                 "build.bat",
                 "-build",
                 "-buildKit",
@@ -125,7 +124,11 @@ class SplBuild:
                 cmd.extend(["-buildType", self.build_type])
             if additional_args:
                 cmd.extend(additional_args)
-            result = CommandLineExecutor().execute(cmd)
+            # Cast to Union[str, List[Union[str, Path]]] to satisfy SubprocessExecutor type
+            result = SubprocessExecutor(command=cmd).execute(handle_errors=False)
+            if result is None:
+                return_code = -1
+                break
             return_code = result.returncode
             if result.returncode:
                 if result.stdout:

spl_core-7.6.1/src/spl_core/__init__.py

@@ -1 +0,0 @@
-__version__ = "7.6.1"

spl_core-7.6.1/src/spl_core/common/command_line_executor.py

@@ -1,70 +0,0 @@
-import locale
-import subprocess
-from pathlib import Path
-from typing import Dict, List, Optional
-
-
-class CommandLineExecutor:
-    def __init__(
-        self,
-        cwd: Optional[Path] = None,
-        env: Optional[Dict[str, str]] = None,
-    ):
-        """
-        A class for executing command line commands.
-
-        Args:
-        - cmd: A string or list of strings representing the command to be executed.
-        - cwd: An optional Path object representing the current working directory.
-        - env: An optional dictionary of environment variables to be used in the command execution.
-        """
-        self.current_working_directory = cwd
-        self.env = env
-
-    def execute(self, cmd: str | List[str]) -> subprocess.CompletedProcess[str]:
-        """
-        Executes the command and returns a CompletedProcess object.
-
-        Returns:
-        - A subprocess.CompletedProcess object representing the result of the command execution.
-        """
-        if isinstance(cmd, str):
-            command: str | list[str] = cmd
-            use_shell = True
-        else:
-            # Check if any argument contains quotes, which indicates shell processing is needed
-            has_quotes = any('"' in arg or "'" in arg for arg in cmd)
-            if has_quotes:
-                command = " ".join(cmd)
-                use_shell = True
-            else:
-                command = cmd
-                use_shell = False
-
-        output = ""
-        try:
-            print("=" * 120)
-            print(f"= Running command: {command}")
-            print("=" * 120)
-            with subprocess.Popen(
-                command,
-                cwd=str(self.current_working_directory or Path.cwd()),
-                stdout=subprocess.PIPE,
-                stderr=subprocess.STDOUT,
-                bufsize=1,
-                text=True,
-                env=self.env,
-                universal_newlines=True,
-                encoding=locale.getpreferredencoding(False),
-                errors="replace",
-                shell=use_shell,
-            ) as process:
-                if process.stdout:
-                    for line in process.stdout:
-                        print(line, end="")
-                        # We have to store the stdout content.
-                        # This is necessary because the stdout object is closed after we printed its content
-                        output += line
-        except Exception:
-            raise RuntimeError(f"Command '{command}' failed.")  # noqa: B904
-        return subprocess.CompletedProcess(args=command, returncode=process.returncode, stdout=output, stderr=None)