machineconfig 6.93__tar.gz → 6.95__tar.gz

{machineconfig-6.93/src/machineconfig.egg-info → machineconfig-6.95}/PKG-INFO

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

{machineconfig-6.93 → machineconfig-6.95}/pyproject.toml

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

{machineconfig-6.93 → machineconfig-6.95}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

{machineconfig-6.93 → machineconfig-6.95}/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.93")
+        uv_with.append("machineconfig>=6.95")
     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.93 → machineconfig-6.95}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -48,9 +48,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.93" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.95" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.93" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.95" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -75,7 +75,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.93,textual" """
+    else: executable = """--with "machineconfig>=6.95,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-6.93 → machineconfig-6.95}/src/machineconfig/scripts/python/helpers_devops/cli_share_server.py

@@ -107,32 +107,37 @@ def share_file_send(path: Annotated[str, typer.Argument(help="Path to the file o
     install_if_missing(which="croc")
     # Get relay server IP from environment or use default
     import socket
-    import subprocess
-    import os
     import platform
     s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     s.connect(('8.8.8.8',80))
     local_ip_v4 = s.getsockname()[0]
     s.close()
     relay_port = "443"
-    env = os.environ.copy()
     is_windows = platform.system() == "Windows"
-    cmd = f"croc --relay {local_ip_v4}:{relay_port} --ip {local_ip_v4}:{relay_port} send"
-    if zip_folder:
-        cmd += " --zip"
-    if code:
-        if is_windows:
-            cmd += f" --code {code}"
+    
+    # Build command parts
+    relay_arg = f"--relay {local_ip_v4}:{relay_port} --ip {local_ip_v4}:{relay_port}"
+    zip_arg = "--zip" if zip_folder else ""
+    text_arg = f"--text '{text}'" if text else ""
+    qrcode_arg = "--qrcode" if qrcode else ""
+    path_arg = f"{path}" if not text else ""
+    
+    if is_windows:
+        # Windows PowerShell format
+        code_arg = f"--code {code}" if code else ""
+        script = f"""croc {relay_arg} send {zip_arg} {code_arg} {qrcode_arg} {text_arg} {path_arg}"""
+    else:
+        # Linux/macOS Bash format
+        if code:
+            script = f"""export CROC_SECRET="{code}"
+croc {relay_arg} send {zip_arg} {qrcode_arg} {text_arg} {path_arg}"""
         else:
-            env["CROC_SECRET"] = code
-    if text:
-        cmd += f" --text '{text}'"
-    if qrcode:
-        cmd += " --qrcode"
-    if not text:
-        cmd += f" {path}"
-    typer.echo(f"🚀 Sending file: {path}. Use: devops network f")
-    subprocess.run(cmd, shell=True, env=env)
+            script = f"""croc {relay_arg} send {zip_arg} {qrcode_arg} {text_arg} {path_arg}"""
+    
+    typer.echo(f"🚀 Sending file: {path}. Use: devops network receive")
+    from machineconfig.utils.code import exit_then_run_shell_script, print_code
+    print_code(code=script, desc="🚀 Receiving file with croc", lexer="bash" if platform.system() != "Windows" else "powershell")
+    exit_then_run_shell_script(script=script, strict=False)
 
 
 def share_file_receive(code_args: Annotated[list[str], typer.Argument(help="Receive code or full relay command. Examples: '7121-donor-olympic-bicycle' or '--relay 10.17.62.206:443 0782-paris-pencil-torso'")],) -> None:
@@ -144,12 +149,9 @@ Usage examples:
 """
     from machineconfig.utils.installer_utils.installer import install_if_missing
     install_if_missing(which="croc")
-    import subprocess
-    import os
     import platform
     import re
     
-    env = os.environ.copy()
     is_windows = platform.system() == "Windows"
     
     # Join all arguments back into a single string
@@ -179,22 +181,20 @@ Usage examples:
     if not secret_code:
         raise ValueError(f"Could not parse croc code from input: {code}")
     
-    # Build the appropriate command for current OS
+    # Build the appropriate script for current OS
     if is_windows:
-        # Windows format: croc --relay server:port secret-code --yes
-        cmd = "croc"
-        if relay_server:
-            cmd += f" --relay {relay_server}"
-        cmd += f" {secret_code} --yes"
+        # Windows PowerShell format: croc --relay server:port secret-code --yes
+        relay_arg = f"--relay {relay_server}" if relay_server else ""
+        script = f"""croc {relay_arg} {secret_code} --yes"""
     else:
-        # Linux/macOS format: CROC_SECRET="secret-code" croc --relay server:port --yes
-        env["CROC_SECRET"] = secret_code
-        cmd = "croc"
-        if relay_server:
-            cmd += f" --relay {relay_server}"
-        cmd += " --yes"
+        # Linux/macOS Bash format: CROC_SECRET="secret-code" croc --relay server:port --yes
+        relay_arg = f"--relay {relay_server}" if relay_server else ""
+        script = f"""export CROC_SECRET="{secret_code}"
+croc {relay_arg} --yes"""
     
-    subprocess.run(cmd, shell=True, env=env)
+    from machineconfig.utils.code import exit_then_run_shell_script, print_code
+    print_code(code=script, desc="🚀 Receiving file with croc", lexer="bash" if platform.system() != "Windows" else "powershell")
+    exit_then_run_shell_script(script=script, strict=False)
 
 
 def get_share_file_app():

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

{machineconfig-6.93 → machineconfig-6.95}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.93" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.95" 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.93 → machineconfig-6.95}/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.93" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.95" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"

{machineconfig-6.93 → machineconfig-6.95}/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.93" mcfg $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.95" mcfg $args
 }
 function d { mcfg devops @args }
 function c { mcfg cloud @args }

{machineconfig-6.93 → machineconfig-6.95}/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.93"
+MACHINECONFIG_VERSION = "machineconfig>=6.95"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 class SSH:

{machineconfig-6.93 → machineconfig-6.95/src/machineconfig.egg-info}/PKG-INFO

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