ScriptCollection 3.3.67__py3-none-any.whl → 3.3.68__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -1,7 +1,6 @@
 from datetime import timedelta, datetime
 import binascii
 import filecmp
-import sys
 import hashlib
 from io import BytesIO
 import itertools
@@ -27,7 +26,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
 
-version = "3.3.67"
+version = "3.3.68"
 __version__ = version
 
 
@@ -1239,11 +1238,23 @@ class ScriptCollectionCore:
                                                               timeoutInSeconds, addLogOverhead, title, log_namespace, arguments_for_log, custom_argument)
         pid = process.pid
 
-        if program_manages_output_itself:
-            for c in iter(lambda: process.stdout.read(1), b""):
-                sys.stdout.buffer.write(c)
-            for c in iter(lambda: process.stderr.read(1), b""):
-                sys.stderr.buffer.write(c)
+        if program_manages_logging_itself:
+            stdout_readable = process.stdout.readable()
+            stderr_readable = process.stderr.readable()
+            while stdout_readable or stderr_readable:
+
+                if stdout_readable:
+                    stdout_line = GeneralUtilities.bytes_to_string(process.stdout.readline()).strip()
+                    if (len(stdout_line)) > 0:
+                        GeneralUtilities.write_message_to_stdout(stdout_line)
+
+                if stderr_readable:
+                    stderr_line = GeneralUtilities.bytes_to_string(process.stderr.readline()).strip()
+                    if (len(stderr_line)) > 0:
+                        GeneralUtilities.write_message_to_stderr(stderr_line)
+
+                stdout_readable = process.stdout.readable()
+                stderr_readable = process.stderr.readable()
 
         stdout, stderr = process.communicate()
         exit_code = process.wait()
@@ -1470,8 +1481,8 @@ class ScriptCollectionCore:
     @GeneralUtilities.check_arguments
     def get_semver_version_from_gitversion(self, repository_folder: str) -> str:
         result = self.get_version_from_gitversion(repository_folder, "MajorMinorPatch")
-        #repository_has_uncommitted_changes = self.git_repository_has_uncommitted_changes(repository_folder)
-        #if repository_has_uncommitted_changes:
+        # repository_has_uncommitted_changes = self.git_repository_has_uncommitted_changes(repository_folder)
+        # if repository_has_uncommitted_changes:
         #    if self.get_current_branch_has_tag(repository_folder):
         #        tag_of_latest_tag = self.git_get_commitid_of_tag(repository_folder, self.get_latest_tag(repository_folder))
         #        current_commit = self.git_get_commit_id(repository_folder)

ScriptCollection/TasksForCommonProjectStructure.py

@@ -1245,7 +1245,7 @@ class TasksForCommonProjectStructure:
                 GeneralUtilities.write_text_to_file(docker_compose_file, replaced)
 
     @GeneralUtilities.check_arguments
-    def run_dockerfile_example(self, current_file: str, verbosity: int = 3, remove_old_container: bool = False, commandline_arguments: list[str] = []):
+    def run_dockerfile_example(self, current_file: str, verbosity: int, remove_old_container: bool, remove_volumes_folder: bool, commandline_arguments: list[str]):
         verbosity = TasksForCommonProjectStructure.get_verbosity_from_commandline_arguments(commandline_arguments, verbosity)
         folder = os.path.dirname(current_file)
         example_name = os.path.basename(folder)
@@ -1258,12 +1258,17 @@ class TasksForCommonProjectStructure:
         if remove_old_container:
             GeneralUtilities.write_message_to_stdout(f"Ensure container {codeunit_name_lower} does not exist...")
             sc.run_program("docker", f"container rm -f {codeunit_name_lower}", oci_image_artifacts_folder, verbosity=verbosity)
+        if remove_volumes_folder:
+            volumes_folder = os.path.join(folder, "Volumes")
+            GeneralUtilities.write_message_to_stdout(f"Ensure volumes-folder '{volumes_folder}' does not exist...")
+            GeneralUtilities.ensure_directory_does_not_exist(volumes_folder)
         GeneralUtilities.write_message_to_stdout("Load docker-image...")
         sc.run_program("docker", f"load -i {image_filename}", oci_image_artifacts_folder, verbosity=verbosity)
         project_name = f"{codeunit_name}_{example_name}".lower()
-        sc.program_runner = ProgramRunnerEpew()
+        sc_epew = ScriptCollectionCore()
+        sc_epew.program_runner = ProgramRunnerEpew()
         GeneralUtilities.write_message_to_stdout("Start docker-container...")
-        sc.run_program("docker-compose", f"--project-name {project_name} up", folder, verbosity=verbosity)
+        sc_epew.run_program("docker-compose", f"--project-name {project_name} up", folder, verbosity=verbosity)
 
     @GeneralUtilities.check_arguments
     def _internal_sort_codenits(self, codeunits=dict[str, set[str]]) -> list[str]:

{ScriptCollection-3.3.67.dist-info → ScriptCollection-3.3.68.dist-info}/METADATA

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

{ScriptCollection-3.3.67.dist-info → ScriptCollection-3.3.68.dist-info}/RECORD

@@ -3,12 +3,12 @@ ScriptCollection/GeneralUtilities.py,sha256=Blo0Iq-G4zuUL5oUxBTeGFtQ23ndK7dpZPOj
 ScriptCollection/ProgramRunnerBase.py,sha256=2kyOuoM3oFjBfLc9Q5t5RTz7Ya2CjUxFtB1rBBDmnjU,1937
 ScriptCollection/ProgramRunnerEpew.py,sha256=ZiBZVMcsphmo49z2BwUwQYXo2uTKXPu33QW3IxCT46E,6273
 ScriptCollection/ProgramRunnerPopen.py,sha256=HOs1QVnXiQtwXy1_xvH79bWBdd0i-2tUyyLloQBvMto,3023
-ScriptCollection/ScriptCollectionCore.py,sha256=AaqVkBaeQIZi6wSoAsY-vLwYaPT045ASo740q53z_e4,86136
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=JUqkBOqA3DlZqCOOODPmprlmHJSRBHzYCQENsBWb10U,106445
+ScriptCollection/ScriptCollectionCore.py,sha256=GwRqXWlRQiIM8BFLNRruDnsos9YNBg4VpSfKaHP551w,86740
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=e-bnGk7ED6JJE0zitVHGxuoRDR_ChhDjY-t31tGKOSw,106801
 ScriptCollection/UpdateCertificates.py,sha256=Go-JJK-YTi7aBB1phlLxypa8GHkmFHBEPB0_TT9G-bw,7918
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.3.67.dist-info/METADATA,sha256=V3bnAt7raah9G_QBMI1a5eYg4LOsrHcI-IdP-P7Xr4A,7878
-ScriptCollection-3.3.67.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-ScriptCollection-3.3.67.dist-info/entry_points.txt,sha256=VIuxVCOpX38lSJUwRRENBNgcGKTIBxQyrCfbJVRHP8g,1968
-ScriptCollection-3.3.67.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.3.67.dist-info/RECORD,,
+ScriptCollection-3.3.68.dist-info/METADATA,sha256=-dbkq5Smk0CLIQSp3qPjjtVl9S5zfGd7PwPXy0AJMzs,7878
+ScriptCollection-3.3.68.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+ScriptCollection-3.3.68.dist-info/entry_points.txt,sha256=VIuxVCOpX38lSJUwRRENBNgcGKTIBxQyrCfbJVRHP8g,1968
+ScriptCollection-3.3.68.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.3.68.dist-info/RECORD,,