machineconfig 4.97__tar.gz → 4.98__tar.gz

{machineconfig-4.97/src/machineconfig.egg-info → machineconfig-4.98}/PKG-INFO

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

{machineconfig-4.97 → machineconfig-4.98}/pyproject.toml

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

{machineconfig-4.97 → machineconfig-4.98}/src/machineconfig/jobs/installer/installer_data.json

@@ -2009,7 +2009,7 @@
 
     },
     {
-      "appName": "Visual Studio Code",
+      "appName": "code",
       "repoURL": "CMD",
       "doc": "Visual Studio Code",
       "fileNamePattern": {

{machineconfig-4.97 → machineconfig-4.98}/src/machineconfig/jobs/installer/package_groups.py

@@ -44,8 +44,9 @@ PACKAGES_BROWSERS = [
 ]
 
 # Code Editors & IDEs - Code editing tools
+# NOTE: Entries must match the corresponding `appName` in installer_data.json for filtering to work.
 PACKAGES_CODE_EDITORS = [
-    "Visual Studio Code",
+    "code",
     "Cursor",
     "lvim",
 ]

{machineconfig-4.97 → machineconfig-4.98}/src/machineconfig/scripts/python/devops.py

@@ -1,6 +1,6 @@
 """devops with emojis"""
 
-import machineconfig.scripts.python.devops_devapps_install as installer_entry_point
+import machineconfig.utils.installer_utils.installer as installer_entry_point
 import machineconfig.scripts.python.share_terminal as share_terminal
 import machineconfig.scripts.python.repos as repos
 

{machineconfig-4.97 → machineconfig-4.98}/src/machineconfig/scripts/python/interactive.py

@@ -124,7 +124,7 @@ def execute_installations(selected_options: list[str]) -> None:
             console.print(Panel("⚡ [bold bright_yellow]CLI APPLICATIONS[/bold bright_yellow]\n[italic]Command-line tools installation[/italic]", border_style="bright_yellow"))
             console.print("🔧 Installing CLI applications", style="bold cyan")
             try:
-                from machineconfig.scripts.python.devops_devapps_install import main as devops_devapps_install_main
+                from machineconfig.utils.installer_utils.installer import main as devops_devapps_install_main
                 devops_devapps_install_main(group=maybe_a_group)  # type: ignore
                 console.print("✅ CLI applications installed successfully", style="bold green")
             except Exception as e:

{machineconfig-4.97 → machineconfig-4.98}/src/machineconfig/scripts/python/share_terminal.py

@@ -58,7 +58,7 @@ def install_ttyd():
         print("✅ ttyd is already installed.")
         return
     print("⏳ ttyd not found. Installing...")
-    from machineconfig.scripts.python.devops_devapps_install import main
+    from machineconfig.utils.installer_utils.installer import main
     main(which="ttyd")
 
 

machineconfig-4.97/src/machineconfig/scripts/python/devops_devapps_install.py → machineconfig-4.98/src/machineconfig/utils/installer_utils/installer.py

@@ -162,12 +162,11 @@ def install_clis(clis_names: list[str]):
 
     total_messages: list[str] = []
     for a_which in clis_names:
-        all_installers = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["ESSENTIAL", "DEV"])
+        all_installers = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=None)
         selected_installer = None
         for installer in all_installers:
-            exe_name = installer["appName"]
             app_name = installer["appName"]
-            if exe_name == a_which or app_name == a_which:
+            if app_name.lower() == a_which.lower():
                 selected_installer = installer
                 break
         if selected_installer is None:

{machineconfig-4.97 → machineconfig-4.98}/src/machineconfig/utils/path_extended.py

@@ -9,8 +9,6 @@ import os
 from platform import system
 from typing import Any, Optional, Union, Callable, TypeAlias, Literal
 
-from machineconfig.utils.terminal import Response
-
 
 OPLike: TypeAlias = Union[str, "PathExtended", Path, None]
 PLike: TypeAlias = Union[str, "PathExtended", Path]
@@ -925,6 +923,8 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
             shell_to_use = "powershell" if sys.platform == "win32" else "bash"
             command = f"rclone link '{cloud}:{rp.as_posix()}'"
             completed = _run_shell_command(command, shell_to_use)
+            from machineconfig.utils.terminal import Response
+
             res = Response.from_completed_process(completed).capture()
             tmp = res.op2path(strict_err=False, strict_returncode=False)
             if tmp is None:
@@ -1001,6 +1001,8 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
         stdout_target: Optional[int] = None if verbose else subprocess.PIPE
         stderr_target: Optional[int] = None if verbose else subprocess.PIPE
         completed = _run_shell_command(rclone_cmd, shell_to_use, stdout=stdout_target, stderr=stderr_target)
+        from machineconfig.utils.terminal import Response
+
         res = Response.from_completed_process(completed)
         success = res.is_successful(strict_err=False, strict_returcode=True)
         if not success:

{machineconfig-4.97 → machineconfig-4.98/src/machineconfig.egg-info}/PKG-INFO

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

{machineconfig-4.97 → machineconfig-4.98}/src/machineconfig.egg-info/SOURCES.txt

@@ -161,7 +161,6 @@ src/machineconfig/scripts/python/devops.py
 src/machineconfig/scripts/python/devops_add_identity.py
 src/machineconfig/scripts/python/devops_add_ssh_key.py
 src/machineconfig/scripts/python/devops_backup_retrieve.py
-src/machineconfig/scripts/python/devops_devapps_install.py
 src/machineconfig/scripts/python/devops_update_repos.py
 src/machineconfig/scripts/python/dotfile.py
 src/machineconfig/scripts/python/fire_agents_help_launch.py
@@ -411,6 +410,7 @@ src/machineconfig/utils/cloud/onedrive/setup_oauth.py
 src/machineconfig/utils/cloud/onedrive/transaction.py
 src/machineconfig/utils/installer_utils/__init__.py
 src/machineconfig/utils/installer_utils/github_release_bulk.py
+src/machineconfig/utils/installer_utils/installer.py
 src/machineconfig/utils/installer_utils/installer_abc.py
 src/machineconfig/utils/installer_utils/installer_class.py
 src/machineconfig/utils/schemas/fire_agents/fire_agents_input.py