machineconfig 5.21__tar.gz → 5.22__tar.gz

{machineconfig-5.21/src/machineconfig.egg-info → machineconfig-5.22}/PKG-INFO

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

{machineconfig-5.21 → machineconfig-5.22}/pyproject.toml

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

{machineconfig-5.21 → machineconfig-5.22}/src/machineconfig/profile/shell.py

@@ -13,7 +13,7 @@ from rich.panel import Panel
 
 system = platform.system()
 sep = ";" if system == "Windows" else ":"  # PATH separator, this is special for PATH object, not to be confused with PathExtended.sep (normal paths), usually / or \
-PATH = os.environ["PATH"].split(sep)  # this is a list of paths in PATH variable, not a crocodile.file_management.P object.
+PATH = os.environ["PATH"].split(sep)
 console = Console()
 BOX_WIDTH = 100  # Define BOX_WIDTH or get it from a config
 

{machineconfig-5.21 → machineconfig-5.22}/src/machineconfig/scripts/python/cloud_repo_sync.py

@@ -1,12 +1,9 @@
-"""utils"""
-
-from pathlib import Path
+import sys
 import git
 from machineconfig.utils.io import read_ini
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.terminal import Response
 
-from machineconfig.scripts.python.helpers.repo_sync_helpers import fetch_dotfiles
 from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
 from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.code import get_shell_file_executing_python_script, write_shell_script_to_file
@@ -15,13 +12,18 @@ import subprocess
 from typing import Optional, Literal
 from rich.console import Console
 from rich.panel import Panel
+import typer
 
 console = Console()
 
-_ = fetch_dotfiles
-
 
-def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optional[str] = None, action: Literal["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"] = "ask", pwd: Optional[str] = None):
+def main(
+    cloud: Optional[str] = typer.Option(None, "--cloud", "-c", help="Cloud storage profile name. If not provided, uses default from config."),
+    path: Optional[str] = typer.Option(None, "--path", "-p", help="Path to the local repository. Defaults to current working directory."),
+    message: Optional[str] = typer.Option(None, "--message", "-m", help="Commit message for local changes."),
+    on_conflict: Literal["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"] = typer.Option("ask", "--on-conflict", "-oc", help="Action to take on merge conflict. Default is 'ask'."),
+    pwd: Optional[str] = typer.Option(None, "--password", help="Password for encryption/decryption of the remote repository."),
+):
     if cloud is None:
         try:
             cloud_resolved = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
@@ -31,8 +33,6 @@ def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optio
             return ""
     else:
         cloud_resolved = cloud
-
-    # repo_root = PathExtended(args.repo).expanduser().absolute()
     repo_local_root = PathExtended.cwd() if path is None else PathExtended(path).expanduser().absolute()
     repo_local_obj = git.Repo(repo_local_root, search_parent_directories=True)
     repo_local_root = PathExtended(repo_local_obj.working_dir)  # cwd might have been in a sub directory of repo_root, so its better to redefine it.
@@ -143,7 +143,7 @@ git commit -am "finished merging"
         print(f"• 4️⃣  {option4:75} 👉 {shell_file_4}")
 
         program_content = None
-        match action:
+        match on_conflict:
             case "ask":
                 choice = choose_from_options(multi=False, msg="Choose one option", options=[option1, option2, option3, option4], fzf=False)
                 if choice == option1:
@@ -165,7 +165,7 @@ git commit -am "finished merging"
             case "RemoveLocalRclone":
                 program_content = program_4
             case _:
-                raise ValueError(f"Unknown action: {action}")
+                raise ValueError(f"Unknown action: {on_conflict}")
         # PROGRAM_PATH.write_text(program_content, encoding="utf-8")
         subprocess.run(program_content, shell=True, check=True)
 
@@ -173,17 +173,16 @@ git commit -am "finished merging"
 
 
 def args_parser():
-    # console.print(Panel("🔄 Repository Synchronization Utility", title_align="left", border_style="blue"))
-    # parser = argparse.ArgumentParser(description="Secure Repo CLI.")
-    # parser.add_argument("path", nargs="?", type=str, help="Repository path, defaults to cwd.", default=None)
-    # parser.add_argument("--cloud", "-c", help="rclone cloud profile name.", default=None)
-    # parser.add_argument("--message", "-m", help="Commit Message", default=f"new message {randstr()}")
-    # parser.add_argument("--pwd", "-p", help="Password for encryption", default=None)
-    # parser.add_argument("--action", "-a", help="Action to take if merge fails.", choices=["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"], default="ask")
-    # args = parser.parse_args()
-    # main(cloud=args.cloud, path=args.path, message=args.message, action=args.action)
-    import typer
-    typer.run(main)
+    # Check if no arguments provided (excluding the script name)
+    if len(sys.argv) == 1:
+        app = typer.Typer(add_completion=False, help="Sync a local git repository with a remote encrypted cloud copy.")
+        app.command()(main)
+        app(["--help"])
+        return
+
+    app = typer.Typer(add_completion=False, no_args_is_help=True, help="Sync a local git repository with a remote encrypted cloud copy.")
+    app.command()(main)
+    app()
 
 
 if __name__ == "__main__":

{machineconfig-5.21 → machineconfig-5.22}/src/machineconfig/scripts/python/croshell.py

@@ -20,10 +20,8 @@ console = Console()
 
 def add_print_header_pycode(path: str, title: str):
     return f"""
-try:
-    from crocodile.file_management import P as PathExtended
-except ImportError:
-    from machineconfig.utils.path_extended import PathExtended
+
+from machineconfig.utils.path_extended import PathExtended
 pycode = PathExtended(r'{path}').read_text(encoding="utf-8")
 pycode = pycode.split("except Exception: print(pycode)")[2]
 

{machineconfig-5.21 → machineconfig-5.22}/src/machineconfig/scripts/python/devops.py

@@ -44,19 +44,24 @@ def interactive():
 @self_app.command()
 def status():
     """📊 STATUS of machine, shell profile, apps, symlinks, dotfiles, etc."""
-    pass
+    import machineconfig.scripts.python.devops_status as helper
+    helper.main()
 @self_app.command()
 def clone():
-    """📋 CLONE machienconfig locally for faster execution and nightly updates. """
+    """📋 CLONE machienconfig locally and incorporate to shell profile for faster execution and nightly updates."""
     import platform
     from machineconfig.utils.code import run_shell_script
+    from machineconfig.profile.shell import create_default_shell_profile
     if platform.system() == "Windows":
         from machineconfig.setup_windows import REPOS
+        create_default_shell_profile(method="copy")
     else:
         from machineconfig.setup_linux import REPOS
+        create_default_shell_profile(method="reference")
     run_shell_script(REPOS.read_text(encoding="utf-8"))
 
 
+
 @config_apps.command(no_args_is_help=True)
 def private(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-m", help="Method to use for linking files"),
                              on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", "--on-conflict", "-o", help="Action to take on conflict"),