machineconfig 5.94__tar.gz → 5.96__tar.gz

{machineconfig-5.94/src/machineconfig.egg-info → machineconfig-5.96}/PKG-INFO

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

{machineconfig-5.94 → machineconfig-5.96}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.94"
+version = "5.96"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -101,6 +101,7 @@ dev = [
     "plotly>=6.3.0",
     "pre-commit>=4.3.0",
     "pudb>=2025.1",
+    "pycrucible>=0.3.0",
     "pylint>=3.3.8",
     "pyrefly>=0.33.1",
     "pyright>=1.1.405",
@@ -121,3 +122,23 @@ dev = [
     "types-urllib3>=1.26.25.14",
     "vt-py>=0.21.0",
 ]
+
+[tool.pycrucible]
+entry = "src/machineconfig/scripts/python/devops.py"
+[tool.pycrucible.options]
+debug = false
+extract_to_temp = false
+delete_after_run = false
+offline_mode = false
+
+[tool.pycrucible.patterns]
+include = [
+    "**/*.py",
+    "**/*.ps1",
+    "**/*.sh",
+    "**/*.md",
+]
+exclude = [
+    "**/__pycache__/**",
+]
+

{machineconfig-5.94 → machineconfig-5.96}/src/machineconfig/scripts/python/ai/solutions/generic.py

@@ -48,7 +48,7 @@ def adjust_gitignore(repo_root: Path) -> None:
         "CLAUDE.md",
         "CRUSH.md",
         ".cursor",
-        ".clinerules"
+        ".clinerules",
         ".github/instructions",
         ".github/chatmodes",
         ".github/prompts",

{machineconfig-5.94 → machineconfig-5.96}/src/machineconfig/scripts/python/devops_helpers/cli_self.py

@@ -20,8 +20,13 @@ def update():
     uv self update
     uv tool install --upgrade machineconfig
     """
-    from machineconfig.utils.code import run_shell_script
-    run_shell_script(code)
+    import platform
+    if platform.system() == "Windows":
+        from machineconfig.utils.code import run_shell_script_after_exit
+        run_shell_script_after_exit(code)
+    else:
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(code)
 
 def interactive():
     """🤖 INTERACTIVE configuration of machine."""
@@ -101,3 +106,4 @@ def get_app():
     cli_app.command("readme", no_args_is_help=False, help="📚  [r] render readme markdown in terminal.")(readme)
     cli_app.command("r", no_args_is_help=False, hidden=True)(readme)
     return cli_app
+

{machineconfig-5.94 → machineconfig-5.96}/src/machineconfig/settings/shells/pwsh/init.ps1

@@ -7,7 +7,6 @@ function Add-ToPathIfNotAlready {
         [Parameter(Mandatory=$true)]
         [string[]]$Directories
     )
-
     foreach ($dir in $Directories) {
         if ($env:Path -notlike "*$dir*") {
             $env:Path += ";$dir"
@@ -16,7 +15,7 @@ function Add-ToPathIfNotAlready {
 }
 
 Add-ToPathIfNotAlready -Directories @(
-    "$CONFIG_ROOT\src\machineconfig\scripts\windows",
+    "$CONFIG_ROOT\scripts\windows",
     "$HOME\dotfiles\scripts\windows",
     "C:\Program Files (x86)\GnuWin32\bin",
     "C:\Program Files\CodeBlocks\MinGW\bin",
@@ -24,10 +23,6 @@ Add-ToPathIfNotAlready -Directories @(
     "C:\Program Files\Graphviz\bin"
 )
 
-# $machineconfig_path = (python -c "print(__import__('machineconfig').__file__[:-12])")
-#C:\Program Files\Git\bin
-
-
 # sources  ================================================================
 . $CONFIG_ROOT\settings\broot\brootcd.ps1
 . $CONFIG_ROOT\settings\lf\windows\lfcd.ps1
@@ -36,7 +31,6 @@ Add-ToPathIfNotAlready -Directories @(
 
 function lsdla { lsd -la }
 Set-Alias -Name l -Value lsdla -Option AllScope
-
 function d { mcfg devops @args }
 function c { mcfg cloud @args }
 function a { mcfg agents @args }
@@ -44,8 +38,6 @@ function s { mcfg sessions @args }
 function ff { mcfg ftpx @args }
 function f { mcfg fire @args }
 function cs { mcfg croshell @args }
-
-
 try {
     Set-Alias -Name gcs -Value {gh copilot suggest -t shell}
     Set-Alias -Name gcg -Value {gh copilot suggest -t git}
@@ -72,25 +64,3 @@ try {
 catch {
     # Do nothing
 }
-
-# try {
-#     Invoke-Expression -Command $(mcfly init powershell | out-string)
-# }
-# catch {
-#     # Do nothing
-# }
-
-
-# oh-my-posh --init --shell pwsh --config $env:USERPROFILE/AppData/Local/Programs/oh-my-posh/themes/atomicBit.omp.json | Invoke-Expression
-
-# try {
-#     Invoke-Expression (&starship init powershell)
-# }
-# catch {
-#     # Do nothing
-# # oh-my-posh --init --shell pwsh --config $env:USERPROFILE/AppData/Local/Programs/oh-my-posh/themes/atomicBit.omp.json | Invoke-Expression
-# }
-
-# Set-Alias lvim '~/.local/bin/lvim.ps1'
-# function fuck {     $history = (Get-History -Count 1).CommandLine;     if (-not [string]::IsNullOrWhiteSpace($history)) {         $f>
-

{machineconfig-5.94 → machineconfig-5.96}/src/machineconfig/utils/code.py

@@ -1,6 +1,8 @@
 import platform
 from typing import Optional
 import subprocess
+import os
+# import time
 from rich.console import Console
 from rich.panel import Panel
 from rich.syntax import Syntax
@@ -134,3 +136,74 @@ def run_shell_script(script: str, display_script: bool = True, clean_env: bool =
     temp_script_path.unlink(missing_ok=True)
     console.print(f"🗑️  [blue]Temporary script deleted:[/blue] [green]{temp_script_path}[/green]")
     return proc
+
+
+def run_shell_script_after_exit(script: str, check_interval: float = 0.1, display_script: bool = True) -> subprocess.Popen[bytes]:
+    current_pid = os.getpid()
+    console = Console()
+    
+    if platform.system() == "Windows":
+        monitor_script = f"""$ErrorActionPreference = "Stop"
+$targetPid = {current_pid}
+$checkInterval = {check_interval}
+
+Write-Host "🔍 Monitoring process PID: $targetPid"
+
+while ($true) {{
+    $process = Get-Process -Id $targetPid -ErrorAction SilentlyContinue
+    if (-not $process) {{
+        Write-Host "✅ Process $targetPid has exited. Running script..."
+        break
+    }}
+    Start-Sleep -Seconds $checkInterval
+}}
+
+# Execute the provided script
+{script}
+"""
+        suffix = ".ps1"
+        cmd = ["powershell", "-ExecutionPolicy", "Bypass", "-NoProfile", "-WindowStyle", "Hidden", "-File"]
+    else:
+        monitor_script = f"""#!/bin/bash
+target_pid={current_pid}
+check_interval={check_interval}
+
+echo "🔍 Monitoring process PID: $target_pid"
+
+while kill -0 $target_pid 2>/dev/null; do
+    sleep $check_interval
+done
+
+echo "✅ Process $target_pid has exited. Running script..."
+
+# Execute the provided script
+{script}
+"""
+        suffix = ".sh"
+        cmd = ["bash"]
+    
+    monitor_script_path = PathExtended.tmp().joinpath("tmp_scripts", "monitor", randstr() + suffix)
+    monitor_script_path.parent.mkdir(parents=True, exist_ok=True)
+    monitor_script_path.write_text(monitor_script, encoding="utf-8")
+    
+    if display_script:
+        lexer = "powershell" if platform.system() == "Windows" else "bash"
+        console.print(Panel(Syntax(code=monitor_script, lexer=lexer), title=f"📄 Monitor script @ {monitor_script_path}", subtitle="Will run after current process exits"), style="bold yellow")
+    
+    if platform.system() != "Windows":
+        monitor_script_path.chmod(0o755)
+    
+    cmd.append(str(monitor_script_path))
+    
+    if platform.system() == "Windows":
+        creation_flags = subprocess.CREATE_NEW_PROCESS_GROUP | subprocess.DETACHED_PROCESS
+        process = subprocess.Popen(cmd, creationflags=creation_flags, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL)
+    else:
+        process = subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL, start_new_session=True)
+    
+    if display_script:
+        console.print(f"🚀 [green]Monitor process started with PID:[/green] [blue]{process.pid}[/blue]")
+        console.print(f"📍 [yellow]Watching PID:[/yellow] [blue]{current_pid}[/blue]")
+    
+    return process
+

{machineconfig-5.94 → machineconfig-5.96/src/machineconfig.egg-info}/PKG-INFO

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