Merge pull request #40 from dyne/maildir-mblaze

refactor: migrate maildir flows to shared mblaze adapters

Author: jaromil

.gitignore

@@ -66,3 +66,4 @@ src/nvpscan.report
 src/pgpewrap
 src/parsedate
 gnupg-mass-recv.cache
+*.sieve

AGENTS.md

@@ -22,10 +22,6 @@ Prefer minimal, readable changes. Keep Zsh functions lowercase, shell modules gr
 
 There is no broad unit-test suite. Use `extras/test/run-source.sh` for checkout-level validation, `extras/test/test-account-wizard.sh` for account onboarding behavior, and `extras/test/inittest.sh` for installed-path validation. The tests depend on external mail tools (`fetchmail`, `msmtp`, `mutt`/`neomutt`, `notmuch`, `pinentry-curses`, `abook`, `wipe`, `mblaze`/`maddr`) plus build tools from `.travis.yml`. For narrow C helper changes, rebuild with `make` and add a focused command-line check where practical.
 
-## Commit & Pull Request Guidelines
-
-Recent history uses short imperative commit messages, for example `fix own accounts filtering for priv` and `update filtering`. Keep commits focused and describe the user-visible behavior changed. Pull requests should include a concise summary, affected commands or modules, test results, and any install or dependency impact. Include screenshots only for UI-facing macOS or documentation changes.
-
 ## Architecture Notes
 
 Respect the existing slice-by-feature organization. Keep IO boundaries explicit: shell modules should call external mail tools clearly, and helpers should do one job well.

doc/command-contracts.md

@@ -60,4 +60,4 @@ This file documents current behavior from `src/jaro` and `src/zlibs/*` without r
 
 ## Missing test pointers
 
-- `fetch`, `send`, `smtp`, `imap`, `publish`, and optional integrations are not fully covered by focused local tests yet.
+- `fetch`, `send`, `smtp`, `imap`, and optional integrations are not fully covered by focused local tests yet.

doc/jaro.1

@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "jaro" "1" "2026-04-30" "" ""
+.TH "jaro" "1" "2026-05-01" "" ""
 .hy
 .SH jaro(1)
 .SS Name
@@ -114,9 +114,9 @@ local filter/addressbook files.
 \f[V]rmdupes\f[R] remove duplicate messages.
 .PP
 \f[V]remember\f[R], \f[V]replay\f[R], \f[V]preview\f[R], \f[V]edit\f[R],
-\f[V]vim\f[R], \f[V]publish\f[R], \f[V]imap\f[R], \f[V]alot\f[R],
-\f[V]alot-config\f[R], \f[V]notmuch\f[R], \f[V]notmuch-config\f[R],
-\f[V]isml\f[R], \f[V]ismd\f[R].
+\f[V]vim\f[R], \f[V]imap\f[R], \f[V]alot\f[R], \f[V]alot-config\f[R],
+\f[V]notmuch\f[R], \f[V]notmuch-config\f[R], \f[V]isml\f[R],
+\f[V]ismd\f[R].
 .SS Files
 .PP
 \f[V]$JAROMAILDIR\f[R] mail root (default usually \f[V]$HOME/Mail\f[R]).

doc/jaro.1.md

@@ -102,7 +102,7 @@ filter/addressbook files.
 
 `rmdupes` remove duplicate messages.
 
-`remember`, `replay`, `preview`, `edit`, `vim`, `publish`, `imap`,
+`remember`, `replay`, `preview`, `edit`, `vim`, `imap`,
 `alot`, `alot-config`, `notmuch`, `notmuch-config`, `isml`, `ismd`.
 
 ## Files
@@ -118,4 +118,3 @@ filter/addressbook files.
 ## See Also
 
 `jaromail(1)`
-

doc/jaromail.1

@@ -15,7 +15,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "jaromail" "1" "2026-04-30" "" ""
+.TH "jaromail" "1" "2026-05-01" "" ""
 .hy
 .SH jaromail(1) \[en] self-sovereign e-mail management
 .PP

doc/maintenance-inventory.md

@@ -16,11 +16,9 @@
 | `extras/gnupg-mass-recv` | GnuPG helper scripts | No | Not in README/manual | `gpg` | Optional | Keep optional, document with explicit support scope. |
 | `extras/shell_completion` | shell completion snippets | No | Not in README/manual | shell-specific | Optional | Keep and document install-by-choice. |
 | `extras/zaw-jaromail` | Zaw integration helper | No | Not in README/manual | Zaw/zsh ecosystem | Optional/Legacy | Keep optional, low priority maintenance. |
-| `src/zlibs/publish` | publishing/sync helper surface | Installed indirectly via `src/zlibs/*` | Command exposed in `src/jaro` | external network tools | Legacy | Mark as legacy in docs; keep behavior unchanged for now. |
 | `build/*` | build/install/release scripts per platform | N/A (tooling) | Indirect (`README.md` make flow) | platform toolchains | Core (tooling) | Keep; separate default Linux flow from platform-specific scripts in docs. |
 
 ## Evidence Notes
 
 - Default install currently includes both `src/mutt` and `src/stats` plus all `src/zlibs/*` (`Makefile` `install` target).
-- `publish` is still an exposed subcommand in `src/jaro`.
 - Stats is actively documented in `doc/jaromail-manual.md|org|tex`, but most extras are not referenced in top-level docs.

doc/optional-integrations.md

@@ -15,12 +15,6 @@ This file lists integrations that are *not* part of the core CLI workflow (`init
 - Test coverage: **not directly covered by current smoke tests**
 - Status: retained for compatibility, but legacy-oriented surface
 
-### `src/zlibs/publish` and `publish` command
-
-- Installed by default: **yes** (via `src/zlibs/*`)
-- Test coverage: **not covered by `extras/test/run-source.sh`**
-- Status: retained, treated as legacy/advanced workflow
-
 ### `extras/roundcube-majordomo`
 
 - Installed by default: **no**

extras/test/lib/test_helpers.zsh

@@ -65,6 +65,34 @@ culpa qui officia deserunt mollit anim id est laborum.
 EOF
 }
 
+# Ensure a path has a valid Maildir layout.
+maildir_fixture_ensure() {
+  target="${1}"
+  mkdir -p "${target}/cur" "${target}/new" "${target}/tmp"
+}
+
+# Create one synthetic RFC822 message under a Maildir subfolder.
+# Usage:
+#   make_maildir_message "/tmp/mail/incoming" "new" "msg1" \
+#     "From: A <a@example.org>" "To: B <b@example.org>" "Subject: Test"
+make_maildir_message() {
+  md_path="${1}"
+  md_subdir="${2}"
+  md_name="${3}"
+  shift 3
+
+  maildir_fixture_ensure "${md_path}"
+  msg_path="${md_path}/${md_subdir}/${md_name}"
+  {
+    for header_line in "$@"; do
+      print -- "${header_line}"
+    done
+    print
+    lorem_message
+  } > "${msg_path}"
+  print -- "${msg_path}"
+}
+
 assert_equal() {
   got="${1}"
   expected="${2}"

extras/test/run-source.sh

@@ -83,7 +83,7 @@ fi
 
 imported_sender="Luther Blisset <luther@dyne.org>"
 print -- "${imported_sender}" | jaro_source import
-if assert_equal "$(jaro_source addr 2>/dev/null)" "${imported_sender}" "import sender"; then
+if assert_contains "$(jaro_source addr 2>/dev/null)" "${imported_sender}" "import sender"; then
   r "IMPORT OK"
 else
   exit 1