ScriptCollection 3.5.159__py3-none-any.whl → 3.5.161__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -36,7 +36,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "3.5.159"
+version = "3.5.161"
 __version__ = version
 
 
@@ -2046,6 +2046,7 @@ DNS                 = {domain}
                 package_name = line.replace(">", GeneralUtilities.empty_string).strip().split(" ")[0]
                 if not (package_name in ignored_dependencies):
                     self.log.log(f"Update package {package_name}...", LogLevel.Debug)
+                    time.sleep(1.1)  # attempt to prevent rate-limit
                     self.run_program("dotnet", f"add {csproj_filename} package {package_name}", folder, print_errors_as_information=True)
 
     @GeneralUtilities.check_arguments

ScriptCollection/TasksForCommonProjectStructure.py

@@ -256,10 +256,14 @@ class TasksForCommonProjectStructure:
                 shutil.copyfile(full_source_file, target_file)
 
     @GeneralUtilities.check_arguments
-    def standardized_tasks_build_for_dart_project_in_common_project_structure(self, build_script_file: str, verbosity: int, targets: list[str], args: list[str], package_name: str):
+    def standardized_tasks_build_for_dart_project_in_common_project_structure(self, build_script_file: str, verbosity: int, targets: list[str], args: list[str], package_name: str = None):
         codeunit_folder = GeneralUtilities.resolve_relative_path("../../..", build_script_file)
         codeunit_name = os.path.basename(codeunit_folder)
-        src_folder = GeneralUtilities.resolve_relative_path(package_name, codeunit_folder)  # TODO replace packagename
+        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")
         verbosity = self.get_verbosity_from_commandline_arguments(args, verbosity)
         target_names: dict[str, str] = {
@@ -269,7 +273,7 @@ class TasksForCommonProjectStructure:
             "appbundle": "Android",
         }
         for target in targets:
-            GeneralUtilities.write_message_to_stdout(f"Build package {package_name} for target {target_names[target]}...")
+            GeneralUtilities.write_message_to_stdout(f"Build flutter-codeunit {codeunit_name} for target {target_names[target]}...")
             self.run_with_epew("flutter", f"build {target}", src_folder, verbosity)
             if target == "web":
                 web_relase_folder = os.path.join(src_folder, "build/web")
@@ -1827,15 +1831,60 @@ class TasksForCommonProjectStructure:
         coverage_file_relative = f"{test_coverage_folder_relative}/TestCoverage.xml"
         coverage_file = GeneralUtilities.resolve_relative_path(coverage_file_relative, codeunit_folder)
         self.run_with_epew("lcov_cobertura", f"coverage/lcov.info --base-dir . --excludes test --output ../{coverage_file_relative} --demangle", src_folder, verbosity)
+
+        # 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('<package ', f'<package name="{codeunit_name}" ', content)
         content = re.sub('\\ filename=\\"lib/', f' filename="{package_name}/lib/', content)
         GeneralUtilities.write_text_to_file(coverage_file, content)
+        self.__testcoverage_for_flutter_project_merge_packages(coverage_file)
+        self.__testcoverage_for_flutter_project_calculate_line_rate(coverage_file)
+
         self.run_testcases_common_post_task(repository_folder, codeunit_name, verbosity, generate_badges, build_environment_target_type, args)
 
+    def __testcoverage_for_flutter_project_merge_packages(self, coverage_file: str):
+        tree = etree.parse(coverage_file)
+        root = tree.getroot()
+
+        packages = root.findall("./packages/package")
+
+        all_classes = []
+        for pkg in packages:
+            classes = pkg.find("classes")
+            if classes is not None:
+                all_classes.extend(classes.findall("class"))
+        new_package = etree.Element("package", name="Malno")
+        new_classes = etree.SubElement(new_package, "classes")
+        for cls in all_classes:
+            new_classes.append(cls)
+        packages_node = root.find("./packages")
+        packages_node.clear()
+        packages_node.append(new_package)
+        tree.write(coverage_file, pretty_print=True, xml_declaration=True, encoding="UTF-8")
+
+    def __testcoverage_for_flutter_project_calculate_line_rate(self, coverage_file: str):
+        tree = etree.parse(coverage_file)
+        root = tree.getroot()
+        package = root.find("./packages/package")
+        if package is None:
+            raise RuntimeError("No <package>-Element found")
+
+        line_elements = package.findall(".//line")
+
+        amount_of_lines = 0
+        amount_of_hited_lines = 0
+
+        for line in line_elements:
+            amount_of_lines += 1
+            hits = int(line.get("hits", "0"))
+            if hits > 0:
+                amount_of_hited_lines += 1
+        line_rate = amount_of_hited_lines / amount_of_lines if amount_of_lines > 0 else 0.0
+        package.set("line-rate", str(line_rate))
+        tree.write(coverage_file, pretty_print=True, xml_declaration=True, encoding="UTF-8")
+
     @GeneralUtilities.check_arguments
     def standardized_tasks_run_testcases_for_angular_codeunit(self, runtestcases_script_file: str, build_environment_target_type: str, generate_badges: bool, verbosity: int, commandline_arguments: list[str]) -> None:
         # prepare

{scriptcollection-3.5.159.dist-info → scriptcollection-3.5.161.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 3.5.159
+Version: 3.5.161
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -35,7 +35,7 @@ Requires-Dist: psutil>=7.0.0
 Requires-Dist: pycdlib>=1.14.0
 Requires-Dist: Pygments>=2.19.2
 Requires-Dist: pylint>=3.3.8
-Requires-Dist: pyOpenSSL>=25.1.0
+Requires-Dist: pyOpenSSL>=25.2.0
 Requires-Dist: PyPDF>=6.0.0
 Requires-Dist: pytest>=8.4.2
 Requires-Dist: PyYAML>=6.0.2

{scriptcollection-3.5.159.dist-info → scriptcollection-3.5.161.dist-info}/RECORD

@@ -7,11 +7,11 @@ ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4b
 ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/SCLog.py,sha256=rMdrEzBKQZBdObPJ9nZ5XCEXRoIFqPh8fAoiX6ZOVuw,4493
-ScriptCollection/ScriptCollectionCore.py,sha256=Rges2qebK89CwmNwUPKMXVlrYa-OCAJUA1bUSQE9S7E,141662
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=nXhwH6rfA-XXdQVXYQoxXUQ5sA82d1bDF2EVKdZIfo8,248595
+ScriptCollection/ScriptCollectionCore.py,sha256=DPbTCj2wGkX2kLuv8pIg8qMvJwtgOJAPm4b7LSq7Q0A,141731
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=TfRpYvL8svDkKHcX2aoj1v3R8nGGxwnoEXqm3OcLK_Q,250485
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.159.dist-info/METADATA,sha256=cgDT6oojuA4Pc_eDYFFTMO_k79xHPo39_9VpMi0e5ok,7689
-scriptcollection-3.5.159.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-3.5.159.dist-info/entry_points.txt,sha256=EBRDrnGDURysHNyK0Z0fPCnL7uCCO_Mxc6WYJ47KxAI,4234
-scriptcollection-3.5.159.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.159.dist-info/RECORD,,
+scriptcollection-3.5.161.dist-info/METADATA,sha256=5rzT3Iy0_wucfGtf_PtLCH4X6pu1fno5r08dROgfBjw,7689
+scriptcollection-3.5.161.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-3.5.161.dist-info/entry_points.txt,sha256=EBRDrnGDURysHNyK0Z0fPCnL7uCCO_Mxc6WYJ47KxAI,4234
+scriptcollection-3.5.161.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.161.dist-info/RECORD,,