machineconfig 2.0__py3-none-any.whl → 2.2__py3-none-any.whl

machineconfig/scripts/python/devops.py

@@ -1,13 +1,14 @@
-"""devops with emojis
-"""
+"""devops with emojis"""
 
-from machineconfig.utils.utils import display_options, PROGRAM_PATH, write_shell_script_to_default_program_path
+from machineconfig.utils.options import display_options
+from machineconfig.utils.source_of_truth import PROGRAM_PATH
+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
+from rich import box  # Import box
 
 console = Console()
 
@@ -15,19 +16,19 @@ BOX_WIDTH = 150  # width for box drawing
 
 
 class Options(Enum):
-    update         = '🔄 UPDATE essential repos'
-    cli_install    = '⚙️ DEVAPPS install'
-    sym_path_shell = '🔗 SYMLINKS, PATH & SHELL PROFILE'
-    sym_new        = '🆕 SYMLINKS new'
-    ssh_add_pubkey = '🔑 SSH add pub key to this machine'
-    ssh_add_id     = '🗝️ SSH add identity (private key) to this machine'
-    ssh_use_pair   = '🔐 SSH use key pair to connect two machines'
-    ssh_setup      = '📡 SSH setup'
-    ssh_setup_wsl  = '🐧 SSH setup wsl'
-    dot_files_sync = '🔗 DOTFILES sync'
-    backup         = '💾 BACKUP'
-    retreive       = '📥 RETRIEVE'
-    scheduler      = '⏰ SCHEDULER'
+    update = "🔄 UPDATE essential repos"
+    cli_install = "⚙️ DEVAPPS install"
+    sym_path_shell = "🔗 SYMLINKS, PATH & SHELL PROFILE"
+    sym_new = "🆕 SYMLINKS new"
+    ssh_add_pubkey = "🔑 SSH add pub key to this machine"
+    ssh_add_id = "🗝️ SSH add identity (private key) to this machine"
+    ssh_use_pair = "🔐 SSH use key pair to connect two machines"
+    ssh_setup = "📡 SSH setup"
+    ssh_setup_wsl = "🐧 SSH setup wsl"
+    dot_files_sync = "🔗 DOTFILES sync"
+    backup = "💾 BACKUP"
+    retreive = "📥 RETRIEVE"
+    scheduler = "⏰ SCHEDULER"
 
 
 def args_parser():
@@ -35,6 +36,7 @@ def args_parser():
     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,29 +45,36 @@ def args_parser():
 
 
 def display_title(title: str) -> None:
-    console.print(Panel(title, box=box.DOUBLE_EDGE, title_align="left")) # Replace print with Panel
+    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
+    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
+    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
+    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
+    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
+    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
+    console.print(Panel(success, box=box.ROUNDED, border_style="green", title_align="left"))  # Replace print with Panel
 
 
 def main(which: Optional[str] = None):
-    PROGRAM_PATH.delete(sure=True, verbose=False)
+    from machineconfig.utils.path_reduced import PathExtended
+    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]
@@ -75,34 +84,40 @@ def main(which: Optional[str] = None):
         except KeyboardInterrupt:
             console.print(Panel("❌ Operation cancelled by user", title_align="left", border_style="red", width=BOX_WIDTH))
             return
-    else: choice_key = Options[which].value
+    else:
+        choice_key = Options[which].value
 
     console.print(Panel(f"🔧 SELECTED OPERATION\n{choice_key}", title_align="left", border_style="green", width=BOX_WIDTH))
 
     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()
 
     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()
 
     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()
 
     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'"
 
     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()
 
     elif choice_key == Options.ssh_use_pair.value:
@@ -112,6 +127,7 @@ 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()
 
     elif choice_key == Options.ssh_setup.value:
@@ -127,11 +143,13 @@ def main(which: Optional[str] = None):
     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")
 
     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")
 
     elif choice_key == Options.scheduler.value:
@@ -143,6 +161,7 @@ def main(which: Optional[str] = None):
     elif choice_key == Options.dot_files_sync.value:
         console.print(Panel("🔗 Synchronizing dotfiles...", width=BOX_WIDTH, border_style="blue"))
         from machineconfig.scripts.python.cloud_repo_sync import main as helper, PathExtended
+
         program = helper(cloud=None, path=str(PathExtended.home() / "dotfiles"), pwd=None, action="ask")
 
     else:
@@ -156,6 +175,5 @@ def main(which: Optional[str] = None):
         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

@@ -1,9 +1,7 @@
-"""ID
-"""
-
+"""ID"""
 
 # from platform import system
-from machineconfig.utils.path_reduced import P as PathExtended, modify_text
+from machineconfig.utils.path_reduced import PathExtended as PathExtended
 from machineconfig.utils.options import display_options
 from rich.panel import Panel
 from rich.text import Text
@@ -53,35 +51,27 @@ def main():
 
     print(Panel("📝 Updating SSH configuration...", expand=False))
 
-    # Inline the previous P.modify_text behavior (now deprecated):
+    # Inline the previous modify_text behavior (now deprecated):
     # - If file doesn't exist, seed content with txt_search
-    # - Then run modify_text to replace/append accordingly and write back
+    # - Otherwise, replace a matching line or append if not found
     if config_path.exists():
         current = config_path.read_text(encoding="utf-8")
         print(Panel("✏️  Updated existing SSH config file", expand=False))
     else:
         current = txt
         print(Panel("📄 Created new SSH config file", expand=False))
-    new_content = modify_text(
-        txt_raw=current,
-        txt_search=txt,
-        txt_alt=txt,
-        replace_line=True,
-        notfound_append=True,
-        prepend=True,
-    )
+    lines = current.split("\n")
+    found = False
+    for i, line in enumerate(lines):
+        if txt in line:
+            lines[i] = txt
+            found = True
+    if not found:
+        lines.insert(0, txt)
+    new_content = "\n".join(lines)
     config_path.write_text(new_content, encoding="utf-8")
 
-    panel_complete = Panel(
-        Text(
-            "✅ SSH IDENTITY CONFIGURATION COMPLETE\n"
-            "Identity added to SSH config file\n"
-            "Consider reloading the SSH config to apply changes",
-            justify="center"
-        ),
-        expand=False,
-        border_style="green"
-    )
+    panel_complete = Panel(Text("✅ SSH IDENTITY CONFIGURATION COMPLETE\nIdentity added to SSH config file\nConsider reloading the SSH config to apply changes", justify="center"), expand=False, border_style="green")
     program = f"echo '{panel_complete}'"
 
     success_message = f"🎉 CONFIGURATION SUCCESSFUL\nIdentity added: {path_to_key.name}\nConfig file: {config_path}"
@@ -90,5 +80,5 @@ def main():
     return program
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     pass

machineconfig/scripts/python/devops_add_ssh_key.py

@@ -1,13 +1,12 @@
-"""SSH
-"""
-
+"""SSH"""
 
 from platform import system
-from machineconfig.utils.utils import LIBRARY_ROOT, display_options
-from machineconfig.utils.path_reduced import P as PathExtended
+from machineconfig.utils.source_of_truth import LIBRARY_ROOT
+from machineconfig.utils.options import display_options
+from machineconfig.utils.path_reduced import PathExtended as PathExtended
 from rich.console import Console
 from rich.panel import Panel
-from rich import box # Import box
+from rich import box  # Import box
 
 
 console = Console()
@@ -46,7 +45,8 @@ def get_add_ssh_key_script(path_to_key: PathExtended):
                 assert place_holder in program, f"This section performs string manipulation on the script {program_path} to add the key to the authorized_keys file. The script has changed and the string {place_holder} is not found."
                 program = program.replace(place_holder, f'$sshfile = "{path_to_key}"')
                 console.print(Panel("🔧 Configured PowerShell script for Windows\n📝 Replaced placeholder with actual key path", title="[bold blue]Configuration[/bold blue]"))
-            else: raise NotImplementedError
+            else:
+                raise NotImplementedError
     else:
         console.print(Panel(f"📝 Creating new authorized_keys file\n🔑 Using key: {path_to_key.name}", title="[bold blue]Action[/bold blue]"))
         if system() == "Linux":
@@ -114,5 +114,5 @@ def main():
     return program
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     pass

machineconfig/scripts/python/devops_backup_retrieve.py

@@ -1,10 +1,11 @@
-"""BR: Backup and Retrieve
-"""
+"""BR: Backup and Retrieve"""
 
 # import subprocess
-from machineconfig.utils.path_reduced import P as PathExtended
+from machineconfig.utils.path_reduced import PathExtended as PathExtended
 from machineconfig.utils.utils2 import read_ini, read_toml
-from machineconfig.utils.utils import LIBRARY_ROOT, DEFAULTS_PATH, print_code, choose_cloud_interactively, choose_multiple_options
+from machineconfig.utils.source_of_truth import LIBRARY_ROOT, DEFAULTS_PATH
+from machineconfig.utils.code import print_code
+from machineconfig.utils.options import choose_cloud_interactively, choose_multiple_options
 from machineconfig.scripts.python.helpers.helpers2 import ES
 from platform import system
 from typing import Any, Literal, Optional
@@ -19,7 +20,7 @@ def main_backup_retrieve(direction: OPTIONS, which: Optional[str] = None):
     console = Console()
 
     try:
-        cloud: str = read_ini(DEFAULTS_PATH)['general']['rclone_config_name']
+        cloud: str = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
         console.print(Panel(f"⚠️  DEFAULT CLOUD CONFIGURATION\n🌥️  Using default cloud: {cloud}", title="[bold blue]Cloud Configuration[/bold blue]", border_style="blue"))
     except (FileNotFoundError, KeyError, IndexError):
         console.print(Panel("🔍 DEFAULT CLOUD NOT FOUND\n🔄 Please select a cloud configuration from the options below", title="[bold red]Error: Cloud Not Found[/bold red]", border_style="red"))
@@ -38,7 +39,7 @@ def main_backup_retrieve(direction: OPTIONS, which: Optional[str] = None):
 
     if which is None:
         console.print(Panel(f"🔍 SELECT {direction} ITEMS\n📋 Choose which configuration entries to process", title="[bold blue]Select Items[/bold blue]", border_style="blue"))
-        choices = choose_multiple_options(msg=f"WHICH FILE of the following do you want to {direction}?", options=['all'] + list(bu_file.keys()))
+        choices = choose_multiple_options(msg=f"WHICH FILE of the following do you want to {direction}?", options=["all"] + list(bu_file.keys()))
     else:
         choices = which.split(",") if which else []
         console.print(Panel(f"🔖 PRE-SELECTED ITEMS\n📝 Using: {', '.join(choices)}", title="[bold blue]Pre-selected Items[/bold blue]", border_style="blue"))
@@ -52,19 +53,20 @@ def main_backup_retrieve(direction: OPTIONS, which: Optional[str] = None):
     program = f"""$cloud = "{cloud}:{ES}" \n """ if system() == "Windows" else f"""cloud="{cloud}:{ES}" \n """
     console.print(Panel(f"🚀 GENERATING {direction} SCRIPT\n🌥️  Cloud: {cloud}\n🗂️  Items: {len(items)}", title="[bold blue]Script Generation[/bold blue]", border_style="blue"))
     for item_name, item in items.items():
-        flags = ''
-        flags += 'z' if item['zip'] == 'True' else ''
-        flags += 'e' if item['encrypt'] == 'True' else ''
-        flags += 'r' if item['rel2home'] == 'True' else ''
-        flags += 'o' if system().lower() in item_name else ''
+        flags = ""
+        flags += "z" if item["zip"] == "True" else ""
+        flags += "e" if item["encrypt"] == "True" else ""
+        flags += "r" if item["rel2home"] == "True" else ""
+        flags += "o" if system().lower() in item_name else ""
         console.print(Panel(f"📦 PROCESSING: {item_name}\n📂 Path: {PathExtended(item['path']).as_posix()}\n🏳️  Flags: {flags or 'None'}", title=f"[bold blue]Processing Item: {item_name}[/bold blue]", border_style="blue"))
-        if flags: flags = "-" + flags
+        if flags:
+            flags = "-" + flags
         if direction == "BACKUP":
-            program += f"""\ncloud_copy "{PathExtended(item['path']).as_posix()}" $cloud {flags}\n"""
+            program += f"""\ncloud_copy "{PathExtended(item["path"]).as_posix()}" $cloud {flags}\n"""
         elif direction == "RETRIEVE":
-            program += f"""\ncloud_copy $cloud "{PathExtended(item['path']).as_posix()}" {flags}\n"""
+            program += f"""\ncloud_copy $cloud "{PathExtended(item["path"]).as_posix()}" {flags}\n"""
         else:
-            console.print(Panel("❌ ERROR: INVALID DIRECTION\n⚠️  Direction must be either \"BACKUP\" or \"RETRIEVE\"", title="[bold red]Error: Invalid Direction[/bold red]", border_style="red"))
+            console.print(Panel('❌ ERROR: INVALID DIRECTION\n⚠️  Direction must be either "BACKUP" or "RETRIEVE"', title="[bold red]Error: Invalid Direction[/bold red]", border_style="red"))
             raise RuntimeError(f"Unknown direction: {direction}")
         if item_name == "dotfiles" and system() == "Linux":
             program += """\nchmod 700 ~/.ssh/*\n"""
@@ -80,7 +82,7 @@ def main(direction: OPTIONS, which: Optional[str] = None):
     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.utils import write_shell_script_to_default_program_path
+    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"))
 

machineconfig/scripts/python/devops_devapps_install.py

@@ -1,10 +1,10 @@
-"""Devops Devapps Install
-"""
+"""Devops Devapps Install"""
 
 # import subprocess
 from machineconfig.utils.installer_utils.installer_class import Installer
 from tqdm import tqdm
-from machineconfig.utils.utils import LIBRARY_ROOT, choose_multiple_options
+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
 from platform import system
 from typing import Any, Optional, Literal, TypeAlias, get_args
@@ -14,13 +14,12 @@ WHICH_CAT: TypeAlias = Literal["AllEssentials", "EssentialsAndOthers", "SystemIn
 
 
 def main(which: Optional[WHICH_CAT | str] = 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 = ""
-        for a_which in (which.split(",") if type(which) == str else which):
+        for a_which in which.split(",") if type(which) == str else which:
             kv = {}
             for _category, v in get_all_dicts(system=system()).items():
                 kv.update(v)
@@ -70,12 +69,14 @@ def get_programs_by_category(program_name: WHICH_CAT):
             program = ""
 
         case "SystemInstallers":
-            if system() == "Windows": options_system = parse_apps_installer_windows(LIBRARY_ROOT.joinpath("setup_windows/apps.ps1").read_text(encoding="utf-8"))
+            if system() == "Windows":
+                options_system = parse_apps_installer_windows(LIBRARY_ROOT.joinpath("setup_windows/apps.ps1").read_text(encoding="utf-8"))
             elif system() == "Linux":
                 options_system_1 = parse_apps_installer_linux(LIBRARY_ROOT.joinpath("setup_linux/apps_dev.sh").read_text(encoding="utf-8"))
                 options_system_2 = parse_apps_installer_linux(LIBRARY_ROOT.joinpath("setup_linux/apps.sh").read_text(encoding="utf-8"))
                 options_system = {**options_system_1, **options_system_2}
-            else: raise NotImplementedError(f"❌ System {system()} not supported")
+            else:
+                raise NotImplementedError(f"❌ System {system()} not supported")
             program_names = choose_multiple_options(msg="", options=sorted(list(options_system.keys())), header="🚀 CHOOSE DEV APP")
             program = ""
             for name in program_names:
@@ -84,7 +85,8 @@ def get_programs_by_category(program_name: WHICH_CAT):
 │ ⚙️  Installing: {name}
 └────────────────────────────────────────────────────""")
                 sub_program = options_system[name]
-                if sub_program.startswith("#winget"): sub_program = sub_program[1:]
+                if sub_program.startswith("#winget"):
+                    sub_program = sub_program[1:]
                 program += "\n" + sub_program
 
         # case "OtherDevApps":
@@ -105,7 +107,7 @@ def get_programs_by_category(program_name: WHICH_CAT):
         #         print(f"Installing {name}")
         #         sub_program = installers[idx].install_robust(version=None)  # finish the task
 
-        case  "PrecheckedCloudInstaller":
+        case "PrecheckedCloudInstaller":
             # from machineconfig.jobs.python.check_installations import PrecheckedCloudInstaller
             # ci = PrecheckedCloudInstaller()
             # ci.download_safe_apps(name="AllEssentials")
@@ -119,15 +121,15 @@ def parse_apps_installer_linux(txt: str) -> dict[str, Any]:
     res = {}
     for chunk in txts[1:]:
         try:
-            k = chunk.split('----')[0].rstrip().lstrip()
+            k = chunk.split("----")[0].rstrip().lstrip()
             v = "\n".join(chunk.split("\n")[1:])
             res[k] = v
         except IndexError as e:
             print(f"""
 ❌ Error parsing chunk:
-{'-' * 50}
+{"-" * 50}
 {chunk}
-{'-' * 50}""")
+{"-" * 50}""")
             raise e
     return res
 
@@ -135,28 +137,31 @@ def parse_apps_installer_linux(txt: str) -> dict[str, Any]:
 def parse_apps_installer_windows(txt: str) -> dict[str, Any]:
     chunks: list[str] = []
     for idx, item in enumerate(txt.split(sep="winget install")):
-        if idx == 0: continue
-        if idx == 1: chunks.append(item)
-        else: chunks.append("winget install" + item)
+        if idx == 0:
+            continue
+        if idx == 1:
+            chunks.append(item)
+        else:
+            chunks.append("winget install" + item)
     # progs = L(txt.splitlines()).filter(lambda x: x.startswith("winget ") or x.startswith("#winget"))
     res: dict[str, str] = {}
     for a_chunk in chunks:
         try:
-            name = a_chunk.split('--name ')[1]
+            name = a_chunk.split("--name ")[1]
             if "--Id" not in name:
                 print(f"⚠️  Warning: {name} does not have an Id, skipping")
                 continue
-            name = name.split(' --Id ', maxsplit=1)[0].strip('"').strip('"')
+            name = name.split(" --Id ", maxsplit=1)[0].strip('"').strip('"')
             res[name] = a_chunk
         except IndexError as e:
             print(f"""
 ❌ Error parsing chunk:
-{'-' * 50}
+{"-" * 50}
 {a_chunk}
-{'-' * 50}""")
+{"-" * 50}""")
             raise e
     return res
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     pass