devdash-mac 0.1.3__tar.gz → 0.1.4__tar.gz

{devdash_mac-0.1.3/src/devdash_mac.egg-info → devdash_mac-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devdash-mac
-Version: 0.1.3
+Version: 0.1.4
 Summary: Open-source macOS menubar developer utilities
 Author: DevDash Contributors
 License: MIT

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devdash-mac"
-version = "0.1.3"
+version = "0.1.4"
 description = "Open-source macOS menubar developer utilities"
 readme = "README.md"
 license = {text = "MIT"}

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/src/devdash/__init__.py

@@ -1,4 +1,4 @@
 """DevDash - Open-source macOS menubar developer utilities."""
 
-__version__ = "0.1.3"
+__version__ = "0.1.4"
 __app_name__ = "DevDash"

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/src/devdash/app.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-import threading
+import subprocess
 
 import rumps
 
@@ -33,6 +33,7 @@ class DevDashApp(rumps.App):
     def __init__(self) -> None:
         super().__init__(name=__app_name__, title="\U0001f527", quit_button=None)
         self._tools: list[DevTool] = discover_tools()
+        self._tool_map: dict[str, DevTool] = {}
         self._last_clipboard: str = ""
         self._build_menu()
         config = load_config()
@@ -55,7 +56,8 @@ class DevDashApp(rumps.App):
                 if current_category:
                     menu_items.append(None)
                 current_category = tool.category
-            item = rumps.MenuItem(tool.name, callback=self._make_tool_callback(tool))
+            item = rumps.MenuItem(tool.name, callback=self._on_tool_click)
+            self._tool_map[tool.name] = tool
             menu_items.append(item)
 
         menu_items.append(None)
@@ -67,53 +69,46 @@ class DevDashApp(rumps.App):
 
         self.menu = menu_items
 
-    def _make_tool_callback(self, tool: DevTool):  # type: ignore[no-untyped-def]
-        """Create a callback closure for a specific tool."""
-
-        def callback(_: rumps.MenuItem) -> None:
-            # Run in a thread so the menubar stays responsive
-            threading.Thread(
-                target=show_tool_dialog, args=(tool,), daemon=True
-            ).start()
-
-        return callback
+    def _on_tool_click(self, sender: rumps.MenuItem) -> None:
+        """Handle tool menu item click."""
+        tool = self._tool_map.get(sender.title)
+        if tool:
+            show_tool_dialog(tool)
 
     def _on_auto_detect(self, _: rumps.MenuItem) -> None:
         """Read clipboard, detect content type, open matching tool."""
-
-        def _detect_and_open() -> None:
-            content = clipboard.read()
-            if not content.strip():
-                notify("DevDash", "Clipboard is empty")
-                return
-
-            detected = clipboard.detect_type(content)
-            keyword_map = {
-                clipboard.ContentType.JSON: "json",
-                clipboard.ContentType.JWT: "jwt",
-                clipboard.ContentType.UUID: "uuid",
-                clipboard.ContentType.BASE64: "base64",
-                clipboard.ContentType.UNIX_TIMESTAMP: "timestamp",
-                clipboard.ContentType.URL: "url",
-                clipboard.ContentType.URL_ENCODED: "url",
-                clipboard.ContentType.HEX_COLOR: "color",
-                clipboard.ContentType.CRON: "cron",
-            }
-            keyword = keyword_map.get(detected)
-            if keyword:
-                for tool in self._tools:
-                    if tool.keyword == keyword:
-                        show_tool_dialog(tool, input_text=content)
-                        return
-            notify("DevDash", f"Detected: {detected.name}. No matching tool found.")
-
-        threading.Thread(target=_detect_and_open, daemon=True).start()
+        content = clipboard.read()
+        if not content.strip():
+            _osascript_alert("DevDash", "Clipboard is empty")
+            return
+
+        detected = clipboard.detect_type(content)
+        keyword_map = {
+            clipboard.ContentType.JSON: "json",
+            clipboard.ContentType.JWT: "jwt",
+            clipboard.ContentType.UUID: "uuid",
+            clipboard.ContentType.BASE64: "base64",
+            clipboard.ContentType.UNIX_TIMESTAMP: "timestamp",
+            clipboard.ContentType.URL: "url",
+            clipboard.ContentType.URL_ENCODED: "url",
+            clipboard.ContentType.HEX_COLOR: "color",
+            clipboard.ContentType.CRON: "cron",
+        }
+        keyword = keyword_map.get(detected)
+        if keyword:
+            for tool in self._tools:
+                if tool.keyword == keyword:
+                    show_tool_dialog(tool, input_text=content)
+                    return
+        _osascript_alert(
+            "DevDash", f"Detected: {detected.name}. No matching tool found."
+        )
 
     def _on_about(self, _: rumps.MenuItem) -> None:
         """Show about dialog."""
-        rumps.alert(
-            title=f"About {__app_name__}",
-            message=(
+        _osascript_alert(
+            f"About {__app_name__}",
+            (
                 f"{__app_name__} v{__version__}\n\n"
                 "Open-source macOS menubar developer utilities.\n"
                 "https://github.com/vamsi876/devdash"
@@ -147,6 +142,17 @@ class DevDashApp(rumps.App):
         _watch_clipboard.start()  # type: ignore[attr-defined]
 
 
+def _osascript_alert(title: str, message: str) -> None:
+    """Show a simple alert via osascript."""
+    t = title.replace("\\", "\\\\").replace('"', '\\"')
+    m = message.replace("\\", "\\\\").replace('"', '\\"')
+    subprocess.run(
+        ["osascript", "-e", f'display alert "{t}" message "{m}"'],
+        capture_output=True,
+        timeout=30,
+    )
+
+
 def main() -> None:
     """Entry point for the application."""
     app = DevDashApp()

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/src/devdash/tools/base64_tool.py

@@ -32,7 +32,7 @@ class Base64Tool(DevTool):
 
     @property
     def description(self) -> str:
-        return "Encode or decode Base64 (standard and URL-safe)"
+        return "Enter text to encode, or paste Base64 to decode"
 
     def process(self, input_text: str, **kwargs: object) -> str:
         if not input_text.strip():

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/src/devdash/tools/color_tool.py

@@ -25,7 +25,7 @@ class ColorTool(DevTool):
 
     @property
     def description(self) -> str:
-        return "Convert between HEX, RGB, HSL, and HSV color formats"
+        return "Enter a color: #hex, rgb(r,g,b), or hsl(h,s,l)"
 
     def process(self, input_text: str, **kwargs: object) -> str:
         if not input_text.strip():

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/src/devdash/tools/cron_tool.py

@@ -33,7 +33,7 @@ class CronTool(DevTool):
 
     @property
     def description(self) -> str:
-        return "Parse cron expressions to human-readable descriptions"
+        return "Enter a cron expression (e.g. '*/5 * * * *') or leave empty for presets"
 
     def process(self, input_text: str, **kwargs: object) -> str:
         if not input_text.strip():

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/src/devdash/tools/hash_tool.py

@@ -23,7 +23,7 @@ class HashTool(DevTool):
 
     @property
     def description(self) -> str:
-        return "Generate MD5, SHA-1, SHA-256, SHA-512, BLAKE2b hashes"
+        return "Enter text to generate MD5, SHA-256, and other hashes"
 
     def process(self, input_text: str, **kwargs: object) -> str:
         if not input_text.strip():

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/src/devdash/tools/json_tool.py

@@ -20,7 +20,7 @@ class JsonTool(DevTool):
 
     @property
     def description(self) -> str:
-        return "Format, validate, or minify JSON"
+        return "Paste JSON to format and pretty-print"
 
     def process(self, input_text: str, **kwargs: object) -> str:
         if not input_text.strip():

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/src/devdash/tools/jwt_tool.py

@@ -23,7 +23,7 @@ class JwtTool(DevTool):
 
     @property
     def description(self) -> str:
-        return "Decode JWT tokens (header + payload + expiry check)"
+        return "Paste a JWT token to decode header, payload, and expiry"
 
     def process(self, input_text: str, **kwargs: object) -> str:
         if not input_text.strip():

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/src/devdash/tools/lorem_tool.py

@@ -44,7 +44,7 @@ class LoremTool(DevTool):
 
     @property
     def description(self) -> str:
-        return "Generate lorem ipsum text by words, sentences, or paragraphs"
+        return "Enter amount, e.g. '5 words', '3 sentences', or '2 paragraphs'"
 
     def process(self, input_text: str, **kwargs: object) -> str:
         text = input_text.strip().lower()

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/src/devdash/tools/password_tool.py

@@ -305,7 +305,7 @@ class PasswordTool(DevTool):
 
     @property
     def description(self) -> str:
-        return "Generate secure passwords or passphrases"
+        return "Enter password length (8-128) or 'passphrase'"
 
     def process(self, input_text: str, **kwargs: object) -> str:
         text = input_text.strip().lower()
@@ -346,6 +346,7 @@ class PasswordTool(DevTool):
         for _ in range(count):
             password = "".join(secrets.choice(charset) for _ in range(length))
             entropy = self._entropy(length, len(charset))
+            entropy = self._entropy(length, len(charset))
             results.append(f"{password}  (entropy: {entropy:.0f} bits)")
 
         return "\n".join(results)

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/src/devdash/tools/regex_tool.py

@@ -28,7 +28,7 @@ class RegexTool(DevTool):
 
     @property
     def description(self) -> str:
-        return "Test regex patterns with match highlighting"
+        return "Enter pattern and test string separated by ---"
 
     def process(self, input_text: str, **kwargs: object) -> str:
         # Check kwargs first

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/src/devdash/tools/timestamp_tool.py

@@ -61,7 +61,7 @@ class TimestampTool(DevTool):
 
     @property
     def description(self) -> str:
-        return "Convert between Unix timestamps and human-readable dates"
+        return "Enter a Unix timestamp or date. Leave empty for current time."
 
     def process(self, input_text: str, **kwargs: object) -> str:
         if not input_text.strip():

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/src/devdash/tools/url_tool.py

@@ -20,7 +20,7 @@ class UrlTool(DevTool):
 
     @property
     def description(self) -> str:
-        return "URL encode/decode and parse URL components"
+        return "Paste a URL to parse, or enter text to URL-encode"
 
     def process(self, input_text: str, **kwargs: object) -> str:
         if not input_text.strip():

{devdash_mac-0.1.3 → devdash_mac-0.1.4}/src/devdash/tools/uuid_tool.py

@@ -79,7 +79,7 @@ class UuidTool(DevTool):
 
     @property
     def description(self) -> str:
-        return "Generate UUID v4, v7, or ULID; validate UUIDs"
+        return "Enter 'v4', 'v7', or 'ulid' to generate. Paste a UUID to validate."
 
     def process(self, input_text: str, **kwargs: object) -> str:
         text = input_text.strip()

devdash_mac-0.1.4/src/devdash/ui/windows.py

@@ -0,0 +1,166 @@
+"""Custom dialog wrappers using osascript for reliable macOS dialogs."""
+
+from __future__ import annotations
+
+import logging
+import re
+import subprocess
+from typing import TYPE_CHECKING
+
+from devdash import clipboard
+from devdash.ui.notifications import notify_copied
+
+if TYPE_CHECKING:
+    from devdash.tools.base import DevTool
+
+logger = logging.getLogger(__name__)
+
+# Metadata patterns to strip when copying output
+_METADATA_RE = re.compile(
+    r"\s*\(entropy:.*?\)"  # password entropy
+    r"|\n\nOriginal bytes:.*"  # base64 byte counts
+    r"|\n\nEncoded bytes:.*"
+    r"|\n\n\[Auto-detected.*?\]"  # base64 auto-detect label
+    r"|\n\nWarning:.*",  # JWT warning
+    re.DOTALL,
+)
+
+
+def _escape(text: str) -> str:
+    """Escape text for use inside AppleScript strings."""
+    return (
+        text.replace("\\", "\\\\")
+        .replace('"', '\\"')
+        .replace("\n", "\\n")
+        .replace("\r", "")
+        .replace("\t", "\\t")
+    )
+
+
+def _input_dialog(title: str, message: str, default: str = "") -> str | None:
+    """Show a native macOS input dialog via osascript.
+
+    Returns the entered text, or None if cancelled.
+    """
+    script = (
+        f'display dialog "{_escape(message)}" '
+        f'default answer "{_escape(default)}" '
+        f'with title "{_escape(title)}" '
+        f'buttons {{"Cancel", "Process"}} default button "Process"'
+        "\n"
+        "return text returned of result"
+    )
+    try:
+        r = subprocess.run(
+            ["osascript", "-e", script],
+            capture_output=True,
+            text=True,
+            timeout=300,
+        )
+        if r.returncode == 0:
+            return r.stdout.strip()
+    except subprocess.TimeoutExpired:
+        logger.warning("Input dialog timed out for %s", title)
+    except Exception:
+        logger.exception("Failed to show input dialog")
+    return None
+
+
+def _output_dialog(title: str, result: str) -> bool:
+    """Show a native macOS output dialog via osascript.
+
+    Returns True if the user clicked 'Copy to Clipboard'.
+    """
+    # Truncate very long results for the dialog display
+    display = result if len(result) <= 1000 else result[:997] + "..."
+    script = (
+        f'display dialog "{_escape(display)}" '
+        f'with title "{_escape(title)}" '
+        f'buttons {{"Close", "Copy to Clipboard"}} '
+        f'default button "Copy to Clipboard"'
+    )
+    try:
+        r = subprocess.run(
+            ["osascript", "-e", script],
+            capture_output=True,
+            text=True,
+            timeout=300,
+        )
+        if r.returncode == 0:
+            return "Copy to Clipboard" in r.stdout
+    except Exception:
+        logger.exception("Failed to show output dialog")
+    return False
+
+
+def _error_dialog(title: str, message: str) -> None:
+    """Show a native macOS error alert via osascript."""
+    script = (
+        f'display alert "{_escape(title)}" '
+        f'message "{_escape(message)}" as critical'
+    )
+    try:
+        subprocess.run(
+            ["osascript", "-e", script],
+            capture_output=True,
+            timeout=10,
+        )
+    except Exception:
+        logger.exception("Failed to show error dialog")
+
+
+def _clean_for_copy(result: str) -> str:
+    """Strip display-only metadata from result before copying."""
+    return _METADATA_RE.sub("", result).strip()
+
+
+def show_tool_dialog(tool: DevTool, input_text: str = "") -> None:
+    """Show input window, process with tool, show output, offer clipboard copy."""
+    text = _input_dialog(
+        title=tool.name,
+        message=tool.description or f"Enter input for {tool.name}",
+        default=input_text,
+    )
+    if text is None:
+        return
+
+    error = tool.validate(text)
+    if error:
+        _error_dialog("DevDash Error", error)
+        return
+
+    try:
+        result = tool.process(text)
+    except Exception as e:
+        _error_dialog("DevDash Error", str(e))
+        return
+
+    if _output_dialog(f"{tool.name} - Result", result):
+        clipboard.write(_clean_for_copy(result))
+        notify_copied()
+
+
+def show_multi_input_dialog(
+    tool: DevTool,
+    fields: list[tuple[str, str]],
+) -> list[str] | None:
+    """Show sequential input dialogs for tools needing multiple inputs.
+
+    Args:
+        tool: The tool instance.
+        fields: List of (label, default_value) tuples.
+
+    Returns:
+        List of input values, or None if cancelled.
+    """
+    values: list[str] = []
+    for label, default in fields:
+        text = _input_dialog(
+            title=tool.name,
+            message=label,
+            default=default,
+        )
+        if text is None:
+            return None
+        values.append(text)
+    return values

{devdash_mac-0.1.3 → devdash_mac-0.1.4/src/devdash_mac.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devdash-mac
-Version: 0.1.3
+Version: 0.1.4
 Summary: Open-source macOS menubar developer utilities
 Author: DevDash Contributors
 License: MIT

devdash_mac-0.1.3/src/devdash/ui/windows.py

@@ -1,84 +0,0 @@
-"""Custom rumps.Window wrappers for consistent tool UI."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import rumps
-
-from devdash import clipboard
-from devdash.ui.notifications import notify_copied, notify_error
-
-if TYPE_CHECKING:
-    from devdash.tools.base import DevTool
-
-
-def show_tool_dialog(tool: DevTool, input_text: str = "") -> None:
-    """Show input window, process with tool, show output, offer clipboard copy."""
-    window = rumps.Window(
-        message=tool.description or f"Enter input for {tool.name}",
-        title=tool.name,
-        default_text=input_text,
-        ok="Process",
-        cancel="Cancel",
-        dimensions=(320, 200),
-    )
-    response = window.run()
-    if not response.clicked:
-        return
-
-    text = response.text
-    error = tool.validate(text)
-    if error:
-        notify_error(error)
-        return
-
-    try:
-        result = tool.process(text)
-    except Exception as e:
-        notify_error(f"Error: {e}")
-        return
-
-    # Show output window
-    output_window = rumps.Window(
-        message="Result (click OK to copy to clipboard):",
-        title=f"{tool.name} - Output",
-        default_text=result,
-        ok="Copy to Clipboard",
-        cancel="Close",
-        dimensions=(320, 200),
-    )
-    out_response = output_window.run()
-    if out_response.clicked:
-        clipboard.write(result)
-        notify_copied()
-
-
-def show_multi_input_dialog(
-    tool: DevTool,
-    fields: list[tuple[str, str]],
-) -> list[str] | None:
-    """Show sequential input dialogs for tools needing multiple inputs.
-
-    Args:
-        tool: The tool instance.
-        fields: List of (label, default_value) tuples.
-
-    Returns:
-        List of input values, or None if cancelled.
-    """
-    values: list[str] = []
-    for label, default in fields:
-        window = rumps.Window(
-            message=label,
-            title=tool.name,
-            default_text=default,
-            ok="Next" if len(values) < len(fields) - 1 else "Process",
-            cancel="Cancel",
-            dimensions=(320, 150),
-        )
-        response = window.run()
-        if not response.clicked:
-            return None
-        values.append(response.text)
-    return values