machineconfig 6.96__tar.gz → 6.98__tar.gz

{machineconfig-6.96/src/machineconfig.egg-info → machineconfig-6.98}/PKG-INFO

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

{machineconfig-6.96 → machineconfig-6.98}/pyproject.toml

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

{machineconfig-6.96 → machineconfig-6.98}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

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

{machineconfig-6.96 → machineconfig-6.98}/src/machineconfig/scripts/python/helpers_devops/cli_share_server.py

@@ -140,12 +140,12 @@ croc {relay_arg} send {zip_arg} {qrcode_arg} {text_arg} {path_arg}"""
     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:
+def share_file_receive(code_args: Annotated[list[str], typer.Argument(help="Receive code or relay command. Examples: '7121-donor-olympic-bicycle' or '--relay 10.17.62.206:443 7121-donor-olympic-bicycle'")],) -> None:
     """Receive a file using croc with relay server.
 Usage examples:
     devops network receive 7121-donor-olympic-bicycle
-    devops network receive --relay 10.17.62.206:443 0782-paris-pencil-torso
-    devops network receive -- --relay 10.17.62.206:443 0782-paris-pencil-torso
+    devops network receive -- --relay 10.17.62.206:443 7121-donor-olympic-bicycle
+    devops network receive -- croc --relay 10.17.62.206:443 7121-donor-olympic-bicycle
 """
     from machineconfig.utils.installer_utils.installer import install_if_missing
     install_if_missing(which="croc")
@@ -153,33 +153,57 @@ Usage examples:
     
     is_windows = platform.system() == "Windows"
     
-    # Join all arguments back into a single string and split into tokens
-    tokens = " ".join(code_args).split()
+    # Join all arguments
+    input_str = " ".join(code_args)
+    tokens = input_str.split()
     
-    # Parse input: either [code] or [--relay, server:port, code]
+    # Parse input to extract relay server and secret code
     relay_server: str | None = None
     secret_code: str | None = None
     
-    if len(tokens) == 1:
-        # Just the code
-        secret_code = tokens[0]
-    elif len(tokens) >= 3 and tokens[0] == "--relay":
-        # Format: --relay server:port code [...]
-        relay_server = tokens[1]
-        secret_code = tokens[2]
-    else:
-        raise ValueError(f"Could not parse croc code from input: {' '.join(code_args)}")
-        
+    # Remove 'croc' from tokens if present
+    tokens = [t for t in tokens if t != 'croc']
+    
+    # Look for --relay flag and capture next token
+    if '--relay' in tokens:
+        relay_idx = tokens.index('--relay')
+        if relay_idx + 1 < len(tokens):
+            relay_server = tokens[relay_idx + 1]
+    
+    # Look for CROC_SECRET= prefix in any token
+    for token in tokens:
+        if token.startswith('CROC_SECRET='):
+            secret_code = token.split('=', 1)[1].strip('"')
+            break
+    
+    # If no secret code found yet, look for tokens with dashes (typical pattern: number-word-word-word)
+    if not secret_code:
+        for token in tokens:
+            if '-' in token and not token.startswith('-') and token not in [relay_server, 'export']:
+                secret_code = token
+                break
+    
+    if not secret_code and not relay_server:
+        typer.echo(f"❌ Error: Could not parse croc receive code from input: {input_str}", err=True)
+        typer.echo("Usage:", err=True)
+        typer.echo("  devops network receive 7121-donor-olympic-bicycle", err=True)
+        typer.echo("  devops network receive -- --relay 10.17.62.206:443 7121-donor-olympic-bicycle", err=True)
+        raise typer.Exit(code=1)
+
     # Build the appropriate script for current OS
     if is_windows:
         # 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"""
+        code_arg = f"{secret_code}" if secret_code else ""
+        script = f"""croc {relay_arg} {code_arg} --yes""".strip()
     else:
         # 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"""
+        if secret_code:
+            script = f"""export CROC_SECRET="{secret_code}"
+croc {relay_arg} --yes""".strip()
+        else:
+            script = f"""croc {relay_arg} --yes""".strip()
     
     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")

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

{machineconfig-6.96 → machineconfig-6.98}/src/machineconfig/scripts/windows/mcfgs.ps1

@@ -1,4 +1,4 @@
-function warp_in_op_code {
+function wrap_in_op_code {
     param(
         [Parameter(Mandatory=$true)]
         [string]$Command,
@@ -49,6 +49,6 @@ function warp_in_op_code {
 
 # Call the function with any arguments passed to the script
 if ($args.Count -gt 0) {
-    warp_in_op_code @args
+    wrap_in_op_code @args
 }
 

{machineconfig-6.96 → machineconfig-6.98}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.96" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.98" 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.96 → machineconfig-6.98}/src/machineconfig/settings/shells/pwsh/init.ps1

@@ -32,15 +32,15 @@ if (Test-Path "$CONFIG_ROOT\scripts\windows\mcfgs.ps1") {
 
     function lsdla { lsd -la }
     Set-Alias -Name l -Value lsdla -Option AllScope
-    function d { warp_in_op_code devops $args }
-    function c { warp_in_op_code cloud $args }
-    function a { warp_in_op_code agents $args }
-    function ss { warp_in_op_code sessions $args }
-    function ff { warp_in_op_code ftpx $args }
-    function f { warp_in_op_code fire $args }
-    function rr { warp_in_op_code croshell $args }
-    function u { warp_in_op_code utils $args }
-    function t { warp_in_op_code terminal $args }
+    function d { wrap_in_op_code devops $args }
+    function c { wrap_in_op_code cloud $args }
+    function a { wrap_in_op_code agents $args }
+    function ss { wrap_in_op_code sessions $args }
+    function ff { wrap_in_op_code ftpx $args }
+    function f { wrap_in_op_code fire $args }
+    function rr { wrap_in_op_code croshell $args }
+    function u { wrap_in_op_code utils $args }
+    function t { wrap_in_op_code terminal $args }
 
 }
 else {

machineconfig-6.98/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+. <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/uv.sh")
+. <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/scripts/linux/mcfgs.sh")
+
+alias devops='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" devops'
+alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" cloud'
+alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" agents'
+alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" sessions'
+alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" ftpx'
+alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" fire'
+alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" croshell'
+alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" utils'
+alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.98" terminal'
+
+alias d='wrap_in_op_code devops'
+alias c='wrap_in_op_code cloud'
+alias a='wrap_in_op_code agents'
+alias ss='wrap_in_op_code sessions'
+alias ff='wrap_in_op_code ftpx'
+alias f='wrap_in_op_code fire'
+alias rr='wrap_in_op_code croshell'
+alias u='wrap_in_op_code utils'
+alias t='wrap_in_op_code terminal'
+
+echo "mcfg command aliases are now defined in this shell session."

machineconfig-6.98/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -0,0 +1,26 @@
+
+
+iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/uv.ps1").Content
+iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/scripts/windows/mcfgs.ps1").Content
+
+function devops   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" devops $args }
+function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" cloud $args }
+function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" agents $args }
+function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" sessions $args }
+function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" ftpx $args }
+function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" fire $args }
+function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" croshell $args }
+function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" utils $args }
+function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.98" terminal $args }
+
+function d { wrap_in_op_code devops @args }
+function c { wrap_in_op_code cloud @args }
+function a { wrap_in_op_code agents @args }
+function ss { wrap_in_op_code sessions @args }
+function ff { wrap_in_op_code ftpx @args }
+function f { wrap_in_op_code fire @args }
+function rr { wrap_in_op_code croshell @args }
+function u { wrap_in_op_code utils @args }
+function t { wrap_in_op_code terminal @args }
+
+Write-Host "mcfg command aliases are now defined in this PowerShell session."

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

{machineconfig-6.96 → machineconfig-6.98/src/machineconfig.egg-info}/PKG-INFO

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

machineconfig-6.96/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,15 +0,0 @@
-#!/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.96" mcfg "$@"
-}
-alias d="mcfg devops"
-alias c="mcfg cloud"
-alias a="mcfg agents"
-alias ss="mcfg sessions"
-alias ff="mcfg ftpx"
-alias f="mcfg fire"
-alias rr="mcfg croshell"
-alias u="mcfg utils"
-alias t="mcfg terminal"
-echo "mcfg command is now defined in this shell session."

machineconfig-6.96/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -1,16 +0,0 @@
-
-
-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.96" mcfg $args
-}
-function d { mcfg devops @args }
-function c { mcfg cloud @args }
-function a { mcfg agents @args }
-function ss { mcfg sessions @args }
-function ff { mcfg ftpx @args }
-function f { mcfg fire @args }
-function rr { mcfg croshell @args }
-function u { mcfg utils @args }
-function t { mcfg terminal @args }
-Write-Host "mcfg command aliases are now defined in this PowerShell session."