machineconfig 6.68__tar.gz → 6.71__tar.gz

{machineconfig-6.68/src/machineconfig.egg-info → machineconfig-6.71}/PKG-INFO

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

{machineconfig-6.68 → machineconfig-6.71}/pyproject.toml

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

machineconfig-6.71/src/machineconfig/scripts/linux/mcfgp

@@ -0,0 +1,14 @@
+
+
+
+RANDOM_NAME=$(date +%s%N | sha256sum | head -c 16)
+export OP_PROGRAM_PATH="$HOME/tmp_results/tmp_scripts/machineconfig/${RANDOM_NAME}.sh"
+
+mcfg "$@"
+
+if [[ -f "$OP_PROGRAM_PATH" ]]; then
+  echo "Found op program at: $OP_PROGRAM_PATH"
+  bash "$OP_PROGRAM_PATH"
+else
+  echo "no op program found"
+fi

{machineconfig-6.68 → machineconfig-6.71}/src/machineconfig/scripts/python/croshell.py

@@ -158,8 +158,15 @@ code --new-window {str(pyfile)}
         # --python 3.14
         fire_line = f"uv run {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"
 
-    from machineconfig.utils.code import run_shell_script
-    run_shell_script(fire_line, clean_env=False)
+    import os
+    program_path_maybe = os.environ.get("OP_PROGRAM_PATH", None)
+    if program_path_maybe is not None:
+        program_path_obj = PathExtended(program_path_maybe)
+        program_path_obj.parent.mkdir(parents=True, exist_ok=True)
+        program_path_obj.write_text(data=fire_line, encoding="utf-8")
+    else:
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(fire_line, clean_env=False)
 
 
 def main() -> None:

{machineconfig-6.68 → machineconfig-6.71}/src/machineconfig/scripts/python/entry.py

@@ -2,13 +2,12 @@
 from machineconfig.scripts.python.devops import get_app as get_devops_app
 from machineconfig.scripts.python.cloud import get_app as get_cloud_app
 from machineconfig.scripts.python.agents import get_app as get_agents_app
-from machineconfig.scripts.python.fire_jobs import get_app as get_fire_jobs_app
 from machineconfig.scripts.python.sessions import get_app as get_sessions_app
 from machineconfig.scripts.python.utils import get_app as get_utils_app
 
 from machineconfig.scripts.python.ftpx import ftpx as ftpx_func
 from machineconfig.scripts.python.croshell import croshell as croshell_func
-
+from machineconfig.scripts.python.fire_jobs import fire as get_fire_jobs_app
 
 def get_app():
     import typer
@@ -25,14 +24,13 @@ def get_app():
     app.add_typer(sessions_app, name="sessions", help="[s] Session and layout management", no_args_is_help=True)
     app.add_typer(sessions_app, name="s", hidden=True)  # short alias
 
-    fire_jobs_app = get_fire_jobs_app()
-    app.add_typer(fire_jobs_app, name="fire", help="[f] Fire and manage jobs", no_args_is_help=True)
-    app.add_typer(fire_jobs_app, name="f", hidden=True)  # short alias
 
     agents_app = get_agents_app()
     app.add_typer(agents_app, name="agents", help="[a] 🤖 AI Agents management commands", no_args_is_help=True)
     app.add_typer(agents_app, name="a", hidden=True)  # short alias
 
+    app.command(name="fire", help="[f] Fire and manage jobs", no_args_is_help=False)(get_fire_jobs_app)
+    app.command(name="f", hidden=True, no_args_is_help=False)(get_fire_jobs_app)
     app.command("ftpx", no_args_is_help=True, help="[ff] File transfer utility though SSH")(ftpx_func)
     app.command("ff", no_args_is_help=True, hidden=True)(ftpx_func)  # short alias
     app.command("croshell", no_args_is_help=False, help="[r] Cross-shell command execution")(croshell_func)

{machineconfig-6.68 → machineconfig-6.71}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

{machineconfig-6.68 → machineconfig-6.71}/src/machineconfig/scripts/python/fire_jobs.py

@@ -192,8 +192,15 @@ python -m machineconfig.cluster.templates.cli_click --file {choice_file} """
             command = "$ErrorActionPreference = 'SilentlyContinue';\n" + command + "\nStart-Sleep -Seconds 0.5"
         else:
             raise NotImplementedError(f"Platform {platform.system()} not supported.")
-    from machineconfig.utils.code import run_shell_script
-    run_shell_script(command)
+    import os
+    op_program_path = os.environ.get("OP_PROGRAM_PATH", None)
+    if op_program_path is not None:
+        op_program_path = PathExtended(op_program_path)
+        op_program_path.parent.mkdir(parents=True, exist_ok=True)
+        op_program_path.write_text(command, encoding="utf-8")
+    else:
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(command)
 
 
 def fire(
@@ -267,6 +274,7 @@ def get_app():
     app.command(context_settings={"allow_extra_args": True, "allow_interspersed_args": False})(fire)
     return app
 
+
 def main():
     app = get_app()
     app()

{machineconfig-6.68 → machineconfig-6.71}/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.68")
+        uv_with.append("machineconfig>=6.71")
     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.68 → machineconfig-6.71}/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.68" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.71" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.68" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.71" """)
     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.68,textual" """
+    else: executable = """--with "machineconfig>=6.71,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-6.68 → machineconfig-6.71}/src/machineconfig/scripts/python/helpers_navigator/command_tree.py

@@ -191,12 +191,36 @@ class CommandTree(Tree[CommandInfo]):
             help_text="devops config shell <copy|reference>"
         ))
 
-        config_node.add("🔗 pwsh_theme - Configure PowerShell theme", data=CommandInfo(
-            name="pwsh_theme",
-            description="Configure your PowerShell theme",
-            command="devops config pwsh_theme",
+        config_node.add("🔗 path - Navigate PATH variable", data=CommandInfo(
+            name="path",
+            description="Navigate PATH variable with TUI",
+            command="devops config path",
             parent="config",
-            help_text="devops config pwsh_theme"
+            help_text="devops config path"
+        ))
+
+        config_node.add("🔗 starship-theme - Select starship theme", data=CommandInfo(
+            name="starship-theme",
+            description="Select starship prompt theme",
+            command="devops config starship-theme",
+            parent="config",
+            help_text="devops config starship-theme"
+        ))
+
+        config_node.add("🔗 pwsh-theme - Configure PowerShell theme", data=CommandInfo(
+            name="pwsh-theme",
+            description="Select powershell prompt theme",
+            command="devops config pwsh-theme",
+            parent="config",
+            help_text="devops config pwsh-theme"
+        ))
+
+        config_node.add("🔗 copy-assets - Copy asset files", data=CommandInfo(
+            name="copy-assets",
+            description="Copy asset files from library to machine",
+            command="devops config copy-assets",
+            parent="config",
+            help_text="devops config copy-assets <scripts|settings|both>"
         ))
 
         # data subcommands
@@ -241,28 +265,52 @@ class CommandTree(Tree[CommandInfo]):
             help_text="devops network share-terminal"
         ))
 
-        network_node.add("� install_ssh_server - Install SSH server", data=CommandInfo(
-            name="install_ssh_server",
+        network_node.add("🌐 share-server - Start local/global server", data=CommandInfo(
+            name="share-server",
+            description="Start local/global server to share files/folders via web browser",
+            command="devops network share-server",
+            parent="network",
+            help_text="devops network share-server"
+        ))
+
+        network_node.add("📡 install-ssh-server - Install SSH server", data=CommandInfo(
+            name="install-ssh-server",
             description="Install SSH server",
-            command="devops network install_ssh_server",
+            command="devops network install-ssh-server",
             parent="network",
-            help_text="devops network install_ssh_server"
+            help_text="devops network install-ssh-server"
         ))
 
-        network_node.add("� add_ssh_key - Add SSH public key", data=CommandInfo(
-            name="add_ssh_key",
+        network_node.add("🔑 add-ssh-key - Add SSH public key", data=CommandInfo(
+            name="add-ssh-key",
             description="Add SSH public key to this machine",
-            command="devops network add_ssh_key",
+            command="devops network add-ssh-key",
             parent="network",
-            help_text="devops network add_ssh_key --path <file> --choose --value --github <username>"
+            help_text="devops network add-ssh-key --path <file> --choose --value --github <username>"
         ))
 
-        network_node.add("�️  add_ssh_identity - Add SSH identity", data=CommandInfo(
-            name="add_ssh_identity",
+        network_node.add("🗝️ add-ssh-identity - Add SSH identity", data=CommandInfo(
+            name="add-ssh-identity",
             description="Add SSH identity (private key) to this machine",
-            command="devops network add_ssh_identity",
+            command="devops network add-ssh-identity",
+            parent="network",
+            help_text="devops network add-ssh-identity"
+        ))
+
+        network_node.add("📌 show-address - Show computer addresses", data=CommandInfo(
+            name="show-address",
+            description="Show this computer addresses on network",
+            command="devops network show-address",
             parent="network",
-            help_text="devops network add_ssh_identity"
+            help_text="devops network show-address"
+        ))
+
+        network_node.add("🐛 debug-ssh - Debug SSH connection", data=CommandInfo(
+            name="debug-ssh",
+            description="Debug SSH connection",
+            command="devops network debug-ssh",
+            parent="network",
+            help_text="devops network debug-ssh"
         ))
 
         # self subcommands
@@ -314,6 +362,22 @@ class CommandTree(Tree[CommandInfo]):
             help_text="devops self navigate"
         ))
 
+        self_node.add("📚 readme - Render README markdown", data=CommandInfo(
+            name="readme",
+            description="Render readme markdown in terminal",
+            command="devops self readme",
+            parent="self",
+            help_text="devops self readme"
+        ))
+
+        self_node.add("🐍 python - Run Python command/file", data=CommandInfo(
+            name="python",
+            description="Run python command/file in the machineconfig environment",
+            command="devops self python",
+            parent="self",
+            help_text="devops self python <path> --command"
+        ))
+
         # fire command - now a typer sub-app
         fire_node = self.root.add("🔥 fire - Fire jobs execution", data=CommandInfo(
             name="fire",
@@ -463,9 +527,9 @@ class CommandTree(Tree[CommandInfo]):
         ))
 
         # croshell command
-        self.root.add("� croshell - Interactive shell", data=CommandInfo(
+        self.root.add("🔄 croshell - Cross-shell command execution", data=CommandInfo(
             name="croshell",
-            description="Interactive shell with various options",
+            description="Cross-shell command execution",
             command="croshell",
             is_group=False,
             module_path="machineconfig.scripts.python.croshell",
@@ -473,11 +537,52 @@ class CommandTree(Tree[CommandInfo]):
         ))
 
         # ftpx command
-        self.root.add("📡 ftpx - File transfer", data=CommandInfo(
+        self.root.add("📡 ftpx - File transfer utility", data=CommandInfo(
             name="ftpx",
-            description="File transfer between machines",
+            description="File transfer utility through SSH",
             command="ftpx",
             is_group=False,
             module_path="machineconfig.scripts.python.ftpx",
             help_text="ftpx <source> <target> --recursive --zipFirst --cloud"
+        ))
+
+        # utils command
+        utils_node = self.root.add("🛠️ utils - Utility commands", data=CommandInfo(
+            name="utils",
+            description="Utility commands",
+            command="utils",
+            is_group=True,
+            module_path="machineconfig.scripts.python.utils"
+        ))
+
+        utils_node.add("💀 kill-process - Kill processes", data=CommandInfo(
+            name="kill-process",
+            description="Choose a process to kill interactively",
+            command="utils kill-process",
+            parent="utils",
+            help_text="utils kill-process"
+        ))
+
+        utils_node.add("⬇️ download - Download file", data=CommandInfo(
+            name="download",
+            description="Download a file from a URL and optionally decompress it",
+            command="utils download",
+            parent="utils",
+            help_text="utils download <url> --destination <path> --decompress"
+        ))
+
+        utils_node.add("📄 merge-pdfs - Merge PDF files", data=CommandInfo(
+            name="merge-pdfs",
+            description="Merge two PDF files into one",
+            command="utils merge-pdfs",
+            parent="utils",
+            help_text="utils merge-pdfs <file1> <file2> --output <file>"
+        ))
+
+        utils_node.add("🖥️ get-machine-specs - Get machine specifications", data=CommandInfo(
+            name="get-machine-specs",
+            description="Get machine specifications",
+            command="utils get-machine-specs",
+            parent="utils",
+            help_text="utils get-machine-specs"
         ))

{machineconfig-6.68 → machineconfig-6.71}/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.68"]
+        uv_with = ["machineconfig>=6.71"]
         uv_project_dir = None
 
     import tempfile

{machineconfig-6.68 → machineconfig-6.71}/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.68" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=6.71" 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.71/src/machineconfig/scripts/windows/mcfgp.ps1

@@ -0,0 +1,17 @@
+# Generate a random name (based on current timestamp hashed with SHA256)
+$timestamp = Get-Date -Format o | Get-FileHash -Algorithm SHA256
+$randomName = ($timestamp.Hash.Substring(0, 16))
+
+# Define the output path
+$env:OP_PROGRAM_PATH = "$HOME/tmp_results/tmp_scripts/machineconfig/${randomName}.ps1"
+
+# Run your equivalent command (replace with your actual command)
+mcfg @args
+
+# Check if the file exists
+if (Test-Path $env:OP_PROGRAM_PATH) {
+    Write-Host "Found op program at: $env:OP_PROGRAM_PATH"
+    & $env:OP_PROGRAM_PATH
+} else {
+    Write-Host "no op program found"
+}

{machineconfig-6.68 → machineconfig-6.71}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.68" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.71" 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.68 → machineconfig-6.71}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,7 +1,7 @@
 #!/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.68" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.71" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"

{machineconfig-6.68 → machineconfig-6.71}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -2,7 +2,7 @@
 
 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.68" mcfg $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.71" mcfg $args
 }
 function d { mcfg devops @args }
 function c { mcfg cloud @args }

{machineconfig-6.68 → machineconfig-6.71}/src/machineconfig/utils/code.py

@@ -1,8 +1,5 @@
 
-import atexit
-# import platform
 from typing import Any, Optional, Callable
-import subprocess
 from machineconfig.utils.accessories import randstr
 from machineconfig.utils.path_extended import PathExtended
 from pathlib import Path
@@ -66,7 +63,6 @@ def run_shell_script(script: str, display_script: bool = True, clean_env: bool =
     with tempfile.NamedTemporaryFile(mode='w', suffix=suffix, delete=False, encoding='utf-8') as temp_file:
         temp_file.write(script)
         temp_script_path = PathExtended(temp_file.name)
-
     console = Console()
     if display_script:
         from rich.syntax import Syntax
@@ -92,37 +88,12 @@ def run_shell_script(script: str, display_script: bool = True, clean_env: bool =
     return proc
 
 
-def run_shell_script_after_exit(script: str, display_script: bool = True) -> None:
-    import platform
-    from rich.console import Console
-    from rich.panel import Panel
-    from rich.syntax import Syntax
-
-    console = Console()
-    def execute_script_at_exit() -> None:
-        if platform.system() == "Windows":
-            suffix = ".ps1"
-            lexer = "powershell"
-        else:
-            suffix = ".sh"
-            lexer = "bash"
-        
-        script_path = PathExtended.tmp().joinpath("tmp_scripts", "exit", randstr() + suffix)
-        script_path.parent.mkdir(parents=True, exist_ok=True)
-        script_path.write_text(script, encoding="utf-8")
-        
-        if display_script:
-            console.print(Panel(Syntax(code=script, lexer=lexer), title=f"📄 Exit script @ {script_path}", subtitle="Running at exit"), style="bold yellow")
-        
-        if platform.system() != "Windows":
-            script_path.chmod(0o755)
-        
-        if platform.system() == "Windows":
-            subprocess.run(["powershell", "-ExecutionPolicy", "Bypass", "-NoProfile", "-File", str(script_path)], check=False)
-        else:
-            subprocess.run(["bash", str(script_path)], check=False)
-        
-        script_path.unlink(missing_ok=True)
-    
-    atexit.register(execute_script_at_exit)
-
+def exit_then_run_shell_script(command: str):
+    import os
+    op_program_path = os.environ.get("OP_PROGRAM_PATH", None)
+    if op_program_path is not None:
+        op_program_path = PathExtended(op_program_path)
+        op_program_path.parent.mkdir(parents=True, exist_ok=True)
+        op_program_path.write_text(command, encoding="utf-8")
+    else:
+        run_shell_script(command)

{machineconfig-6.68 → machineconfig-6.71}/src/machineconfig/utils/ssh.py

@@ -8,7 +8,7 @@ from machineconfig.utils.terminal import Response
 from machineconfig.utils.accessories import pprint, randstr
 from machineconfig.utils.meta import lambda_to_python_script
 UV_RUN_CMD = "$HOME/.local/bin/uv run" if platform.system() != "Windows" else """& "$env:USERPROFILE/.local/bin/uv" run"""
-MACHINECONFIG_VERSION = "machineconfig>=6.68"
+MACHINECONFIG_VERSION = "machineconfig>=6.71"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 class SSH:

{machineconfig-6.68 → machineconfig-6.71/src/machineconfig.egg-info}/PKG-INFO

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

{machineconfig-6.68 → machineconfig-6.71}/src/machineconfig.egg-info/SOURCES.txt

@@ -120,6 +120,7 @@ src/machineconfig/scripts/linux/fzfag
 src/machineconfig/scripts/linux/fzffg
 src/machineconfig/scripts/linux/fzfg
 src/machineconfig/scripts/linux/fzfrga
+src/machineconfig/scripts/linux/mcfgp
 src/machineconfig/scripts/linux/skrg
 src/machineconfig/scripts/linux/warp-cli.sh
 src/machineconfig/scripts/linux/z_ls
@@ -264,6 +265,7 @@ src/machineconfig/scripts/python/nw/wsl_windows_transfer.py
 src/machineconfig/scripts/windows/fzfb.ps1
 src/machineconfig/scripts/windows/fzfg.ps1
 src/machineconfig/scripts/windows/fzfrga.bat
+src/machineconfig/scripts/windows/mcfgp.ps1
 src/machineconfig/scripts/windows/mounts/mount_nfs.ps1
 src/machineconfig/scripts/windows/mounts/mount_nw.ps1
 src/machineconfig/scripts/windows/mounts/mount_smb.ps1