machineconfig 2.7__py3-none-any.whl → 2.9__py3-none-any.whl

machineconfig/jobs/python/check_installations.py

@@ -11,8 +11,6 @@ import platform
 # # from rich.progress import track
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT
 # from machineconfig.utils.installer import get_installed_cli_apps
-
-# from tqdm import tqdm
 # from typing import Optional
 # from datetime import datetime
 # import csv

machineconfig/jobs/python/python_ve_symlink.py

@@ -22,7 +22,7 @@ def main():
 🎯 Target: {target}
 {"=" * 150}
 """)
-    return "echo '🔗 Finished creating symlink.'"
+    print('🔗 Finished creating symlink.')
 
 
 if __name__ == "__main__":

machineconfig/scripts/python/devops.py

@@ -2,13 +2,11 @@
 
 from machineconfig.utils.options import display_options
 
-from machineconfig.utils.code import write_shell_script_to_default_program_path
 from platform import system
 from enum import Enum
 from typing import Optional
 from rich.console import Console
 from rich.panel import Panel
-from rich import box  # Import box
 
 console = Console()
 
@@ -31,11 +29,8 @@ class Options(Enum):
 
 
 def args_parser():
-    # Print header
     console.print(Panel("🛠️  DevOps Tool Suite", title_align="left", border_style="blue", width=BOX_WIDTH))
-
     import argparse
-
     parser = argparse.ArgumentParser()
     new_line = "\n\n"
     parser.add_argument("-w", "--which", help=f"""which option to run\nChoose one of those:\n{new_line.join([f"{item.name}: {item.value}" for item in list(Options)])}""", type=str, default=None)  # , choices=[op.value for op in Options]
@@ -43,36 +38,8 @@ def args_parser():
     main(which=args.which)
 
 
-def display_title(title: str) -> None:
-    console.print(Panel(title, box=box.DOUBLE_EDGE, title_align="left"))  # Replace print with Panel
-
-
-def display_task_title(title: str) -> None:
-    console.print(Panel(title, box=box.ROUNDED, title_align="left"))  # Replace print with Panel
-
-
-def display_task_status(status: str) -> None:
-    console.print(Panel(status, box=box.ROUNDED, title_align="left"))  # Replace print with Panel
-
-
-def display_task_result(result: str) -> None:
-    console.print(Panel(result, box=box.ROUNDED, title_align="left"))  # Replace print with Panel
-
-
-def display_task_error(error: str) -> None:
-    console.print(Panel(error, box=box.ROUNDED, border_style="red", title_align="left"))  # Replace print with Panel
-
-
-def display_task_warning(warning: str) -> None:
-    console.print(Panel(warning, box=box.ROUNDED, border_style="yellow", title_align="left"))  # Replace print with Panel
-
-
-def display_task_success(success: str) -> None:
-    console.print(Panel(success, box=box.ROUNDED, border_style="green", title_align="left"))  # Replace print with Panel
-
-
 def main(which: Optional[str] = None):
-    # PathExtended(PROGRAM_PATH).delete(sure=True, verbose=False)
+    # PathExtended(_program_PATH).delete(sure=True, verbose=False)
     console.print(Panel("🚀 Initializing DevOps operation...", width=BOX_WIDTH, border_style="blue"))
     options = [op.value for op in Options]
     if which is None:
@@ -89,31 +56,27 @@ def main(which: Optional[str] = None):
     if choice_key == Options.update.value:
         console.print(Panel("🔄 Updating essential repositories...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.scripts.python.devops_update_repos as helper
-        program = helper.main()
+        helper.main()
     elif choice_key == Options.cli_install.value:
         console.print(Panel("⚙️  Installing development applications...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.scripts.python.devops_devapps_install as helper
-
-        program = helper.main()
+        helper.main()
 
     elif choice_key == Options.sym_new.value:
         console.print(Panel("🔄 Creating new symlinks...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.jobs.python.python_ve_symlink as helper
-
-        program = helper.main()
+        helper.main()
 
     elif choice_key == Options.sym_path_shell.value:
         console.print(Panel("🔗 Setting up symlinks, PATH, and shell profile...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.profile.create as helper
-
         helper.main()
-        program = "echo '✅ done with symlinks'"
+        "echo '✅ done with symlinks'"
 
     elif choice_key == Options.ssh_add_pubkey.value:
         console.print(Panel("🔑 Adding public SSH key to this machine...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.scripts.python.devops_add_ssh_key as helper
-
-        program = helper.main()
+        helper.main()
 
     elif choice_key == Options.ssh_use_pair.value:
         console.print(Panel("❌ ERROR: Not Implemented\nSSH key pair connection feature is not yet implemented", title_align="left", border_style="red", width=BOX_WIDTH))
@@ -122,47 +85,38 @@ def main(which: Optional[str] = None):
     elif choice_key == Options.ssh_add_id.value:  # so that you can SSH directly withuot pointing to identity key.
         console.print(Panel("🗝️  Adding SSH identity (private key) to this machine...", width=BOX_WIDTH, border_style="blue"))
         import machineconfig.scripts.python.devops_add_identity as helper
-
-        program = helper.main()
+        helper.main()
 
     elif choice_key == Options.ssh_setup.value:
         console.print(Panel("📡 Setting up SSH...", width=BOX_WIDTH, border_style="blue"))
-        program_windows = """Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/openssh_all.ps1 | Invoke-Expression  # https://github.com/thisismygitrepo.keys"""
-        program_linux = """curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_all.sh | sudo bash  # https://github.com/thisismygitrepo.keys"""
-        program = program_linux if system() == "Linux" else program_windows
+        _program_windows = """Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/openssh_all.ps1 | Invoke-Expression  # https://github.com/thisismygitrepo.keys"""
+        _program_linux = """curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_all.sh | sudo bash  # https://github.com/thisismygitrepo.keys"""
+        _program_linux if system() == "Linux" else _program_windows
+        import subprocess
+        subprocess.run(_program_linux if system() == "Linux" else _program_windows, shell=True, check=True)
 
     elif choice_key == Options.ssh_setup_wsl.value:
         console.print(Panel("🐧 Setting up SSH for WSL...", width=BOX_WIDTH, border_style="blue"))
-        program = """curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_wsl.sh | sudo bash"""
+        """curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_wsl.sh | sudo bash"""
 
     elif choice_key == Options.backup.value:
         console.print(Panel("💾 Creating backup...", width=BOX_WIDTH, border_style="blue"))
-        from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve as helper
-
-        program = helper(direction="BACKUP")
+        from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve
+        main_backup_retrieve(direction="BACKUP")
 
     elif choice_key == Options.retreive.value:
         console.print(Panel("📥 Retrieving backup...", width=BOX_WIDTH, border_style="blue"))
-        from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve as helper
-
-        program = helper(direction="RETRIEVE")
+        from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve
+        main_backup_retrieve(direction="RETRIEVE")
 
     elif choice_key == Options.scheduler.value:
         console.print(Panel("⏰ Setting up scheduler...", width=BOX_WIDTH, border_style="blue"))
         # from machineconfig.scripts.python.scheduler import main as helper
-        # program = helper()
-        program = ""
+        # helper()
 
     else:
         console.print(Panel("❌ ERROR: Invalid choice", title_align="left", border_style="red", width=BOX_WIDTH))
         raise ValueError(f"Unimplemented choice: {choice_key}")
 
-    if program:
-        console.print(Panel("📜 Preparing shell script...", width=BOX_WIDTH, border_style="blue"))
-        write_shell_script_to_default_program_path(program=program, display=True, preserve_cwd=True, desc="🔧 Shell script prepared by Python.", execute=True if which is not None else False)
-    else:
-        write_shell_script_to_default_program_path(program="echo '✨ Done.'", display=False, desc="🔧 Shell script prepared by Python.", preserve_cwd=True, execute=False)
-
-
 if __name__ == "__main__":
     args_parser()

machineconfig/scripts/python/devops_add_identity.py

@@ -9,7 +9,7 @@ from rich.text import Text
 BOX_WIDTH = 150  # width for box drawing
 
 
-def main():
+def main() -> None:
     title = "🔑 SSH IDENTITY MANAGEMENT"
     print(Panel(Text(title, justify="center"), expand=False))
 
@@ -77,7 +77,11 @@ def main():
     success_message = f"🎉 CONFIGURATION SUCCESSFUL\nIdentity added: {path_to_key.name}\nConfig file: {config_path}"
     print(Panel(Text(success_message, justify="center"), expand=False, border_style="green"))
 
-    return program
+    import subprocess
+    # run program
+    subprocess.run(program, shell=True, check=True, text=True)
+    print(Panel("🔐 Identity added to SSH agent", expand=False, border_style="green"))
+    return None
 
 
 if __name__ == "__main__":

machineconfig/scripts/python/devops_add_ssh_key.py

@@ -68,7 +68,7 @@ sudo service ssh --full-restart
     return program
 
 
-def main():
+def main() -> None:
     console.print(Panel("🔐 SSH PUBLIC KEY AUTHORIZATION TOOL", box=box.DOUBLE_EDGE, title_align="left"))
 
     console.print(Panel("🔍 Searching for public keys...", title="[bold blue]SSH Setup[/bold blue]", border_style="blue"))
@@ -111,7 +111,10 @@ def main():
 
     console.print(Panel("🚀 SSH KEY AUTHORIZATION READY\nRun the generated script to apply changes", box=box.DOUBLE_EDGE, title_align="left"))
 
-    return program
+    # return program
+    import subprocess
+    subprocess.run(program, shell=True, check=True)
+    console.print(Panel("✅ SSH KEY AUTHORIZATION COMPLETED", box=box.DOUBLE_EDGE, title_align="left"))
 
 
 if __name__ == "__main__":

machineconfig/scripts/python/devops_backup_retrieve.py

@@ -16,7 +16,7 @@ from rich.panel import Panel
 OPTIONS = Literal["BACKUP", "RETRIEVE"]
 
 
-def main_backup_retrieve(direction: OPTIONS, which: Optional[str] = None):
+def main_backup_retrieve(direction: OPTIONS, which: Optional[str] = None) -> None:
     console = Console()
 
     try:
@@ -73,20 +73,8 @@ def main_backup_retrieve(direction: OPTIONS, which: Optional[str] = None):
             console.print(Panel("🔒 SPECIAL HANDLING: SSH PERMISSIONS\n🛠️  Setting secure permissions for SSH files\n📝 Command: chmod 700 ~/.ssh/*", title="[bold blue]Special Handling: SSH Permissions[/bold blue]", border_style="blue"))
     print_code(program, lexer="shell", desc=f"{direction} script")
     console.print(Panel(f"✅ {direction} SCRIPT GENERATION COMPLETE\n🚀 Ready to execute the operations", title="[bold green]Script Generation Complete[/bold green]", border_style="green"))
-    return program
-
-
-def main(direction: OPTIONS, which: Optional[str] = None):
-    console = Console()
-
-    console.print(Panel(f"🔄 {direction} OPERATION STARTED\n⏱️  {'-' * 58}", title="[bold blue]Operation Initiated[/bold blue]", border_style="blue"))
-
-    code = main_backup_retrieve(direction=direction, which=which)
-    from machineconfig.utils.code import write_shell_script_to_default_program_path
-
-    console.print(Panel("💾 GENERATING SHELL SCRIPT\n📄 Filename: backup_retrieve.sh", title="[bold blue]Shell Script Generation[/bold blue]", border_style="blue"))
-
-    write_shell_script_to_default_program_path(program=code, desc="backup_retrieve.sh", preserve_cwd=True, display=True, execute=False)
+    import subprocess
+    subprocess.run(program, shell=True, check=True)
 
 
 if __name__ == "__main__":

machineconfig/scripts/python/devops_devapps_install.py

@@ -2,7 +2,7 @@
 
 # import subprocess
 from machineconfig.utils.installer_utils.installer_class import Installer
-from tqdm import tqdm
+from rich.progress import Progress, SpinnerColumn, TextColumn
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT
 from machineconfig.utils.options import choose_multiple_options
 from machineconfig.utils.installer import get_installers, install_all, get_all_dicts
@@ -13,12 +13,12 @@ from typing import Any, Optional, Literal, TypeAlias, get_args
 WHICH_CAT: TypeAlias = Literal["AllEssentials", "EssentialsAndOthers", "SystemInstallers", "PrecheckedCloudInstaller"]
 
 
-def main(which: Optional[WHICH_CAT | str] = None):
+def main(which: Optional[WHICH_CAT | str] = None) -> None:
     if which is not None and which in get_args(WHICH_CAT):  # install by category
         return get_programs_by_category(program_name=which)  # type: ignore
 
     if which is not None:  # install by name
-        program_total = ""
+        total_messages: list[str] = []
         for a_which in which.split(",") if type(which) == str else which:
             kv = {}
             for _category, v in get_all_dicts(system=system()).items():
@@ -32,13 +32,26 @@ def main(which: Optional[WHICH_CAT | str] = None):
             installer = Installer.from_dict(name=a_which, d=kv[a_which])
             print(installer)
             program = installer.install_robust(version=None)  # finish the task
-            program = "echo 'Finished Installation'"  # write an empty program
-            program_total += "\n" + program
-        return program_total
+            total_messages.append(program)
+        for a_message in total_messages:
+            print(a_message)
+        return None
 
     # interactive installation
     installers = [Installer.from_dict(d=vd, name=name) for __kat, vds in get_all_dicts(system=system()).items() for name, vd in vds.items()]
-    options = [x.get_description() for x in tqdm(installers, desc="✅ Checking installed programs")] + list(get_args(WHICH_CAT))
+    
+    # Check installed programs with progress indicator
+    with Progress(
+        SpinnerColumn(),
+        TextColumn("[progress.description]{task.description}"),
+    ) as progress:
+        task = progress.add_task("✅ Checking installed programs...", total=len(installers))
+        options = []
+        for x in installers:
+            options.append(x.get_description())
+            progress.update(task, advance=1)
+    
+    options += list(get_args(WHICH_CAT))
     # print("s"*1000)
     program_names = choose_multiple_options(msg="", options=options, header="🚀 CHOOSE DEV APP", default="AllEssentials")
 
@@ -53,7 +66,8 @@ def main(which: Optional[WHICH_CAT | str] = None):
         else:
             an_installer = installers[options.index(a_program_name)]
             total_program += "\n" + an_installer.install_robust(version=None)  # finish the task
-    return total_program
+    import subprocess
+    subprocess.run(total_program, shell=True, check=True)
 
 
 def get_programs_by_category(program_name: WHICH_CAT):