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

atomicshop/process.py

@@ -8,6 +8,7 @@ import shutil
 from .print_api import print_api
 from .inspect_wrapper import get_target_function_default_args_and_combine_with_current
 from .basics.strings import match_pattern_against_string
+from .wrappers import ubuntu_terminal
 
 if os.name == 'nt':
     from .process_poller import GetProcessList
@@ -211,7 +212,7 @@ def execute_script(
             raise OSError(f'OS not supported: {os.name}')
 
     if as_regular_user:
-        script = f'su {os.getlogin()} -c "/bin/bash {script}"'
+        script = ubuntu_terminal.get_command_execution_as_sudo_executer(script)
         # script = f'sudo -u {os.getlogin()} {script}'
 
     try:

atomicshop/wrappers/dockerw/install_docker.py

@@ -134,16 +134,28 @@ def install_docker_ubuntu(
 
     if rootless:
         # Install uidmap package.
-        ubuntu_terminal.update_system_packages()
-        ubuntu_terminal.install_packages(['uidmap'])
+        if not ubuntu_terminal.is_executable_exists('uidmap'):
+            print_api('uidmap is not installed, installing...', color='yellow')
+            ubuntu_terminal.update_system_packages()
+            ubuntu_terminal.install_packages(['uidmap'])
 
         with permissions.temporary_regular_permissions():
             # After 'get-docker.sh' execution, we will install docker in rootless mode.
             # process.execute_script('dockerd-rootless-setuptool.sh install', shell=True, as_regular_user=True)
-            process.execute_script('/usr/bin/dockerd-rootless-setuptool.sh install', as_regular_user=True, executable=None)
+            process.execute_script(
+                '/usr/bin/dockerd-rootless-setuptool.sh install',
+                as_regular_user=True,
+                shell=True,
+                executable=None)
 
         # Start and enable the docker service in user mode.
-        ubuntu_terminal.start_enable_service_check_availability('docker.service', user_mode=True, sudo=False)
+        docker_start_command = ubuntu_terminal.get_command_execution_as_sudo_executer(
+            'systemctl --user start docker.service')
+        docker_enable_command = ubuntu_terminal.get_command_execution_as_sudo_executer(
+            'systemctl --user enable docker.service')
+        process.execute_script(docker_start_command, shell=True, executable=None)
+        process.execute_script(docker_enable_command, shell=True, executable=None)
+
         input("Press Enter to continue...")
 
         with permissions.temporary_regular_permissions():

atomicshop/wrappers/elasticsearchw/infrastructure.py

@@ -13,11 +13,11 @@ def is_elastic_service_running():
 
 
 def enable_elastic_service():
-    ubuntu_terminal.enable_service(config_basic.UBUNTU_ELASTIC_SERVICE_NAME)
+    ubuntu_terminal.enable_service(config_basic.UBUNTU_ELASTIC_SERVICE_NAME, sudo=True)
 
 
 def start_elastic_service():
-    ubuntu_terminal.start_service(config_basic.UBUNTU_ELASTIC_SERVICE_NAME)
+    ubuntu_terminal.start_service(config_basic.UBUNTU_ELASTIC_SERVICE_NAME, sudo=True)
 
 
 def is_kibana_service_running():
@@ -25,11 +25,11 @@ def is_kibana_service_running():
 
 
 def enable_kibana_service():
-    ubuntu_terminal.enable_service(config_basic.UBUNTU_KIBANA_SERVICE_NAME)
+    ubuntu_terminal.enable_service(config_basic.UBUNTU_KIBANA_SERVICE_NAME, sudo=True)
 
 
 def start_kibana_service():
-    ubuntu_terminal.start_service(config_basic.UBUNTU_KIBANA_SERVICE_NAME)
+    ubuntu_terminal.start_service(config_basic.UBUNTU_KIBANA_SERVICE_NAME, sudo=True)
 
 
 def start_elastic_and_check_service_availability(wait_time_seconds: float = 30, exit_on_error: bool = True):

atomicshop/wrappers/ubuntu_terminal.py

@@ -103,7 +103,7 @@ def is_service_running(service_name: str, user_mode: bool = False, return_false_
         return False
 
 
-def enable_service(service_name: str, sudo: bool = True, user_mode: bool = False):
+def enable_service(service_name: str, sudo: bool = False, user_mode: bool = False):
     """
     Function enables a service.
     :param service_name: str, the service name.
@@ -127,7 +127,7 @@ def enable_service(service_name: str, sudo: bool = True, user_mode: bool = False
     subprocess.check_call(command)
 
 
-def start_service(service_name: str, sudo: bool = True, user_mode: bool = False):
+def start_service(service_name: str, sudo: bool = False, user_mode: bool = False):
     """
     Function starts a service.
     :param service_name: str, the service name.
@@ -226,3 +226,25 @@ def add_path_to_bashrc(as_regular_user: bool = False):
             print("Added $HOME/bin to .bashrc")
         else:
             print("$HOME/bin already in .bashrc")
+
+
+def get_command_execution_as_sudo_executer(command: str) -> str:
+    """
+    Function gets the command execution as the sudo executer.
+    The input command should be without 'sudo', if it will be, it will be omitted.
+    :param command: str, the command to execute.
+    :return: str, the command execution as the sudo executer.
+    """
+
+    if command.startswith('sudo'):
+        if command.startswith('sudo -'):
+            raise ValueError("The command should not start with 'sudo -'.")
+
+        command = command.replace('sudo ', '').strip()
+
+    sudo_executer_username: str = permissions.get_ubuntu_sudo_executer_username()
+
+    if sudo_executer_username:
+        return f'su {sudo_executer_username} -c "/bin/bash {command}"'
+    else:
+        return command

{atomicshop-2.11.20.dist-info → atomicshop-2.11.22.dist-info}/METADATA

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

{atomicshop-2.11.20.dist-info → atomicshop-2.11.22.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=V79fHx0ezrqmMcreL64BopGTi3hRURr5mDw33_dU_Yw,124
+atomicshop/__init__.py,sha256=J9VEZPOpY7bpVVAApDulvQp5NP0oPKwgRo2d7A0Py4w,124
 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
@@ -24,7 +24,7 @@ atomicshop/keyboard_press.py,sha256=1W5kRtOB75fulVx-uF2yarBhW0_IzdI1k73AnvXstk0,
 atomicshop/pbtkmultifile_argparse.py,sha256=aEk8nhvoQVu-xyfZosK3ma17CwIgOjzO1erXXdjwtS4,4574
 atomicshop/permissions.py,sha256=tKIluW-p3ThLh1H3QEFgPFRVzw5hafAHk9QJ5OOT_0M,3047
 atomicshop/print_api.py,sha256=DhbCQd0MWZZ5GYEk4oTu1opRFC-b31g1VWZgTGewG2Y,11568
-atomicshop/process.py,sha256=vBsu1Bc_RQ0zCkz2mQ2GsCCvdEpP4nPdf9OPhrD2-hU,15614
+atomicshop/process.py,sha256=kOLrpUb5T5QN9ZvpGOjXyo7Kivrc14A9gcw9lvNMidI,15670
 atomicshop/process_name_cmd.py,sha256=TNAK6kQZm5JKWzEW6QLqVHEG98ZLNDQiSS4YwDk8V8c,3830
 atomicshop/process_poller.py,sha256=WfmwCLALfTYOq8ri0vkPeqq8ruEyA_43DaN--CU2_XY,10854
 atomicshop/python_file_patcher.py,sha256=kd3rBWvTcosLEk-7TycNdfKW9fZbe161iVwmH4niUo0,5515
@@ -151,7 +151,7 @@ atomicshop/wrappers/olefilew.py,sha256=biD5m58rogifCYmYhJBrAFb9O_Bn_spLek_9HofLe
 atomicshop/wrappers/pipw.py,sha256=iq4pDhmrHqKbcRi3Y6_v2PQSdb4fqfAx79rsX7JEmXo,801
 atomicshop/wrappers/process_wrapper_pbtk.py,sha256=ycPmBRnv627RWks6N8OhxJQe8Gu3h3Vwj-4HswPOw0k,599
 atomicshop/wrappers/pyopensslw.py,sha256=OBWxA6EJ2vU_Qlf4M8m6ilcG3hyYB4yB0EsXUf7NhEU,6804
-atomicshop/wrappers/ubuntu_terminal.py,sha256=zKSp5d8aBLHQwFg2P9zYVEM1g5_zp3ctFUs3O9Vh5Bc,7533
+atomicshop/wrappers/ubuntu_terminal.py,sha256=7CKKO700dM6GR2S_6j9lnYWlk94JudzjloAJkFTsw9U,8324
 atomicshop/wrappers/wslw.py,sha256=AKphiHLSddL7ErevUowr3f9Y1AgGz_R3KZ3NssW07h8,6959
 atomicshop/wrappers/certauthw/certauth.py,sha256=hKedW0DOWlEigSNm8wu4SqHkCQsGJ1tJfH7s4nr3Bk0,12223
 atomicshop/wrappers/certauthw/certauthw.py,sha256=4WvhjANI7Kzqrr_nKmtA8Kf7B6rute_5wfP65gwQrjw,8082
@@ -164,11 +164,11 @@ atomicshop/wrappers/ctyping/msi_windows_installer/extract_msi_main.py,sha256=eyF
 atomicshop/wrappers/ctyping/msi_windows_installer/tables.py,sha256=ajiFiLXl1prg2kOhatfT8E2RKX7F8JjUJpwkVuKu1GY,16263
 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=0K4IokanBOXz5QpZgiysSrwD7ppegqP6S0gL4LoSUrc,7987
+atomicshop/wrappers/dockerw/install_docker.py,sha256=zq94ojAFrrmPX_B1eczxGTMST2x9y6J6Ry9yxHaTmcE,8565
 atomicshop/wrappers/elasticsearchw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/elasticsearchw/config_basic.py,sha256=fDujtrjEjbWiYh_WQ3OcYp_8mXhXPYeKLy4wSPL5qM0,1177
 atomicshop/wrappers/elasticsearchw/elasticsearchw.py,sha256=7TqFdEFznO8NlligJhEKk1vm641ALpCYdaRl1uoXdzM,9768
-atomicshop/wrappers/elasticsearchw/infrastructure.py,sha256=aQZpPNN6mcBR5K5iOX-pLV3GJJhmkj5IqbTwkzKKSYE,10261
+atomicshop/wrappers/elasticsearchw/infrastructure.py,sha256=lhG83BF5uXnbPxOUeNb8vJX1rOffuCnF6uAwJ8mh8Ro,10305
 atomicshop/wrappers/elasticsearchw/install_elastic.py,sha256=IhbapWeq5am-MtmnvKBNBPzvaL338rvfG0rbSpl8azE,8620
 atomicshop/wrappers/elasticsearchw/queries/__init__.py,sha256=KBjT-bAt75CJsx1Apko9mpuFU4pfZV8DcGWQvpX65RU,78
 atomicshop/wrappers/elasticsearchw/queries/aggregation.py,sha256=N9a5yMMnb10sMa_x1qJBFQpgyJ49UWo8_vxuqmUtZ1A,1742
@@ -242,8 +242,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.11.20.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.11.20.dist-info/METADATA,sha256=njGzCvxerN2aR2967GNSs37Qn0VW9S1pe8JPUl8hmgQ,10448
-atomicshop-2.11.20.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.11.20.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.11.20.dist-info/RECORD,,
+atomicshop-2.11.22.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.11.22.dist-info/METADATA,sha256=3-5riYcQBh8JJ66yZWuB3Zb0PepN5aGqmJjLjRkV8q4,10448
+atomicshop-2.11.22.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.11.22.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.11.22.dist-info/RECORD,,