mxctl 0.4.1__tar.gz → 0.4.2__tar.gz

{mxctl-0.4.1 → mxctl-0.4.2}/ARCHITECTURE.md

@@ -87,4 +87,4 @@ Batch commands (`batch-read`, `batch-move`, `batch-delete`, `batch-flag`) log th
 
 Tests live in `tests/` and use `unittest.mock` to mock AppleScript calls. No actual Mail.app interaction happens during testing. Run with `pytest --cov` for coverage.
 
-The suite has 678 tests (100% coverage) across 19 test files covering command parsing, AppleScript output parsing, error paths, date handling, formatting, config resolution, batch operations, undo logging, templates, AI classification logic, unsubscribe HTTP paths, Todoist integration, inbox tools, bulk export, and the public API module. Six unreachable defensive guards are marked with `# pragma: no cover`.
+The suite has 678 tests (100% coverage) across 19 test files covering command parsing, AppleScript output parsing, error paths, date handling, formatting, config resolution, batch operations, undo logging, templates, AI classification logic, unsubscribe HTTP paths, Todoist integration, inbox tools, bulk export, and the public API module. Five unreachable defensive guards are marked with `# pragma: no cover`.

{mxctl-0.4.1 → mxctl-0.4.2}/CHANGELOG.md

@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+## [0.4.2] - 2026-02-28
+
+### Fixed
+
+- `mxctl --version` now reports the correct version at runtime (was stuck at `0.3.0` since the rename)
+- Consolidated duplicate `get_headers()` / `get_raw_headers()` code in system.py
+- Moved delayed inline imports to module level in actions.py (subprocess, sys, get_gmail_accounts)
+- Fixed ARCHITECTURE.md stale claim: "Six" → "Five" pragma:no cover guards
+
 ## [0.4.1] - 2026-02-27
 
 ### Added

{mxctl-0.4.1 → mxctl-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mxctl
-Version: 0.4.1
+Version: 0.4.2
 Summary: Apple Mail from your terminal
 Project-URL: Homepage, https://github.com/Jscoats/mxctl
 Project-URL: Repository, https://github.com/Jscoats/mxctl

{mxctl-0.4.1 → mxctl-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "mxctl"
-version = "0.4.1"
+version = "0.4.2"
 description = "Apple Mail from your terminal"
 readme = "README.md"
 requires-python = ">=3.10"

{mxctl-0.4.1 → mxctl-0.4.2}/src/mxctl/__init__.py

@@ -1,3 +1,3 @@
 """mxctl: Apple Mail from your terminal."""
 
-__version__ = "0.3.0"
+__version__ = "0.4.2"

{mxctl-0.4.1 → mxctl-0.4.2}/src/mxctl/commands/mail/actions.py

@@ -5,11 +5,12 @@ import re
 import socket
 import ssl
 import subprocess
+import sys
 import urllib.error
 import urllib.parse
 import urllib.request
 
-from mxctl.config import APPLESCRIPT_TIMEOUT_SHORT, FIELD_SEPARATOR, resolve_account
+from mxctl.config import APPLESCRIPT_TIMEOUT_SHORT, FIELD_SEPARATOR, get_gmail_accounts, resolve_account
 from mxctl.util.applescript import escape, run, validate_msg_id
 from mxctl.util.applescript_templates import set_message_property
 from mxctl.util.formatting import die, format_output, truncate
@@ -355,8 +356,6 @@ def cmd_unsubscribe(args) -> None:
 
 def cmd_junk(args) -> None:
     """Mark a message as junk or spam."""
-    import sys
-
     account, mailbox, _, _ = resolve_message_context(args)
     message_id = validate_msg_id(args.id)
 
@@ -397,8 +396,6 @@ def _try_not_junk_in_mailbox(
     Returns the message subject string on success, None if the message or mailbox
     was not found.
     """
-    import subprocess as _subprocess
-
     if subject and sender:
         # Search by subject + sender — avoids stale-ID problem after cross-mailbox moves
         subj_esc = escape(subject)
@@ -429,7 +426,7 @@ def _try_not_junk_in_mailbox(
             return msgSubject
         end tell
         """
-    result = _subprocess.run(
+    result = subprocess.run(
         ["osascript", "-e", script],
         capture_output=True,
         text=True,
@@ -457,8 +454,6 @@ def not_junk(account: str, message_id: int, custom_mailbox: str | None = None) -
 
     Returns a result dict on success, or raises SystemExit on failure.
     """
-    import sys
-
     acct_escaped = escape(account)
     inbox_mailbox = resolve_mailbox(account, "INBOX")
     inbox_escaped = escape(inbox_mailbox)
@@ -470,8 +465,6 @@ def not_junk(account: str, message_id: int, custom_mailbox: str | None = None) -
     orig_subject = ""
     orig_sender = ""
     try:
-        import subprocess as _subprocess
-
         fetch_script = f"""
         tell application "Mail"
             set acct to account "{acct_escaped}"
@@ -480,7 +473,7 @@ def not_junk(account: str, message_id: int, custom_mailbox: str | None = None) -
             return (subject of theMsg) & "{FIELD_SEPARATOR}" & (sender of theMsg)
         end tell
         """
-        fetch_result = _subprocess.run(
+        fetch_result = subprocess.run(
             ["osascript", "-e", fetch_script],
             capture_output=True,
             text=True,
@@ -500,8 +493,6 @@ def not_junk(account: str, message_id: int, custom_mailbox: str | None = None) -
         # Build a prioritized list of junk folder candidates
         junk_primary = resolve_mailbox(account, "Junk")
         candidates = [junk_primary]
-        from mxctl.config import get_gmail_accounts
-
         if account in get_gmail_accounts():
             if "[Gmail]/Spam" not in candidates:
                 candidates.append("[Gmail]/Spam")

{mxctl-0.4.1 → mxctl-0.4.2}/src/mxctl/commands/mail/system.py

@@ -39,19 +39,7 @@ def cmd_check(args) -> None:
 
 def get_headers(account: str, mailbox: str, message_id: int) -> dict:
     """Return parsed email headers dict for the given message."""
-    acct_escaped = escape(account)
-    mb_escaped = escape(mailbox)
-
-    script = f"""
-    tell application "Mail"
-        set mb to mailbox "{mb_escaped}" of account "{acct_escaped}"
-        set theMsg to first message of mb whose id is {message_id}
-        return all headers of theMsg
-    end tell
-    """
-
-    result = run(script)
-    return parse_email_headers(result)
+    return parse_email_headers(get_raw_headers(account, mailbox, message_id))
 
 
 def get_raw_headers(account: str, mailbox: str, message_id: int) -> str:

{mxctl-0.4.1 → mxctl-0.4.2}/tests/test_100_coverage.py

@@ -486,7 +486,7 @@ class TestNotJunkGmailPaths:
         from mxctl.commands.mail.actions import cmd_not_junk
 
         monkeypatch.setattr("mxctl.commands.mail.actions.resolve_account", lambda _: "Gmail")
-        monkeypatch.setattr("mxctl.config.get_gmail_accounts", lambda: ["Gmail"])
+        monkeypatch.setattr("mxctl.commands.mail.actions.get_gmail_accounts", lambda: ["Gmail"])
         # resolve_mailbox("Junk") returns "[Gmail]/Spam" for Gmail, so candidates start with that
         monkeypatch.setattr("mxctl.commands.mail.actions.resolve_mailbox", lambda acct, mb: "[Gmail]/Spam" if mb == "Junk" else mb)
 
@@ -517,7 +517,7 @@ class TestNotJunkGmailPaths:
         from mxctl.commands.mail.actions import cmd_not_junk
 
         monkeypatch.setattr("mxctl.commands.mail.actions.resolve_account", lambda _: "iCloud")
-        monkeypatch.setattr("mxctl.config.get_gmail_accounts", lambda: [])
+        monkeypatch.setattr("mxctl.commands.mail.actions.get_gmail_accounts", lambda: [])
         monkeypatch.setattr("mxctl.commands.mail.actions.resolve_mailbox", lambda acct, mb: mb)
 
         # Mock the subprocess for fetching original subject/sender - SUCCEEDS
@@ -542,7 +542,7 @@ class TestNotJunkGmailPaths:
         from mxctl.commands.mail.actions import cmd_not_junk
 
         monkeypatch.setattr("mxctl.commands.mail.actions.resolve_account", lambda _: "iCloud")
-        monkeypatch.setattr("mxctl.config.get_gmail_accounts", lambda: [])
+        monkeypatch.setattr("mxctl.commands.mail.actions.get_gmail_accounts", lambda: [])
         monkeypatch.setattr("mxctl.commands.mail.actions.resolve_mailbox", lambda acct, mb: mb)
 
         # Mock subprocess.run to raise an exception (e.g. OSError)
@@ -564,7 +564,7 @@ class TestNotJunkGmailPaths:
         from mxctl.commands.mail.actions import cmd_not_junk
 
         monkeypatch.setattr("mxctl.commands.mail.actions.resolve_account", lambda _: "Gmail")
-        monkeypatch.setattr("mxctl.config.get_gmail_accounts", lambda: ["Gmail"])
+        monkeypatch.setattr("mxctl.commands.mail.actions.get_gmail_accounts", lambda: ["Gmail"])
         # resolve_mailbox returns "Junk" as-is (not mapping to [Gmail]/Spam),
         # so [Gmail]/Spam is NOT already in candidates and gets appended
         monkeypatch.setattr("mxctl.commands.mail.actions.resolve_mailbox", lambda acct, mb: mb)