py-app-dev 2.3.2__tar.gz → 2.3.3__tar.gz

{py_app_dev-2.3.2 → py_app_dev-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-app-dev
-Version: 2.3.2
+Version: 2.3.3
 Summary: My application development modules.
 Home-page: https://github.com/cuinixam/python-app-dev
 License: MIT

{py_app_dev-2.3.2 → py_app_dev-2.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py-app-dev"
-version = "2.3.2"
+version = "2.3.3"
 description = "My application development modules."
 authors = ["cuinixam <me@cuinixam.com>"]
 license = "MIT"
@@ -68,7 +68,7 @@ match = "(?!main$)"
 prerelease = true
 
 [tool.pytest.ini_options]
-addopts = "-v -Wdefault --cov=py_app_dev --cov-report=term-missing:skip-covered"
+addopts = "-vv -Wdefault --cov=py_app_dev --cov-report=term-missing:skip-covered -s"
 pythonpath = ["src"]
 
 [tool.coverage.run]

py_app_dev-2.3.3/src/py_app_dev/__init__.py

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

{py_app_dev-2.3.2 → py_app_dev-2.3.3}/src/py_app_dev/core/scoop_wrapper.py

@@ -1,5 +1,4 @@
 import json
-import os
 import re
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from dataclasses import dataclass, field
@@ -209,13 +208,16 @@ class ScoopWrapper:
         with TemporaryDirectory() as tmp_dir:
             tmp_scoop_file = Path(tmp_dir).joinpath("scoopfile.json")
             ScoopInstallConfigFile(scoop_install_config.buckets, apps_to_install).to_file(tmp_scoop_file)
-            # (!) Make sure powershell core module does not pollute the module path. Without this change scoop.ps1 fails because 'Get-FileHash' cannot be found.
-            # See more details here: https://github.com/PowerShell/PowerShell/issues/8635
-            env = os.environ.copy()
-            env["PSMODULEPATH"] = f"$PSHOME/Modules;{env.get('PSMODULEPATH', '')}"
-            SubprocessExecutor(["powershell.exe", self.scoop_script, "import", tmp_scoop_file], env=env).execute()
+            self.run_powershell_command(f"{self.scoop_script} import {tmp_scoop_file}")
         return apps_to_install
 
+    @staticmethod
+    def run_powershell_command(command: str, update_ps_module_path: bool = True) -> None:
+        # (!) Make sure powershell core module does not pollute the module path. Without this change scoop.ps1 fails because 'Get-FileHash' cannot be found.
+        # See more details here: https://github.com/PowerShell/PowerShell/issues/8635
+        ps_command = f'$env:PSModulePath=\\"$PSHOME\\Modules;$env:PSMODULEPATH\\"; {command}' if update_ps_module_path else f"{command}"
+        SubprocessExecutor(f"powershell.exe -Command {ps_command}").execute()
+
     @staticmethod
     def map_required_apps_to_installed_apps(
         app_names: List[str],

{py_app_dev-2.3.2 → py_app_dev-2.3.3}/src/py_app_dev/core/subprocess.py

@@ -1,7 +1,7 @@
 import shutil
 import subprocess  # nosec
 from pathlib import Path
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, Union
 
 from .exceptions import UserNotificationException
 from .logging import logger
@@ -16,31 +16,37 @@ def which(app_name: str) -> Optional[Path]:
 class SubprocessExecutor:
     def __init__(
         self,
-        command: List[str | Path],
+        command: Union[str, List[str | Path]],
         cwd: Optional[Path] = None,
         capture_output: bool = True,
         env: Optional[Dict[str, str]] = None,
         shell: bool = False,
     ):
         self.logger = logger.bind()
-        self.command = " ".join([str(cmd) for cmd in command])
+        self.command = command
         self.current_working_directory = cwd
         self.capture_output = capture_output
         self.env = env
         self.shell = shell
 
+    @property
+    def command_str(self) -> str:
+        if isinstance(self.command, str):
+            return self.command
+        return " ".join(str(arg) if not isinstance(arg, str) else arg for arg in self.command)
+
     def execute(self) -> None:
         try:
-            self.logger.info(f"Running command: {self.command}")
+            self.logger.info(f"Running command: {self.command_str}")
             cwd_path = (self.current_working_directory or Path.cwd()).as_posix()
             with subprocess.Popen(
-                self.command.split(),
+                args=self.command,
                 cwd=cwd_path,
                 stdout=(subprocess.PIPE if self.capture_output else subprocess.DEVNULL),
                 stderr=(subprocess.STDOUT if self.capture_output else subprocess.DEVNULL),
                 text=True,
                 env=self.env,
-                shell=self.shell,  # noqa: S603
+                shell=self.shell,
             ) as process:  # nosec
                 if self.capture_output and process.stdout is not None:
                     for line in iter(process.stdout.readline, ""):
@@ -49,8 +55,8 @@ class SubprocessExecutor:
 
             # Check return code
             if process.returncode != 0:
-                raise subprocess.CalledProcessError(process.returncode, self.command)
+                raise subprocess.CalledProcessError(process.returncode, self.command_str)
         except subprocess.CalledProcessError as e:
-            raise UserNotificationException(f"Command '{self.command}' failed with return code {e.returncode}") from None
+            raise UserNotificationException(f"Command '{self.command_str}' failed with return code {e.returncode}") from None
         except FileNotFoundError as e:
-            raise UserNotificationException(f"Command '{self.command}' failed with error {e}") from None
+            raise UserNotificationException(f"Command '{self.command_str}' failed with error {e}") from None

py_app_dev-2.3.2/src/py_app_dev/__init__.py

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