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

atomicshop/permissions.py

@@ -1,9 +1,12 @@
 import os
+import sys
 import stat
 import ctypes
 import contextlib
 import subprocess
 
+from .print_api import print_api
+
 
 def is_admin() -> bool:
     """
@@ -25,6 +28,22 @@ def is_admin() -> bool:
     return result
 
 
+def request_sudo_on_ubuntu():
+    """
+    The function tries to request sudo on Ubuntu for the user to enter the password.
+
+    :return:
+    """
+
+    try:
+        # Attempt to re-execute the script using sudo
+        subprocess.check_call(['sudo', 'python3'] + sys.argv)
+    except subprocess.CalledProcessError:
+        # Handle the error in case sudo command fails (e.g., wrong password)
+        print_api("Failed to gain sudo access. Please try again.", color='red')
+        sys.exit(1)
+
+
 def set_executable_permission(file_path: str):
     """
     Function sets the executable permission on a file.

atomicshop/wrappers/dockerw/install_docker.py

@@ -71,6 +71,8 @@ def install_docker_ubuntu():
 
     process.execute_script(script, shell=True)
 
+    subprocess.check_call(['sudo', 'usermod', '-aG', 'docker', '$USER'])
+
     # Verify the installation.
     result: list = process.execute_with_live_output('sudo docker run hello-world')
 

atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py

@@ -3,6 +3,7 @@ from pathlib import Path
 import sys
 
 from .... import permissions, filesystem
+from ....print_api import print_api
 from ... import githubw
 from ...dockerw import install_docker
 from .. import config_install
@@ -20,8 +21,9 @@ def install_before_restart(installation_directory: str, remove_existing_installa
     """
 
     if not permissions.is_admin():
-        print("This script requires root privileges...")
-        sys.exit(0)
+        permissions.request_sudo_on_ubuntu()
+        print_api("This script requires root privileges...", color='red')
+        sys.exit(1)
 
     docker_keyring_file_path: str = "/etc/apt/keyrings/docker.gpg"
     nodesource_keyring_file_path: str = "/etc/apt/keyrings/nodesource.gpg"
@@ -56,3 +58,6 @@ 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()
+
+    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.17.dist-info → atomicshop-2.9.18.dist-info}/METADATA

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

{atomicshop-2.9.17.dist-info → atomicshop-2.9.18.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=5nnfZ4INjh7Td0NcgHF-mbOcPr5rUifepycV_eERZNE,123
+atomicshop/__init__.py,sha256=M9CdUd43TxcAkGoqpVIcLZJ3BXtWLn6o_tWhlRD4vsI,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=GYWxm9niuJWY0pWCnASF34_HiTuvhTamn8BCgcFyVAk,2540
+atomicshop/permissions.py,sha256=tala8vSLhcfZ9sTTrhji8m7c7WFa1XoVuE-s6QbBRDI,3096
 atomicshop/print_api.py,sha256=DhbCQd0MWZZ5GYEk4oTu1opRFC-b31g1VWZgTGewG2Y,11568
 atomicshop/process.py,sha256=SXaqG8pzNkHvppPhuhixEIXSaqbeDlTUFLaS5bYSp54,14176
 atomicshop/process_name_cmd.py,sha256=TNAK6kQZm5JKWzEW6QLqVHEG98ZLNDQiSS4YwDk8V8c,3830
@@ -154,7 +154,7 @@ 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=CHe4W_PB0opIte2h33eFDSgQh-z1vRA5b1aU2hS3Vps,2992
+atomicshop/wrappers/dockerw/install_docker.py,sha256=-lCb8mNVTQBlXaYqDCPlryLpCdHsoUdugoFZN-tCIFY,3068
 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
@@ -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=ylVkGcMj_PfdGsdzBPH3DpA2Vkll175_8k_UKZEsimw,2638
+atomicshop/wrappers/factw/install/pre_install_and_install_before_restart.py,sha256=iLpPnnVyP7wOGgly_JymU5TRtsem_QSHNqZFTGf30eM,2913
 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.17.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.9.17.dist-info/METADATA,sha256=wuIL9MN0dslfKHxhB1vTqQhspcT_StwFu5UffkRlYwM,10423
-atomicshop-2.9.17.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.9.17.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.9.17.dist-info/RECORD,,
+atomicshop-2.9.18.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.9.18.dist-info/METADATA,sha256=0z6bpso-RwK8-9HXDDyuoR9nWCmH3kyBjqeljzn3vmI,10423
+atomicshop-2.9.18.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.9.18.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.9.18.dist-info/RECORD,,