ScriptCollection 3.5.27__py3-none-any.whl → 3.5.29__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.27"
+version = "3.5.29"
 __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
@@ -1778,7 +1788,7 @@ chmod {permission} {link_file}
         main_reference_file = f"{reference_root_folder}/Reference.md"
         GeneralUtilities.ensure_file_exists(main_reference_file)
         GeneralUtilities.write_text_to_file(main_reference_file, f"""# {productname}
-    
+
 TXDX add minimal service-description here.
 
 ## Technical documentation
@@ -1870,7 +1880,7 @@ TXDX
 - [Productive-System](TXDX)
 - [QualityCheck-system](TXDX)
 
-""")
+""".replace("XDX", "ODO"))
 
     @GeneralUtilities.check_arguments
     def run_with_timeout(self, method, timeout_in_seconds: float) -> bool:

ScriptCollection/TasksForCommonProjectStructure.py

@@ -1692,11 +1692,16 @@ class TasksForCommonProjectStructure:
         GeneralUtilities.write_text_to_file(file, result)
 
     @GeneralUtilities.check_arguments
-    def do_npm_install(self, package_json_folder: str,force:bool, verbosity: int) -> None:
-        argument = "clean-install"
+    def do_npm_install(self, package_json_folder: str, force: bool, verbosity: int) -> None:
+        argument1 = "install"
         if force:
-            argument = f"{argument} --force"
-        self.run_with_epew("npm", argument, package_json_folder, verbosity=verbosity)
+            argument1 = f"{argument1} --force"
+        self.run_with_epew("npm", argument1, package_json_folder, verbosity=verbosity)
+
+        argument2 = "clean-install"
+        if force:
+            argument2 = f"{argument2} --force"
+        self.run_with_epew("npm", argument2, 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]:
@@ -2397,7 +2402,7 @@ class TasksForCommonProjectStructure:
     def generate_svg_files_from_plantuml_files(self, target_folder: str) -> None:
         self.ensure_plantuml_is_available(target_folder)
         plant_uml_folder = os.path.join(target_folder, "Other", "Resources", "PlantUML")
-        files_folder = os.path.join(target_folder, "Other/Reference")
+        files_folder = os.path.join(target_folder, "Other", "Reference")
         sc = ScriptCollectionCore()
         for file in GeneralUtilities.get_all_files_of_folder(files_folder):
             if file.endswith(".plantuml"):

{ScriptCollection-3.5.27.dist-info → ScriptCollection-3.5.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ScriptCollection
-Version: 3.5.27
+Version: 3.5.29
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -24,7 +24,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: build >=1.2.2.post1
 Requires-Dist: coverage >=7.6.4
-Requires-Dist: cyclonedx-bom >=5.0.0
+Requires-Dist: cyclonedx-bom >=5.1.1
 Requires-Dist: defusedxml >=0.7.1
 Requires-Dist: keyboard >=0.13.5
 Requires-Dist: lcov-cobertura >=2.0.2
@@ -41,7 +41,7 @@ Requires-Dist: PyYAML >=6.0.2
 Requires-Dist: qrcode >=8.0
 Requires-Dist: send2trash >=1.8.3
 Requires-Dist: twine >=5.1.1
-Requires-Dist: xmlschema >=3.4.2
+Requires-Dist: xmlschema >=3.4.3
 
 # ScriptCollection
 

{ScriptCollection-3.5.27.dist-info → ScriptCollection-3.5.29.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=ghiD-bDQz7a0WeZyur_ziZHKdmIdVi_70iMYo4185rA,101078
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=iZWDpFSF0VQotKpjGngs1bBy1-7sVEZiUFRUD08d5wo,194090
+ScriptCollection/ScriptCollectionCore.py,sha256=hJFDTk5gJtTECbWX7m92Q63Ts95ZMN-_dh3tRypLLWs,101921
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=YrCDXbGUIyR_pNH70yq90fRSmIncUia_TCWwFxcY_dc,194282
 ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.5.27.dist-info/METADATA,sha256=6ZIEIrTa60Zt0EWsS0HnSMg6BsTnyJUZNwx6WyqEH6A,7684
-ScriptCollection-3.5.27.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-ScriptCollection-3.5.27.dist-info/entry_points.txt,sha256=yASwR6hWZ_b5d4W49YeX1htD8ngfWbwgjpfQiJdtUAU,2322
-ScriptCollection-3.5.27.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.5.27.dist-info/RECORD,,
+ScriptCollection-3.5.29.dist-info/METADATA,sha256=nYenV-RxLarp4trAzLJVDInmTv-59RNoSvWcOsL5HPE,7684
+ScriptCollection-3.5.29.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+ScriptCollection-3.5.29.dist-info/entry_points.txt,sha256=yASwR6hWZ_b5d4W49YeX1htD8ngfWbwgjpfQiJdtUAU,2322
+ScriptCollection-3.5.29.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.29.dist-info/RECORD,,

{ScriptCollection-3.5.27.dist-info → ScriptCollection-3.5.29.dist-info}/WHEEL

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