atomicshop 2.9.27__py3-none-any.whl → 2.9.29__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__ = '2.9.27'
+__version__ = '2.9.29'

atomicshop/permissions.py

@@ -29,6 +29,18 @@ def is_admin() -> bool:
     return result
 
 
+def get_ubuntu_sudo_executer_username() -> str:
+    """
+    Function gets the username of the user who executed the script with sudo.
+    :return: str, username.
+    """
+
+    if 'SUDO_USER' in os.environ:
+        return os.environ['SUDO_USER']
+    else:
+        return ''
+
+
 def set_executable_permission(file_path: str):
     """
     Function sets the executable permission on a file.

atomicshop/wrappers/dockerw/install_docker.py

@@ -1,7 +1,7 @@
 import subprocess
 import getpass
 
-from ... import process, filesystem
+from ... import process, filesystem, permissions
 from ...print_api import print_api
 
 
@@ -28,9 +28,40 @@ def is_docker_installed():
         return False
 
 
-def install_docker_ubuntu():
+def add_current_user_to_docker_group(print_kwargs: dict = None):
+    """
+    The function will add the current user to the docker group.
+
+    :param print_kwargs: dict, the print arguments.
+    :return:
+    """
+    # Check if current user that executed the script is a sudo user. If not, use the current user.
+    sudo_executer_username: str = permissions.get_ubuntu_sudo_executer_username()
+    if sudo_executer_username:
+        current_user = sudo_executer_username
+    else:
+        current_user = getpass.getuser()
+
+    # Add the current user to the docker group.
+    # subprocess.check_call(['sudo', 'usermod', '-aG', 'docker', current_user])
+    command = f"sudo usermod -aG docker {current_user}"
+    # Execute the command
+    subprocess.run(command, shell=True, capture_output=True, text=True)
+
+    # Check if the user was added to the docker group.
+    result = subprocess.run(['groups'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+    if 'docker' in result.stdout:
+        print_api(f"User {current_user} was added to the docker group.", color='green', **(print_kwargs or {}))
+        return True
+    else:
+        print_api(f"User {current_user} was not added to the docker group.", color='red', **(print_kwargs or {}))
+        return False
+
+
+def install_docker_ubuntu(add_current_user_to_docker_group_bool: bool = True):
     """
     The function will install docker on ubuntu.
+    :param add_current_user_to_docker_group_bool: bool, if True, the current user will be added to the docker group.
 
     Usage in main.py (run with sudo):
         from atomicshop.wrappers.dockerw import install_docker
@@ -67,17 +98,15 @@ def install_docker_ubuntu():
     # sudo docker run hello-world
     
     # Add Privileges to run docker without sudo. Add current user to Docker superuser group.
-    sudo usermod -aG docker $USER
+    # sudo usermod -aG docker $USER
     """
 
     process.execute_script(script, shell=True)
 
-    # Add the current user to the docker group.
-    current_user: str = getpass.getuser()
-    # subprocess.check_call(['sudo', 'usermod', '-aG', 'docker', current_user])
-    command = f"sudo usermod -aG docker {current_user}"
-    # Execute the command
-    subprocess.run(command, shell=True, capture_output=True, text=True)
+    if add_current_user_to_docker_group_bool:
+        # Check if current user that executed the script is a sudo user. If not, use the current user.
+        # Add the current user to the docker group.
+        add_current_user_to_docker_group()
 
     # Verify the installation.
     result: list = process.execute_with_live_output('sudo docker run hello-world')

atomicshop/wrappers/elasticsearchw/install_elastic.py

@@ -1,7 +1,7 @@
 import sys
 
 from ...print_api import print_api
-from ... import process
+from ... import process, permissions
 from .. import ubuntu_terminal
 from . import config_basic, infrastructure
 
@@ -196,6 +196,10 @@ def install_elastic_kibana_ubuntu(install_elastic: bool = True, install_kibana:
         # Install Elasticsearch.
         ubuntu_terminal.install_packages([config_basic.UBUNTU_ELASTIC_PACKAGE_NAME])
 
+        if not permissions.is_admin():
+            print_api("This script requires root privileges...", color='red')
+            sys.exit(1)
+            
         # Check if the configuration file exists.
         infrastructure.is_elastic_config_file_exists(exit_on_error=True, output_message=True)
 

atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py

@@ -4,7 +4,7 @@ import sys
 
 from .... import permissions, filesystem
 from ....print_api import print_api
-from ... import githubw
+from ... import githubw, ubuntu_terminal
 from ...dockerw import install_docker
 from .. import config_install
 
@@ -22,7 +22,7 @@ def install_before_restart(installation_directory: str, remove_existing_installa
 
     if not permissions.is_admin():
         print_api("This script requires root privileges...", color='red')
-        sys.exit(1)
+        ubuntu_terminal.update_system_packages()
 
     docker_keyring_file_path: str = "/etc/apt/keyrings/docker.gpg"
     nodesource_keyring_file_path: str = "/etc/apt/keyrings/nodesource.gpg"
@@ -56,7 +56,9 @@ def install_before_restart(installation_directory: str, remove_existing_installa
 
     # Install docker. FACT installs the docker, but there can be a problem with permissions, so we need to add
     # the user permissions to the docker group before restart.
-    install_docker.install_docker_ubuntu()
+    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)
 
     print_api("FACT_core installation before restart is finished.", color='green')
     print_api("Please restart the computer to continue the installation.", color='red')

{atomicshop-2.9.27.dist-info → atomicshop-2.9.29.dist-info}/METADATA

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

{atomicshop-2.9.27.dist-info → atomicshop-2.9.29.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=eixw0W8CpRsTZbQy0ScgUPUrQ7rug49PmAaiXOic24Q,123
+atomicshop/__init__.py,sha256=RAQCwmncU0o_AWH7w8Apgd9_IIDDk-vUclliLZt1h6c,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
@@ -22,7 +22,7 @@ atomicshop/inspect_wrapper.py,sha256=sGRVQhrJovNygHTydqJj0hxES-aB2Eg9KbIk3G31apw
 atomicshop/ip_addresses.py,sha256=Hvi4TumEFoTEpKWaq5WNF-YzcRzt24IxmNgv-Mgax1s,1190
 atomicshop/keyboard_press.py,sha256=1W5kRtOB75fulVx-uF2yarBhW0_IzdI1k73AnvXstk0,452
 atomicshop/pbtkmultifile_argparse.py,sha256=aEk8nhvoQVu-xyfZosK3ma17CwIgOjzO1erXXdjwtS4,4574
-atomicshop/permissions.py,sha256=An48413FO1RzvcKa_62rNxcw8RQY411O9Zdm_wNAI9s,2611
+atomicshop/permissions.py,sha256=y63kcxU6GAmnVXqWhs_N29XorOD2xYWlK_CjZ1PpHgA,2897
 atomicshop/print_api.py,sha256=DhbCQd0MWZZ5GYEk4oTu1opRFC-b31g1VWZgTGewG2Y,11568
 atomicshop/process.py,sha256=SXaqG8pzNkHvppPhuhixEIXSaqbeDlTUFLaS5bYSp54,14176
 atomicshop/process_name_cmd.py,sha256=TNAK6kQZm5JKWzEW6QLqVHEG98ZLNDQiSS4YwDk8V8c,3830
@@ -154,12 +154,12 @@ atomicshop/wrappers/certauthw/certauthw.py,sha256=4WvhjANI7Kzqrr_nKmtA8Kf7B6rute
 atomicshop/wrappers/ctyping/process_winapi.py,sha256=QcXL-ETtlSSkoT8F7pYle97ubGWsjYp8cx8HxkVMgAc,2762
 atomicshop/wrappers/dockerw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/dockerw/dockerw.py,sha256=w8zSJr5C7cbvbuG09ORCpAe0BOcibqqL_Z2EKEBHYK4,6266
-atomicshop/wrappers/dockerw/install_docker.py,sha256=qlHrzRi_N5VuXpiCQqVQGbMOMV0GaDe5GB0tdyB4Jfg,3340
+atomicshop/wrappers/dockerw/install_docker.py,sha256=2dC1yccpOTqYbQK8t4HfzHmu5IvjAnUoqpzd21438xU,4742
 atomicshop/wrappers/elasticsearchw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/elasticsearchw/config_basic.py,sha256=XJMKKfDrUq9ZKxYnQ-xFJxSA51z31Nn4eB8_n_hryVk,800
 atomicshop/wrappers/elasticsearchw/elasticsearchw.py,sha256=7TqFdEFznO8NlligJhEKk1vm641ALpCYdaRl1uoXdzM,9768
 atomicshop/wrappers/elasticsearchw/infrastructure.py,sha256=J1hKIEQA8ImRUmkM25fbmwHbZPC9VnT9NK1_kOfXitA,8311
-atomicshop/wrappers/elasticsearchw/install_elastic.py,sha256=Lez_Tt21Jlprz7EaRZlppzbpTkYerWkkHd9cfIwcyy8,8308
+atomicshop/wrappers/elasticsearchw/install_elastic.py,sha256=3mxtNx8IXOC1sVu6xL-4N7kcd71x7LUu6tm1bz-hpTA,8479
 atomicshop/wrappers/elasticsearchw/queries/__init__.py,sha256=KBjT-bAt75CJsx1Apko9mpuFU4pfZV8DcGWQvpX65RU,78
 atomicshop/wrappers/elasticsearchw/queries/aggregation.py,sha256=N9a5yMMnb10sMa_x1qJBFQpgyJ49UWo8_vxuqmUtZ1A,1742
 atomicshop/wrappers/elasticsearchw/queries/info.py,sha256=P_VhhBo8MvRI4Shi-bh4RsYtlYNRKRBzScXPC64Up_Q,2900
@@ -177,7 +177,7 @@ atomicshop/wrappers/factw/fact_extractor/docker_image.py,sha256=jJAoJNQ4aoATjn3x
 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=roM1W2hkDynpEKda55xd7AsZxodsFj8i4wmFGt_HHzA,1558
-atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=AC5DxxNhJGHIb2GCIL76OCk0HJXOGUOx90wIBgRJjT8,2867
+atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=WyMlj9V3YAd2h0ymznJAKDHOx_F7_fipAmbVzsG_fak,3065
 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
@@ -230,8 +230,8 @@ atomicshop/wrappers/socketw/socket_server_tester.py,sha256=AhpurHJmP2kgzHaUbq5ey
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=aXBwlEIJhFT0-c4i8iNlFx2It9VpCEpsv--5Oqcpxao,11624
 atomicshop/wrappers/socketw/ssl_base.py,sha256=k4V3gwkbq10MvOH4btU4onLX2GNOsSfUAdcHmL1rpVE,2274
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=t3dtDEfN47CfYVi0CW6Kc2QHTEeZVyYhc57IYYh5nmA,826
-atomicshop-2.9.27.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.9.27.dist-info/METADATA,sha256=X7DQvvPnKUlo-lci9eIi2QGsFZNhWAG1-_TrO9Os4uw,10423
-atomicshop-2.9.27.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.9.27.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.9.27.dist-info/RECORD,,
+atomicshop-2.9.29.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.9.29.dist-info/METADATA,sha256=X6u20qhtlgrm_5xuM8uzH7sLn_d5uJgOQ95qOrmJtX8,10423
+atomicshop-2.9.29.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.9.29.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.9.29.dist-info/RECORD,,