machineconfig 7.32__tar.gz → 7.33__tar.gz

{machineconfig-7.32/src/machineconfig.egg-info → machineconfig-7.33}/PKG-INFO

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

{machineconfig-7.32 → machineconfig-7.33}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "7.32"
+version = "7.33"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -69,8 +69,8 @@ sessions = "machineconfig.scripts.python.sessions:main"
 croshell = "machineconfig.scripts.python.croshell:main"
 ftpx = "machineconfig.scripts.python.ftpx:main"
 utils = "machineconfig.scripts.python.utils:main"
-mcfg = "machineconfig.scripts.python.mcfg:main"
-machineconfig = "machineconfig.scripts.python.mcfg:main"
+mcfg = "machineconfig.scripts.python.machineconfig:main"
+machineconfig = "machineconfig.scripts.python.machineconfig:main"
 terminal = "machineconfig.scripts.python.terminal:main"
 define = "machineconfig.scripts.python.define:main"
 

{machineconfig-7.32 → machineconfig-7.33}/src/machineconfig/scripts/python/define.py

@@ -16,10 +16,10 @@ def define_scripts():
     print(script)
 
 
-def main():
+def get_app():
     app = typer.Typer(add_completion=False, no_args_is_help=True)
     app.command(name="scripts", help="define all scripts", no_args_is_help=False)(define_scripts)
-    app()
+    return app
 
 
 # if __name__ == "__main__":

{machineconfig-7.32 → machineconfig-7.33}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

{machineconfig-7.32 → machineconfig-7.33}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -39,7 +39,7 @@ def path():
     uv_with = ["textual"]
     uv_project_dir = None
     if not Path.home().joinpath("code/machineconfig").exists():
-        uv_with.append("machineconfig>=7.32")
+        uv_with.append("machineconfig>=7.33")
     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-7.32 → machineconfig-7.33}/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>=7.32" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=7.33" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=7.32" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=7.33" """)
     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>=7.32,textual" """
+    else: executable = """--with "machineconfig>=7.33,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-7.32 → machineconfig-7.33}/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>=7.32"]
+        uv_with = ["machineconfig>=7.33"]
         uv_project_dir = None
 
     import tempfile

machineconfig-7.32/src/machineconfig/scripts/python/mcfg.py → machineconfig-7.33/src/machineconfig/scripts/python/machineconfig.py

@@ -8,6 +8,7 @@ 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
+from machineconfig.scripts.python.define import get_app as get_define_app
 
 def get_app():
     import typer
@@ -40,6 +41,9 @@ def get_app():
     app.add_typer(utils_app, name="utils", help="[u] Utility commands", no_args_is_help=True)
     app.add_typer(utils_app, name="u", hidden=True)  # short alias
 
+    define_app = get_define_app()
+    app.add_typer(define_app, name="define", help="[df] Define and manage configurations", no_args_is_help=True)
+    app.add_typer(define_app, name="df", hidden=True)  # short alias
     return app
 
 

{machineconfig-7.32 → machineconfig-7.33}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=7.32" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=7.33" 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-7.32 → machineconfig-7.33}/src/machineconfig/settings/shells/bash/init.sh

@@ -37,7 +37,7 @@ add_to_path_if_not_already \
 . $CONFIG_ROOT/settings/broot/br.sh
 . $CONFIG_ROOT/settings/lf/linux/exe/lfcd.sh
 . $CONFIG_ROOT/settings/tere/terecd.sh
-. $CONFIG_ROOT/scripts/linux/mcfgs
+. $CONFIG_ROOT/scripts/linux/wrap_mcfg
 
 # check if file in ~/dotfiles/machineconfig/init_linux.sh exists and source it
 if [ -f "$HOME/dotfiles/machineconfig/init_linux.sh" ]; then

{machineconfig-7.32 → machineconfig-7.33}/src/machineconfig/settings/shells/pwsh/init.ps1

@@ -24,11 +24,11 @@ Add-ToPathIfNotAlready -Directories @(
 )
 
 # sources  ================================================================
-if (Test-Path "$CONFIG_ROOT\scripts\windows\mcfgs.ps1") {
+if (Test-Path "$CONFIG_ROOT\scripts\windows\wrap_mcfg.ps1") {
     . $CONFIG_ROOT\settings\broot\brootcd.ps1
     . $CONFIG_ROOT\settings\lf\windows\lfcd.ps1
     . $CONFIG_ROOT\settings\tere\terecd.ps1
-    . $CONFIG_ROOT\scripts\windows\mcfgs.ps1
+    . $CONFIG_ROOT\scripts\windows\wrap_mcfg.ps1
 
     function lsdla { lsd -la }
     Set-Alias -Name l -Value lsdla -Option AllScope

{machineconfig-7.32 → machineconfig-7.33}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,16 +1,16 @@
 #!/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")
+. <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/scripts/linux/wrap_mcfg")
 
-alias devops='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.32" devops'
-alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.32" cloud'
-alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.32" agents'
-alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.32" sessions'
-alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.32" ftpx'
-alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.32" fire'
-alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.32" croshell'
-alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.32" utils'
-alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.32" terminal'
+alias devops='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" devops'
+alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" cloud'
+alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" agents'
+alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" sessions'
+alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" ftpx'
+alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" fire'
+alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" croshell'
+alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" utils'
+alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" terminal'
 
 alias d='wrap_in_shell_script devops'
 alias c='wrap_in_shell_script cloud'

{machineconfig-7.32 → machineconfig-7.33}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -1,17 +1,17 @@
 
 
 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
+iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/scripts/windows/wrap_mcfg.ps1").Content
 
-function devops   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.32" devops $args }
-function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.32" cloud $args }
-function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.32" agents $args }
-function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.32" sessions $args }
-function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.32" ftpx $args }
-function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.32" fire $args }
-function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.32" croshell $args }
-function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.32" utils $args }
-function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.32" terminal $args }
+function devops   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" devops $args }
+function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" cloud $args }
+function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" agents $args }
+function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" sessions $args }
+function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" ftpx $args }
+function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" fire $args }
+function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" croshell $args }
+function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" utils $args }
+function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" terminal $args }
 
 function d { wrap_in_shell_script devops @args }
 function c { wrap_in_shell_script cloud @args }

machineconfig-7.33/src/machineconfig/utils/io.py

@@ -0,0 +1,148 @@
+from __future__ import annotations
+
+from typing import Any, Union, Optional, Mapping
+from pathlib import Path
+import json
+import pickle
+import configparser
+
+
+PathLike = Union[str, Path]
+
+
+def _ensure_parent(path: PathLike) -> Path:
+    path_obj = Path(path)
+    path_obj.parent.mkdir(parents=True, exist_ok=True)
+    return path_obj
+
+
+def save_pickle(obj: Any, path: PathLike, verbose: bool = False) -> Path:
+    path_obj = _ensure_parent(path)
+    with open(path_obj, "wb") as fh:
+        pickle.dump(obj, fh, protocol=pickle.HIGHEST_PROTOCOL)
+    if verbose:
+        print(f"Saved pickle -> {path_obj}")
+    return Path(path_obj)
+
+
+def save_json(obj: Any, path: PathLike, indent: Optional[int] = None, verbose: bool = False) -> Path:
+    path_obj = _ensure_parent(path)
+    with open(path_obj, "w", encoding="utf-8") as fh:
+        json.dump(obj, fh, indent=indent, ensure_ascii=False)
+        fh.write("\n")
+    if verbose:
+        print(f"Saved json -> {path_obj}")
+    return Path(path_obj)
+
+
+def save_ini(path: PathLike, obj: Mapping[str, Mapping[str, Any]], verbose: bool = False) -> Path:
+    cp = configparser.ConfigParser()
+    for section, values in obj.items():
+        cp[section] = {str(k): str(v) for k, v in values.items()}
+    path_obj = _ensure_parent(path)
+    with open(path_obj, "w", encoding="utf-8") as fh:
+        cp.write(fh)
+    if verbose:
+        print(f"Saved ini -> {path_obj}")
+    return Path(path_obj)
+
+
+def read_ini(path: "Path", encoding: Optional[str] = None):
+    if not Path(path).exists() or Path(path).is_dir():
+        raise FileNotFoundError(f"File not found or is a directory: {path}")
+    import configparser
+    res = configparser.ConfigParser()
+    res.read(filenames=[str(path)], encoding=encoding)
+    return res
+
+
+def read_json(path: "Path", r: bool = False, **kwargs: Any) -> Any:  # return could be list or dict etc
+    import json
+    try:
+        mydict = json.loads(Path(path).read_text(encoding="utf-8"), **kwargs)
+    except Exception:
+        import re
+        def remove_comments(text: str) -> str:
+            # remove all // single-line comments
+            text = re.sub(r'//.*', '', text)
+            # remove all /* … */ block comments (non-greedy)
+            text = re.sub(r'/\*.*?\*/', '', text, flags=re.DOTALL)
+            return text
+        mydict = json.loads(remove_comments(Path(path).read_text(encoding="utf-8")), **kwargs)
+    _ = r
+    return mydict
+
+
+def from_pickle(path: Path) -> Any:
+    import pickle
+
+    return pickle.loads(path.read_bytes())
+
+
+def pwd2key(password: str, salt: Optional[bytes] = None, iterations: int = 10) -> bytes:  # Derive a secret key from a given password and salt"""
+    import base64
+    if salt is None:
+        import hashlib
+        m = hashlib.sha256()
+        m.update(password.encode(encoding="utf-8"))
+        return base64.urlsafe_b64encode(s=m.digest())  # make url-safe bytes required by Ferent.
+    from cryptography.hazmat.primitives import hashes
+    from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
+    return base64.urlsafe_b64encode(PBKDF2HMAC(algorithm=hashes.SHA256(), length=32, salt=salt, iterations=iterations, backend=None).derive(password.encode()))
+
+
+def encrypt(msg: bytes, key: Optional[bytes] = None, pwd: Optional[str] = None, salted: bool = True, iteration: Optional[int] = None, gen_key: bool = False) -> bytes:
+    import base64
+    from cryptography.fernet import Fernet
+
+    salt, iteration = None, None
+    if pwd is not None:  # generate it from password
+        assert (key is None) and (type(pwd) is str), "❌ You can either pass key or pwd, or none of them, but not both."
+        import secrets
+        iteration = iteration or secrets.randbelow(exclusive_upper_bound=1_000_000)
+        salt = secrets.token_bytes(nbytes=16) if salted else None
+        key_resolved = pwd2key(password=pwd, salt=salt, iterations=iteration)
+    elif key is None:
+        if gen_key:
+            key_resolved = Fernet.generate_key()
+            Path.home().joinpath("dotfiles/creds/data/encrypted_files_key.bytes").write_bytes(key_resolved)
+        else:
+            try:
+                key_resolved = Path.home().joinpath("dotfiles/creds/data/encrypted_files_key.bytes").read_bytes()
+                print(f"⚠️ Using key from: {Path.home().joinpath('dotfiles/creds/data/encrypted_files_key.bytes')}")
+            except FileNotFoundError as err:
+                print("\n" * 3, "~" * 50, """Consider Loading up your dotfiles or pass `gen_key=True` to make and save one.""", "~" * 50, "\n" * 3)
+                raise FileNotFoundError(err) from err
+    elif isinstance(key, (str, Path)):
+        key_resolved = Path(key).read_bytes()  # a path to a key file was passed, read it:
+    elif type(key) is bytes:
+        key_resolved = key  # key passed explicitly
+    else:
+        raise TypeError("❌ Key must be either a path, bytes object or None.")
+    code = Fernet(key=key_resolved).encrypt(msg)
+    if pwd is not None and salt is not None and iteration is not None:
+        return base64.urlsafe_b64encode(b"%b%b%b" % (salt, iteration.to_bytes(4, "big"), base64.urlsafe_b64decode(code)))
+    return code
+
+
+def decrypt(token: bytes, key: Optional[bytes] = None, pwd: Optional[str] = None, salted: bool = True) -> bytes:
+    import base64
+    if pwd is not None:
+        assert key is None, "❌ You can either pass key or pwd, or none of them, but not both."
+        if salted:
+            decoded = base64.urlsafe_b64decode(token)
+            salt, iterations, token = decoded[:16], decoded[16:20], base64.urlsafe_b64encode(decoded[20:])
+            key_resolved = pwd2key(password=pwd, salt=salt, iterations=int.from_bytes(bytes=iterations, byteorder="big"))
+        else:
+            key_resolved = pwd2key(password=pwd)  # trailing `;` prevents IPython from caching the result.
+    elif type(key) is bytes:
+        assert pwd is None, "❌ You can either pass key or pwd, or none of them, but not both."
+        key_resolved = key  # passsed explicitly
+    elif key is None:
+        key_resolved = Path.home().joinpath("dotfiles/creds/data/encrypted_files_key.bytes").read_bytes()  # read from file
+    elif isinstance(key, (str, Path)):
+        key_resolved = Path(key).read_bytes()  # passed a path to a file containing kwy
+    else:
+        raise TypeError(f"❌ Key must be either str, P, Path, bytes or None. Recieved: {type(key)}")
+    from cryptography.fernet import Fernet
+    return Fernet(key=key_resolved).decrypt(token)

{machineconfig-7.32 → machineconfig-7.33}/src/machineconfig/utils/path_extended.py

@@ -1,4 +1,5 @@
 from machineconfig.utils.accessories import randstr
+from machineconfig.utils.io import decrypt, encrypt
 
 from datetime import datetime
 import time
@@ -10,6 +11,7 @@ from platform import system
 from typing import Any, Optional, Union, Callable, TypeAlias, Literal
 
 
+
 OPLike: TypeAlias = Union[str, "PathExtended", Path, None]
 PLike: TypeAlias = Union[str, "PathExtended", Path]
 FILE_MODE: TypeAlias = Literal["r", "w", "x", "a"]
@@ -54,81 +56,6 @@ def _run_shell_command(
     )
 
 
-def pwd2key(password: str, salt: Optional[bytes] = None, iterations: int = 10) -> bytes:  # Derive a secret key from a given password and salt"""
-    import base64
-
-    if salt is None:
-        import hashlib
-
-        m = hashlib.sha256()
-        m.update(password.encode(encoding="utf-8"))
-        return base64.urlsafe_b64encode(s=m.digest())  # make url-safe bytes required by Ferent.
-    from cryptography.hazmat.primitives import hashes
-    from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
-
-    return base64.urlsafe_b64encode(PBKDF2HMAC(algorithm=hashes.SHA256(), length=32, salt=salt, iterations=iterations, backend=None).derive(password.encode()))
-
-
-def encrypt(msg: bytes, key: Optional[bytes] = None, pwd: Optional[str] = None, salted: bool = True, iteration: Optional[int] = None, gen_key: bool = False) -> bytes:
-    import base64
-    from cryptography.fernet import Fernet
-
-    salt, iteration = None, None
-    if pwd is not None:  # generate it from password
-        assert (key is None) and (type(pwd) is str), "❌ You can either pass key or pwd, or none of them, but not both."
-        import secrets
-
-        iteration = iteration or secrets.randbelow(exclusive_upper_bound=1_000_000)
-        salt = secrets.token_bytes(nbytes=16) if salted else None
-        key_resolved = pwd2key(password=pwd, salt=salt, iterations=iteration)
-    elif key is None:
-        if gen_key:
-            key_resolved = Fernet.generate_key()
-            Path.home().joinpath("dotfiles/creds/data/encrypted_files_key.bytes").write_bytes(key_resolved)
-        else:
-            try:
-                key_resolved = Path.home().joinpath("dotfiles/creds/data/encrypted_files_key.bytes").read_bytes()
-                print(f"⚠️ Using key from: {Path.home().joinpath('dotfiles/creds/data/encrypted_files_key.bytes')}")
-            except FileNotFoundError as err:
-                print("\n" * 3, "~" * 50, """Consider Loading up your dotfiles or pass `gen_key=True` to make and save one.""", "~" * 50, "\n" * 3)
-                raise FileNotFoundError(err) from err
-    elif isinstance(key, (str, PathExtended, Path)):
-        key_resolved = Path(key).read_bytes()  # a path to a key file was passed, read it:
-    elif type(key) is bytes:
-        key_resolved = key  # key passed explicitly
-    else:
-        raise TypeError("❌ Key must be either a path, bytes object or None.")
-    code = Fernet(key=key_resolved).encrypt(msg)
-    if pwd is not None and salt is not None and iteration is not None:
-        return base64.urlsafe_b64encode(b"%b%b%b" % (salt, iteration.to_bytes(4, "big"), base64.urlsafe_b64decode(code)))
-    return code
-
-
-def decrypt(token: bytes, key: Optional[bytes] = None, pwd: Optional[str] = None, salted: bool = True) -> bytes:
-    import base64
-
-    if pwd is not None:
-        assert key is None, "❌ You can either pass key or pwd, or none of them, but not both."
-        if salted:
-            decoded = base64.urlsafe_b64decode(token)
-            salt, iterations, token = decoded[:16], decoded[16:20], base64.urlsafe_b64encode(decoded[20:])
-            key_resolved = pwd2key(password=pwd, salt=salt, iterations=int.from_bytes(bytes=iterations, byteorder="big"))
-        else:
-            key_resolved = pwd2key(password=pwd)  # trailing `;` prevents IPython from caching the result.
-    elif type(key) is bytes:
-        assert pwd is None, "❌ You can either pass key or pwd, or none of them, but not both."
-        key_resolved = key  # passsed explicitly
-    elif key is None:
-        key_resolved = Path.home().joinpath("dotfiles/creds/data/encrypted_files_key.bytes").read_bytes()  # read from file
-    elif isinstance(key, (str, Path)):
-        key_resolved = Path(key).read_bytes()  # passed a path to a file containing kwy
-    else:
-        raise TypeError(f"❌ Key must be either str, P, Path, bytes or None. Recieved: {type(key)}")
-    from cryptography.fernet import Fernet
-
-    return Fernet(key=key_resolved).decrypt(token)
-
-
 def validate_name(astring: str, replace: str = "_") -> str:
     import re
 

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

{machineconfig-7.32 → machineconfig-7.33/src/machineconfig.egg-info}/PKG-INFO

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

{machineconfig-7.32 → machineconfig-7.33}/src/machineconfig.egg-info/SOURCES.txt

@@ -119,8 +119,8 @@ src/machineconfig/scripts/linux/fzfag
 src/machineconfig/scripts/linux/fzffg
 src/machineconfig/scripts/linux/fzfg
 src/machineconfig/scripts/linux/fzfrga
-src/machineconfig/scripts/linux/mcfgs
 src/machineconfig/scripts/linux/skrg
+src/machineconfig/scripts/linux/wrap_mcfg
 src/machineconfig/scripts/linux/other/share_cloud.sh
 src/machineconfig/scripts/linux/other/share_nfs
 src/machineconfig/scripts/linux/other/start_docker
@@ -135,7 +135,7 @@ src/machineconfig/scripts/python/devops_navigator.py
 src/machineconfig/scripts/python/fire_jobs.py
 src/machineconfig/scripts/python/ftpx.py
 src/machineconfig/scripts/python/interactive.py
-src/machineconfig/scripts/python/mcfg.py
+src/machineconfig/scripts/python/machineconfig.py
 src/machineconfig/scripts/python/sessions.py
 src/machineconfig/scripts/python/terminal.py
 src/machineconfig/scripts/python/utils.py
@@ -264,7 +264,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/mcfgs.ps1
+src/machineconfig/scripts/windows/wrap_mcfg.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

{machineconfig-7.32 → machineconfig-7.33}/src/machineconfig.egg-info/entry_points.txt

@@ -6,8 +6,8 @@ define = machineconfig.scripts.python.define:main
 devops = machineconfig.scripts.python.devops:main
 fire = machineconfig.scripts.python.fire_jobs:main
 ftpx = machineconfig.scripts.python.ftpx:main
-machineconfig = machineconfig.scripts.python.mcfg:main
-mcfg = machineconfig.scripts.python.mcfg:main
+machineconfig = machineconfig.scripts.python.machineconfig:main
+mcfg = machineconfig.scripts.python.machineconfig:main
 sessions = machineconfig.scripts.python.sessions:main
 terminal = machineconfig.scripts.python.terminal:main
 utils = machineconfig.scripts.python.utils:main

machineconfig-7.32/src/machineconfig/utils/io.py

@@ -1,79 +0,0 @@
-from __future__ import annotations
-
-from typing import Any, Union, Optional, Mapping
-from pathlib import Path
-import json
-import pickle
-import configparser
-
-
-PathLike = Union[str, Path]
-
-
-def _ensure_parent(path: PathLike) -> Path:
-    path_obj = Path(path)
-    path_obj.parent.mkdir(parents=True, exist_ok=True)
-    return path_obj
-
-
-def save_pickle(obj: Any, path: PathLike, verbose: bool = False) -> Path:
-    path_obj = _ensure_parent(path)
-    with open(path_obj, "wb") as fh:
-        pickle.dump(obj, fh, protocol=pickle.HIGHEST_PROTOCOL)
-    if verbose:
-        print(f"Saved pickle -> {path_obj}")
-    return Path(path_obj)
-
-
-def save_json(obj: Any, path: PathLike, indent: Optional[int] = None, verbose: bool = False) -> Path:
-    path_obj = _ensure_parent(path)
-    with open(path_obj, "w", encoding="utf-8") as fh:
-        json.dump(obj, fh, indent=indent, ensure_ascii=False)
-        fh.write("\n")
-    if verbose:
-        print(f"Saved json -> {path_obj}")
-    return Path(path_obj)
-
-
-def save_ini(path: PathLike, obj: Mapping[str, Mapping[str, Any]], verbose: bool = False) -> Path:
-    cp = configparser.ConfigParser()
-    for section, values in obj.items():
-        cp[section] = {str(k): str(v) for k, v in values.items()}
-    path_obj = _ensure_parent(path)
-    with open(path_obj, "w", encoding="utf-8") as fh:
-        cp.write(fh)
-    if verbose:
-        print(f"Saved ini -> {path_obj}")
-    return Path(path_obj)
-
-
-def read_ini(path: "Path", encoding: Optional[str] = None):
-    if not Path(path).exists() or Path(path).is_dir():
-        raise FileNotFoundError(f"File not found or is a directory: {path}")
-    import configparser
-    res = configparser.ConfigParser()
-    res.read(filenames=[str(path)], encoding=encoding)
-    return res
-
-
-def read_json(path: "Path", r: bool = False, **kwargs: Any) -> Any:  # return could be list or dict etc
-    import json
-    try:
-        mydict = json.loads(Path(path).read_text(encoding="utf-8"), **kwargs)
-    except Exception:
-        import re
-        def remove_comments(text: str) -> str:
-            # remove all // single-line comments
-            text = re.sub(r'//.*', '', text)
-            # remove all /* … */ block comments (non-greedy)
-            text = re.sub(r'/\*.*?\*/', '', text, flags=re.DOTALL)
-            return text
-        mydict = json.loads(remove_comments(Path(path).read_text(encoding="utf-8")), **kwargs)
-    _ = r
-    return mydict
-
-
-def from_pickle(path: Path) -> Any:
-    import pickle
-
-    return pickle.loads(path.read_bytes())