tool-tray 0.3.8__py3-none-any.whl → 0.3.11__py3-none-any.whl

tool_tray/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.8"
+__version__ = "0.3.11"
 
 
 def main() -> None:

tool_tray/autostart.py

@@ -3,33 +3,25 @@ import sys
 from pathlib import Path
 
 
-def _get_tooltray_path() -> str:
-    """Get the path to tooltray executable."""
-    try:
-        result = subprocess.run(
-            ["uv", "tool", "list", "--show-paths"],
-            capture_output=True,
-            text=True,
-            check=True,
-        )
-        for line in result.stdout.splitlines():
-            if line.startswith("- tooltray ") or line.startswith("- tool-tray "):
-                start = line.find("(")
-                end = line.find(")")
-                if start != -1 and end != -1:
-                    return line[start + 1 : end]
-    except subprocess.CalledProcessError:
-        pass
-    return "tooltray"
+def _get_tooltray_path() -> str | None:
+    """Get the path to tooltray executable. Returns None if not found."""
+    import shutil
+
+    return shutil.which("tooltray")
 
 
 def _linux_autostart_enable() -> bool:
     """Add tooltray to Linux autostart."""
     from tool_tray.logging import log_error, log_info
 
+    exe = _get_tooltray_path()
+    if not exe:
+        log_error("Cannot enable autostart: tooltray not found in PATH")
+        print("Error: tooltray not found in PATH")
+        return False
+
     desktop_file = Path.home() / ".config/autostart/tooltray.desktop"
     desktop_file.parent.mkdir(parents=True, exist_ok=True)
-    exe = _get_tooltray_path()
     try:
         desktop_file.write_text(f"""[Desktop Entry]
 Type=Application
@@ -69,19 +61,29 @@ def _macos_autostart_enable() -> bool:
 
     from tool_tray.logging import log_error, log_info
 
-    plist = Path.home() / "Library/LaunchAgents/com.tooltray.plist"
-    plist.parent.mkdir(parents=True, exist_ok=True)
-
-    # Use sys.executable to run with same Python interpreter
-    python_exe = sys.executable
-
-    # Find uv binary path for PATH env (needed for get_installed_version)
+    # Find both binaries - fail fast if either missing
     uv_bin = shutil.which("uv")
+    tooltray_bin = shutil.which("tooltray")
+
     if not uv_bin:
         log_error("Cannot enable autostart: uv not found in PATH")
         print("Error: uv not found in PATH. Install uv first.")
         return False
-    uv_dir = str(Path(uv_bin).parent)
+
+    if not tooltray_bin:
+        log_error("Cannot enable autostart: tooltray not found in PATH")
+        print("Error: tooltray not found in PATH")
+        return False
+
+    # Collect unique directories for PATH
+    path_dirs = {str(Path(uv_bin).parent), str(Path(tooltray_bin).parent)}
+    path_env = ":".join(sorted(path_dirs)) + ":/usr/bin:/bin"
+
+    plist = Path.home() / "Library/LaunchAgents/com.tooltray.plist"
+    plist.parent.mkdir(parents=True, exist_ok=True)
+
+    # Use sys.executable to run with same Python interpreter
+    python_exe = sys.executable
 
     log_dir = Path.home() / "Library/Logs/tooltray"
     log_dir.mkdir(parents=True, exist_ok=True)
@@ -105,7 +107,7 @@ def _macos_autostart_enable() -> bool:
     <key>EnvironmentVariables</key>
     <dict>
         <key>PATH</key>
-        <string>{uv_dir}:/usr/bin:/bin</string>
+        <string>{path_env}</string>
     </dict>
     <key>StandardOutPath</key>
     <string>{log_dir}/stdout.log</string>
@@ -149,6 +151,11 @@ def _windows_autostart_enable() -> bool:
         return False
 
     exe = _get_tooltray_path()
+    if not exe:
+        log_error("Cannot enable autostart: tooltray not found in PATH")
+        print("Error: tooltray not found in PATH")
+        return False
+
     try:
         key = winreg.OpenKey(
             winreg.HKEY_CURRENT_USER,

tool_tray/tray.py

@@ -371,13 +371,17 @@ def on_startup(icon: Any) -> None:
 
 
 def spawn_setup() -> None:
-    """Spawn setup dialog as subprocess."""
-    import sys
+    """Spawn setup dialog as subprocess via uv for proper Tcl/Tk paths."""
+    import shutil
 
-    from tool_tray.logging import log_info
+    from tool_tray.logging import log_error, log_info
+
+    uv_bin = shutil.which("uv")
+    if not uv_bin:
+        log_error("Cannot spawn setup: uv not found in PATH")
+        return
 
-    # Use sys.executable to run with same Python interpreter
-    cmd = [sys.executable, "-m", "tool_tray", "setup"]
+    cmd = [uv_bin, "run", "tooltray", "setup"]
     log_info(f"Spawning setup subprocess: {cmd}")
     subprocess.Popen(cmd)
 

{tool_tray-0.3.8.dist-info → tool_tray-0.3.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tool-tray
-Version: 0.3.8
+Version: 0.3.11
 Summary: System tray tool manager for private GitHub tools via uv
 Author: Fredrik Averpil
 Author-email: Fredrik Averpil <fredrik.averpil@gmail.com>

{tool_tray-0.3.8.dist-info → tool_tray-0.3.11.dist-info}/RECORD

@@ -1,15 +1,15 @@
-tool_tray/__init__.py,sha256=XLe-TtIKjOmZRxc0AE6p-B57-quCUuB9oPNZBGDwcZI,10337
+tool_tray/__init__.py,sha256=hP6OXemmKIStpYMsEKuQl9ms7DxnQKu98I3tmEwLCEY,10338
 tool_tray/__main__.py,sha256=kPhKj3ISnfdEj_xNeV02OyVne5R22PDUJXBrFdCdw6c,66
-tool_tray/autostart.py,sha256=ukgQoqvuMOtn9_toaLwMkDbDbU9aOXaIglScGFseO7Q,7684
+tool_tray/autostart.py,sha256=h1JcycsP8H97gMkD7GbBNVxdGrU_ZeFJDCGY50-i8qY,7862
 tool_tray/config.py,sha256=sPD2BL4s9ONcOK0Gac-efkiFgHJvbHxD2-LK2nl5-uw,3154
 tool_tray/desktop.py,sha256=87uBbZgE3pgZhjKfV1pKRrk83nuMKtBrR87enH_3eq0,3236
 tool_tray/logging.py,sha256=cXO4mxZsQ2sSdCC1HyMbszBOzDH17GFzVnh_bpsk6-c,1939
 tool_tray/manifest.py,sha256=lr13lcoaNsOi4E2_PCiomPN4-cQ05_bdNVuPyrONJeM,1915
 tool_tray/setup_dialog.py,sha256=1IOifQdrpGWuVd27P0XcMXBriCv9QkK_gMvnWfTKs5c,2301
 tool_tray/state.py,sha256=GEbXheWQeuw_IZGXBgccTxzP3jb_OEu-fh_o_4MrKQc,3079
-tool_tray/tray.py,sha256=RbXWfNbLpVqIhrVRDRr2RXimwsZ6f-CwpzxZnN7qpOM,11910
+tool_tray/tray.py,sha256=vy8wWaAtdAtJ44V-z6xYDtSbu49iZ4SQppzaRBQEBcQ,12015
 tool_tray/updater.py,sha256=4yA1nvV2UKKY4POk_lPegpeXUhXsWVCXRHr5V-2DAjs,4354
-tool_tray-0.3.8.dist-info/WHEEL,sha256=XV0cjMrO7zXhVAIyyc8aFf1VjZ33Fen4IiJk5zFlC3g,80
-tool_tray-0.3.8.dist-info/entry_points.txt,sha256=8tdG3k77qXzGiU9GunLH2EkNwmiBg8dy2MnvMy5NaCA,45
-tool_tray-0.3.8.dist-info/METADATA,sha256=HpRnjUmUahSzHZZV5yPZRu-nJZwNqXxgr9g4kET6P8A,4382
-tool_tray-0.3.8.dist-info/RECORD,,
+tool_tray-0.3.11.dist-info/WHEEL,sha256=XV0cjMrO7zXhVAIyyc8aFf1VjZ33Fen4IiJk5zFlC3g,80
+tool_tray-0.3.11.dist-info/entry_points.txt,sha256=8tdG3k77qXzGiU9GunLH2EkNwmiBg8dy2MnvMy5NaCA,45
+tool_tray-0.3.11.dist-info/METADATA,sha256=WzgF2cTKyza82m4SXvc-AmuqMyT-w-QwEqDztJXjsw0,4383
+tool_tray-0.3.11.dist-info/RECORD,,