addftool 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

addftool/addf_portal.py

@@ -1,5 +1,7 @@
 import argparse
 from addftool.process import add_killer_args, killer_main
+from addftool.sync import add_sync_args, sync_main
+from addftool.deploy import add_deploy_args, deploy_main
 
 
 def get_args():
@@ -7,6 +9,8 @@ def get_args():
 
     subparsers = parser.add_subparsers(dest='command', help='Sub-command help')
     add_killer_args(subparsers)
+    add_sync_args(subparsers)
+    add_deploy_args(subparsers)
 
     return parser.parse_args()
 
@@ -15,6 +19,10 @@ def main():
     args = get_args()
     if args.command == "kill":
         killer_main(args)
+    elif args.command == "sync":
+        sync_main(args)
+    elif args.command == "deploy":
+        deploy_main(args)
     else:
         print("Unknown command: ", args.command)
 

addftool/process/__init__.py

@@ -52,6 +52,7 @@ def kill_process(processes, timeout=5, try_count=3):
         if all_terminated:
             print("All processes terminated")
             break
+        time.sleep(timeout)
     
     if not all_terminated:
         print("Some processes are still running. Please check manually.")

addftool/util.py

@@ -1,12 +1,75 @@
+import os
 import subprocess
 
 
-def execute_command(command, to_file=None):
+def execute_command(command, to_file=None, only_stdout=True, hide=False):
     if to_file is not None:
         to_file.write(command + "\n")
         return None
     else:
-        print("Execute command: ", command)
-        result = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE).stdout.read().decode()
-        print("Result: ", result)
-        return result
+        if not hide:
+            print("Execute command: ", command)
+        result = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
+        result.wait()
+        print(f"Return code: {result.returncode}")
+        if result.stdout is not None:
+            stdout = result.stdout.read().decode()
+            print(f"Stdout: {stdout}")
+        else:
+            stdout = None
+        if only_stdout:
+            if not hide and stdout is not None:
+                print(stdout)
+            return stdout
+        if result.stderr is not None:
+            stderr = result.stderr.read().decode()
+            print(f"Stderr: {stderr}")
+        else:
+            stderr = None
+
+        return {'stdout': stdout, 'stderr': stderr, 'returncode': result.returncode}
+
+
+def need_sudo():
+    return os.name == 'posix' and os.getuid() != 0
+
+
+def is_running_in_docker():
+    return os.path.exists('/.dockerenv') or \
+           any('docker' in line for line in open('/proc/self/cgroup', 'r')) if os.path.exists('/proc/self/cgroup') else False or \
+           os.environ.get('container') == 'docker' or \
+           os.environ.get('DOCKER') == 'true' or \
+           os.environ.get('DOCKER_CONTAINER') == 'yes'
+
+
+def get_ubuntu_version():  
+    with open("/etc/os-release") as f:
+        for line in f:
+            if line.startswith("VERSION_ID="):
+                version = line.split("=")[1].strip().strip('"')
+                return version
+    return "22.04"
+
+
+def check_package_installed(package):
+    command = f"dpkg -l | grep {package}"
+    result = execute_command(command)
+    if result is not None and package in result:
+        return True
+    return False
+
+
+def install_packages(package_list):
+    to_install = []
+    for package in package_list:
+        if check_package_installed(package):
+            print(f"{package} is already installed")
+            continue
+        to_install.append(package)
+    
+    if len(to_install) > 0:
+        packages = " ".join(to_install)
+        command = f"apt-get install -y {packages}"
+        if need_sudo():
+            command = "sudo " + command
+        execute_command(command)

{addftool-0.1.5.dist-info → addftool-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: addftool
-Version: 0.1.5
+Version: 0.1.6
 Requires-Dist: cryptography
 Requires-Dist: requests
 Requires-Dist: PyYAML

{addftool-0.1.5.dist-info → addftool-0.1.6.dist-info}/RECORD

@@ -1,17 +1,17 @@
 addftool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-addftool/addf_portal.py,sha256=U52TdNcwWOEvv_C5r-guWYxn3ntzwYI2eBzJIE7IdcY,493
+addftool/addf_portal.py,sha256=w2LgsoutfnrKhtrQAXouUMwLqnsp5ALlsBYUWg8n9NM,781
 addftool/blob.py,sha256=NZOItDyFUIdV1tfhJZJJBEzGy296CE5NCictTzP4OPc,8282
 addftool/tool.py,sha256=EuKQ2t2InN7yB-_oYLcdsA7vRqzRGTunwIxplUSqEG0,2054
-addftool/util.py,sha256=Q3A68vJDxgfeNiEFmk54HuMuworVndocXpSbVpvGMfc,362
+addftool/util.py,sha256=zlNLu8Be8cGIpNRqBw8_0q7nFxWlsJ9cToN62ohjdXE,2335
 addftool/deploy/__init__.py,sha256=tpyoTh3SqAQojPizsJDvQohu1Pcb3-w-DP5sO4-5lBM,1220
 addftool/deploy/azure.py,sha256=UQR1hOEYUtsm2fbWBczsnEB_mh7yUuN2NDv3sgMMsac,1246
 addftool/deploy/ssh_server.py,sha256=f2T8fgwACVljPfdcimMywUjsFnLCWRde7iWPAILpRz8,5463
-addftool/process/__init__.py,sha256=OB-cZXP1jK7l8uN8nKfhg_bCX6Slz6DeeBpEodt-IK4,3515
+addftool/process/__init__.py,sha256=gPdGsjMEET6crzOz4Iw5cmf6RR1toXGovydRXv8Uagk,3543
 addftool/process/utils.py,sha256=me4HqMz5OgRcQMUJmVhKdTJh4SW5BB-pd_lq7g8-UwE,2252
 addftool/ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 addftool/sync/__init__.py,sha256=wOqFCOA51rFUttBjOO44W3Fc66mhX5ir2R89lsO6gR0,1702
-addftool-0.1.5.dist-info/METADATA,sha256=8fCVZ1r4rS685bprhRuQE5Le7MV3gu8dbNRkvFfo05w,148
-addftool-0.1.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-addftool-0.1.5.dist-info/entry_points.txt,sha256=9lkmuWMInwUAtev8w8poNkNd7iML9Bjd5CBCFVxg2b8,111
-addftool-0.1.5.dist-info/top_level.txt,sha256=jqj56-plrBbyzY0tIxB6wPzjAA8kte4hUlajyyQygN4,9
-addftool-0.1.5.dist-info/RECORD,,
+addftool-0.1.6.dist-info/METADATA,sha256=SQSnBFDxmD836XQAgZDtqvpzT_Z1LewNKTRCfdMC5ag,148
+addftool-0.1.6.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+addftool-0.1.6.dist-info/entry_points.txt,sha256=9lkmuWMInwUAtev8w8poNkNd7iML9Bjd5CBCFVxg2b8,111
+addftool-0.1.6.dist-info/top_level.txt,sha256=jqj56-plrBbyzY0tIxB6wPzjAA8kte4hUlajyyQygN4,9
+addftool-0.1.6.dist-info/RECORD,,