atomicshop 3.2.11__py3-none-any.whl → 3.2.13__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '3.2.11'
+__version__ = '3.2.13'

atomicshop/wrappers/dockerw/install_docker.py

@@ -66,7 +66,7 @@ def install_docker_ubuntu(
         use_docker_installer: bool = True,
         rootless: bool = False,
         add_current_user_to_docker_group_bool: bool = False
-):
+) -> int:
     """
     The function will install docker on ubuntu.
     Note: If you want to install docker in rootless mode, you need to run the script without sudo.
@@ -81,15 +81,17 @@ def install_docker_ubuntu(
         this is not needed.
 
     Usage in main.py (run with sudo):
+        import sys
         from atomicshop.wrappers.dockerw import install_docker
 
 
         def main():
-            install_docker.install_docker_ubuntu()
+            execution_result: int = install_docker.install_docker_ubuntu()
+            return execution_result
 
 
         if __name__ == '__main__':
-            main()
+            sys.exit(main())
     """
 
     if rootless and permissions.is_admin():
@@ -203,8 +205,8 @@ def install_docker_ubuntu(
 
     if 'Hello from Docker!' in '\n'.join(result):
         print_api('Docker installed successfully.', color='green')
-        return True
+        return 0
     else:
         print_api('Docker installation failed.', color='red')
         print_api('Please check the logs above for more information.', color='red')
-        return False
+        return 1

atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py

@@ -17,7 +17,7 @@ def install_before_restart(
         fact_source_archive_path: str = None,
         use_built_in_fact_installer: bool = True,
         print_kwargs: dict = None
-):
+) -> int:
     """
     This function will install the FACT_core before the restart of the computer.
     :param installation_directory: string, the directory to install the FACT_core to.
@@ -35,12 +35,12 @@ def install_before_restart(
         If False, only the regular prerequisites will be installed, while the user will need to install DOCKER
         and Node.js separately.
     :param print_kwargs: dict, the print kwargs for the print_api function.
-    :return:
+    :return: int, 0 if the installation was successful, 1 if there was an error.
     """
 
     # if not permissions.is_admin():
     #     print_api("This script requires root privileges...", color='red')
-    #     sys.exit(1)
+    #     return 1
 
     # # Install docker in rootless mode.
     # with ubuntu_permissions.temporary_regular_permissions():
@@ -89,7 +89,7 @@ def install_before_restart(
         # the user permissions to the docker group before restart.
         if not install_docker.add_current_user_to_docker_group():
             print_api("Docker is installed, but the current user was not added to the docker group.", color='red')
-            sys.exit(1)
+            return 1
     else:
         message = ("You will need to install DOCKER and NODEJS separately.\n"
                    "This was done to enable Rootless docker install and install other version of NodeJS.")
@@ -108,8 +108,13 @@ def install_before_restart(
         #     use_docker_installer=True, rootless=True, add_current_user_to_docker_group_bool=False)
 
         # Install docker in regular mode.
-        install_docker.install_docker_ubuntu(
+        result: int = install_docker.install_docker_ubuntu(
             use_docker_installer=True, rootless=False, add_current_user_to_docker_group_bool=True)
+        if result != 0:
+            print_api("Docker installation failed. Please install Docker manually.", color='red')
+            return result
 
     print_api("FACT_core installation before restart is finished.", color='green')
     print_api("Please restart the computer to continue the installation.", color='red')
+
+    return 0

{atomicshop-3.2.11.dist-info → atomicshop-3.2.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 3.2.11
+Version: 3.2.13
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-3.2.11.dist-info → atomicshop-3.2.13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=uAe2_I-bgd4PsVkPLa-ANJSdckjZL2cytN_g3gJV6m8,123
+atomicshop/__init__.py,sha256=UYDi1DtFvpmGJ2kxBvAeb_fCaEUk-YIU60Fc_p2ADWM,123
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -225,7 +225,7 @@ atomicshop/wrappers/ctyping/msi_windows_installer/extract_msi_main.py,sha256=AEk
 atomicshop/wrappers/ctyping/msi_windows_installer/tables.py,sha256=tHsu0YfBgzuIk9L-PyqLgU_IzyVbCfy8L1EqelNnvWk,17674
 atomicshop/wrappers/dockerw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/dockerw/dockerw.py,sha256=GgPSvXxJj15kZ-LPiaHLl8aekof53sSP_U-vUMUe7_8,10639
-atomicshop/wrappers/dockerw/install_docker.py,sha256=7NTMxCPBesr0QcqB0RZ5YU0I8FDPtNux_mYAX28wI0I,9982
+atomicshop/wrappers/dockerw/install_docker.py,sha256=CeDlxWuOn_bRUhHEnvpgVGGYZgP7B-Q9qNMkDfFiV2E,10073
 atomicshop/wrappers/elasticsearchw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/elasticsearchw/config_basic.py,sha256=fDujtrjEjbWiYh_WQ3OcYp_8mXhXPYeKLy4wSPL5qM0,1177
 atomicshop/wrappers/elasticsearchw/elastic_infra.py,sha256=at0sD-SFtmEvfGyIU_YBEKoU-MNeVtDQSNscPm0JWLc,10368
@@ -248,7 +248,7 @@ atomicshop/wrappers/factw/fact_extractor/docker_image.py,sha256=2FyYjnw8gxFNwISQ
 atomicshop/wrappers/factw/fact_extractor/get_extractor.py,sha256=2mfOAftHIlCcGt1s7MWdq7DsDCuI6wX3MtvcEZ4SK-0,756
 atomicshop/wrappers/factw/install/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/factw/install/install_after_restart.py,sha256=4dHn2XMbYaPJlhRCmZqqwsgHQBlG2mT7aW50pQCPtp4,4345
-atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=GFsO9MTH0czKoxkiPJtjalilUwsmFLBCcx9Znv37S4M,5945
+atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=Xnb1-NGAR-jjzfgkSbJ8JTkGNWb9R4-N36zsLO245n0,6193
 atomicshop/wrappers/factw/postgresql/__init__.py,sha256=xMBn2d3Exo23IPP2F_9-SXmOlhFbwWDgS9KwozSTjA0,162
 atomicshop/wrappers/factw/postgresql/analysis.py,sha256=2Rxzy2jyq3zEKIo53z8VkjuslKE_i5mq2ZpmJAvyd6U,716
 atomicshop/wrappers/factw/postgresql/file_object.py,sha256=VRiCXnsd6yDbnsE-TEKYPC-gkAgFVkE6rygRrJLQShI,713
@@ -337,9 +337,9 @@ atomicshop/wrappers/socketw/statistics_csv.py,sha256=WcNyaqEZ82S5-f3kzqi1nllNT2N
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=Qzmyktvob1qp6Tjk2DjLfAqr_yXV0sgWzdMW_9kwNjY,2345
 atomicshop/wrappers/winregw/winreg_network.py,sha256=ih0BVNwByLvf9F_Lac4EdmDYYJA3PzMvmG0PieDZrsE,9905
-atomicshop-3.2.11.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.2.11.dist-info/METADATA,sha256=5C3bLgLQeg8N_xL7RpKGTnOSU8CEi9MIgciC5B6sXNE,10603
-atomicshop-3.2.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-3.2.11.dist-info/entry_points.txt,sha256=SJEgEP0KoFtfxuGwe5tOzKfXkjR9Dv6YYug33KNYxyY,69
-atomicshop-3.2.11.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.2.11.dist-info/RECORD,,
+atomicshop-3.2.13.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.2.13.dist-info/METADATA,sha256=UbWeoDTbsuOu-nLT0S9r-d0xSWAFC0tnx4iPrPP-SHU,10603
+atomicshop-3.2.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-3.2.13.dist-info/entry_points.txt,sha256=SJEgEP0KoFtfxuGwe5tOzKfXkjR9Dv6YYug33KNYxyY,69
+atomicshop-3.2.13.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.2.13.dist-info/RECORD,,