ScriptCollection 3.5.26__py3-none-any.whl → 3.5.28__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -31,7 +31,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.26"
+version = "3.5.28"
 __version__ = version
 
 
@@ -44,9 +44,11 @@ class ScriptCollectionCore:
     execute_program_really_if_no_mock_call_is_defined: bool = False
     __mocked_program_calls: list = None
     program_runner: ProgramRunnerBase = None
+    call_program_runner_directly: bool = None
 
     def __init__(self):
         self.program_runner = ProgramRunnerPopen()
+        self.call_program_runner_directly = None
         self.__mocked_program_calls = list[ScriptCollectionCore.__MockProgramCall]()
 
     @staticmethod
@@ -1234,6 +1236,8 @@ class ScriptCollectionCore:
         # verbosity 2: If the exitcode of the executed program is not 0 then the StdErr will be logged. This is supposed to be the default verbosity-level.
         # verbosity 3: Logs and prints StdOut and StdErr of the executed program in realtime.
         # verbosity 4: Same as loglevel 3 but with some more overhead-information.
+        if self.call_program_runner_directly:
+            return self.program_runner.run_program_argsasarray(program, arguments_as_array, working_directory, custom_argument, interactive)
         try:
             arguments_as_str = ' '.join(arguments_as_array)
             mock_loader_result = self.__try_load_mock(program, arguments_as_str, working_directory)
@@ -1323,11 +1327,15 @@ class ScriptCollectionCore:
     # Return-values program_runner: Exitcode, StdOut, StdErr, Pid
     @GeneralUtilities.check_arguments
     def run_program(self, program: str, arguments:  str = "", working_directory: str = None, verbosity: int = 1, print_errors_as_information: bool = False, log_file: str = None, timeoutInSeconds: int = 600, addLogOverhead: bool = False, title: str = None, log_namespace: str = "", arguments_for_log:  list[str] = None, throw_exception_if_exitcode_is_not_zero: bool = True, custom_argument: object = None, interactive: bool = False) -> tuple[int, str, str, int]:
+        if self.call_program_runner_directly:
+            return self.program_runner.run_program(program, arguments, working_directory, custom_argument, interactive)
         return self.run_program_argsasarray(program, GeneralUtilities.arguments_to_array(arguments), working_directory, verbosity, print_errors_as_information, log_file, timeoutInSeconds, addLogOverhead, title, log_namespace, arguments_for_log, throw_exception_if_exitcode_is_not_zero, custom_argument, interactive)
 
     # Return-values program_runner: Pid
     @GeneralUtilities.check_arguments
     def run_program_argsasarray_async(self, program: str, arguments_as_array: list[str] = [], working_directory: str = None, verbosity: int = 1, print_errors_as_information: bool = False, log_file: str = None, timeoutInSeconds: int = 600, addLogOverhead: bool = False, title: str = None, log_namespace: str = "", arguments_for_log:  list[str] = None, custom_argument: object = None, interactive: bool = False) -> int:
+        if self.call_program_runner_directly:
+            return self.program_runner.run_program_argsasarray_async(program, arguments_as_array, working_directory, custom_argument, interactive)
         mock_loader_result = self.__try_load_mock(program, ' '.join(arguments_as_array), working_directory)
         if mock_loader_result[0]:
             return mock_loader_result[1]
@@ -1337,6 +1345,8 @@ class ScriptCollectionCore:
     # Return-values program_runner: Pid
     @GeneralUtilities.check_arguments
     def run_program_async(self, program: str, arguments: str = "",  working_directory: str = None, verbosity: int = 1, print_errors_as_information: bool = False, log_file: str = None, timeoutInSeconds: int = 600, addLogOverhead: bool = False, title: str = None, log_namespace: str = "", arguments_for_log:  list[str] = None, custom_argument: object = None, interactive: bool = False) -> int:
+        if self.call_program_runner_directly:
+            return self.program_runner.run_program_argsasarray_async(program, arguments, working_directory, custom_argument, interactive)
         return self.run_program_argsasarray_async(program, GeneralUtilities.arguments_to_array(arguments), working_directory, verbosity, print_errors_as_information, log_file, timeoutInSeconds, addLogOverhead, title, log_namespace, arguments_for_log, custom_argument, interactive)
 
     @GeneralUtilities.check_arguments

ScriptCollection/TasksForCommonProjectStructure.py

@@ -1692,8 +1692,11 @@ class TasksForCommonProjectStructure:
         GeneralUtilities.write_text_to_file(file, result)
 
     @GeneralUtilities.check_arguments
-    def do_npm_install(self, package_json_folder: str, verbosity: int) -> None:
-        self.run_with_epew("npm", "clean-install", package_json_folder, verbosity=verbosity)
+    def do_npm_install(self, package_json_folder: str,force:bool, verbosity: int) -> None:
+        argument = "clean-install"
+        if force:
+            argument = f"{argument} --force"
+        self.run_with_epew("npm", argument, package_json_folder, verbosity=verbosity)
 
     @GeneralUtilities.check_arguments
     def run_with_epew(self, program: str, argument: str = "", working_directory: str = None, verbosity: int = 1, print_errors_as_information: bool = False, log_file: str = None, timeoutInSeconds: int = 600, addLogOverhead: bool = False, title: str = None, log_namespace: str = "", arguments_for_log:  list[str] = None, throw_exception_if_exitcode_is_not_zero: bool = True, custom_argument: object = None, interactive: bool = False) -> tuple[int, str, str, int]:
@@ -2129,10 +2132,12 @@ class TasksForCommonProjectStructure:
         ce_source_folder = GeneralUtilities.resolve_relative_path("Other/Resources/DevelopmentCertificate", codeunit_folder)
         ca_source_folder = GeneralUtilities.resolve_relative_path("Other/Resources/CA", codeunit_folder)
         ce_target_folder = GeneralUtilities.resolve_relative_path("Other/Artifacts/DevelopmentCertificate", codeunit_folder)
-        ca_target_folder = GeneralUtilities.resolve_relative_path("Other/Artifacts/A", codeunit_folder)
+        ca_target_folder = GeneralUtilities.resolve_relative_path("Other/Artifacts/CA", codeunit_folder)
 
+        GeneralUtilities.ensure_directory_does_not_exist(ce_target_folder)
         GeneralUtilities.ensure_directory_exists(ce_target_folder)
         GeneralUtilities.copy_content_of_folder(ce_source_folder, ce_target_folder)
+        GeneralUtilities.ensure_directory_does_not_exist(ca_target_folder)
         GeneralUtilities.ensure_directory_exists(ca_target_folder)
         GeneralUtilities.copy_content_of_folder(ca_source_folder, ca_target_folder)
 

{ScriptCollection-3.5.26.dist-info → ScriptCollection-3.5.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ScriptCollection
-Version: 3.5.26
+Version: 3.5.28
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -23,7 +23,7 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: build >=1.2.2.post1
-Requires-Dist: coverage >=7.6.3
+Requires-Dist: coverage >=7.6.4
 Requires-Dist: cyclonedx-bom >=5.0.0
 Requires-Dist: defusedxml >=0.7.1
 Requires-Dist: keyboard >=0.13.5

{ScriptCollection-3.5.26.dist-info → ScriptCollection-3.5.28.dist-info}/RECORD

@@ -5,12 +5,12 @@ ScriptCollection/ProgramRunnerBase.py,sha256=7QAjoqOz6XPmJH19F2k-Z1fFQB_uZnPFvn-
 ScriptCollection/ProgramRunnerEpew.py,sha256=C2Rs3YWOWWWJct7XmKphp5CF1tf0j4Fp-ljV2drLTfs,6349
 ScriptCollection/ProgramRunnerPopen.py,sha256=G3LgQUVCfaq7XjBsGzalElH31Hbr0etttGR2_H87YzA,3512
 ScriptCollection/RPStream.py,sha256=NRRHL3YSP3D9MuAV2jB_--0KUKCsvJGxeKnxgrRZ9kY,1545
-ScriptCollection/ScriptCollectionCore.py,sha256=xpuR9YHgFS_4Q1UGzp5XgnEps6Wjz1YgeUGeVLOcNnQ,101078
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=sBCq3yRe-qj4RJ798MRfihyJh7QJwFebWL6zS77g2IU,193837
+ScriptCollection/ScriptCollectionCore.py,sha256=e-Yug2hQFohALDE2Ytga4Aw6KJH5yuFcNduTC_u-Cqs,101903
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=iZWDpFSF0VQotKpjGngs1bBy1-7sVEZiUFRUD08d5wo,194090
 ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.5.26.dist-info/METADATA,sha256=M-KtqbiHOThnfw35SL_aJWSOJln9cK-M9z2cb93FIyE,7684
-ScriptCollection-3.5.26.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-ScriptCollection-3.5.26.dist-info/entry_points.txt,sha256=yASwR6hWZ_b5d4W49YeX1htD8ngfWbwgjpfQiJdtUAU,2322
-ScriptCollection-3.5.26.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.5.26.dist-info/RECORD,,
+ScriptCollection-3.5.28.dist-info/METADATA,sha256=-e83nP7ReNYtSMAer-iMvtflmr4novJrC6sdxoHopkg,7684
+ScriptCollection-3.5.28.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+ScriptCollection-3.5.28.dist-info/entry_points.txt,sha256=yASwR6hWZ_b5d4W49YeX1htD8ngfWbwgjpfQiJdtUAU,2322
+ScriptCollection-3.5.28.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.28.dist-info/RECORD,,

{ScriptCollection-3.5.26.dist-info → ScriptCollection-3.5.28.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any