machineconfig 6.22__tar.gz → 6.25__tar.gz

{machineconfig-6.22/src/machineconfig.egg-info → machineconfig-6.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 6.22
+Version: 6.25
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-6.22 → machineconfig-6.25}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "6.22"
+version = "6.25"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}

{machineconfig-6.22 → machineconfig-6.25}/src/machineconfig/jobs/installer/installer_data.json

@@ -613,6 +613,23 @@
         }
       }
     },
+    {
+      "appName": "clifm",
+      "repoURL": "https://github.com/leo-arch/clifm",
+      "doc": "📂 A terminal file manager with vim-like keybindings.",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "clifm-{version}-linux-x86_64.tar.gz",
+          "macos": null,
+          "windows": null
+        },
+        "arm64": {
+          "linux": null,
+          "macos": null,
+          "windows": null
+        }
+      }
+    },
     {
       "appName": "lsd",
       "repoURL": "https://github.com/lsd-rs/lsd",

{machineconfig-6.22 → machineconfig-6.25}/src/machineconfig/scripts/python/devops.py

@@ -30,8 +30,9 @@ def get_app():
     app_config = cli_config.get_app()
     app.add_typer(app_config, name="config")
     app.add_typer(app_config, name="c", hidden=True)
-    app.add_typer(cli_data.app_data, name="data")
-    app.add_typer(cli_data.app_data, name="d", hidden=True)
+    app_data = cli_data.get_app()
+    app.add_typer(app_data, name="data")
+    app.add_typer(app_data, name="d", hidden=True)
     app_self = cli_self.get_app()
     app.add_typer(app_self, name="self")
     app.add_typer(app_self, name="s", hidden=True)

machineconfig-6.25/src/machineconfig/scripts/python/devops_helpers/cli_data.py

@@ -0,0 +1,25 @@
+
+import typer
+from typing import Annotated, Optional
+
+def backup(cloud: Annotated[Optional[str], typer.Option("--cloud", "-c", help="☁️  Cloud configuration name (rclone config name)")] = None,
+           which: Annotated[Optional[str], typer.Option("--which", "-w", help="📝 Comma-separated list of items to BACKUP (from backup.toml), or 'all' for all items")] = None):
+    """💾 BACKUP"""
+    from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
+    main_backup_retrieve(direction="BACKUP", which=which, cloud=cloud)
+
+
+def retrieve(cloud: Annotated[Optional[str], typer.Option("--cloud", "-c", help="☁️  Cloud configuration name (rclone config name)")] = None,
+             which: Annotated[Optional[str], typer.Option("--which", "-w", help="📝 Comma-separated list of items to RETRIEVE (from backup.toml), or 'all' for all items")] = None):
+    """📥 RETRIEVE"""
+    from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
+    main_backup_retrieve(direction="RETRIEVE", which=which, cloud=cloud)
+
+
+def get_app() -> typer.Typer:
+    app = typer.Typer(name="data", help="💾 [d] Backup and Retrieve configuration files and directories to/from cloud storage using rclone.", no_args_is_help=True)
+    app.command(name="backup", no_args_is_help=True, hidden=False, help="💾 [b] Backup files and directories to cloud storage using rclone.")(backup)
+    app.command(name="b", no_args_is_help=True, hidden=True,)(backup)
+    app.command(name="retrieve", no_args_is_help=True, hidden=False, help="📥 [r] Retrieve files and directories from cloud storage using rclone.")(retrieve)
+    app.command(name="r", no_args_is_help=True, hidden=True, )(retrieve)
+    return app

{machineconfig-6.22 → machineconfig-6.25}/src/machineconfig/scripts/python/devops_helpers/cli_repos.py

@@ -47,11 +47,9 @@ def capture(directory: DirectoryArgument = None, cloud: CloudOption = None) -> N
     """📝 Record repositories into a repos.json specification."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import resolve_directory
     repos_root = resolve_directory(directory)
-    from machineconfig.scripts.python.repos_helpers.record import main as record_repos
-
+    from machineconfig.scripts.python.repos_helpers.record import main_record as record_repos
     save_path = record_repos(repos_root=repos_root)
     from machineconfig.utils.path_extended import PathExtended
-
     if cloud is not None:
         PathExtended(save_path).to_cloud(rel2home=True, cloud=cloud)
 
@@ -59,16 +57,12 @@ def capture(directory: DirectoryArgument = None, cloud: CloudOption = None) -> N
 def clone(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
     """📥 Clone repositories described by a repos.json specification."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import clone_from_specs
-
-    
     clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=False)
 
 
 def checkout_command(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
     """🔀 Check out specific commits listed in the specification."""
-    from machineconfig.scripts.python.repos_helpers.entrypoint import clone_from_specs
-
-    
+    from machineconfig.scripts.python.repos_helpers.entrypoint import clone_from_specs    
     clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=True)
 
 
@@ -82,7 +76,6 @@ def analyze(directory: DirectoryArgument = None) -> None:
     """📊 Analyze repository development over time."""
     repo_path = directory if directory is not None else "."
     from machineconfig.scripts.python.repos_helpers.count_lines_frontend import analyze_repo_development
-
     analyze_repo_development(repo_path=repo_path)
 
 

{machineconfig-6.22 → machineconfig-6.25}/src/machineconfig/scripts/python/devops_helpers/devops_backup_retrieve.py

@@ -17,18 +17,15 @@ import tomllib
 OPTIONS = Literal["BACKUP", "RETRIEVE"]
 
 
-def main_backup_retrieve(direction: OPTIONS, which: Optional[str] = None) -> None:
+def main_backup_retrieve(direction: OPTIONS, which: Optional[str], cloud: Optional[str]) -> None:
     console = Console()
-
     try:
-        cloud: str = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
+        cloud = 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"))
         cloud = choose_cloud_interactively()
-
     bu_file: dict[str, Any] = tomllib.loads(LIBRARY_ROOT.joinpath("profile/backup.toml").read_text(encoding="utf-8"))
-
     console.print(Panel(f"🧰 LOADING BACKUP CONFIGURATION\n📄 File: {LIBRARY_ROOT.joinpath('profile/backup.toml')}", title="[bold blue]Backup Configuration[/bold blue]", border_style="blue"))
 
     if system() == "Linux":

{machineconfig-6.22 → machineconfig-6.25}/src/machineconfig/scripts/python/interactive.py

@@ -165,7 +165,7 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
         console.print("🔧 Retrieving backup data", style="bold cyan")
         try:
             from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
-            main_backup_retrieve(direction="RETRIEVE")
+            main_backup_retrieve(direction="RETRIEVE", cloud=None, which=None)
             console.print("✅ Backup data retrieved successfully", style="bold green")
         except Exception as e:
             console.print(f"❌ Error retrieving backup data: {e}", style="bold red")

{machineconfig-6.22 → machineconfig-6.25}/src/machineconfig/scripts/python/repos_helpers/clone.py

@@ -8,7 +8,7 @@ from git.exc import GitCommandError
 from rich import print as pprint
 from rich.progress import BarColumn, MofNCompleteColumn, Progress, SpinnerColumn, TextColumn, TimeElapsedColumn
 
-from machineconfig.utils.schemas.repos.repos_types import RepoRecordDict, RepoRemote
+from machineconfig.utils.schemas.repos.repos_types import RepoRecordDict, RepoRecordFile, RepoRemote
 from machineconfig.utils.io import read_json
 
 
@@ -95,7 +95,8 @@ def clone_single_repo(repo_spec: RepoRecordDict, preferred_remote: Optional[str]
 
 
 def clone_repos(spec_path: Path, preferred_remote: Optional[str], checkout_branch_flag: bool, checkout_commit_flag: bool) -> list[tuple[CloneStatus, str]]:
-    repos = cast(list[RepoRecordDict], read_json(path=spec_path))
+    spec_file = cast(RepoRecordFile, read_json(path=spec_path))
+    repos = spec_file["repos"]
     results: list[tuple[CloneStatus, str]] = []
     with Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}"), BarColumn(), MofNCompleteColumn(), TimeElapsedColumn()) as progress:
         task_id = progress.add_task("Processing repositories...", total=len(repos))

{machineconfig-6.22 → machineconfig-6.25}/src/machineconfig/scripts/python/repos_helpers/record.py

@@ -186,7 +186,7 @@ def record_repos_recursively(repos_root: str, r: bool, progress: Progress | None
     return res
 
 
-def main(repos_root: Path):
+def main_record(repos_root: Path):
     print("\n📝 Recording repositories...")
     repos_root = PathExtended(repos_root).expanduser().absolute()
 

{machineconfig-6.22 → machineconfig-6.25}/src/machineconfig/settings/shells/wt/settings.json

@@ -6,19 +6,19 @@
     "copyOnSelect": true,
     "defaultProfile": "{574e775e-4f2a-5b96-ac1e-a2962a402336}",
     "focusFollowMouse": true,
-    "keybindings":
+    "keybindings": 
     [
         {
-            "id": "Terminal.TogglePaneZoom",
-            "keys": "ctrl+shift+z"
+            "id": "Terminal.FindText",
+            "keys": "ctrl+shift+f"
         },
         {
             "id": "Terminal.PasteFromClipboard",
             "keys": "ctrl+v"
         },
         {
-            "id": "Terminal.FindText",
-            "keys": "ctrl+shift+f"
+            "id": "Terminal.TogglePaneZoom",
+            "keys": "ctrl+shift+z"
         },
         {
             "id": "Terminal.DuplicatePaneAuto",
@@ -38,27 +38,27 @@
         }
     ],
     "launchMode": "fullscreen",
-    "newTabMenu":
+    "newTabMenu": 
     [
         {
             "type": "remainingProfiles"
         }
     ],
-    "profiles":
+    "profiles": 
     {
-        "defaults":
+        "defaults": 
         {
             "colorScheme": "Campbell (modified)",
             "padding": "0",
             "useAcrylic": false
         },
-        "list":
+        "list": 
         [
             {
                 "commandline": "pwsh",
                 "cursorColor": "#D4D8E1",
                 "cursorShape": "filledBox",
-                "font":
+                "font": 
                 {
                     "face": "CaskaydiaCove Nerd Font"
                 },
@@ -84,7 +84,7 @@
             },
             {
                 "commandline": "%SystemRoot%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
-                "font":
+                "font": 
                 {
                     "face": "CaskaydiaCove Nerd Font"
                 },
@@ -139,10 +139,16 @@
                 "hidden": false,
                 "name": "Ubuntu 22.04.3 LTS",
                 "source": "CanonicalGroupLimited.Ubuntu22.04LTS_79rhkp1fndgsc"
+            },
+            {
+                "guid": "{988a16a9-2179-5ba2-8367-4854ea3de17d}",
+                "hidden": false,
+                "name": "Ubuntu-24.04",
+                "source": "Microsoft.WSL"
             }
         ]
     },
-    "schemes":
+    "schemes": 
     [
         {
             "background": "#000000",

{machineconfig-6.22 → machineconfig-6.25}/src/machineconfig/utils/path_extended.py

@@ -909,9 +909,10 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
             rp = localpath.get_remote_path(root=root, os_specific=os_specific, rel2home=rel2home, strict=strict)  # if rel2home else (P(root) / localpath if root is not None else localpath)
         else:
             rp = PathExtended(remotepath)
-
         from rclone_python import rclone
+        print(f"⬆️ UPLOADING {repr(localpath)} TO {cloud}:{rp.as_posix()}`") if verbose else None
         rclone.copyto(in_path=localpath.as_posix(), out_path=f"{cloud}:{rp.as_posix()}", )
+
         _ = [item.delete(sure=True) for item in to_del]
         if verbose:
             print(f"{'⬆️' * 5} UPLOAD COMPLETED.")
@@ -922,7 +923,6 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
             command = f"rclone link '{cloud}:{rp.as_posix()}'"
             completed = _run_shell_command(command, shell_to_use)
             from machineconfig.utils.terminal import Response
-
             res = Response.from_completed_process(completed).capture()
             tmp = res.op2path(strict_err=False, strict_returncode=False)
             if tmp is None:

{machineconfig-6.22 → machineconfig-6.25/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 6.22
+Version: 6.25
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

machineconfig-6.22/src/machineconfig/scripts/python/devops_helpers/cli_data.py

@@ -1,18 +0,0 @@
-
-import typer
-
-app_data = typer.Typer(help="💾 [d] data subcommands", no_args_is_help=True)
-
-@app_data.command()
-def backup():
-    """💾 BACKUP"""
-    from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
-    main_backup_retrieve(direction="BACKUP")
-
-
-@app_data.command()
-def retrieve():
-    """📥 RETRIEVE"""
-    from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
-    main_backup_retrieve(direction="RETRIEVE")
-