machineconfig 3.88__tar.gz → 3.90__tar.gz

{machineconfig-3.88/src/machineconfig.egg-info → machineconfig-3.90}/PKG-INFO

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

{machineconfig-3.88 → machineconfig-3.90}/pyproject.toml

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

{machineconfig-3.88 → machineconfig-3.90}/src/machineconfig/jobs/python/check_installations.py

@@ -193,7 +193,7 @@ APP_SUMMARY_PATH = LIBRARY_ROOT.joinpath(f"profile/records/{platform.system().lo
 #     else: return None
 
 
-# class PrecheckedCloudInstaller:
+# class precheckedPackages:
 #     def __init__(self):
 #         # Read CSV using standard library
 #         self.data = []
@@ -214,7 +214,7 @@ APP_SUMMARY_PATH = LIBRARY_ROOT.joinpath(f"profile/records/{platform.system().lo
 #     @staticmethod
 #     def install_cli_apps(app_url: str):
 #         try:
-#             exe = PrecheckedCloudInstaller.download_google_links(app_url)
+#             exe = precheckedPackages.download_google_links(app_url)
 #         except Exception as ex:  # type: ignore
 #             print(f"❌ ERROR | Failed downloading {app_url}: {ex}")
 #             return None
@@ -225,7 +225,7 @@ APP_SUMMARY_PATH = LIBRARY_ROOT.joinpath(f"profile/records/{platform.system().lo
 #             exe.move(folder=PathExtended.home().joinpath("AppData/Local/Microsoft/WindowsApps"), overwrite=True)
 #         return True
 
-#     def download_safe_apps(self, name: str="AllEssentials"):
+#     def download_safe_apps(self, name: str="essentials"):
 #         # if platform.system().lower() == "windows":
 #         #     from machineconfig.jobs.python.python_windows_installers_all import get_cli_py_installers
 #         #     cli_installers = get_cli_py_installers()
@@ -234,7 +234,7 @@ APP_SUMMARY_PATH = LIBRARY_ROOT.joinpath(f"profile/records/{platform.system().lo
 #         #     cli_installers = get_cli_py_installers()
 #         # else: raise NotImplementedError(f"Platform {platform.system().lower()} is not supported yet.")
 
-#         if name == "AllEssentials":
+#         if name == "essentials":
 #             print(f"""
 # {'=' * 150}
 # 📥 DOWNLOAD | Downloading {len(self.data)} apps...
@@ -244,13 +244,13 @@ APP_SUMMARY_PATH = LIBRARY_ROOT.joinpath(f"profile/records/{platform.system().lo
 #             app_urls = [item['app_url'] for item in self.data]
 #             from concurrent.futures import ThreadPoolExecutor
 #             with ThreadPoolExecutor(max_workers=20) as executor:
-#                 _res = list(executor.map(PrecheckedCloudInstaller.install_cli_apps, app_urls))
+#                 _res = list(executor.map(precheckedPackages.install_cli_apps, app_urls))
 #         else:
 #             app_items = [item for item in self.data if item['app_name'] == name]
 #             if not app_items:
 #                 raise ValueError(f"App '{name}' not found in data")
 #             app_url = app_items[0]['app_url']
-#             _res = PrecheckedCloudInstaller.install_cli_apps(app_url=app_url)
+#             _res = precheckedPackages.install_cli_apps(app_url=app_url)
 
 #         # print("\n" * 3)
 #         # for item_flag, item_name in zip(res, self.df["app_name"]):

{machineconfig-3.88 → machineconfig-3.90}/src/machineconfig/jobs/python_generic_installers/config.json

@@ -456,7 +456,7 @@
     },
     {
       "appName": "starship",
-      "repoURL": "starship/starship",
+      "repoURL": "https://github.com/starship/starship",
       "doc": "⭐️ The minimal, blazing-fast, and infinitely customizable prompt for any shell!",
       "filenameTemplate": {
         "amd64": {

{machineconfig-3.88 → machineconfig-3.90}/src/machineconfig/profile/create.py

@@ -147,17 +147,14 @@ def apply_mapper(choice: Optional[str] = None):
 """)
 
 
-def main(choice: Optional[str] = None):
+def main():
     console = Console()
     print("\n")
-
     console.rule("[bold blue]🔗 CREATING SYMLINKS 🔗")
-    apply_mapper(choice=choice)
-
+    apply_mapper(choice=None)
     print("\n")
     console.rule("[bold green]🐚 CREATING SHELL PROFILE 🐚")
     create_default_shell_profile()
-
     print(f"""
 {"=" * 80}
 ✨ Configuration setup complete! ✨

{machineconfig-3.88 → machineconfig-3.90}/src/machineconfig/scripts/cloud/init.sh

@@ -98,7 +98,7 @@ echo "🚀 Activating Python virtual environment..."
 
 # Install all essential development applications
 echo "📥 Installing essential development applications..."
-python -m fire machineconfig.scripts.python.devops_devapps_install main --which=AllEssentials
+python -m fire machineconfig.scripts.python.devops_devapps_install main --which=essentials
 
 # Reload shell configuration
 echo "🔄 Reloading shell configuration..."

{machineconfig-3.88 → machineconfig-3.90}/src/machineconfig/scripts/python/devops.py

@@ -28,7 +28,7 @@ def main(which: Optional[Options] = None):
     options = options_list
     if which is None:
         try:
-            choice_key = choose_from_options(msg="", options=options, header="🛠️ DEVOPS", default=options[0], multi=False)
+            choice_key = choose_from_options(msg="", options=options, header="🛠️ DEVOPS", default=options[0], multi=False, fzf=False)
         except KeyboardInterrupt:
             console.print(Panel("❌ Operation cancelled by user", title_align="left", border_style="red", width=BOX_WIDTH))
             return

{machineconfig-3.88 → machineconfig-3.90}/src/machineconfig/scripts/python/devops_devapps_install.py

@@ -9,7 +9,7 @@ from machineconfig.utils.installer import get_installers, install_all
 from platform import system
 from typing import Any, Optional, Literal, TypeAlias, get_args, Annotated
 
-WHICH_CAT: TypeAlias = Literal["AllEssentials", "EssentialsAndOthers", "SystemInstallers", "PrecheckedCloudInstaller"]
+WHICH_CAT: TypeAlias = Literal["essentials", "essentialsPlus", "systymPackages", "precheckedPackages"]
 
 
 def main_with_parser():
@@ -53,8 +53,8 @@ def main(which: Annotated[Optional[str], typer.Argument(help=f"Choose a category
             print(a_message)
         return None
 
-    # interactive installation
-    installers = get_installers(system=system(), dev=False) + get_installers(system=system(), dev=True)
+    # interactive installation - get all installers including dev ones
+    installers = get_installers(system=system(), dev=True)
 
     # Check installed programs with progress indicator
     with Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}")) as progress:
@@ -66,7 +66,7 @@ def main(which: Annotated[Optional[str], typer.Argument(help=f"Choose a category
 
     options += list(get_args(WHICH_CAT))
     # print("s"*1000)
-    program_names = choose_from_options(multi=True, msg="", options=options, header="🚀 CHOOSE DEV APP", default="AllEssentials")
+    program_names = choose_from_options(multi=True, msg="", options=options, header="🚀 CHOOSE DEV APP", default="essentials", fzf=True)
 
     total_commands = ""
     installation_messages: list[str] = []
@@ -103,14 +103,14 @@ def get_programs_by_category(program_name: WHICH_CAT):
 ┃ 📦 Installing Category: {program_name}
 ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━""")
     match program_name:
-        case "AllEssentials" | "EssentialsAndOthers":
+        case "essentials" | "essentialsPlus":
             installers_ = get_installers(dev=False, system=system())
-            if program_name == "EssentialsAndOthers":
+            if program_name == "essentialsPlus":
                 installers_ += get_installers(dev=True, system=system())
             install_all(installers=installers_)
             program = ""
 
-        case "SystemInstallers":
+        case "systymPackages":
             if system() == "Windows":
                 options_system = parse_apps_installer_windows(LIBRARY_ROOT.joinpath("setup_windows/apps.ps1").read_text(encoding="utf-8"))
             elif system() == "Linux":
@@ -119,7 +119,7 @@ def get_programs_by_category(program_name: WHICH_CAT):
                 options_system = {**options_system_1, **options_system_2}
             else:
                 raise NotImplementedError(f"❌ System {system()} not supported")
-            program_names = choose_from_options(multi=True, msg="", options=sorted(list(options_system.keys())), header="🚀 CHOOSE DEV APP")
+            program_names = choose_from_options(multi=True, msg="", options=sorted(list(options_system.keys())), header="🚀 CHOOSE DEV APP", fzf=True)
             program = ""
             for name in program_names:
                 print(f"""
@@ -149,12 +149,12 @@ def get_programs_by_category(program_name: WHICH_CAT):
         #         print(f"Installing {name}")
         #         sub_program = installers[idx].install_robust(version=None)  # finish the task
 
-        case "PrecheckedCloudInstaller":
-            # from machineconfig.jobs.python.check_installations import PrecheckedCloudInstaller
-            # ci = PrecheckedCloudInstaller()
-            # ci.download_safe_apps(name="AllEssentials")
+        case "precheckedPackages":
+            # from machineconfig.jobs.python.check_installations import precheckedPackages
+            # ci = precheckedPackages()
+            # ci.download_safe_apps(name="essentials")
             # program = ""
-            raise NotImplementedError("PrecheckedCloudInstaller is not implemented yet.")
+            raise NotImplementedError("precheckedPackages is not implemented yet.")
     return program
 
 

{machineconfig-3.88 → machineconfig-3.90}/src/machineconfig/settings/yazi/yazi.toml

@@ -1,4 +1,4 @@
 
-[manager]
+[mgr]
 show_hidden = true
 ratio = [1, 3, 5]

{machineconfig-3.88 → machineconfig-3.90}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -118,7 +118,7 @@ choice=${choice:-y}
 if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
     echo """    🔧 Installing CLI applications...
     """
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main --which=AllEssentials
+    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main --which=essentials
     . $HOME/.bashrc
 else
     echo """    ⏭️  Skipping CLI apps installation

{machineconfig-3.88 → machineconfig-3.90}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -120,7 +120,7 @@ if (-not $yesAll) {
     }
     
 } else {
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main  --which=AllEssentials
+    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main  --which=essentials
 }
 
 

{machineconfig-3.88 → machineconfig-3.90}/src/machineconfig/utils/io.py

@@ -77,7 +77,6 @@ def read_ini(path: "Path", encoding: Optional[str] = None):
 
 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:

{machineconfig-3.88 → machineconfig-3.90}/src/machineconfig/utils/options.py

@@ -51,13 +51,13 @@ def choose_from_options[T](msg: str, options: Iterable[T], multi: Literal[True],
 def choose_from_options[T](msg: str, options: Iterable[T], multi: bool, custom_input: bool = True, header: str = "", tail: str = "", prompt: str = "", default: Optional[T] = None, fzf: bool = False, ) -> Union[T, list[T]]:
     # TODO: replace with https://github.com/tmbo/questionary
     # # also see https://github.com/charmbracelet/gum
-    tool_name = "fzf"
     options_strings: list[str] = [str(x) for x in options]
     default_string = str(default) if default is not None else None
     console = Console()
-    if fzf and check_tool_exists(tool_name):
+    fzf_exists = check_tool_exists("fzf")
+    # print("\n" * 10, f"{fzf=}, {fzf_exists=}", "\n" * 10)
+    if fzf and fzf_exists:
         from pyfzf.pyfzf import FzfPrompt
-
         fzf_prompt = FzfPrompt()
         nl = "\n"
         choice_string_multi: list[str] = fzf_prompt.prompt(choices=options_strings, fzf_options=("--multi" if multi else "") + f' --prompt "{prompt.replace(nl, " ")}" ')  # --border-label={msg.replace(nl, ' ')}")
@@ -86,9 +86,9 @@ def choose_from_options[T](msg: str, options: Iterable[T], multi: bool, custom_i
 
         console.print(txt_panel)
         if default is not None:
-            choice_string = input(f"{prompt}\nEnter option number or hit enter for default choice: ")
+            choice_string = input(f"{prompt}\nEnter option number/name or hit enter for default choice: ")
         else:
-            choice_string = input(f"{prompt}\nEnter option number: ")
+            choice_string = input(f"{prompt}\nEnter option number/name: ")
 
         if choice_string == "":
             if default_string is None:
@@ -112,7 +112,7 @@ def choose_from_options[T](msg: str, options: Iterable[T], multi: bool, custom_i
                     # raise ValueError(f"Unknown choice. {choice_string}") from ie
                     console.print(Panel(f"❓ Unknown choice: '{choice_string}'", title="Error", expand=False))
                     return choose_from_options(msg=msg, options=options, header=header, tail=tail, prompt=prompt, default=default, fzf=fzf, multi=multi, custom_input=custom_input)
-            except TypeError as te:  # int(choice_string) failed due to # either the number is invalid, or the input is custom.
+            except (TypeError, ValueError) as te:  # int(choice_string) failed due to # either the number is invalid, or the input is custom.
                 if choice_string in options_strings:  # string input
                     choice_idx = options_strings.index(choice_one)  # type: ignore
                     choice_one = list(options)[choice_idx]

{machineconfig-3.88 → machineconfig-3.90}/src/machineconfig/utils/path_extended.py

@@ -861,6 +861,7 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
         transfers: int = 10,
         root: Optional[str] = "myhome",
     ) -> "PathExtended":
+        _ = transfers
         to_del = []
         localpath = self.expanduser().absolute() if not self.exists() else self
         if zip:
@@ -873,21 +874,17 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
             rp = localpath.get_remote_path(root=root, os_specific=os_specific, rel2home=rel2home, strict=strict)  # if rel2home else (P(root) / localpath if root is not None else localpath)
         else:
             rp = PathExtended(remotepath)
-        rclone_cmd = f"""rclone copyto '{localpath.as_posix()}' '{cloud}:{rp.as_posix()}' {"--progress" if verbose else ""} --transfers={transfers}"""
-        from machineconfig.utils.terminal import Terminal
 
-        if verbose:
-            print(f"{'⬆️' * 5} UPLOADING with `{rclone_cmd}`")
-        shell_to_use = "powershell" if sys.platform == "win32" else "bash"
-        res = Terminal(stdout=None if verbose else subprocess.PIPE).run(rclone_cmd, shell=shell_to_use).capture()
+        from rclone_python import rclone
+        rclone.copyto(in_path=localpath.as_posix(), out_path=f"{cloud}:{rp.as_posix()}", )
         _ = [item.delete(sure=True) for item in to_del]
-        assert res.is_successful(strict_err=False, strict_returcode=True), res.print(capture=False, desc="Cloud Storage Operation")
         if verbose:
             print(f"{'⬆️' * 5} UPLOAD COMPLETED.")
         if share:
             if verbose:
                 print("🔗 SHARING FILE")
             shell_to_use = "powershell" if sys.platform == "win32" else "bash"
+            from machineconfig.utils.terminal import Terminal
             res = Terminal().run(f"""rclone link '{cloud}:{rp.as_posix()}'""", shell=shell_to_use).capture()
             tmp = res.op2path(strict_err=False, strict_returncode=False)
             if tmp is None:
@@ -916,6 +913,7 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
         overwrite: bool = True,
         merge: bool = False,
     ):
+        _ = verbose, transfers
         if remotepath is None:
             remotepath = self.get_remote_path(root=root, os_specific=os_specific, rel2home=rel2home, strict=strict)
             remotepath += ".zip" if unzip else ""
@@ -925,16 +923,11 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
         localpath = self.expanduser().absolute()
         localpath += ".zip" if unzip else ""
         localpath += ".enc" if decrypt else ""
-        rclone_cmd = f"""rclone copyto '{cloud}:{remotepath.as_posix()}' '{localpath.as_posix()}' {"--progress" if verbose else ""} --transfers={transfers}"""
-        from machineconfig.utils.terminal import Terminal
-
-        if verbose:
-            print(f"{'⬇️' * 5} DOWNLOADING with `{rclone_cmd}`")
-        shell_to_use = "powershell" if sys.platform == "win32" else "bash"
-        res = Terminal(stdout=None if verbose else subprocess.PIPE).run(rclone_cmd, shell=shell_to_use)
-        success = res.is_successful(strict_err=False, strict_returcode=True)
-        if not success:
-            res.print(capture=False, desc="Cloud Storage Operation")
+        from rclone_python import rclone
+        try:
+            rclone.copyto(in_path=f"{cloud}:{remotepath.as_posix()}", out_path=localpath.as_posix(), )
+        except Exception as e:
+            print("to_cloud error", e)
             return None
         if decrypt:
             localpath = localpath.decrypt(key=key, pwd=pwd, inplace=True)
@@ -946,17 +939,23 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
         tmp_path_obj = self.expanduser().absolute()
         tmp_path_obj.parent.mkdir(parents=True, exist_ok=True)
         tmp1, tmp2 = tmp_path_obj.as_posix(), self.get_remote_path(root=root, os_specific=os_specific).as_posix()
-        source, target = (tmp1, f"{cloud}:{tmp2 if rel2home else tmp1}") if sync_up else (f"{cloud}:{tmp2 if rel2home else tmp1}", tmp1)  # in bisync direction is irrelavent.
+        if sync_up:
+            source = tmp1
+            target = f"{cloud}:{tmp2 if rel2home else tmp1}"
+        else:
+            source = f"{cloud}:{tmp2 if rel2home else tmp1}"   # in bisync direction is irrelavent.
+            target = tmp1
+
         if not sync_down and not sync_up:
             _ = print(f"SYNCING 🔄️ {source} {'<>' * 7} {target}`") if verbose else None
             rclone_cmd = f"""rclone bisync '{source}' '{target}' --resync --remove-empty-dirs """
         else:
             print(f"SYNCING 🔄️ {source} {'>' * 15} {target}`")
             rclone_cmd = f"""rclone sync '{source}' '{target}' """
+
         rclone_cmd += f" --progress --transfers={transfers} --verbose"
         rclone_cmd += " --delete-during" if delete else ""
         from machineconfig.utils.terminal import Terminal
-
         if verbose:
             print(rclone_cmd)
         shell_to_use = "powershell" if sys.platform == "win32" else "bash"
@@ -965,4 +964,5 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
         if not success:
             res.print(capture=False, desc="Cloud Storage Operation")
             return None
+
         return self

{machineconfig-3.88 → machineconfig-3.90/src/machineconfig.egg-info}/PKG-INFO

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