machineconfig 6.59__tar.gz → 6.62__tar.gz

{machineconfig-6.59/src/machineconfig.egg-info → machineconfig-6.62}/PKG-INFO

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

{machineconfig-6.59 → machineconfig-6.62}/pyproject.toml

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

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/jobs/installer/installer_data.json

@@ -1,6 +1,23 @@
 {
   "version": "1",
   "installers": [
+    {
+      "appName": "fx",
+      "repoURL": "https://github.com/antonmedv/fx",
+      "doc": "🧙‍♂️ Command-line JSON viewer",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "fx_linux_amd64",
+          "windows": "fx_windows_amd64.exe",
+          "macos": "fx_darwin_amd64"
+        },
+        "arm64": {
+          "linux": "fx_linux_arm64",
+          "windows": "fx_windows_arm64.exe",
+          "macos": "fx_darwin_arm64"
+        }
+      }
+    },    
     {
       "appName": "jq",
       "repoURL": "https://github.com/jqlang/jq",

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/profile/create_shell_profile.py

@@ -17,11 +17,11 @@ console = Console()
 BOX_WIDTH = 100  # Define BOX_WIDTH or get it from a config
 
 
-def get_shell_profile_path() -> PathExtended:
+def get_shell_profile_path() -> Path:
     if system == "Windows":
         result = subprocess.run(["pwsh", "-Command", "$PROFILE"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, check=False)
         if result.returncode == 0 and result.stdout.strip():
-            profile_path = PathExtended(result.stdout.strip())
+            profile_path = Path(result.stdout.strip())
         else:
             print(f"Command failed with return code {result.returncode}")
             print(f"stdout: {result.stdout}")

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/scripts/python/croshell.py

@@ -65,8 +65,8 @@ def croshell(
         text = f"📄 Reading data from: {file_obj.name}"
         console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
     else:  # if nothing is specified, then run in interactive mode.
-        text = "⌨️  Entering interactive mode"
-        console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
+        # text = "⌨️  Entering interactive mode"
+        # console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
         # from machineconfig.scripts.python.croshell import InteractiveShell
         # InteractiveShell().run()
         # return None
@@ -124,7 +124,10 @@ def croshell(
             # if writing fails, fall back to the default nb_target already set
             pass
     if visidata:
-        fire_line = f"uv run --with visidata,pyarrow vd {str(file_obj)}"
+        if file_obj.suffix == ".json":
+            fire_line = f"uv run --with visidata vd {str(file_obj)}"
+        else:
+            fire_line = f"uv run --with visidata,pyarrow vd {str(file_obj)}"
     elif marimo:
         if Path.home().joinpath("code/machineconfig").exists(): requirements = f"""--with marimo --project "{str(Path.home().joinpath("code/machineconfig"))}" """
         else: requirements = """--with "marimo,machineconfig[plot]>=6.57" """

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

@@ -2,7 +2,7 @@
 # /// script
 # requires-python = ">=3.13"
 # dependencies = [
-#     "machineconfig>=6.59",
+#     "machineconfig>=6.61",
 #     "textual",
 #     "pyperclip",
 # ]

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/scripts/python/ftpx.py

@@ -183,7 +183,7 @@ def ftpx(
                     padding=(1, 2),
                 )
             )
-            received_file = ssh.copy_from_here(source_path=resolved_source, target_path=resolved_target, compress_with_zip=zipFirst, recursive=recursive, overwrite_existing=False)
+            received_file = ssh.copy_from_here(source_path=resolved_source, target_rel2home=resolved_target, compress_with_zip=zipFirst, recursive=recursive, overwrite_existing=False)
 
     if source_is_remote and isinstance(received_file, PathExtended):
         console.print(

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -46,7 +46,7 @@ def path():
     uv_with = ["textual"]
     uv_project_dir = None
     if not Path.home().joinpath("code/machineconfig").exists():
-        uv_with.append("machineconfig>=6.59")
+        uv_with.append("machineconfig>=6.61")
     else:
         uv_project_dir = str(Path.home().joinpath("code/machineconfig"))
     run_shell_script(get_uv_command_executing_python_script(python_script=path.read_text(encoding="utf-8"), uv_with=uv_with, uv_project_dir=uv_project_dir)[0])

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -41,9 +41,9 @@ def install(no_copy_assets: Annotated[bool, typer.Option("--no-assets-copy", "-n
     else:
         import platform
         if platform.system() == "Windows":
-            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.59" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.61" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.59" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.61" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -68,7 +68,7 @@ def navigate():
     path = Path(navigator.__file__).resolve().parent.joinpath("devops_navigator.py")
     from machineconfig.utils.code import run_shell_script
     if Path.home().joinpath("code/machineconfig").exists(): executable = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with textual"""
-    else: executable = """--with "machineconfig>=6.59,textual" """
+    else: executable = """--with "machineconfig>=6.61,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/scripts/python/helpers_devops/cli_utils.py

@@ -1,7 +1,7 @@
 
 
 import typer
-from typing import Annotated, Optional
+from typing import Annotated, Optional, TypedDict
 from pathlib import Path
 import subprocess
 import requests
@@ -115,3 +115,28 @@ def merge_pdfs(
     from machineconfig.utils.code import run_shell_script, get_uv_command_executing_python_script
     uv_command, _py_file = get_uv_command_executing_python_script(python_script=code, uv_with=["pypdf"], uv_project_dir=None)
     run_shell_script(uv_command)
+
+
+class MachineSpecs(TypedDict):
+    system: str
+    distro: str
+    home_dir: str
+def get_machine_specs() -> MachineSpecs:
+    """Write print and return the local machine specs."""
+    import platform
+    UV_RUN_CMD = "$HOME/.local/bin/uv run" if platform.system() != "Windows" else """& "$env:USERPROFILE/.local/bin/uv" run"""
+    command = f"""{UV_RUN_CMD} --with distro python -c "import distro; print(distro.name(pretty=True))" """
+    import subprocess
+    distro = subprocess.run(command, shell=True, capture_output=True, text=True).stdout.strip()
+    specs: MachineSpecs = {
+        "system": platform.system(),
+        "distro": distro,
+        "home_dir": str(Path.home()),
+    }
+    print(specs)
+    from machineconfig.utils.source_of_truth import CONFIG_ROOT
+    path = CONFIG_ROOT.joinpath("machine_specs.json")
+    CONFIG_ROOT.mkdir(parents=True, exist_ok=True)
+    import json
+    path.write_text(json.dumps(specs, indent=4), encoding="utf-8")
+    return specs

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -80,7 +80,7 @@ git pull originEnc master
         uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
         uv_with = None
     else:
-        uv_with = ["machineconfig>=6.59"]
+        uv_with = ["machineconfig>=6.61"]
         uv_project_dir = None
 
     import tempfile

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/scripts/python/nw/mount_nfs

@@ -5,7 +5,7 @@
 # mkdir ~/data/local
 # sudo mount -o nolock,noatime,nodiratime,proto=tcp,timeo=600,retrans=2,noac alex-p51s-5:/home/alex/data/local ./data/local
 
-uv run --python 3.14 --with "machineconfig>=6.59" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=6.61" python -m machineconfig.scripts.python.mount_nfs
 # Check if remote server is reachable and share folder exists
 if ! ping -c 1 "$remote_server" &> /dev/null; then
   echo "💥 Error: Remote server $remote_server is not reachable."

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/scripts/python/utils.py

@@ -1,6 +1,6 @@
 
 
-from machineconfig.scripts.python.helpers_devops.cli_utils import download, merge_pdfs
+from machineconfig.scripts.python.helpers_devops.cli_utils import download, merge_pdfs, get_machine_specs
 import typer
 
 
@@ -11,6 +11,8 @@ def get_app() -> typer.Typer:
     app.command(name="d", no_args_is_help=True, hidden=True)(download)
     app.command(name="merge-pdfs", no_args_is_help=True, help="[m] Merge two PDF files into one.")(merge_pdfs)
     app.command(name="m", no_args_is_help=True, hidden=True)(merge_pdfs)
+    app.command(name="get-machine-specs", no_args_is_help=False, help="[g] Get machine specifications.")(get_machine_specs)
+    app.command(name="g", no_args_is_help=False, hidden=True)(get_machine_specs)
     return app
 
 

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.59" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.61" python -m machineconfig.scripts.python.mount_ssh
 
 net use T: \\sshfs.kr\$user@$host.local
 # this worked: net use T: \\sshfs\alex@alex-p51s-5.local

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/settings/shells/pwsh/init.ps1

@@ -34,10 +34,10 @@ Set-Alias -Name l -Value lsdla -Option AllScope
 function d { devops @args }
 function c { cloud @args }
 function a { agents @args }
-function s { sessions @args }
+function ss { sessions @args }
 function ff { ftpx @args }
 function f { fire @args }
-function r { croshell @args }
+function rr { croshell @args }
 function u { utils @args }
 
 # try {

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 . <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/uv.sh")
 mcfg() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.59" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.61" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"
 alias a="mcfg agents"
-alias s="mcfg sessions"
+alias ss="mcfg sessions"
 alias ff="mcfg ftpx"
 alias f="mcfg fire"
-alias r="mcfg croshell"
+alias rr="mcfg croshell"
 alias u="mcfg utils"
 echo "mcfg command is now defined in this shell session."

{machineconfig-6.59 → machineconfig-6.62}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -2,14 +2,14 @@
 
 iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/uv.ps1").Content
 function mcfg {
-    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.59" mcfg $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.61" mcfg $args
 }
 function d { mcfg devops @args }
 function c { mcfg cloud @args }
 function a { mcfg agents @args }
-function s { mcfg sessions @args }
+function ss { mcfg sessions @args }
 function ff { mcfg ftpx @args }
 function f { mcfg fire @args }
-function r { mcfg croshell @args }
+function rr { mcfg croshell @args }
 function u { mcfg utils @args }
 Write-Host "mcfg command aliases are now defined in this PowerShell session."