ScriptCollection 3.5.34__py3-none-any.whl → 3.5.35__py3-none-any.whl

ScriptCollection/Executables.py

@@ -256,7 +256,7 @@ def HealthCheck() -> int:
 def BuildCodeUnit() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument('--codeunitfolder', required=False, default=".")
-    parser.add_argument('--verbosity', required=False, default=1)
+    parser.add_argument('-v', '--verbosity', required=False, default=1)
     parser.add_argument('--targetenvironment', required=False, default="QualityCheck")
     parser.add_argument('--additionalargumentsfile', required=False, default=None)
     parser.add_argument('--assume_dependent_codeunits_are_already_built', type=GeneralUtilities.string_to_boolean, const=True, default=False, nargs='?')
@@ -268,7 +268,7 @@ def BuildCodeUnit() -> int:
 def BuildCodeUnits() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument('--repositoryfolder', required=False, default=".")
-    parser.add_argument('--verbosity', required=False, default=1)
+    parser.add_argument('-v', '--verbosity', required=False, default=1)
     parser.add_argument('--targetenvironment', required=False, default="QualityCheck")
     parser.add_argument('--additionalargumentsfile', required=False, default=None)
     parser.add_argument('--removeuncommittedfiles', required=False, default=False, action='store_true')
@@ -280,7 +280,7 @@ def BuildCodeUnits() -> int:
 def BuildCodeUnitsC() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument('--repositoryfolder', required=False, default=".")
-    parser.add_argument('--verbosity', required=False, default=1)
+    parser.add_argument('-v', '--verbosity', required=False, default=1)
     parser.add_argument('--targetenvironment', required=False, default="QualityCheck")
     parser.add_argument('--additionalargumentsfile', required=False, default=None)
     parser.add_argument('--image', required=False, default="scbuilder:latest")

ScriptCollection/GeneralUtilities.py

@@ -392,7 +392,7 @@ class GeneralUtilities:
     @staticmethod
     @check_arguments
     def __rmtree(directory: str) -> None:
-        shutil.rmtree(directory, onerror=GeneralUtilities.__remove_readonly)
+        shutil.rmtree(directory, onerror=GeneralUtilities.__remove_readonly)  # pylint: disable=deprecated-argument
 
     @staticmethod
     @check_arguments

ScriptCollection/ScriptCollectionCore.py

@@ -31,7 +31,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.34"
+version = "3.5.35"
 __version__ = version
 
 
@@ -1206,26 +1206,49 @@ class ScriptCollectionCore:
             queue.put(line)
         file.close()
 
+    @staticmethod
+    def __continue_process_reading(pid: int, p: Popen, q_stdout: Queue, q_stderr: Queue, reading_stdout_last_time_resulted_in_exception: bool, reading_stderr_last_time_resulted_in_exception: bool):
+        if p.poll() is None:
+            return True
+
+        # if reading_stdout_last_time_resulted_in_exception and reading_stderr_last_time_resulted_in_exception:
+        #    return False
+
+        if not q_stdout.empty():
+            return True
+
+        if not q_stderr.empty():
+            return True
+
+        return False
+
     @staticmethod
     def __read_popen_pipes(p: Popen):
+        p_id = p.pid
         with ThreadPoolExecutor(2) as pool:
             q_stdout = Queue()
             q_stderr = Queue()
 
             pool.submit(ScriptCollectionCore.__enqueue_output, p.stdout, q_stdout)
             pool.submit(ScriptCollectionCore.__enqueue_output, p.stderr, q_stderr)
-            while (p.poll() is None) or (not q_stdout.empty()) or (not q_stderr.empty()):
-                time.sleep(0.01)
+            reading_stdout_last_time_resulted_in_exception: bool = False
+            reading_stderr_last_time_resulted_in_exception: bool = False
+            while (ScriptCollectionCore.__continue_process_reading(p_id, p, q_stdout, q_stderr, reading_stdout_last_time_resulted_in_exception, reading_stderr_last_time_resulted_in_exception)):
                 out_line = None
                 err_line = None
                 try:
                     out_line = q_stdout.get_nowait()
+                    reading_stdout_last_time_resulted_in_exception = False
                 except Empty:
-                    pass
+                    reading_stdout_last_time_resulted_in_exception = True
+
                 try:
                     err_line = q_stderr.get_nowait()
+                    reading_stderr_last_time_resulted_in_exception = False
                 except Empty:
-                    pass
+                    reading_stderr_last_time_resulted_in_exception = True
+
+                time.sleep(0.01)
 
                 yield (out_line, err_line)
 

ScriptCollection/TasksForCommonProjectStructure.py

@@ -12,6 +12,7 @@ import json
 import configparser
 import tempfile
 import uuid
+import yaml
 import requests
 from packaging import version
 import xmlschema
@@ -230,8 +231,14 @@ class TasksForCommonProjectStructure:
         src_folder = GeneralUtilities.resolve_relative_path(package_name, codeunit_folder)  # TODO replace packagename
         artifacts_folder = os.path.join(codeunit_folder, "Other", "Artifacts")
         verbosity = self.get_verbosity_from_commandline_arguments(args, verbosity)
+        target_names: dict[str, str] = {
+            "web": "WebApplication",
+            "windows": "Windows",
+            "ios": "IOS",
+            "appbundle": "Android",
+        }
         for target in targets:
-            GeneralUtilities.write_message_to_stdout(f"Build package {package_name} for target {target}...")
+            GeneralUtilities.write_message_to_stdout(f"Build package {package_name} for target {target_names[target]}...")
             sc = ScriptCollectionCore()
             self.run_with_epew("flutter", f"build {target}", src_folder, verbosity)
             if target == "web":
@@ -996,6 +1003,8 @@ class TasksForCommonProjectStructure:
 
         for codeunitname in self.get_codeunits(information.repository):
             # Push artifacts to registry
+            if information.verbosity > 2:
+                GeneralUtilities.write_message_to_stdout(f"Push artifacts of {codeunitname}...")
             scriptfilename = f"PushArtifacts.{codeunitname}.py"
             push_artifact_to_registry_script = os.path.join(information.push_artifacts_scripts_folder, scriptfilename)
             if os.path.isfile(push_artifact_to_registry_script):
@@ -1895,9 +1904,36 @@ class TasksForCommonProjectStructure:
         GeneralUtilities.ensure_directory_exists(os.path.join(artifacts_folder, "APISpecification"))
         verbosity = self.get_verbosity_from_commandline_arguments(commandline_arguments, verbosity)
         codeunit_version = self.get_version_of_codeunit_folder(codeunit_folder)
+
         versioned_api_spec_file = f"APISpecification/{codeunitname}.v{codeunit_version}.api.json"
         self.__sc.run_program("swagger", f"tofile --output {versioned_api_spec_file} BuildResult_DotNet_{runtime}/{codeunitname}.dll {swagger_document_name}", artifacts_folder, verbosity=verbosity)
-        shutil.copyfile(os.path.join(artifacts_folder, versioned_api_spec_file), os.path.join(artifacts_folder, f"APISpecification/{codeunitname}.latest.api.json"))
+        api_file: str = os.path.join(artifacts_folder, versioned_api_spec_file)
+        shutil.copyfile(api_file, os.path.join(artifacts_folder, f"APISpecification/{codeunitname}.latest.api.json"))
+
+        resources_folder = os.path.join(codeunit_folder, "Other", "Resources")
+        GeneralUtilities.ensure_directory_exists(resources_folder)
+        resources_apispec_folder = os.path.join(resources_folder, "APISpecification")
+        GeneralUtilities.ensure_directory_exists(resources_apispec_folder)
+        resource_target_file = os.path.join(resources_apispec_folder, f"{codeunitname}.api.json")
+        GeneralUtilities.ensure_file_does_not_exist(resource_target_file)
+        shutil.copyfile(api_file, resource_target_file)
+
+        with open(api_file, encoding="utf-8") as api_file_content:
+            reloaded_json = json.load(api_file_content)
+
+            yamlfile1: str = str(os.path.join(artifacts_folder, f"APISpecification/{codeunitname}.v{codeunit_version}.api.yaml"))
+            GeneralUtilities.ensure_file_does_not_exist(yamlfile1)
+            GeneralUtilities.ensure_file_exists(yamlfile1)
+            with open(yamlfile1, "w+", encoding="utf-8") as yamlfile:
+                yaml.dump(reloaded_json, yamlfile, allow_unicode=True)
+
+            yamlfile2: str = str(os.path.join(artifacts_folder, f"APISpecification/{codeunitname}.latest.api.yaml"))
+            GeneralUtilities.ensure_file_does_not_exist(yamlfile2)
+            shutil.copyfile(yamlfile1, yamlfile2)
+
+            yamlfile3: str = str(os.path.join(resources_apispec_folder, f"{codeunitname}.api.yaml"))
+            GeneralUtilities.ensure_file_does_not_exist(yamlfile3)
+            shutil.copyfile(yamlfile1, yamlfile3)
 
     @GeneralUtilities.check_arguments
     def ensure_openapigenerator_is_available(self, codeunit_folder: str) -> None:
@@ -1930,7 +1966,7 @@ class TasksForCommonProjectStructure:
         openapigenerator_jar_file = os.path.join(codeunit_folder, "Other", "Resources", "OpenAPIGenerator", "open-api-generator.jar")
         openapi_spec_file = os.path.join(codeunit_folder, "Other", "Resources", "DependentCodeUnits", name_of_api_providing_codeunit, "APISpecification", f"{name_of_api_providing_codeunit}.latest.api.json")
         target_folder = os.path.join(codeunit_folder, target_subfolder_in_codeunit)
-        GeneralUtilities.ensure_directory_exists(target_folder)
+        GeneralUtilities.ensure_folder_exists_and_is_empty(target_folder)
         ScriptCollectionCore().run_program("java", f'-jar {openapigenerator_jar_file} generate -i {openapi_spec_file} -g {language} -o {target_folder} --global-property supportingFiles --global-property models --global-property apis', codeunit_folder)
 
     @GeneralUtilities.check_arguments
@@ -2580,6 +2616,8 @@ class TasksForCommonProjectStructure:
         now = datetime.now()
         codeunit_folder = GeneralUtilities.resolve_relative_path_from_current_working_directory(codeunit_folder)
         codeunit_name: str = os.path.basename(codeunit_folder)
+        if verbosity > 2:
+            GeneralUtilities.write_message_to_stdout(f"Start building codeunit {codeunit_name}")
         codeunit_file = os.path.join(codeunit_folder, f"{codeunit_name}.codeunit.xml")
 
         if (not os.path.isfile(codeunit_file)):

{ScriptCollection-3.5.34.dist-info → ScriptCollection-3.5.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ScriptCollection
-Version: 3.5.34
+Version: 3.5.35
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke

{ScriptCollection-3.5.34.dist-info → ScriptCollection-3.5.35.dist-info}/RECORD

@@ -1,16 +1,16 @@
-ScriptCollection/Executables.py,sha256=0JitZCU2j3N--HREXpTAckPbf7RQ-Q-DER79lnFidLE,20819
-ScriptCollection/GeneralUtilities.py,sha256=S_JX32I4fMpjwIzIinZT72TZ2r7rM736QNSA-ke-ET8,36347
+ScriptCollection/Executables.py,sha256=ls3wGZpt48YwwtO0QGWWyIImSE87SyzbL-WxhpwQJug,20837
+ScriptCollection/GeneralUtilities.py,sha256=d_K9pI4hHF8Ha7gnt8N9CQnElrUhHpqyXL7p_6lQ4Nc,36386
 ScriptCollection/ProcessesRunner.py,sha256=3mu4ZxzZleQo0Op6o9EYTCFiJfb6kx5ov2YfZfT89mU,1395
 ScriptCollection/ProgramRunnerBase.py,sha256=7QAjoqOz6XPmJH19F2k-Z1fFQB_uZnPFvn-T54IJcHQ,2324
 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=lL-K0HAocSef6KJkb3khklWBP8TQZXgqRSdOtjmvqDs,101810
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=2mgCqK1R6wY_se2orP1z5U8sn9-V1-BijI8cfHe0zK0,201543
+ScriptCollection/ScriptCollectionCore.py,sha256=1UD_9PhlJEKPdv0Xi1nAbey-8sKdS4S8J4opXPM1hvU,102878
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=JCk-itC1ScDot4yxKPvV6yYEwXhSCJIv838pIB-LgjY,203571
 ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.5.34.dist-info/METADATA,sha256=hszq5Cyh3Ct-GItfNJMpurz1bzzVJLpR01_H2yefkpg,7664
-ScriptCollection-3.5.34.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ScriptCollection-3.5.34.dist-info/entry_points.txt,sha256=_O7BmQ81LdDfrj5uOhjshg9Xc-tABHQJIxDOyOGRzzI,2397
-ScriptCollection-3.5.34.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.5.34.dist-info/RECORD,,
+ScriptCollection-3.5.35.dist-info/METADATA,sha256=Wfy5SAnlPTelhTzWYOZuJPMASpjHNwiVaFHUVCKQagQ,7664
+ScriptCollection-3.5.35.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ScriptCollection-3.5.35.dist-info/entry_points.txt,sha256=_O7BmQ81LdDfrj5uOhjshg9Xc-tABHQJIxDOyOGRzzI,2397
+ScriptCollection-3.5.35.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.35.dist-info/RECORD,,