machineconfig 6.36__tar.gz → 6.38__tar.gz

{machineconfig-6.36/src/machineconfig.egg-info → machineconfig-6.38}/PKG-INFO

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

{machineconfig-6.36 → machineconfig-6.38}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "6.36"
+version = "6.38"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -79,7 +79,7 @@ license-files = []
 where = ["src"]
 
 [tool.setuptools.package-data]
-machineconfig = ["**/*.toml", "**/*.md", "**/*.sh", "**/*.ps1"]
+machineconfig = ["**/*.toml", "**/*.md", "**/*.sh", "**/*.ps1", "**/*.txt"]
 
 [dependency-groups]
 dev = [

{machineconfig-6.36 → machineconfig-6.38}/src/machineconfig/scripts/python/cloud.py

@@ -22,3 +22,8 @@ def get_app():
 def main():
     app = get_app()
     app()
+
+
+if __name__ == "__main__":
+    pass
+    # a = get_app()(asdf)

{machineconfig-6.36 → machineconfig-6.38}/src/machineconfig/scripts/python/cloud_helpers/cloud_sync.py

@@ -73,8 +73,8 @@ def main(
     cmd_line = f"{rclone_cmd[:65]}..."
     console.print(Panel(f"{title}\n{cmd_line}", title="[bold blue]Command[/bold blue]", expand=False))
 
-    # PROGRAM_PATH.write_text(txt, encoding="utf-8")
-    import subprocess
-
-    subprocess.run(txt, shell=True, check=True)
+    # import subprocess
+    # subprocess.run(txt, shell=True, check=True)
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(txt)
 

{machineconfig-6.36 → machineconfig-6.38}/src/machineconfig/scripts/python/croshell.py

@@ -10,9 +10,10 @@ from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.accessories import randstr
 
 from machineconfig.utils.options import choose_from_options
-# from machineconfig.utils.ve import get_ve_activate_line
 from rich.console import Console
 from rich.panel import Panel
+# from machineconfig.utils.ve import get_ve_path_and_ipython_profile
+# from pathlib import Path
 # from rich.text import Text
 
 console = Console()
@@ -63,10 +64,11 @@ except Exception as e:
 
 
 def croshell(
-    path: Annotated[Optional[str], typer.Argument(help="read a file.")] = "",
+    path: Annotated[Optional[str], typer.Argument(help="path of file to read.")] = "",
     python: Annotated[bool, typer.Option("--python", "-p", help="flag to use python over IPython.")] = False,
     profile: Annotated[Optional[str], typer.Option("--profile", "-P", help="ipython profile to use, defaults to default profile.")] = None,
     jupyter: Annotated[bool, typer.Option("--jupyter", "-j", help="run in jupyter interactive console")] = False,
+    vscode: Annotated[bool, typer.Option("--vscode", "-c", help="open the script in vscode")] = False,
     streamlit_viewer: Annotated[bool, typer.Option("--stViewer", "-s", help="view in streamlit app")] = False,
     visidata: Annotated[bool, typer.Option("--visidata", "-V", help="open data file in visidata")] = False,
     local: Annotated[bool, typer.Option("--local", "-l", help="run in local mode, not in virtual env.")]= False,
@@ -104,7 +106,6 @@ def croshell(
         program = get_read_data_pycode(str(file_obj))
         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]"))
@@ -124,7 +125,7 @@ from pathlib import Path
 
 """
 
-    pyfile = PathExtended.tmp().joinpath(f"tmp_scripts/python/croshell/{randstr()}.py")
+    pyfile = PathExtended.tmp().joinpath(f"tmp_scripts/python/croshell/{randstr()}/script.py")
     pyfile.parent.mkdir(parents=True, exist_ok=True)
 
     title = "Reading Data"
@@ -137,7 +138,16 @@ from pathlib import Path
     if visidata:
         fire_line = f"uv run --with visidata,pyarrow vd {str(file_obj)}"
     elif jupyter:
-        fire_line = f"code --new-window {str(pyfile)}"
+        fire_line = f"uv run --with 'machineconfig[plot]>=6.36' jupyter-lab {str(pyfile)}"
+    elif vscode:
+        fire_line = f"""
+cd {str(pyfile.parent)}
+uv init --python 3.14
+uv venv
+uv add "machineconfig[plot]>=6.36"
+# code serve-web
+code --new-window {str(pyfile)}
+"""
     else:
         if interpreter == "ipython": profile = f" --profile {ipython_profile} --no-banner"
         else: profile = ""
@@ -150,7 +160,9 @@ from pathlib import Path
                 console.print(Panel("❌ Could not determine the local machineconfig repo root. Please ensure the `REPO_ROOT` in `source_of_truth.py` is correctly set to the local path of the machineconfig repo, or do not use the `--local` flag.", title="Error", border_style="red"))
                 return
         else: ve_line = """--with "machineconfig[plot]>=6.36" """
-        fire_line = f"uv run --python 3.14 {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"
+        # ve_path_maybe, ipython_profile_maybe = get_ve_path_and_ipython_profile(Path.cwd())
+        # --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)

{machineconfig-6.36 → machineconfig-6.38}/src/machineconfig/scripts/python/devops.py

@@ -8,6 +8,7 @@ import machineconfig.scripts.python.devops_helpers.cli_config as cli_config
 import machineconfig.scripts.python.devops_helpers.cli_self as cli_self
 import machineconfig.scripts.python.devops_helpers.cli_data as cli_data
 import machineconfig.scripts.python.devops_helpers.cli_nw as cli_network
+from machineconfig.scripts.python.devops_helpers.cli_utils import get_app as get_app_utils
 
 
 def install(which: Annotated[Optional[str], typer.Argument(..., help="Comma-separated list of program names to install, or group name if --group flag is set.")] = None,
@@ -39,6 +40,9 @@ def get_app():
     app_nw = cli_network.get_app()
     app.add_typer(app_nw, name="network")
     app.add_typer(app_nw, name="n", hidden=True)
+    app_utils = get_app_utils()
+    app.add_typer(app_utils, name="utils")
+    app.add_typer(app_utils, name="u", hidden=True)
     return app
 
 def main():

{machineconfig-6.36 → machineconfig-6.38}/src/machineconfig/scripts/python/devops_helpers/cli_nw.py

@@ -64,9 +64,9 @@ def get_app():
     nw_apps.command(name="i", help="Install SSH server", hidden=True)(install_ssh_server)
     nw_apps.command(name="add-ssh-key", help="🔑  [k] Add SSH public key to this machine", no_args_is_help=True)(add_ssh_key)
     nw_apps.command(name="k", help="Add SSH public key to this machine", hidden=True, no_args_is_help=True)(add_ssh_key)
-    nw_apps.command(name="add-ssh-identity", help="🗝️  [a] Add SSH identity (private key) to this machine")(add_ssh_identity)
-    nw_apps.command(name="a", help="Add SSH identity (private key) to this machine", hidden=True)(add_ssh_identity)
-    nw_apps.command(name="show-address", help="[A] Show this computer addresses on network")(show_address)
+    nw_apps.command(name="add-ssh-identity", help="🗝️  [A] Add SSH identity (private key) to this machine")(add_ssh_identity)
+    nw_apps.command(name="A", help="Add SSH identity (private key) to this machine", hidden=True)(add_ssh_identity)
+    nw_apps.command(name="show-address", help="📌  [a] Show this computer addresses on network")(show_address)
     nw_apps.command(name="a", help="Show this computer addresses on network", hidden=True)(show_address)
     nw_apps.command(name="debug-ssh", help="🐛  [d] Debug SSH connection")(debug_ssh)
     nw_apps.command(name="d", help="Debug SSH connection", hidden=True)(debug_ssh)

{machineconfig-6.36 → machineconfig-6.38}/src/machineconfig/scripts/python/devops_helpers/cli_repos.py

@@ -20,27 +20,27 @@ CloudOption = Annotated[Optional[str], typer.Option("--cloud", "-c", help="☁
 def push(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
     """🚀 Push changes across repositories."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
-    git_operations(directory, pull=False, commit=False, push=True, recursive=recursive, no_sync=no_sync)
+    git_operations(directory, pull=False, commit=False, push=True, recursive=recursive, auto_uv_sync=not no_sync)
 
 
 def pull(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
     """⬇️ Pull changes across repositories."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
 
-    git_operations(directory, pull=True, commit=False, push=False, recursive=recursive, no_sync=no_sync)
+    git_operations(directory, pull=True, commit=False, push=False, recursive=recursive, auto_uv_sync=not no_sync)
 
 
 def commit(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
     """💾 Commit changes across repositories."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
-
-    git_operations(directory, pull=False, commit=True, push=False, recursive=recursive, no_sync=no_sync)
+    git_operations(directory, pull=False, commit=True, push=False, recursive=recursive, auto_uv_sync=not no_sync)
 
 
 def sync(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
     """🔄 Pull, commit, and push changes across repositories."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
-    git_operations(directory, pull=True, commit=True, push=True, recursive=recursive, no_sync=no_sync)
+    print(f"no_sync is {no_sync}")
+    git_operations(directory, pull=True, commit=True, push=True, recursive=recursive, auto_uv_sync=not no_sync)
 
 
 def capture(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:

machineconfig-6.38/src/machineconfig/scripts/python/devops_helpers/cli_utils.py

@@ -0,0 +1,79 @@
+
+
+import typer
+from typing import Annotated, Optional
+from pathlib import Path
+import subprocess
+import requests
+
+def download(url: Annotated[Optional[str], typer.Argument(..., help="The URL to download the file from." )] = None,
+             decompress: Annotated[bool, typer.Option("--decompress", "-d", help="Decompress the file if it's an archive.")] = False,
+             output: Annotated[Optional[str], typer.Option("--output", "-o", help="The output file path.")] = None) -> None:
+    if url is None:
+        typer.echo("❌ Error: URL is required.", err=True)
+        raise typer.Exit(code=1)
+    
+    typer.echo(f"📥 Downloading from: {url}")
+    
+    download_path = Path(output) if output else Path(url.split("/")[-1])
+    
+    try:
+        response = requests.get(url, allow_redirects=True, stream=True, timeout=60)
+        response.raise_for_status()
+        
+        total_size = int(response.headers.get('content-length', 0))
+        
+        with open(download_path, 'wb') as f:
+            if total_size == 0:
+                f.write(response.content)
+            else:
+                downloaded = 0
+                chunk_size = 8192
+                for chunk in response.iter_content(chunk_size=chunk_size):
+                    if chunk:
+                        f.write(chunk)
+                        downloaded += len(chunk)
+                        progress = (downloaded / total_size) * 100
+                        typer.echo(f"\r⏬ Progress: {progress:.1f}% ({downloaded}/{total_size} bytes)", nl=False)
+                typer.echo()
+        
+        typer.echo(f"✅ Downloaded to: {download_path}")
+    except requests.exceptions.RequestException as e:
+        typer.echo(f"❌ Download failed: {e}", err=True)
+        raise typer.Exit(code=1)
+    except OSError as e:
+        typer.echo(f"❌ File write error: {e}", err=True)
+        raise typer.Exit(code=1)
+    
+    if decompress:
+        typer.echo(f"📦 Decompressing: {download_path}")
+        
+        output_dir = download_path.parent if output else Path.cwd()
+        
+        try:
+            _result = subprocess.run(
+                ["ouch", "decompress", str(download_path), "--dir", str(output_dir)],
+                check=True,
+                capture_output=True,
+                text=True
+            )
+            typer.echo(f"✅ Decompressed to: {output_dir}")
+            
+            if download_path.exists():
+                download_path.unlink()
+                typer.echo(f"🗑️  Removed archive: {download_path}")
+                
+        except subprocess.CalledProcessError as e:
+            typer.echo(f"❌ Decompression failed: {e.stderr}", err=True)
+            raise typer.Exit(code=1)
+        except FileNotFoundError:
+            typer.echo("❌ Error: ouch command not found. Please install ouch.", err=True)
+            typer.echo("💡 Install with: cargo install ouch", err=True)
+            raise typer.Exit(code=1)
+
+
+def get_app() -> typer.Typer:
+    app = typer.Typer(help="🛠️  [u]  utilities operations", no_args_is_help=True, add_completion=True)
+    app.command(name="download", no_args_is_help=True, help="[d] Download a file from a URL and optionally decompress it.")(download)
+    app.command(name="d", no_args_is_help=True, hidden=True)(download)
+    return app

{machineconfig-6.36 → machineconfig-6.38}/src/machineconfig/scripts/python/repos_helpers/action.py

@@ -57,7 +57,7 @@ class GitOperationSummary:
         self.repos_without_remotes: list[PathExtended] = []
 
 
-def git_action(path: PathExtended, action: GitAction, mess: Optional[str] = None, r: bool = False, auto_sync: bool = True) -> GitOperationResult:
+def git_action(path: PathExtended, action: GitAction, mess: Optional[str], r: bool, auto_uv_sync: bool) -> GitOperationResult:
     """Perform git actions using Python instead of shell scripts. Returns detailed operation result."""
     from git.exc import InvalidGitRepositoryError
     from git.repo import Repo
@@ -67,7 +67,7 @@ def git_action(path: PathExtended, action: GitAction, mess: Optional[str] = None
     except InvalidGitRepositoryError:
         pprint(f"⚠️ Skipping {path} because it is not a git repository.")
         if r:
-            results = [git_action(path=sub_path, action=action, mess=mess, r=r, auto_sync=auto_sync) for sub_path in path.search()]
+            results = [git_action(path=sub_path, action=action, mess=mess, r=r, auto_uv_sync=auto_uv_sync) for sub_path in path.search()]
             # For recursive calls, we need to aggregate results somehow
             # For now, return success if all recursive operations succeeded
             all_successful = all(result.success for result in results)
@@ -154,7 +154,7 @@ def git_action(path: PathExtended, action: GitAction, mess: Optional[str] = None
         elif action == GitAction.pull:
             # Use the enhanced update function with uv sync support
             try:
-                update_repository(repo, auto_uv_sync=auto_sync, allow_password_prompt=False)
+                update_repository(repo, auto_uv_sync=auto_uv_sync, allow_password_prompt=False)
                 print("✅ Pull completed")
                 return GitOperationResult(
                     repo_path=path,
@@ -341,7 +341,7 @@ def perform_git_operations(repos_root: PathExtended, pull: bool, commit: bool, p
                 
             # Now perform the actual operations
             if pull:
-                result = git_action(path=a_path, action=GitAction.pull, r=recursive, auto_sync=auto_uv_sync)
+                result = git_action(path=a_path, action=GitAction.pull, mess=None, r=recursive, auto_uv_sync=auto_uv_sync)
                 summary.pulls_attempted += 1
                 if result.success:
                     summary.pulls_successful += 1
@@ -350,7 +350,7 @@ def perform_git_operations(repos_root: PathExtended, pull: bool, commit: bool, p
                     summary.failed_operations.append(result)
                     
             if commit:
-                result = git_action(a_path, action=GitAction.commit, r=recursive, auto_sync=auto_uv_sync)
+                result = git_action(a_path, action=GitAction.commit, mess=None, r=recursive, auto_uv_sync=auto_uv_sync)
                 summary.commits_attempted += 1
                 if result.success:
                     if result.had_changes:
@@ -362,7 +362,7 @@ def perform_git_operations(repos_root: PathExtended, pull: bool, commit: bool, p
                     summary.failed_operations.append(result)
                     
             if push:
-                result = git_action(a_path, action=GitAction.push, r=recursive, auto_sync=auto_uv_sync)
+                result = git_action(a_path, action=GitAction.push, mess=None, r=recursive, auto_uv_sync=auto_uv_sync)
                 summary.pushes_attempted += 1
                 if result.success:
                     summary.pushes_successful += 1

{machineconfig-6.36 → machineconfig-6.38}/src/machineconfig/scripts/python/repos_helpers/entrypoint.py

@@ -20,11 +20,10 @@ def git_operations(
     commit: bool,
     push: bool,
     recursive: bool,
-    no_sync: bool,
+    auto_uv_sync: bool,
 ) -> None:
     
     repos_root = resolve_directory(directory)
-    auto_uv_sync = not no_sync
     from machineconfig.scripts.python.repos_helpers.action import perform_git_operations
     from machineconfig.utils.path_extended import PathExtended
     perform_git_operations(

machineconfig-6.38/src/machineconfig/utils/files/art/fat_croco.txt

@@ -0,0 +1,10 @@
+                _ ___                /^^\ /^\  /^^\_
+    _          _@)@) \            ,,/ '` ~ `'~~ ', `\.
+  _/o\_ _ _ _/~`.`...'~\        ./~~..,'`','',.,' '  ~:
+ / `,'.~,~.~  .   , . , ~|,   ,/ .,' , ,. .. ,,.   `,  ~\_
+( ' _' _ '_` _  '  .    , `\_/ .' ..' '  `  `   `..  `,   \_
+ ~V~ V~ V~ V~ ~\ `   ' .  '    , ' .,.,''`.,.''`.,.``. ',   \_
+  _/\ /\ /\ /\_/, . ' ,   `_/~\_ .' .,. ,, , _/~\_ `. `. '.,  \_
+ < ~ ~ '~`'~'`, .,  .   `_: ::: \_ '      `_/ ::: \_ `.,' . ',  \_
+  \ ' `_  '`_    _    ',/ _::_::_ \ _    _/ _::_::_ \   `.,'.,`., \-,-,-,_,_,
+   `'~~ `'~~ `'~~ `'~~  \(_)(_)(_)/  `~~' \(_)(_)(_)/ ~'`\_.._,._,'_;_;_;_;_;

machineconfig-6.38/src/machineconfig/utils/files/art/halfwit_croco.txt

@@ -0,0 +1,9 @@
+                    .-._   _ _ _ _ _ _ _ _
+         .-''-.__.-'00  '-' ' ' ' ' ' ' ' '-.
+         '.___ '    .   .--_'-' '-' '-' _'-' '._
+          V: V 'vv-'   '_   '.       .'  _..' '.'.
+            '=.____.=_.--'   :_.__.__:_   '.   : :
+                    (((____.-'        '-.  /   : :
+                                      (((-'\ .' /
+                                    _____..'  .'
+                                   '-._____.-'

machineconfig-6.38/src/machineconfig/utils/files/art/happy_croco.txt

@@ -0,0 +1,22 @@
+                          .--.  .--.
+                         /    \/    \
+                        | .-.  .-.   \
+                        |/_  |/_  |   \
+                        || `\|| `\|    `----.
+                        |\0_/ \0_/    --,    \_
+      .--"""""-.       /              (` \     `-.
+     /          \-----'-.              \          \
+     \  () ()                         /`\          \
+     |                         .___.-'   |          \
+     \                        /` \|      /           ;
+      `-.___             ___.' .-.`.---.|             \
+         \| ``-..___,.-'`\| / /   /     |              `\
+          `      \|      ,`/ /   /   ,  /
+                  `      |\ /   /    |\/
+                   ,   .'`-;   '     \/
+              ,    |\-'  .'   ,   .-'`
+            .-|\--;`` .-'     |\.'
+           ( `"'-.|\ (___,.--'`'
+            `-.    `"`          _.--'
+               `.          _.-'`-.
+                 `''---''``       `."

machineconfig-6.38/src/machineconfig/utils/files/art/water_croco.txt

@@ -0,0 +1,11 @@
+                     _.---._     .---.
+            __...---' .---. `---'-.   `.
+  ~ -~ -.-''__.--' _.'( | )`.  `.  `._ :
+ -.~~ .'__-'_ .--'' ._`---'_.-.  `.   `-`.
+  ~ ~_~-~-~_ ~ -._ -._``---. -.    `-._   `.
+    ~- ~ ~ -_ -~ ~ -.._ _ _ _ ..-_ `.  `-._``--.._
+     ~~-~ ~-_ _~ ~-~ ~ -~ _~~_-~ -._  `-.  -. `-._``--.._.--''. ~ -~_
+         ~~ -~_-~ _~- _~~ _~-_~ ~-_~~ ~-.___    -._  `-.__   `. `. ~ -_~
+             ~~ _~- ~~- -_~  ~- ~ - _~~- _~~ ~---...__ _    ._ .` `. ~-_~
+                ~ ~- _~~- _-_~ ~-_ ~-~ ~_-~ _~- ~_~-_~  ~--.....--~ -~_ ~
+                     ~ ~ - ~  ~ ~~ - ~~-  ~~- ~-  ~ -~ ~ ~ -~~-  ~- ~-~

{machineconfig-6.36 → machineconfig-6.38}/src/machineconfig/utils/files/headers.py

@@ -6,7 +6,6 @@ import random
 from pathlib import Path
 from rich import pretty
 from rich.console import Console
-from typing import Optional
 
 
 def print_header():
@@ -38,18 +37,13 @@ def print_logo(logo: str):
             if random.choice([True, True, False]): font_box_color(logo)
             else: character_color(logo)
         else:
-            print("\n" + "🚫 " + "-" * 70 + " 🚫")
-            print("🔍 Missing ASCII art dependencies. Install with: iwr bit.ly/cfgasciiartwindows | iex")
-            print("🚫 " + "-" * 70 + " 🚫\n")
+            # print("\n" + "🚫 " + "-" * 70 + " 🚫")
+            # print("🔍 Missing ASCII art dependencies. Install with: iwr bit.ly/cfgasciiartwindows | iex")
+            # print("🚫 " + "-" * 70 + " 🚫\n")
             _default_art = Path(random.choice(glob.glob(str(Path(__file__).parent.joinpath("art", "*")))))
             print(_default_art.read_text())
     elif platform.system() in ["Linux", "Darwin"]:  # Explicitly handle both Linux and macOS
-        def is_executable_in_path(executable_name: str) -> Optional[str]:
-            path_dirs = os.environ['PATH'].split(os.pathsep)
-            for path_dir in path_dirs:
-                path_to_executable = os.path.join(path_dir, executable_name)
-                if os.path.isfile(path_to_executable) and os.access(path_to_executable, os.X_OK): return path_to_executable
-            return None
+        from machineconfig.utils.installer_utils.installer_abc import is_executable_in_path
         avail_cowsay = is_executable_in_path("cowsay")
         avail_lolcat = is_executable_in_path("lolcat")
         avail_boxes = is_executable_in_path("boxes")

{machineconfig-6.36 → machineconfig-6.38}/src/machineconfig/utils/installer_utils/installer_abc.py

@@ -141,11 +141,12 @@ def check_tool_exists(tool_name: str) -> bool:
         return npm_check
     else:
         raise NotImplementedError(f"platform {platform.system()} not implemented")
-def is_executable_in_path(executable_name: str) -> bool:
+
+def is_executable_in_path(name: str) -> bool:
     import os
     path_dirs = os.environ['PATH'].split(os.pathsep)
     for path_dir in path_dirs:
-        path_to_executable = os.path.join(path_dir, executable_name)
+        path_to_executable = os.path.join(path_dir, name)
         if os.path.isfile(path_to_executable) and os.access(path_to_executable, os.X_OK): return True
     return False
 

{machineconfig-6.36 → machineconfig-6.38}/src/machineconfig/utils/scheduler.py

@@ -1,4 +1,3 @@
-
 from pathlib import Path
 from typing import Callable, Optional, Union, Any, Protocol, List, TypeVar
 import logging
@@ -152,6 +151,64 @@ def to_pickle(obj: Any, path: Path) -> None:
     path.write_bytes(pickle.dumps(obj))
 
 
+class CacheMemory[T]():
+    def __init__(
+        self, source_func: Callable[[], T], expire: timedelta, logger: LoggerTemplate, name: Optional[str] = None
+    ) -> None:
+        self.cache: T
+        self.source_func = source_func
+        self.time_produced = datetime.now()
+        self.logger = logger
+        self.expire = expire
+        self.name = name if isinstance(name, str) else str(self.source_func)
+        self.last_call_is_fresh = False
+
+    @property
+    def age(self) -> timedelta:
+        return datetime.now() - self.time_produced
+
+    def __call__(self, fresh: bool = False) -> T:
+        self.last_call_is_fresh = False
+        if fresh or not hasattr(self, "cache"):
+            if self.logger:
+                why = "There was an explicit fresh order." if fresh else "Previous cache never existed."
+                self.logger.warning(f"""
+🆕 ════════════════════ NEW CACHE ════════════════════
+🔄 {self.name} cache: Populating fresh cache from source func
+ℹ️  Reason: {why}
+════════════════════════════════════════════════════════""")
+            self.cache = self.source_func()
+            self.last_call_is_fresh = True
+            self.time_produced = datetime.now()
+        else:
+            age = self.age
+            if age > self.expire:
+                if self.logger:
+                    self.logger.warning(f"""
+🔄 ════════════════════ CACHE UPDATE ════════════════════
+⚠️  {self.name} cache: Updating cache from source func
+⏱️  Age = {age} > {self.expire}
+════════════════════════════════════════════════════════""")
+                self.cache = self.source_func()
+                self.last_call_is_fresh = True
+                self.time_produced = datetime.now()
+            else:
+                if self.logger:
+                    self.logger.warning(f"""
+✅ ════════════════════ USING CACHE ════════════════════
+📦 {self.name} cache: Using cached values
+⏱️  Lag = {age}
+════════════════════════════════════════════════════════""")
+        return self.cache
+
+    @staticmethod
+    def as_decorator(expire: timedelta, logger: LoggerTemplate, name: Optional[str] = None):
+        def decorator(source_func: Callable[[], T2]) -> CacheMemory["T2"]:
+            res = CacheMemory(source_func=source_func, expire=expire, logger=logger, name=name)
+            return res
+        return decorator
+
+
 class Cache[T]():  # This class helps to accelrate access to latest data coming from expensive function. The class has two flavours, memory-based and disk-based variants."""
     def __init__(
         self, source_func: Callable[[], T], expire: timedelta, logger: LoggerTemplate, path: Path, saver: Callable[[T, Path], Any] = to_pickle, reader: Callable[[Path], T] = from_pickle, name: Optional[str] = None
@@ -180,8 +237,7 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
 📦 ════════════════════ CACHE OPERATION ════════════════════
 🔄 {self.name} cache: Reading cached values from `{self.path}`
 ⏱️  Lag = {age}
-════════════════════════════════════════════════════════════
-"""
+════════════════════════════════════════════════════════════"""
                 try:
                     self.cache = self.reader(self.path)
                 except Exception as ex:
@@ -190,8 +246,7 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
 ❌ ════════════════════ CACHE ERROR ════════════════════
 ⚠️  {self.name} cache: Cache file is corrupted
 🔍 Error: {ex}
-════════════════════════════════════════════════════════
-"""
+════════════════════════════════════════════════════════"""
                         self.logger.warning(msg1 + msg2)
                     self.cache = self.source_func()
                     self.last_call_is_fresh = True
@@ -208,8 +263,7 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
 🆕 ════════════════════ NEW CACHE ════════════════════
 🔄 {self.name} cache: Populating fresh cache from source func
 ℹ️  Reason: {why}
-════════════════════════════════════════════════════════
-""")
+════════════════════════════════════════════════════════""")
                 self.cache = self.source_func()  # fresh data.
                 self.last_call_is_fresh = True
                 self.time_produced = datetime.now()
@@ -248,21 +302,3 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
             return res
 
         return decorator
-
-#     def from_cloud(self, cloud: str, rel2home: bool = True, root: Optional[str] = None):
-#         assert self.path is not None
-#         exists = self.path.exists()
-#         exists_but_old = exists and ((datetime.now() - datetime.fromtimestamp(self.path.stat().st_mtime)) > self.expire)
-#         if not exists or exists_but_old:
-#             returned_path = self.path.from_cloud(cloud=cloud, rel2home=rel2home, root=root)
-#             if returned_path is None and not exists:
-#                 raise FileNotFoundError(f"❌ Failed to get @ {self.path}. Build the cache first with signed API.")
-#             elif returned_path is None and exists:
-#                 self.logger.warning(f"""
-# ⚠️ ════════════════════ CLOUD FETCH WARNING ════════════════════
-# 🔄 Failed to get fresh data from cloud
-# 📦 Using old cache @ {self.path}
-# ════════════════════════════════════════════════════════════════""")
-#         else:
-#             pass  # maybe we don't need to fetch it from cloud, if its too hot
-#         return self.reader(self.path)

{machineconfig-6.36 → machineconfig-6.38/src/machineconfig.egg-info}/PKG-INFO

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

{machineconfig-6.36 → machineconfig-6.38}/src/machineconfig.egg-info/SOURCES.txt

@@ -191,6 +191,7 @@ src/machineconfig/scripts/python/devops_helpers/cli_repos.py
 src/machineconfig/scripts/python/devops_helpers/cli_self.py
 src/machineconfig/scripts/python/devops_helpers/cli_share_server.py
 src/machineconfig/scripts/python/devops_helpers/cli_terminal.py
+src/machineconfig/scripts/python/devops_helpers/cli_utils.py
 src/machineconfig/scripts/python/devops_helpers/devops_backup_retrieve.py
 src/machineconfig/scripts/python/devops_helpers/devops_status.py
 src/machineconfig/scripts/python/devops_helpers/devops_update_repos.py
@@ -419,6 +420,10 @@ src/machineconfig/utils/files/ascii_art.py
 src/machineconfig/utils/files/dbms.py
 src/machineconfig/utils/files/headers.py
 src/machineconfig/utils/files/read.py
+src/machineconfig/utils/files/art/fat_croco.txt
+src/machineconfig/utils/files/art/halfwit_croco.txt
+src/machineconfig/utils/files/art/happy_croco.txt
+src/machineconfig/utils/files/art/water_croco.txt
 src/machineconfig/utils/files/ouch/__init__.py
 src/machineconfig/utils/files/ouch/decompress.py
 src/machineconfig/utils/installer_utils/__init__.py