machineconfig 4.97__py3-none-any.whl → 4.98__py3-none-any.whl

machineconfig/jobs/installer/installer_data.json

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

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/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/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/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/{scripts/python/devops_devapps_install.py → 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/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.dist-info → machineconfig-4.98.dist-info}/METADATA

@@ -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.dist-info → machineconfig-4.98.dist-info}/RECORD

@@ -43,8 +43,8 @@ machineconfig/cluster/templates/run_remote.py,sha256=vCc56t8BUAUJp7tyb0PFfwy5hlm
 machineconfig/cluster/templates/utils.py,sha256=5lHgjHvodoSPBD31AwluHBBNgwimwThUsDNWGN8iH9I,1647
 machineconfig/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/jobs/installer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/jobs/installer/installer_data.json,sha256=tBf8X6TEfdhRrvTbp5qyKUs0nEYxE62C8XgDkPCJnfc,72128
-machineconfig/jobs/installer/package_groups.py,sha256=hG9-RLfEXlGg5u7-8x9PrNLr9mNtuoVLVrfDN9hqzQ0,6735
+machineconfig/jobs/installer/installer_data.json,sha256=K6B6EPD8IXIeOzkY7sIIpphBmDVwnV_tczULAx-Y2ps,72114
+machineconfig/jobs/installer/package_groups.py,sha256=VuI4WZEDpgApBptxqu7mbfKxrQ99JY52L1n2devP-y0,6822
 machineconfig/jobs/installer/custom/gh.py,sha256=iZZI4ND87eiWlj-Y5uJ7LuN8ln2QkqjJyeOMFZ0o-YA,2963
 machineconfig/jobs/installer/custom/hx.py,sha256=FrUD0mlhWG2GxrnarccVIaW_sHJ5mxeF6yyzbBWyx6w,5840
 machineconfig/jobs/installer/custom_dev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -148,11 +148,10 @@ machineconfig/scripts/python/cloud_mount.py,sha256=RFMzRUep2D5HtVXANIi-pab3EkI-W
 machineconfig/scripts/python/cloud_repo_sync.py,sha256=PTZ4gyhMFwW77DxE86GyNQK0JDFLcMUSF69AM80SvxY,9781
 machineconfig/scripts/python/cloud_sync.py,sha256=RWGpAfJ9fnN18yNBSgN44dzA38Hmd4879JL5r2pcyrM,3514
 machineconfig/scripts/python/croshell.py,sha256=wYi8xWkzYzpfg8YNppmu22mvx0Gxtbs979ERO3kZS2w,8587
-machineconfig/scripts/python/devops.py,sha256=fTEut6gTDfmNqzS8-gRyRAsmWJYPGGIt8X35Irj7Cl8,3434
+machineconfig/scripts/python/devops.py,sha256=C2aHrYJqXcvgTOam1zucWflLjUYZnNwpFrZ7ccltqXk,3428
 machineconfig/scripts/python/devops_add_identity.py,sha256=JfN3ZrYMCgmt4ks_VCfnV9BIIHAsOYO3E0W0wZ15FR8,3791
 machineconfig/scripts/python/devops_add_ssh_key.py,sha256=KaoX83KltBsmutfKhSfZjd7nP_R1hJ2OLAWRhbswO7o,6889
 machineconfig/scripts/python/devops_backup_retrieve.py,sha256=jZe5Vki7E2GCMG8hvqUZeOONFC4cNzISoGzq_dMG4GA,5601
-machineconfig/scripts/python/devops_devapps_install.py,sha256=2MZsR5aOY_z7dhgrdeffxVhq1i3kxeuthtHLpKmCA18,9333
 machineconfig/scripts/python/devops_update_repos.py,sha256=c5qBc9cuTGDEqDHufkjDT4d_vvJsswv3tlqk9MAulYk,8063
 machineconfig/scripts/python/dotfile.py,sha256=SRcX-9Ak1jRvF-killBTTm2IWcsNxfiLucH6ZsytAFA,2202
 machineconfig/scripts/python/fire_agents_help_launch.py,sha256=1ymWiszfjCyPv3ofinWzfOmbzLEt3d7ntac_afLh-V4,5017
@@ -166,7 +165,7 @@ machineconfig/scripts/python/fire_jobs_streamlit_helper.py,sha256=47DEQpj8HBSa-_
 machineconfig/scripts/python/ftpx.py,sha256=l_gdJS0QB2wVZErubtZvm4HJD9HZAJxSP68sbY73xwo,10278
 machineconfig/scripts/python/get_zellij_cmd.py,sha256=e35-18hoXM9N3PFbvbizfkNY_-63iMicieWE3TbGcCQ,576
 machineconfig/scripts/python/gh_models.py,sha256=3BLfW25mBRiPO5VKtVm-nMlKLv-PaZDw7mObajq6F6M,5538
-machineconfig/scripts/python/interactive.py,sha256=W0NIGTZb0RFyoJIcp02pToRUv_WP5F7-67AOX5N46G4,11797
+machineconfig/scripts/python/interactive.py,sha256=NHAniZPgEfhgA3higTRD3U76nHIDpZLygWebhKc6ld0,11791
 machineconfig/scripts/python/mount_nfs.py,sha256=5HmtsAelFSVzl8o_F9mBoKiuVNIyRHjvdqKzFJR1P64,3376
 machineconfig/scripts/python/mount_nw_drive.py,sha256=iru6AtnTyvyuk6WxlK5R4lDkuliVpPV5_uBTVVhXtjQ,1550
 machineconfig/scripts/python/mount_ssh.py,sha256=7dYCBtkJE43rwuvhxiYzyTlJ230RFQbZOA29veYQbuU,2284
@@ -179,7 +178,7 @@ machineconfig/scripts/python/repos_helper_record.py,sha256=YEEQORfEiLddOIIgePo5e
 machineconfig/scripts/python/repos_helper_update.py,sha256=AYyKIB7eQ48yoYmFjydIhRI1lV39TBv_S4_LCa-oKuQ,11042
 machineconfig/scripts/python/scheduler.py,sha256=rKhssuxkD697EY6qaV6CSdNhxpAQLDWO4fE8GMCQ9FA,3061
 machineconfig/scripts/python/sessions.py,sha256=moLdAPHMn90zd6blugplQ2V__xurOcMBH2WRYqRf-hA,8415
-machineconfig/scripts/python/share_terminal.py,sha256=biuG35YiknTMVr3Mzs4bBZwEq53JcuBRlzMTp6eY90M,5009
+machineconfig/scripts/python/share_terminal.py,sha256=lBZgfFH34P9dfcy3eZNjFUR5OsR6sVfq1vV2eiqQYxQ,5003
 machineconfig/scripts/python/snapshot.py,sha256=aDvKeoniZaeTSNv9zWBUajaj2yagAxVdfuvO1_tgq5Y,1026
 machineconfig/scripts/python/start_slidev.py,sha256=0rVK7uQL70FAYvVk1SQ-tKRlT1fEj-5wIKCLAnM4-9M,4913
 machineconfig/scripts/python/start_terminals.py,sha256=DRWbMZumhPmL0DvvsCsbRNFL5AVQn1SgaziafTio3YQ,6149
@@ -386,7 +385,7 @@ machineconfig/utils/io.py,sha256=ZXB3aataS1IZ_0WMcCRSmoN1nbkvEO-bWYcs-TpngqU,287
 machineconfig/utils/links.py,sha256=riNUrG8aGElRszdOPOic4M2AyOcpdcth_-y8JEiZpJ4,10253
 machineconfig/utils/notifications.py,sha256=vvdsY5IX6XEiILTnt5lNyHxhCi0ljdGX2T_67VRfrG4,9009
 machineconfig/utils/options.py,sha256=8pG-apcc28xxJ5BQiACsGNTKwWtkQyH3hCtzBEhokK8,8366
-machineconfig/utils/path_extended.py,sha256=0Ev2BgkiruTDAYFHxsGzPvQ9EU3OGCGzx5ozZpO6UU8,53129
+machineconfig/utils/path_extended.py,sha256=Xjdn2AVnB8p1jfNMNe2kJutVa5zGnFFJVGZbw-Bp_hg,53200
 machineconfig/utils/path_helper.py,sha256=jqOf3TAlw5cqSp4HBAlOqjAR_bzC8_fvjA-_-CooI6Y,8030
 machineconfig/utils/procs.py,sha256=Bm-yopmj19yiBO9tywJHEcs9rZmeRyJqbgTSe216LTU,11349
 machineconfig/utils/scheduler.py,sha256=bUHDviS_HE9_6LaA1k9Nnfz5rr2FJIfrk5qO2FJ-oUs,15119
@@ -402,14 +401,15 @@ machineconfig/utils/cloud/onedrive/setup_oauth.py,sha256=ZTVkqgrwbV_EoPvyT8dyOTU
 machineconfig/utils/cloud/onedrive/transaction.py,sha256=m-aNcnWj_gfZVvJOSpkdIqjZxU_3nXx2CA-qKbQgP3I,26232
 machineconfig/utils/installer_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/utils/installer_utils/github_release_bulk.py,sha256=WJf_qZlF02SmIc6C7o1h4Gy4gAaJAfeAS8O9s2Itj-k,6535
+machineconfig/utils/installer_utils/installer.py,sha256=_XcatwArhwRepMYfaGYpjd-lqNGfijnjeZB8l4uKd-c,9266
 machineconfig/utils/installer_utils/installer_abc.py,sha256=MRVfkjCPlPgCQQcSxXdVJMVnr_9CC3SQbFVDJxWy1zI,10813
 machineconfig/utils/installer_utils/installer_class.py,sha256=6IQswaC9mxIdeaMG-rOt-vqyKGYibBRMvC0UglZ_3mI,20268
 machineconfig/utils/schemas/fire_agents/fire_agents_input.py,sha256=pTxvLzIpD5RF508lUUBBkWcc4V1B10J4ylvVgVGkcM0,2037
 machineconfig/utils/schemas/installer/installer_types.py,sha256=QClRY61QaduBPJoSpdmTIdgS9LS-RvE-QZ-D260tD3o,1214
 machineconfig/utils/schemas/layouts/layout_types.py,sha256=TcqlZdGVoH8htG5fHn1KWXhRdPueAcoyApppZsPAPto,2020
 machineconfig/utils/schemas/repos/repos_types.py,sha256=ECVr-3IVIo8yjmYmVXX2mnDDN1SLSwvQIhx4KDDQHBQ,405
-machineconfig-4.97.dist-info/METADATA,sha256=TASblKhYFS5DONxX0YvajOjOzNPHg_WvLeSXnkgAmFI,7061
-machineconfig-4.97.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-4.97.dist-info/entry_points.txt,sha256=LcwklRJPY_uKBvStgtOJn5G_pmFCEdpgRNzUUc6twAQ,1134
-machineconfig-4.97.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-4.97.dist-info/RECORD,,
+machineconfig-4.98.dist-info/METADATA,sha256=Xtvi0zedO2u7yGDMu2GlOZtwTVZgrldIp8on4VJ-kcQ,7061
+machineconfig-4.98.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-4.98.dist-info/entry_points.txt,sha256=LcwklRJPY_uKBvStgtOJn5G_pmFCEdpgRNzUUc6twAQ,1134
+machineconfig-4.98.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-4.98.dist-info/RECORD,,