sup 1.2 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b3d74175eddced998ccf3d918989ba1f90781bb0f2432df5cc11ae2cf3a5ba9
-  data.tar.gz: f415405432adaa8fcfa9a10640107da0cce2575afee758902b934b137e1077e3
+  metadata.gz: '09751b9afafb4e88646de270d85e983cd91cd9ffb7259afce7ae4bca8c94cc5b'
+  data.tar.gz: 3aaf78540a2d33f168f13eba8b4d7afb9787efa5e2d27911c851ead6a178ad43
 SHA512:
-  metadata.gz: 1e3f012755517d29e9c2c0f5df80eac0432390bcbdd3108e32f921794aeafb2e791e9e6ff64b0663d1c1495b0040ebb1bbe8c006113380b787715ba85edf34dd
-  data.tar.gz: bc829f5939d98acd30f8c241b4f4defd3d6e8c09bde0a39802e28a5a2ecb78a15d7d7e4f25aa7456e0ddd6e20d01453d0715d8947942c74808c65037720fb25b
+  metadata.gz: a4f829939a5a06de18c48bd2ba0d860b918fd1bbf7069876518c415093a2bb22047dd06f6177d1a67ceed66ea5a280e52bd9a43a7a54cac65793cd9069569919
+  data.tar.gz: 78bf43e7e413314a7e6d89a4b71a15c6940687f4fbee003d5ef82a8b2dd35ae314fe534f7ea589deb24323928b330e8b5eabac7b61e863f16de15d8cd1b36258

data/.github/workflows/checks.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         os:
         - ubuntu-latest
-        - macos-latest
+        - macos-15
         ruby-version:
         - '2.4'
         - '2.5'
@@ -25,16 +25,31 @@ jobs:
         - '3.1'
         - '3.2'
         - '3.3'
+        - '3.4'
+        - '4.0'
+        exclude:
+        # We use xapian-bindings 1.4.22 for Ruby < 3.1, but it does not link on MacOS 14:
+        # https://github.com/Garaio-REM/xapian-ruby/issues/10
+        - os: macos-15
+          ruby-version: '2.4'
+        - os: macos-15
+          ruby-version: '2.5'
+        - os: macos-15
+          ruby-version: '2.6'
+        - os: macos-15
+          ruby-version: '2.7'
+        - os: macos-15
+          ruby-version: '3.0'
     runs-on: ${{ matrix.os }}
     env:
       nixfile: "contrib/nix/ruby${{ matrix.ruby-version }}-shell.nix"
     steps:
     - name: Check out source
-      uses: actions/checkout@v3
+      uses: actions/checkout@v5
       with:
         submodules: recursive
     - name: Cache nix store
-      uses: actions/cache@v3
+      uses: actions/cache@v5
       id: nix-cache
       with:
         path: /tmp/nixcache
@@ -46,7 +61,7 @@ jobs:
       run: brew install bash
       if: runner.os == 'macOS'
     - name: Install nix
-      uses: nixbuild/nix-quick-install-action@v21
+      uses: nixbuild/nix-quick-install-action@v34
     - name: Import nix cache
       run: |
         if [ -f /tmp/nixcache ] ; then

data/.gitmodules

@@ -1,3 +1,4 @@
 [submodule "doc/wiki"]
 	path = doc/wiki
 	url = https://github.com/sup-heliotrope/sup.wiki.git
+	branch = master

data/.rubocop.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-packaging
 
 AllCops:

data/History.txt

@@ -1,3 +1,36 @@
+== 1.4 / 2026-04-21
+
+* #343: Draft messages containing non-ASCII characters are now displayed
+  correctly in thread view.
+* #533, #524: Sup now refuses to start if config.yaml is missing a default
+  account, or no sendmail command is configured.
+* Improved the lazy-loading behaviour when scrolling down in thread list views.
+* Sup now gracefully handles RFC2047-encoded words which contain incomplete
+  UTF-8 sequences after decoding, instead of crashing with ArgumentError.
+* #516: Sup can now load sources.yaml produced by very old versions of Sup,
+  which left a syntactically invalid YAML tag for the SentLoader class.
+* Fixed error handling behaviour for various scenarios where a draft message is
+  modified outside Sup.
+* Sup no longer uses deprecated Xapian APIs, for compatibility with Xapian 2.0.
+* Sup is now tested on Ruby 4.0.
+* Sup's web site and git repos have moved to: https://supmua.dev/
+
+== 1.3 / 2025-04-21
+
+* #596: If a message lacks a Date header, or the Date header is not in valid
+  RFC2822 format, the local delivery timestamp of the message will now be used
+  instead. Fixes a bug where such messages would constantly jump to the top of
+  the thread list.
+* #502: Fixed incorrect Content-Transfer-Encoding headers when sending GPG
+  signed or encrypted messages with attachments.
+* #522: Sup now uses the configured signing key when sending a message that is
+  both signed and encrypted. Previously it would ignore the configured key and
+  use the GPG default signing key.
+* #489: Attachments are now encoded if they have lines longer than 998
+  characters.
+* #602: The message/global MIME type is now recognised as an embedded message.
+* Sup is now tested on Ruby 3.4.
+
 == 1.2 / 2024-04-21
 
 * #619: Sup is now compatible with and tested on Ruby 3.2 and Ruby 3.3.

data/Manifest.txt

@@ -37,11 +37,21 @@ contrib/nix/ruby2.5-shell.nix
 contrib/nix/ruby2.6-Gemfile.lock
 contrib/nix/ruby2.6-gemset.nix
 contrib/nix/ruby2.6-shell.nix
+contrib/nix/ruby2.7-Gemfile.lock
+contrib/nix/ruby2.7-gemset.nix
 contrib/nix/ruby2.7-shell.nix
+contrib/nix/ruby3.0-Gemfile.lock
+contrib/nix/ruby3.0-gemset.nix
 contrib/nix/ruby3.0-shell.nix
+contrib/nix/ruby3.1-Gemfile.lock
+contrib/nix/ruby3.1-gemset.nix
 contrib/nix/ruby3.1-shell.nix
+contrib/nix/ruby3.2-Gemfile.lock
+contrib/nix/ruby3.2-gemset.nix
 contrib/nix/ruby3.2-shell.nix
 contrib/nix/ruby3.3-shell.nix
+contrib/nix/ruby3.4-shell.nix
+contrib/nix/ruby4.0-shell.nix
 contrib/nix/test-all-rubies.sh
 devel/console.sh
 devel/count-loc.sh
@@ -120,14 +130,16 @@ lib/sup/util/path.rb
 lib/sup/util/query.rb
 lib/sup/util/uri.rb
 lib/sup/version.rb
-shell.nix
 sup.gemspec
+test/dummy_buffer.rb
 test/dummy_source.rb
 test/fixtures/bad-content-transfer-encoding-1.eml
 test/fixtures/binary-content-transfer-encoding-2.eml
 test/fixtures/blank-header-fields.eml
 test/fixtures/contacts.txt
+test/fixtures/embedded-message-rfc6532.eml
 test/fixtures/embedded-message.eml
+test/fixtures/invalid-date.eml
 test/fixtures/mailing-list-header.eml
 test/fixtures/malicious-attachment-names.eml
 test/fixtures/missing-from-to.eml
@@ -144,13 +156,16 @@ test/fixtures/utf8-header.eml
 test/fixtures/zimbra-quote-with-bottom-post.eml
 test/gnupg_test_home/.gpg-v21-migrated
 test/gnupg_test_home/gpg.conf
-test/gnupg_test_home/private-keys-v1.d/306D2EE90FF0014B5B9FD07E265C751791674140.key
+test/gnupg_test_home/private-keys-v1.d/26C05E44706A8E230B3255BB9532B34DC9420232.key
+test/gnupg_test_home/private-keys-v1.d/D187ADC90EC4DEB7047678EAA37E33A53A465D47.key
+test/gnupg_test_home/private-keys-v1.d/FB2D9BD3B1BE90B5BCF697781F8404224B0FCF5B.key
 test/gnupg_test_home/pubring.gpg
 test/gnupg_test_home/receiver_pubring.gpg
 test/gnupg_test_home/receiver_secring.gpg
 test/gnupg_test_home/regen_keys.sh
 test/gnupg_test_home/secring.gpg
 test/gnupg_test_home/sup-test-2@foo.bar.asc
+test/integration/test_draft.rb
 test/integration/test_maildir.rb
 test/integration/test_mbox.rb
 test/integration/test_sup-add.rb
@@ -163,9 +178,13 @@ test/test_messages_dir.rb
 test/test_yaml_regressions.rb
 test/unit/service/test_label_service.rb
 test/unit/test_contact.rb
+test/unit/test_edit_message_mode.rb
 test/unit/test_horizontal_selector.rb
+test/unit/test_index.rb
+test/unit/test_line_cursor_mode.rb
 test/unit/test_locale_fiddler.rb
 test/unit/test_person.rb
+test/unit/test_rmail_message.rb
 test/unit/util/test_query.rb
 test/unit/util/test_string.rb
 test/unit/util/test_uri.rb

data/README.md

@@ -2,7 +2,7 @@
 
 Sup is a console-based email client for people with a lot of email.
 
-<img src="https://sup-heliotrope.github.io/images/old_screenshot_1.png" />
+<img src="https://supmua.dev/images/old_screenshot_1.png" />
 
 ## Installation
 
@@ -35,10 +35,12 @@ Please report bugs to the [GitHub issue tracker](https://github.com/sup-heliotro
 
 ## Links
 
-* [Homepage](https://sup-heliotrope.github.io/)
+* [Homepage](https://supmua.dev/)
 * [Code repository](https://github.com/sup-heliotrope/sup)
 * [Wiki](https://github.com/sup-heliotrope/sup/wiki)
-* Mailing list: supmua@googlegroups.com (subscribe: supmua+subscribe@googlegroups.com, archive: https://groups.google.com/d/forum/supmua )
+* Mailing list: supmua@googlegroups.com
+  (subscribe: supmua+subscribe@googlegroups.com,
+  [archives](https://supmua.dev/lists/supmua/))
 
 ## Maintenance status
 

data/Rakefile

@@ -79,7 +79,7 @@ task :check_manifest do
 end
 
 task :rubocop_packaging do
-  if /^2\.[012]\./ =~ RUBY_VERSION
+  if /^(2\.|3\.[012]\.)/ =~ RUBY_VERSION
     puts "skipping rubocop-packaging checks on unsupported Ruby #{RUBY_VERSION}"
     next
   end

data/bin/sup

@@ -206,7 +206,10 @@ begin
     end
   end unless $opts[:no_initial_poll]
 
-  imode.load_threads :num => ibuf.content_height, :when_done => lambda { |num| reporting_thread("poll after loading inbox") { sleep 1; PollManager.poll } unless $opts[:no_threads] || $opts[:no_initial_poll] }
+  reporting_thread("poll after loading inbox") do
+    sleep 1
+    PollManager.poll
+  end unless $opts[:no_threads] || $opts[:no_initial_poll]
 
   if $opts[:compose]
     to = Person.from_address_list $opts[:compose]
@@ -328,8 +331,7 @@ begin
         BufferManager.spawn "Edit message", r
         r.default_edit_message
       else
-        b, new = BufferManager.spawn_unless_exists("All drafts") { LabelSearchResultsMode.new [:draft] }
-        b.mode.load_threads :num => b.content_height if new
+        BufferManager.spawn_unless_exists("All drafts") { LabelSearchResultsMode.new [:draft] }
       end
     when :show_inbox
       BufferManager.raise_to_front ibuf

data/contrib/nix/Gemfile

@@ -12,6 +12,8 @@ gem "chronic"
 gem "unicode", "~> 0.4.4"
 gem "unicode-display_width"
 gem "string-scrub" if /^2\.0\./ =~ RUBY_VERSION
+gem "benchmark"
+gem "fiddle"
 
 gem "bundler", ">= 1.3", "< 3"
 gem "rake"

data/contrib/nix/Gemfile.lock

@@ -1,64 +1,92 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
+    ast (2.4.3)
+    benchmark (0.5.0)
     chronic (0.10.2)
     coderay (1.1.3)
-    gpgme (2.0.24)
+    fiddle (1.1.8)
+    gpgme (2.0.26)
       mini_portile2 (~> 2.7)
-    highline (3.0.1)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
-    locale (2.1.4)
+    highline (3.1.2)
+      reline
+    io-console (0.8.2)
+    json (2.19.3)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    locale (2.1.5)
+      fiddle
     lockfile (2.1.3)
+    logger (1.7.0)
     method_source (1.1.0)
-    mime-types (3.5.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0305)
-    mini_portile2 (2.8.6)
-    minitest (5.22.3)
-    ncursesw (1.4.11)
-    optimist (3.1.0)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2026.0331)
+    mini_portile2 (2.8.9)
+    minitest (5.27.0)
+    ncursesw (1.4.13)
+    optimist (3.2.1)
+    parallel (1.28.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
-    pry (0.14.2)
+    prism (1.9.0)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.7.3)
+      reline (>= 0.6.0)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.2.1)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
+    rake (13.3.1)
+    regexp_parser (2.12.0)
+    reline (0.6.3)
+      io-console (~> 0.5)
     rmail (1.1.4)
     rr (1.2.1)
-    rubocop (1.63.2)
+    rubocop (1.86.0)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
-    rubocop-packaging (0.5.2)
-      rubocop (>= 1.33, < 2.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    rubocop-packaging (0.6.0)
+      lint_roller (~> 1.1.0)
+      rubocop (>= 1.72.1, < 2.0)
     ruby-progressbar (1.13.0)
-    unicode (0.4.4.4)
-    unicode-display_width (2.5.0)
-    xapian-ruby (1.4.22)
+    unicode (0.4.4.5)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    xapian-ruby (1.4.27)
 
 PLATFORMS
   aarch64-linux
+  arm64-darwin-24
+  ruby
+  x86_64-darwin-17
+  x86_64-darwin-18
+  x86_64-darwin-19
+  x86_64-darwin-20
+  x86_64-darwin-21
+  x86_64-darwin-22
+  x86_64-darwin-23
+  x86_64-darwin-24
+  x86_64-linux
 
 DEPENDENCIES
+  benchmark
   bundler (>= 1.3, < 3)
   chronic
+  fiddle
   gpgme (>= 2.0.2)
   highline
   locale (~> 2.0)
@@ -77,4 +105,4 @@ DEPENDENCIES
   xapian-ruby (~> 1.2)
 
 BUNDLED WITH
-   2.4.22
+   2.7.2

data/contrib/nix/gem-install-shell.nix

@@ -3,6 +3,8 @@ pkgs.mkShell {
   packages = with pkgs; [
     ncurses
     ncurses.dev
+    libffi
+    libffi.dev
     libuuid
     libuuid.dev
     ruby_3_2