ScriptCollection 4.0.41__py3-none-any.whl → 4.0.43__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -37,7 +37,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "4.0.41"
+version = "4.0.43"
 __version__ = version
 
 
@@ -2509,3 +2509,20 @@ OCR-content:
                     file_path = os.path.join(root, file)
                     arcname = os.path.relpath(file_path, start=folder)
                     zipf.write(file_path, arcname)
+
+    @GeneralUtilities.check_arguments
+    def start_local_test_service(self, file: str):
+        example_folder = os.path.dirname(file)
+        docker_compose_file = os.path.join(example_folder, "docker-compose.yml")
+        for service in self.get_services_from_yaml_file(docker_compose_file):
+            self.kill_docker_container(service)
+        example_name = os.path.basename(example_folder)
+        title = f"Test{example_name}"
+        self.run_program("docker", f"compose -p {title.lower()} up --detach", example_folder, title=title)
+
+    @GeneralUtilities.check_arguments
+    def stop_local_test_service(self, file: str):
+        example_folder = os.path.dirname(file)
+        example_name = os.path.basename(example_folder)
+        title = f"Test{example_name}"
+        self.run_program("docker", f"compose -p {title.lower()} down", example_folder, title=title)

ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py

@@ -291,7 +291,7 @@ class TFCPS_CodeUnitSpecific_DotNet_Functions(TFCPS_CodeUnitSpecific_Base):
     <PropertyGroup Condition=\\\"'\\$\\(Configuration\\)'=='Productive'\\\">
         <DebugType>portable<\\/DebugType>
         <DebugSymbols>true<\\/DebugSymbols>
-        <Optimize>true<\\/Optimize>
+        <Optimize>false<\\/Optimize>
         <DefineConstants>Productive<\\/DefineConstants>
         <ErrorReport>none<\\/ErrorReport>
     <\\/PropertyGroup>(\\n|.)*
@@ -355,7 +355,7 @@ class TFCPS_CodeUnitSpecific_DotNet_Functions(TFCPS_CodeUnitSpecific_Base):
     <PropertyGroup Condition=\\\"'\\$\\(Configuration\\)'=='Productive'\\\">
         <DebugType>portable<\\/DebugType>
         <DebugSymbols>true<\\/DebugSymbols>
-        <Optimize>true<\\/Optimize>
+        <Optimize>false<\\/Optimize>
         <DefineConstants>Productive<\\/DefineConstants>
         <ErrorReport>none<\\/ErrorReport>
     <\\/PropertyGroup>(\\n|.)*

ScriptCollection/TFCPS/Flutter/TFCPS_CodeUnitSpecific_Flutter.py

@@ -1,3 +1,7 @@
+import os
+import shutil
+import re
+import zipfile
 from ...GeneralUtilities import GeneralUtilities
 from ...SCLog import  LogLevel
 from ..TFCPS_CodeUnitSpecific_Base import TFCPS_CodeUnitSpecific_Base,TFCPS_CodeUnitSpecific_Base_CLI
@@ -9,8 +13,62 @@ class TFCPS_CodeUnitSpecific_Flutter_Functions(TFCPS_CodeUnitSpecific_Base):
 
 
     @GeneralUtilities.check_arguments
-    def build(self) -> None:
-        pass#TODO
+    def build(self,package_name:str,targets:list[str]) -> None:
+        codeunit_folder = self.get_codeunit_folder()
+        codeunit_name = os.path.basename(codeunit_folder)
+        src_folder: str = None
+        if package_name is None:
+            src_folder = codeunit_folder
+        else:
+            src_folder = GeneralUtilities.resolve_relative_path(package_name, codeunit_folder)  # TODO replace packagename
+        artifacts_folder = os.path.join(codeunit_folder, "Other", "Artifacts")
+        
+        target_names: dict[str, str] = {
+            "web": "WebApplication",
+            "windows": "Windows",
+            "ios": "IOS",
+            "appbundle": "Android",
+        }
+        for target in targets:
+            self._protected_sc.log.log(f"Build flutter-codeunit {codeunit_name} for target {target_names[target]}...")
+            self._protected_sc.run_with_epew("flutter", f"build {target}", src_folder)
+            if target == "web":
+                web_relase_folder = os.path.join(src_folder, "build/web")
+                web_folder = os.path.join(artifacts_folder, "BuildResult_WebApplication")
+                GeneralUtilities.ensure_directory_does_not_exist(web_folder)
+                GeneralUtilities.ensure_directory_exists(web_folder)
+                GeneralUtilities.copy_content_of_folder(web_relase_folder, web_folder)
+            elif target == "windows":
+                windows_release_folder = os.path.join(src_folder, "build/windows/x64/runner/Release")
+                windows_folder = os.path.join(artifacts_folder, "BuildResult_Windows")
+                GeneralUtilities.ensure_directory_does_not_exist(windows_folder)
+                GeneralUtilities.ensure_directory_exists(windows_folder)
+                GeneralUtilities.copy_content_of_folder(windows_release_folder, windows_folder)
+            elif target == "ios":
+                raise ValueError("building for ios is not implemented yet")
+            elif target == "appbundle":
+                aab_folder = os.path.join(artifacts_folder, "BuildResult_AAB")
+                GeneralUtilities.ensure_directory_does_not_exist(aab_folder)
+                GeneralUtilities.ensure_directory_exists(aab_folder)
+                aab_relase_folder = os.path.join(src_folder, "build/app/outputs/bundle/release")
+                aab_file_original = self._protected_sc.find_file_by_extension(aab_relase_folder, "aab")
+                aab_file = os.path.join(aab_folder, f"{codeunit_name}.aab")
+                shutil.copyfile(aab_file_original, aab_file)
+                
+                bundletool = self.tfcps_Tools_General.ensure_androidappbundletool_is_available(None,self.use_cache())
+                apk_folder = os.path.join(artifacts_folder, "BuildResult_APK")
+                GeneralUtilities.ensure_directory_does_not_exist(apk_folder)
+                GeneralUtilities.ensure_directory_exists(apk_folder)
+                apks_file = f"{apk_folder}/{codeunit_name}.apks"
+                self._protected_sc.run_program("java", f"-jar {bundletool} build-apks --bundle={aab_file} --output={apks_file} --mode=universal", aab_relase_folder)
+                with zipfile.ZipFile(apks_file, "r") as zip_ref:
+                    zip_ref.extract("universal.apk", apk_folder)
+                GeneralUtilities.ensure_file_does_not_exist(apks_file)
+                os.rename(f"{apk_folder}/universal.apk", f"{apk_folder}/{codeunit_name}.apk")
+            else:
+                raise ValueError(f"Not supported target: {target}")
+        self.copy_source_files_to_output_directory()
+        #TODO check for updateable dependencies (in a unified way)
 
     @GeneralUtilities.check_arguments
     def linting(self) -> None:
@@ -29,9 +87,31 @@ class TFCPS_CodeUnitSpecific_Flutter_Functions(TFCPS_CodeUnitSpecific_Base):
         pass#TODO
     
     @GeneralUtilities.check_arguments
-    def run_testcases(self) -> None:
-        pass#TODO
+    def run_testcases(self,package_name:str) -> None:
+        codeunit_folder = self.get_codeunit_folder()
+        repository_folder = GeneralUtilities.resolve_relative_path("..", codeunit_folder)
+        codeunit_name = os.path.basename(codeunit_folder)
+        src_folder = GeneralUtilities.resolve_relative_path(package_name, codeunit_folder)
+        
+        self._protected_sc.run_with_epew("flutter", "test --coverage", src_folder)
+        test_coverage_folder_relative = "Other/Artifacts/TestCoverage"
+        test_coverage_folder = GeneralUtilities.resolve_relative_path(test_coverage_folder_relative, codeunit_folder)
+        GeneralUtilities.ensure_directory_exists(test_coverage_folder)
+        coverage_file_relative = f"{test_coverage_folder_relative}/TestCoverage.xml"
+        coverage_file = GeneralUtilities.resolve_relative_path(coverage_file_relative, codeunit_folder)
+        self._protected_sc.run_with_epew("lcov_cobertura", f"coverage/lcov.info --base-dir . --excludes test --output ../{coverage_file_relative} --demangle", src_folder)
 
+        # format correctly
+        content = GeneralUtilities.read_text_from_file(coverage_file)
+        content = re.sub('<![^<]+>', '', content)
+        content = re.sub('\\\\', '/', content)
+        content = re.sub('\\ name=\\"lib\\"', '', content)
+        content = re.sub('\\ filename=\\"lib/', f' filename="{package_name}/lib/', content)
+        GeneralUtilities.write_text_to_file(coverage_file, content)
+        self.tfcps_Tools_General.merge_packages(coverage_file, self.get_codeunit_name())
+        self.tfcps_Tools_General.calculate_entire_line_rate(coverage_file)
+        self.run_testcases_common_post_task(repository_folder, codeunit_name, True, self.get_target_environment_type())
+    
 class TFCPS_CodeUnitSpecific_Flutter_CLI:
 
     @staticmethod

ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py

@@ -369,7 +369,7 @@ class TFCPS_CodeUnitSpecific_Base(ABC):
                 found_existing_files = True
             else:
                 coverage_report_class.getparent().remove(coverage_report_class)
-        GeneralUtilities.assert_condition(found_existing_files, f"No existing files in testcoderage-report-file \"{testcoveragefile}\".")
+        GeneralUtilities.assert_condition(found_existing_files, f"No existing files in testcoverage-report-file \"{testcoveragefile}\".")
         result = etree.tostring(root).decode("utf-8")
         GeneralUtilities.write_text_to_file(testcoveragefile, result)
 

ScriptCollection/TFCPS/TFCPS_Tools_General.py

@@ -897,7 +897,7 @@ class TFCPS_Tools_General:
         GeneralUtilities.ensure_folder_exists_and_is_empty(target_folder)
         GeneralUtilities.copy_content_of_folder(source_folder, target_folder)
 
-    
+
     @GeneralUtilities.check_arguments
     def merge_packages(self,coverage_file:str,package_name:str) -> None:
         tree = etree.parse(coverage_file) 
@@ -906,7 +906,7 @@ class TFCPS_Tools_General:
         all_classes = []
         for pkg in packages:
             pkg_name:str=pkg.get("name")
-            if pkg_name==package_name or pkg_name.startswith(f"{package_name}."):
+            if len(packages)==1 or ( pkg_name==package_name or pkg_name.startswith(f"{package_name}.")):
                 classes = pkg.find("classes")
                 if classes is not None:
                     all_classes.extend(classes.findall("class"))
@@ -918,11 +918,11 @@ class TFCPS_Tools_General:
         packages_node.clear()
         packages_node.append(new_package)
         tree.write(coverage_file, pretty_print=True, xml_declaration=True, encoding="UTF-8")
-        self.__calculate_entire_line_rate(coverage_file)
+        self.calculate_entire_line_rate(coverage_file)
 
     
     @GeneralUtilities.check_arguments
-    def __calculate_entire_line_rate(self,coverage_file:str) -> None:
+    def calculate_entire_line_rate(self,coverage_file:str) -> None:
         tree = etree.parse(coverage_file)
         root = tree.getroot()
         package = root.find("./packages/package")
@@ -943,6 +943,7 @@ class TFCPS_Tools_General:
         package.set("line-rate", str(line_rate))
         tree.write(coverage_file, pretty_print=True, xml_declaration=True, encoding="UTF-8")
 
+
     @GeneralUtilities.check_arguments
     def generate_api_client_from_dependent_codeunit_for_angular(self, codeunit_folder:str, name_of_api_providing_codeunit: str, generated_program_part_name: str,language:str,use_cache:bool) -> None:
         target_subfolder_in_codeunit = f"src/app/generated/{generated_program_part_name}"
@@ -1150,3 +1151,11 @@ class TFCPS_Tools_General:
         self.__sc.run_program_with_retry("docker", f"push {remote_image_version}")
         if push_readme:
             self.__sc.run_program_with_retry("docker-pushrm", f"{remote_repo}", codeunit_folder)
+
+    def prepare_building_codeunits(self,repository_folder:str,use_cache:bool,generate_development_certificate:bool):        
+        if generate_development_certificate:
+            self.ensure_certificate_authority_for_development_purposes_is_generated(repository_folder)
+            self.generate_certificate_for_development_purposes_for_product(repository_folder)
+        self.generate_tasksfile_from_workspace_file(repository_folder)
+        self.generate_codeunits_overview_diagram(repository_folder)
+        self.generate_svg_files_from_plantuml_files_for_repository(repository_folder,use_cache)

{scriptcollection-4.0.41.dist-info → scriptcollection-4.0.43.dist-info}/METADATA

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

{scriptcollection-4.0.41.dist-info → scriptcollection-4.0.43.dist-info}/RECORD

@@ -9,9 +9,9 @@ ScriptCollection/ProgramRunnerEpew.py,sha256=TJdDx9zIMSiCaXh8X-ekrMlbXfGtmd0Mmyx
 ScriptCollection/ProgramRunnerMock.py,sha256=uTu-aFle1W_oKjeQEmuPsFPQpvo0kRf2FrRjAPIwT5Y,37
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/SCLog.py,sha256=dxGOI4E9lG5v9jk_LajXCkM5nghliCDV8YB8Ihn160s,4541
-ScriptCollection/ScriptCollectionCore.py,sha256=qLSBLbji2G2pDgkPkOiVHIWfiQbYB98YbpgMlyrKlgk,141223
+ScriptCollection/ScriptCollectionCore.py,sha256=hzraZbT2qQrny90RSK55aVMmrQPMPIiHAiB35Coj8U4,142098
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=E7QtV1y5ZUFPO3Jfn04__KBRwOlOisB3Z0ByvMwc0rA,25853
+ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=2Ng-GyKWQ6FfTUmogd7g-xF6_XeTMxvkeJddagxFR5o,25853
 ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=4rYKgTAga11NiDx8YUqz3K_Q4eX_n3kC6lvNdXEa24s,7389
 ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=h3PWj7SgJF9huMognPpfNwGb9E9Y9HQ0Ym72yvvJwwg,5676
 ScriptCollection/TFCPS/TFCPS_CreateRelease.py,sha256=bcJlfI062Eoq7MOIhun-_iNG7SdO1ZIuC_cylaoLI1s,6332
@@ -20,23 +20,23 @@ ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=41g219jaBRZ2VQCrWM4-Trvervrt8
 ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=ifB1K6A903vvfH0LvtiFbZgYSgR94thfEI-jjf40LpU,21653
 ScriptCollection/TFCPS/TFCPS_PreBuildCodeunitsScript.py,sha256=CxdwUklhZVuJGp0vcokoH_KMXFzmlUlZwj77xFYijho,2242
 ScriptCollection/TFCPS/TFCPS_Tools_Dependencies.py,sha256=o7HI3ki3WWqlAiUsrh3Lky_w6UhYh9hdjYPGOhubQGA,414
-ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=rG54XGperjNVIszLWa024_y3nwzmvxJIVKJKvHTOS8o,72541
+ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=S_uQX8kmjntIe8b_3FVh7ABgPCBcLCCpmewMv2gVvD4,73160
 ScriptCollection/TFCPS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=-g8h2gCf9rh0KJXUBeQD5d0qLJgBU3Q8DNZXM1UXC04,5259
 ScriptCollection/TFCPS/Docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationBase.py,sha256=bT6Gd5pQpZCw4OQz6HWkPCSn5z__eUUEisABLDSxd0o,200
 ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationGenerate.py,sha256=QyjOfMY22JWCvKjMelHiDWbJiWqotOfebpJpgDUaoO4,237
 ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationNoGenerate.py,sha256=i0zEGehj0sttxjjZtoq2KFSKp_ulxVyWp_ZgAhIY_So,241
-ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py,sha256=S1LPpQf_F3yLpNPuwMdYqm_Ns8nad6czJmfdohFVsE4,30999
+ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py,sha256=myR8hG2RMGg59S6Rf0Ts7R7df2IIVFDkazu4XSmSvrA,31001
 ScriptCollection/TFCPS/DotNet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection/TFCPS/Flutter/TFCPS_CodeUnitSpecific_Flutter.py,sha256=6g1xZ6_Nnr0Xa2VvSEtMg0H1hjUCvjzXXaPHFJ2xD1o,1626
+ScriptCollection/TFCPS/Flutter/TFCPS_CodeUnitSpecific_Flutter.py,sha256=TIR95f6TVOnW25ieX9q4RUi1FogbYEfrlZOcZ1aE014,6969
 ScriptCollection/TFCPS/Flutter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=dnuDlQXThFmhe6EbUAWmGhx7AAYGL0lVUqsrhOgtmC8,6255
 ScriptCollection/TFCPS/NodeJS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=q7msAxCb5VIZ-xhFg1MfzUvWomQRKYldqmW42KFhyMU,6868
 ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-4.0.41.dist-info/METADATA,sha256=g8cNKktu-eamdrpRB6foLjQGUnMHezPmrca9ePopj_k,7688
-scriptcollection-4.0.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-4.0.41.dist-info/entry_points.txt,sha256=NeU26D6q7d8n2cmKQiOvHK21w1C7D2kxoNRJaKiyZ5w,4295
-scriptcollection-4.0.41.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-4.0.41.dist-info/RECORD,,
+scriptcollection-4.0.43.dist-info/METADATA,sha256=gUEW02jG627c1YV8_WeShyqVa8XFVr8NWTiyn1UMfYc,7688
+scriptcollection-4.0.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-4.0.43.dist-info/entry_points.txt,sha256=NeU26D6q7d8n2cmKQiOvHK21w1C7D2kxoNRJaKiyZ5w,4295
+scriptcollection-4.0.43.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-4.0.43.dist-info/RECORD,,