ScriptCollection 3.5.44__py3-none-any.whl → 3.5.45__py3-none-any.whl

ScriptCollection/GeneralUtilities.py

@@ -889,3 +889,19 @@ class GeneralUtilities:
         if print_result:
             GeneralUtilities.write_message_to_stdout(f"Result: {result}")
         return result
+
+    @staticmethod
+    @check_arguments
+    def assert_is_git_repository(folder: str) -> str:
+        git_file_or_folder = os.path.join(folder, ".git")
+        GeneralUtilities.assert_condition(os.path.isdir(git_file_or_folder) or os.path.isfile(git_file_or_folder), f"'{folder}' is not a git-repository.")
+
+    @staticmethod
+    @check_arguments
+    def assert_file_exists(file: str) -> str:
+        GeneralUtilities.assert_condition(os.path.isfile(file), f"File '{file}' does not exist.")
+
+    @staticmethod
+    @check_arguments
+    def assert_folder_exists(folder: str) -> str:
+        GeneralUtilities.assert_condition(os.path.isdir(folder), f"Folder '{folder}' does not exist.")

ScriptCollection/ScriptCollectionCore.py

@@ -31,7 +31,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.44"
+version = "3.5.45"
 __version__ = version
 
 
@@ -1251,18 +1251,18 @@ class ScriptCollectionCore:
                 out_line = None
                 err_line = None
                 try:
-                    out_line = q_stdout.get_nowait()
+                    out_line = q_stdout.get_nowait()  # TODO read all avaliable lines
                     reading_stdout_last_time_resulted_in_exception = False
                 except Empty:
                     reading_stdout_last_time_resulted_in_exception = True
 
                 try:
-                    err_line = q_stderr.get_nowait()
+                    err_line = q_stderr.get_nowait()  # TODO read all avaliable lines
                     reading_stderr_last_time_resulted_in_exception = False
                 except Empty:
                     reading_stderr_last_time_resulted_in_exception = True
 
-                time.sleep(0.01)
+                time.sleep(0.01)  # this is required to not finish too early
 
                 yield (out_line, err_line)
 

ScriptCollection/TasksForCommonProjectStructure.py

@@ -1118,12 +1118,11 @@ class TasksForCommonProjectStructure:
         ca_folder = os.path.join(product_folder, "Other", "Resources", "CA")
         generate_certificate = True
         if os.path.isdir(ca_folder):
-            try:
-                ca_file = [file for file in GeneralUtilities.get_direct_files_of_folder(ca_folder) if file.endswith(".crt")][-1]  # pylint:disable=unused-variable
-                certificate_is_valid = True   # TODO check if certificate is really valid
+            ca_files = [file for file in GeneralUtilities.get_direct_files_of_folder(ca_folder) if file.endswith(".crt")]
+            if len(ca_files) > 0:
+                ca_file = ca_files[-1]  # pylint:disable=unused-variable
+                certificate_is_valid = True  # TODO check if certificate is really valid
                 generate_certificate = not certificate_is_valid
-            except FileNotFoundError:
-                pass
         if generate_certificate:
             self.__sc.generate_certificate_authority(ca_folder, ca_name, "DE", "SubjST", "SubjL", "SubjO", "SubjOU")
         # TODO add switch to auto-install the script if desired
@@ -1178,7 +1177,9 @@ class TasksForCommonProjectStructure:
 
     @GeneralUtilities.check_arguments
     def copy_product_resource_to_codeunit_resource_folder(self, codeunit_folder: str, resourcename: str) -> None:
-        src_folder = GeneralUtilities.resolve_relative_path(f"../Other/Resources/{resourcename}", codeunit_folder)
+        repository_folder = GeneralUtilities.resolve_relative_path(f"..", codeunit_folder)
+        GeneralUtilities.assert_is_git_repository(repository_folder)
+        src_folder = GeneralUtilities.resolve_relative_path(f"Other/Resources/{resourcename}", repository_folder)
         GeneralUtilities.assert_condition(os.path.isdir(src_folder), f"Required product-resource {resourcename} does not exist. Expected folder: {src_folder}")
         trg_folder = GeneralUtilities.resolve_relative_path(f"Other/Resources/{resourcename}", codeunit_folder)
         GeneralUtilities.ensure_directory_does_not_exist(trg_folder)
@@ -1196,6 +1197,7 @@ class TasksForCommonProjectStructure:
 
     @GeneralUtilities.check_arguments
     def get_codeunits(self, repository_folder: str, ignore_disabled_codeunits: bool = True) -> list[str]:
+        GeneralUtilities.assert_is_git_repository(repository_folder)
         result: list[str] = []
         for direct_subfolder in GeneralUtilities.get_direct_folders_of_folder(repository_folder):
             subfoldername = os.path.basename(direct_subfolder)
@@ -1217,6 +1219,7 @@ class TasksForCommonProjectStructure:
     def merge_to_main_branch(self, repository_folder: str, source_branch: str = "other/next-release", target_branch: str = "main", verbosity: int = 1, additional_arguments_file: str = None, fast_forward_source_branch: bool = False) -> None:
         # This is an automatization for automatic merges. Usual this merge would be done by a pull request in a sourcecode-version-control-platform
         # (like GitHub, GitLab or Azure DevOps)
+        GeneralUtilities.assert_is_git_repository(repository_folder)
         self.assert_no_uncommitted_changes(repository_folder)
 
         src_branch_commit_id = self.__sc.git_get_commit_id(repository_folder,  source_branch)
@@ -1243,6 +1246,7 @@ class TasksForCommonProjectStructure:
         self.__sc.git_checkout(build_repository_folder, createRelease_configuration.build_repository_branch)
 
         repository_folder = GeneralUtilities.resolve_relative_path(f"Submodules{os.path.sep}{createRelease_configuration.repository_folder_name}", build_repository_folder)
+        GeneralUtilities.assert_is_git_repository(repository_folder)
         mergeInformation = MergeToStableBranchInformationForProjectInCommonProjectFormat(repository_folder, createRelease_configuration.additional_arguments_file, createRelease_configuration.artifacts_folder)
 
         # TODO check if repository_folder-merge-source-branch and repository_folder-merge-target-branch have different commits
@@ -1634,6 +1638,7 @@ class TasksForCommonProjectStructure:
 
     @GeneralUtilities.check_arguments
     def get_version_of_project(self, repository_folder: str) -> str:
+        GeneralUtilities.assert_is_git_repository(repository_folder)
         return ScriptCollectionCore().get_semver_version_from_gitversion(repository_folder)
 
     @GeneralUtilities.check_arguments
@@ -2367,6 +2372,7 @@ class TasksForCommonProjectStructure:
     def build_codeunits(self, repository_folder: str, verbosity: int = 1, target_environmenttype: str = "QualityCheck", additional_arguments_file: str = None, is_pre_merge: bool = False, export_target_directory: str = None, commandline_arguments: list[str] = [], do_git_clean_when_no_changes: bool = False) -> None:
         self.__check_target_environmenttype(target_environmenttype)
         repository_folder = GeneralUtilities.resolve_relative_path_from_current_working_directory(repository_folder)
+        GeneralUtilities.assert_is_git_repository(repository_folder)
         codeunits = self.get_codeunits(repository_folder, False)
         self.build_specific_codeunits(repository_folder, codeunits, verbosity, target_environmenttype, additional_arguments_file, is_pre_merge, export_target_directory, False, commandline_arguments, do_git_clean_when_no_changes)
 
@@ -2848,9 +2854,12 @@ class TasksForCommonProjectStructure:
         # constants
         folder_of_this_file = os.path.dirname(generic_prepare_new_release_arguments.current_file)
         build_repository_folder = GeneralUtilities.resolve_relative_path("../..", folder_of_this_file)
+        GeneralUtilities.assert_is_git_repository(build_repository_folder)
 
         repository_folder = GeneralUtilities.resolve_relative_path(f"../../Submodules/{generic_prepare_new_release_arguments.product_name}", folder_of_this_file)
-        reference_folder = GeneralUtilities.resolve_relative_path(f"../../Submodules/{generic_prepare_new_release_arguments.product_name}Reference", folder_of_this_file)
+        GeneralUtilities.assert_is_git_repository(repository_folder)
+        reference_folder = repository_folder+"Reference"
+        GeneralUtilities.assert_is_git_repository(reference_folder)
         verbosity: int = TasksForCommonProjectStructure.get_verbosity_from_commandline_arguments(generic_prepare_new_release_arguments.commandline_arguments, 1)
 
         merge_source_branch = "other/next-release"  # TODO make this configurable
@@ -2902,6 +2911,7 @@ class TasksForCommonProjectStructure:
         build_repository_folder = GeneralUtilities.resolve_relative_path("../..", folder_of_this_file)
         repository_folder_name = generic_create_release_arguments.product_name
         repository_folder = GeneralUtilities.resolve_relative_path(f"../../Submodules/{generic_create_release_arguments.product_name}", folder_of_this_file)
+        GeneralUtilities.assert_is_git_repository(repository_folder)
 
         merge_source_branch = "main"  # TODO make this configurable
         main_branch = "stable"  # TODO make this configurable

{ScriptCollection-3.5.44.dist-info → ScriptCollection-3.5.45.dist-info}/METADATA

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

{ScriptCollection-3.5.44.dist-info → ScriptCollection-3.5.45.dist-info}/RECORD

@@ -1,16 +1,16 @@
 ScriptCollection/Executables.py,sha256=ls3wGZpt48YwwtO0QGWWyIImSE87SyzbL-WxhpwQJug,20837
-ScriptCollection/GeneralUtilities.py,sha256=coLosZMy17SzEBwvl7PUooPSFCsW0O3tM6G7iA1YrI0,36870
+ScriptCollection/GeneralUtilities.py,sha256=YLVXHzKfyN3F50SE-xzrz2YHmLtaS70OogWOSjm4mrc,37570
 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=XzduxCnIixxB2Blc4v7-zNYa9R801lsDmt_-vQNZfLs,103654
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=WqkrpofkzX6NXQOu8ewLAxldh3aj0b3nYtUtFRpr_8c,207901
+ScriptCollection/ScriptCollectionCore.py,sha256=5XEZn6gsooKL-d9QlliE7Jp_fjqwNGexTTwmcqNjazU,103764
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=nYGBxOiyIh5Uq-6CbRCb3-eqMIAv7CqZKRKe1uexMcU,208562
 ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.5.44.dist-info/METADATA,sha256=iEXboM0721iM6EEZADkXVy8-uJ-BrqX8Fpwvqw0Y8rI,7665
-ScriptCollection-3.5.44.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ScriptCollection-3.5.44.dist-info/entry_points.txt,sha256=_O7BmQ81LdDfrj5uOhjshg9Xc-tABHQJIxDOyOGRzzI,2397
-ScriptCollection-3.5.44.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.5.44.dist-info/RECORD,,
+ScriptCollection-3.5.45.dist-info/METADATA,sha256=7WsZEeomKvQmqBYteUe5TpZqd8g7PHj690UaIUMTG1k,7665
+ScriptCollection-3.5.45.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ScriptCollection-3.5.45.dist-info/entry_points.txt,sha256=_O7BmQ81LdDfrj5uOhjshg9Xc-tABHQJIxDOyOGRzzI,2397
+ScriptCollection-3.5.45.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.45.dist-info/RECORD,,