machineconfig 6.99__tar.gz → 7.2__tar.gz

{machineconfig-6.99/src/machineconfig.egg-info → machineconfig-7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 6.99
+Version: 7.2
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -59,15 +59,25 @@ Dotfiles are divided into private and public. Examples of private ones are, `~/.
 # Install On Windows:
 
 ```powershell
-
+# Temporary install:
 iex (iwr bit.ly/cfgwindows).Content
+# Or, if UV is installed:
+iex (uvx machineconfig define)
+# Permanent install:
+powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"  # Skip if UV is already installed
+uvx install --upgrade machineconfig
 ```
 
 # Install On Linux and MacOS
 
 ```bash
-
+# Temporary install:
 . <(curl -L bit.ly/cfglinux)
+# Or, if UV is installed:
+. <(uvx machineconfig define)
+# Permanent install:
+curl -LsSf https://astral.sh/uv/install.sh | sh  # Skip if UV is already installed
+uvx install --upgrade machineconfig
 ```
 
 

{machineconfig-6.99 → machineconfig-7.2}/README.md

@@ -16,15 +16,25 @@ Dotfiles are divided into private and public. Examples of private ones are, `~/.
 # Install On Windows:
 
 ```powershell
-
+# Temporary install:
 iex (iwr bit.ly/cfgwindows).Content
+# Or, if UV is installed:
+iex (uvx machineconfig define)
+# Permanent install:
+powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"  # Skip if UV is already installed
+uvx install --upgrade machineconfig
 ```
 
 # Install On Linux and MacOS
 
 ```bash
-
+# Temporary install:
 . <(curl -L bit.ly/cfglinux)
+# Or, if UV is installed:
+. <(uvx machineconfig define)
+# Permanent install:
+curl -LsSf https://astral.sh/uv/install.sh | sh  # Skip if UV is already installed
+uvx install --upgrade machineconfig
 ```
 
 

{machineconfig-6.99 → machineconfig-7.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "6.99"
+version = "7.2"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -70,7 +70,9 @@ croshell = "machineconfig.scripts.python.croshell:main"
 ftpx = "machineconfig.scripts.python.ftpx:main"
 utils = "machineconfig.scripts.python.utils:main"
 mcfg = "machineconfig.scripts.python.mcfg:main"
+machineconfig = "machineconfig.scripts.python.mcfg:main"
 terminal = "machineconfig.scripts.python.terminal:main"
+define = "machineconfig.scripts.python.define:main"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

machineconfig-7.2/src/machineconfig/scripts/python/define.py

@@ -0,0 +1,26 @@
+
+"""
+Minimalist programs that only print scripts without frills so it can be sourced by by shell.
+"""
+
+
+import typer
+import platform
+
+
+def define_scripts():
+    if platform.system() != "Linux":
+        raise RuntimeError("This command is only supported on Linux systems.")
+    from machineconfig.setup_linux import INTERACTIVE as script_path
+    script = script_path.read_text(encoding="utf-8")
+    print(script)
+
+
+def main():
+    app = typer.Typer(add_completion=False, no_args_is_help=True)
+    app.command(name="scripts", help="define all scripts", no_args_is_help=False)(define_scripts)
+    app()
+
+
+# if __name__ == "__main__":
+#     main()

{machineconfig-6.99 → machineconfig-7.2}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -3,7 +3,7 @@
 from typing import Literal, Annotated, Optional
 from pathlib import Path
 import typer
-
+import machineconfig.scripts.python.helpers_devops.cli_config_dotfile as dotfile_module
 
 
 def private(method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--method", "-m", help="Method to use for linking files")],
@@ -22,15 +22,6 @@ def public(method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--me
     import machineconfig.profile.create_links_export as create_links_export
     create_links_export.main_public_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
 
-def dotfile(file: Annotated[str, typer.Argument(help="file/folder path.")],
-    overwrite: Annotated[bool, typer.Option("--overwrite", "-o", help="Overwrite.")] = False,
-    dest: Annotated[str, typer.Option("--dest", "-d", help="destination folder")] = "",
-    ):
-    """🔗 Manage dotfiles."""
-    import machineconfig.scripts.python.helpers_devops.cli_config_dotfile as dotfile_module
-    dotfile_module.main(file=file, overwrite=overwrite, dest=dest)
-
-
 def shell():
     """🔗 Configure your shell profile."""
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
@@ -104,8 +95,8 @@ def get_app():
     config_apps.command("v", no_args_is_help=True, hidden=True)(private)
     config_apps.command("public", no_args_is_help=True, help="🔗  [b] Manage public configuration files.")(public)
     config_apps.command("b", no_args_is_help=True, help="Manage public configuration files.", hidden=True)(public)
-    config_apps.command("dotfile", no_args_is_help=True, help="🔗  [d] Manage dotfiles.")(dotfile)
-    config_apps.command("d", no_args_is_help=True,  hidden=True)(dotfile)
+    config_apps.command("dotfile", no_args_is_help=True, help="🔗  [d] Manage dotfiles.")(dotfile_module.main)
+    config_apps.command("d", no_args_is_help=True,  hidden=True)(dotfile_module.main)
     config_apps.command("shell", no_args_is_help=False, help="🔗  [s] Configure your shell profile.")(shell)
     config_apps.command("s", no_args_is_help=False, help="Configure your shell profile.", hidden=True)(shell)
     config_apps.command("path", no_args_is_help=False, help="📚  [p] NAVIGATE PATH variable with TUI")(path)

machineconfig-7.2/src/machineconfig/scripts/python/helpers_devops/cli_config_dotfile.py

@@ -0,0 +1,80 @@
+"""Like yadm and dotter."""
+
+from typing import Annotated, Literal
+import typer
+
+
+def main(
+    file: Annotated[str, typer.Argument(help="file/folder path.")],
+    method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--method", "-m", help="Method to use for linking files")] = "copy",
+    on_conflict: Annotated[Literal["throw-error", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
+    sensitivity: Annotated[Literal["private", "public"], typer.Option(..., "--sensitivity", "-s", help="Sensitivity of the config file.")] = "private",
+    destination: Annotated[str, typer.Option("--destination", "-d", help="destination folder (override the default, use at your own risk)")] = "",
+) -> None:
+    from rich.console import Console
+    from rich.panel import Panel
+    from machineconfig.utils.links import symlink_map, copy_map
+    from pathlib import Path
+    match sensitivity:
+        case "private":
+            backup_root = Path.home().joinpath("dotfiles/mapper")
+        case "public":
+            from machineconfig.utils.source_of_truth import CONFIG_ROOT
+            backup_root = Path(CONFIG_ROOT).joinpath("dotfiles/mapper")
+
+    console = Console()
+    orig_path = Path(file).expanduser().absolute()
+    if destination == "":
+        new_path = backup_root.joinpath(orig_path.relative_to(Path.home()))
+        new_path.parent.mkdir(parents=True, exist_ok=True)
+    else:
+        dest_path = Path(destination).expanduser().absolute()
+        dest_path.mkdir(parents=True, exist_ok=True)
+        new_path = dest_path.joinpath(orig_path.name)
+
+    from machineconfig.utils.path_extended import PathExtended
+    if method == "copy":
+        copy_map(config_file_default_path=PathExtended(orig_path), self_managed_config_file_path=PathExtended(new_path), on_conflict=on_conflict)
+    elif method == "symlink":
+        symlink_map(config_file_default_path=PathExtended(orig_path), self_managed_config_file_path=PathExtended(new_path), on_conflict=on_conflict)
+    else:
+        raise ValueError(f"Unknown method: {method}")
+    console.print(
+        Panel(
+            "\n".join(
+                [
+                    "✅ Symbolic link created successfully!",
+                    "🔄 Add the following snippet to mapper.toml to persist this mapping:",
+                ]
+            ),
+            title="Symlink Created",
+            border_style="green",
+            padding=(1, 2),
+        )
+    )
+
+    # mapper_snippet = "\n".join(
+    #     [
+    #         f"[bold]📝 Edit configuration file:[/] [cyan]nano {PathExtended(CONFIG_ROOT)}/symlinks/mapper.toml[/cyan]",
+    #         "",
+    #         f"[{new_path.parent.name}]",
+    #         f"{orig_path.name.split('.')[0]} = {{ this = '{orig_path.collapseuser().as_posix()}', to_this = '{new_path.collapseuser().as_posix()}' }}",
+    #     ]
+    # )
+
+    # console.print(
+    #     Panel(
+    #         mapper_snippet,
+    #         title="Mapper Entry",
+    #         border_style="cyan",
+    #         padding=(1, 2),
+    #     )
+    # )
+
+
+def arg_parser() -> None:
+    typer.run(main)
+
+
+if __name__ == "__main__":
+    arg_parser()

{machineconfig-6.99 → machineconfig-7.2}/src/machineconfig/setup_linux/__init__.py

@@ -1,6 +1,7 @@
 
 from pathlib import Path
 
+INTERACTIVE = Path(__file__).parent.joinpath("web_shortcuts/interactive.sh")
 APPS = Path(__file__).parent.joinpath("apps.sh")
 UV = Path(__file__).parent.joinpath("uv.sh")
 

{machineconfig-6.99 → machineconfig-7.2}/src/machineconfig/utils/links.py

@@ -162,14 +162,15 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
                     config_file_default_path.delete(sure=True)
                 else:
                     # Files are different, use on_conflict strategy
+                    import subprocess
+                    command = f"""delta --side-by-side "{config_file_default_path}" "{self_managed_config_file_path}" """
+                    try:
+                        console.print(Panel(f"🆘 CONFLICT DETECTED | Showing diff between {config_file_default_path} and {self_managed_config_file_path}", title="Conflict Detected", expand=False))
+                        subprocess.run(command, shell=True, check=True)
+                    except Exception:
+                        console.print(Panel("⚠️ Could not show diff using 'delta'. Please install 'delta' for better diff visualization.", title="Delta Not Found", expand=False))
+
                     if on_conflict == "throw-error":
-                        import subprocess
-                        command = f"""delta --side-by-side "{config_file_default_path}" "{self_managed_config_file_path}" """
-                        try:
-                            console.print(Panel(f"🆘 CONFLICT DETECTED | Showing diff between {config_file_default_path} and {self_managed_config_file_path}", title="Conflict Detected", expand=False))
-                            subprocess.run(command, shell=True, check=True)
-                        except Exception:
-                            console.print(Panel("⚠️ Could not show diff using 'delta'. Please install 'delta' for better diff visualization.", title="Delta Not Found", expand=False))
                         raise RuntimeError(f"Conflict detected: {config_file_default_path} and {self_managed_config_file_path} both exist with different content")
                     elif on_conflict == "overwriteSelfManaged":
                         action_taken = "backing_up_target"
@@ -289,6 +290,14 @@ def copy_map(config_file_default_path: PathExtended, self_managed_config_file_pa
                     config_file_default_path.delete(sure=True)
                 else:
                     # Files are different, use on_conflict strategy
+                    import subprocess
+                    command = f"""delta --side-by-side "{config_file_default_path}" "{self_managed_config_file_path}" """
+                    try:
+                        console.print(Panel(f"🆘 CONFLICT DETECTED | Showing diff between {config_file_default_path} and {self_managed_config_file_path}", title="Conflict Detected", expand=False))
+                        subprocess.run(command, shell=True, check=True)
+                    except Exception:
+                        console.print(Panel("⚠️ Could not show diff using 'delta'. Please install 'delta' for better diff visualization.", title="Delta Not Found", expand=False))
+
                     match on_conflict:
                         case "throw-error":
                             raise RuntimeError(f"Conflict detected: {config_file_default_path} and {self_managed_config_file_path} both exist with different content")

{machineconfig-6.99 → machineconfig-7.2}/src/machineconfig/utils/upgrade_packages.py

@@ -113,9 +113,11 @@ def upgrade_machine_config_version() -> None:
     major: int = int(version_parts[0])
     minor: int = int(version_parts[1])
     
-    # Bump minor version by 1
+    # Bump minor version by 1, preserving zero-padding
     new_minor: int = minor + 1
-    new_version: str = f"{major}.{new_minor}"
+    # Preserve the same number of digits as the original minor version
+    minor_width: int = len(version_parts[1])
+    new_version: str = f"{major}.{new_minor:0{minor_width}d}"
     
     old_version_constraint: str = f"machineconfig>={current_version_str}"
     new_version_constraint: str = f"machineconfig>={new_version}"

{machineconfig-6.99 → machineconfig-7.2/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 6.99
+Version: 7.2
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -59,15 +59,25 @@ Dotfiles are divided into private and public. Examples of private ones are, `~/.
 # Install On Windows:
 
 ```powershell
-
+# Temporary install:
 iex (iwr bit.ly/cfgwindows).Content
+# Or, if UV is installed:
+iex (uvx machineconfig define)
+# Permanent install:
+powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"  # Skip if UV is already installed
+uvx install --upgrade machineconfig
 ```
 
 # Install On Linux and MacOS
 
 ```bash
-
+# Temporary install:
 . <(curl -L bit.ly/cfglinux)
+# Or, if UV is installed:
+. <(uvx machineconfig define)
+# Permanent install:
+curl -LsSf https://astral.sh/uv/install.sh | sh  # Skip if UV is already installed
+uvx install --upgrade machineconfig
 ```
 
 

{machineconfig-6.99 → machineconfig-7.2}/src/machineconfig.egg-info/SOURCES.txt

@@ -130,6 +130,7 @@ src/machineconfig/scripts/python/__init__.py
 src/machineconfig/scripts/python/agents.py
 src/machineconfig/scripts/python/cloud.py
 src/machineconfig/scripts/python/croshell.py
+src/machineconfig/scripts/python/define.py
 src/machineconfig/scripts/python/devops.py
 src/machineconfig/scripts/python/devops_navigator.py
 src/machineconfig/scripts/python/fire_jobs.py

{machineconfig-6.99 → machineconfig-7.2}/src/machineconfig.egg-info/entry_points.txt

@@ -2,9 +2,11 @@
 agents = machineconfig.scripts.python.agents:main
 cloud = machineconfig.scripts.python.cloud:main
 croshell = machineconfig.scripts.python.croshell:main
+define = machineconfig.scripts.python.define:main
 devops = machineconfig.scripts.python.devops:main
 fire = machineconfig.scripts.python.fire_jobs:main
 ftpx = machineconfig.scripts.python.ftpx:main
+machineconfig = machineconfig.scripts.python.mcfg:main
 mcfg = machineconfig.scripts.python.mcfg:main
 sessions = machineconfig.scripts.python.sessions:main
 terminal = machineconfig.scripts.python.terminal:main

machineconfig-6.99/src/machineconfig/scripts/python/helpers_devops/cli_config_dotfile.py

@@ -1,77 +0,0 @@
-"""Like yadm and dotter."""
-
-from typing import Annotated
-
-import typer
-
-
-def main(
-    file: Annotated[str, typer.Argument(help="file/folder path.")],
-    overwrite: Annotated[bool, typer.Option("--overwrite", "-o", help="Overwrite.")] = False,
-    dest: Annotated[str, typer.Option("--dest", "-d", help="destination folder")] = "",
-) -> None:
-
-    from rich.console import Console
-    from rich.panel import Panel
-
-    from machineconfig.utils.links import symlink_map
-    from machineconfig.utils.path_extended import PathExtended
-    from machineconfig.utils.source_of_truth import CONFIG_ROOT
-    console = Console()
-    orig_path = PathExtended(file).expanduser().absolute()
-    if dest == "":
-        if "Local" in str(orig_path):
-            junction = orig_path.split(at="Local", sep=-1)[1]
-        elif "Roaming" in str(orig_path):
-            junction = orig_path.split(at="Roaming", sep=-1)[1]
-        elif ".config" in str(orig_path):
-            junction = orig_path.split(at=".config", sep=-1)[1]
-        else:
-            junction = orig_path.rel2home()
-        new_path = PathExtended(CONFIG_ROOT).parent.parent.joinpath(junction)
-    else:
-        dest_path = PathExtended(dest).expanduser().absolute()
-        dest_path.mkdir(parents=True, exist_ok=True)
-        new_path = dest_path.joinpath(orig_path.name)
-
-    symlink_map(config_file_default_path=orig_path, self_managed_config_file_path=new_path, on_conflict="throw-error")
-
-    console.print(
-        Panel(
-            "\n".join(
-                [
-                    "✅ Symbolic link created successfully!",
-                    "🔄 Add the following snippet to mapper.toml to persist this mapping:",
-                ]
-            ),
-            title="Symlink Created",
-            border_style="green",
-            padding=(1, 2),
-        )
-    )
-
-    mapper_snippet = "\n".join(
-        [
-            f"[bold]📝 Edit configuration file:[/] [cyan]nano {PathExtended(CONFIG_ROOT)}/symlinks/mapper.toml[/cyan]",
-            "",
-            f"[{new_path.parent.name}]",
-            f"{orig_path.name.split('.')[0]} = {{ this = '{orig_path.collapseuser().as_posix()}', to_this = '{new_path.collapseuser().as_posix()}' }}",
-        ]
-    )
-
-    console.print(
-        Panel(
-            mapper_snippet,
-            title="Mapper Entry",
-            border_style="cyan",
-            padding=(1, 2),
-        )
-    )
-
-
-def arg_parser() -> None:
-    typer.run(main)
-
-
-if __name__ == "__main__":
-    arg_parser()