sup 0.22.1 → 0.23

data/test/gnupg_test_home/sup-test-2@foo.bar.asc

@@ -1,25 +1,23 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
 
-mQGiBFP3VogRBADVBEkaZQXj728C1HUIaTRDCFoKzojwC79Z1BLsD72qQYE8z1ic
-5P9CJpJU5wbhQFDTGBjw+i1nNTWy01z4q5bfFqok+KorT3XNp5IJRcRIEOkj+Twq
-7ZaSODwXGsUmdzSoOVDYmtUpVzRQe0IM0rPQQV4vGzgw55FdJBe7a63nIwCg+WvR
-iQN09PlhpGG7SIEmx0psEqUEAL/t1c5oC9RC7L4a0GM+2AcgFRBMXvzpdnytrzgt
-73Ud6CcUplQp6WODrUYhX0RLzSJPO4zWDsBmkBad/iQCwbCKpFPfAFdBMArJpknx
-rc6vRED4a9dLfCNTT1g86CkiElge9t36juZgOoFT3xt/XP7BxhU1fCFshZNR6VK6
-tN9eA/9G4fUX6XvEGIrNiBYKyU4QvM1nyMXCBujm7vYF6KfSlYyAvVXxG4h+mvUy
-ZXQ/WHMQJSbPTY3dd4hmo0p0GUMlSvXU8JLf7qienW1IccD9Pv88J1XjkbFd+wgw
-feoSx1sAfc36gH+aE17lvsU+PPAP4Bc9CSiScNo0iQv7v/KZjrQ+U3VwIFRlc3Qg
-UmVjZWl2ZXIgKFRlc3QgcmVjZWl2ZXIgZm9yIFN1cCkgPHN1cC10ZXN0LTJAZm9v
-LmJhcj6IaQQTEQIAKQUCU/dWiAIbIwUJAeEzgAcLCQgHAwIBBhUIAgkKCwQWAgMB
-Ah4BAheAAAoJEKfs+g8ACvQGPxIAnj1CSZCzjwyIFLgNEQnIhntU+b28AKDsMEVN
-gf9mHqwhabN+UKgBwX0U3LkBDQRT91aIEAQAjQZEnDK++SKp/l2Oiku6H9IuCsi4
-lv+MhLQP0bMuD4DrPk3mauZNc8BB+U0wgAMh/kZoCKySEdMK1mcf2iOsd5yOCrK+
-sJQAMsALAnrYjCE9QA2xIQs8gHF4PrKopycF55iRHQMDNa1QWfs+j4WJaXderlGQ
-S0dGfLyoqtZsFusAAwUEAIi0+aDZlAVVIdDO2cvR0lu6eDW2Mr2ExZzuwTfAI6dS
-tJLoPzoA2OAVW7cFVVpCOHcVLiF2GOHvtJPw1MgpxaNjzpNdJPTiP2sYZg253dfR
-v66Cw9IuWKgZcElWXmIy5vFWqWWbLyTBOuwEQxCsFnjN9UUZauSADOJSPFy1sekf
-iE8EGBECAA8FAlP3VogCGwwFCQHhM4AACgkQp+z6DwAK9Ab/swCg8LWNwfMwNk+H
-gLgnS1LVsesZ8D4An2Ie2P0/oYuSmPPFV44kbWySX9wW
-=Jo82
+mQGNBF7leTkBDAC3auy8xodH6jxoISylFZTpVqy/0L2ul879YUb/QbC58+F/H36S
+CjLfPxFlq0FAOXHelOvktxaybg+BG5UpSvTgBLbcArq5nctee+04TMXCzQzrG2V1
+zb9gIRT665fX3+WYncSIXdr4LAp7r8Jw3RT3tTOZqbaencumCWaJblnvfFwPrMKf
+AXWa/NVndNMAXmJ5uBf1MRr45KXaQ2tczPIeHqSOKhKNnKZPRqPs0fg4i3d0Vb6G
+yItgtJapfBo50FV+PvtodMHo3LDlz/BBjdEJHSvghqEjb1S7xGo+hdXs+lfCMfa0
+3PAWoj+OeHNorbK0YbVKOtS0E0xYvScbyC7bfwtA9yb3LZYmy7VHsKJmQfygCNQ6
+wIKQGAVN1NcQcJsvWyAwk9+WMN5oqB5lb76u40beoWlUjSJRlph2VvWvkGuh/huU
+sVGqcN7EO4SFkwi2YQLoWfQRGur3mids/PQTBywpGE1SyziPZK76pT6SqP8b+OpI
+CG1QbcTZzYpbv6kAEQEAAbQSc3VwLXRlc3QtMkBmb28uYmFyiQHOBBMBCgA4FiEE
+e0oXvVeqMzUcfd1s2bF8xbTizW8FAl7leTkCGw8FCwkIBwIGFQoJCAsCBBYCAwEC
+HgECF4AACgkQ2bF8xbTizW92TAv/WGlYfDTKNEmJ0K+kxt33T2ldmZXaJKL04Mft
+h5s5KlRZWDNpkCC/L55uyaeEg+Uy+BEEQKLAEeJrrLMV8UMJwMPDOizSTT9uLyiz
+b8RjnQw4iMT8wt9TQboXGaTMslwdXvFPii7w44KgCimE7VuPetJuLMLMbnl147G8
++QhkNUsrB51TuPS8xZJ4qjbH+K/Y2NlvwLtJrxNE3SRQuy2ApYJxKPZIj1KpUL8M
+7Jy/2hI8DaRm/0Fpu8HwRIVsd6/dgdkqdj1uVyLj+wyhgdzqV5WrPLFCRVhd3icd
+lPNRIDjg8YKCh353LVHjKwefOW4SnkOPn4uVMdCP9gUFd9zpMP9lMFpjk0o0tcYO
+NiFrOclS4q5qZ5jrj1MnBF0NaGhuC83DDgRfKV+p5noVeJxg0nXYZSlsSMfAT/K7
+FbdNEg0XUsrLgWVzhvWv/ebMetFPSfGHIveZ7lhiq1qpA5hLBNfSSBb1JJsFmtQt
+cEUluymdNe5W7Y6UGs1CpvcIvbj+
+=Cy9S
 -----END PGP PUBLIC KEY BLOCK-----

data/test/test_crypto.rb

@@ -61,6 +61,8 @@ class TestCryptoManager < Minitest::Test
         if CryptoManager.have_crypto? then
             signed = CryptoManager.sign @from_email,@to_email,"ABCDEFG"
             assert_instance_of RMail::Message, signed
+            assert_equal("multipart/signed; protocol=application/pgp-signature; micalg=pgp-sha256",
+                         signed.header["Content-Type"])
             assert_equal "ABCDEFG", signed.body[0]
             assert signed.body[1].body.length > 0 , "signature length must be > 0"
             assert (signed.body[1].body.include? "-----BEGIN PGP SIGNATURE-----") , "Expecting PGP armored data"

data/test/test_message.rb

@@ -181,6 +181,51 @@ class TestMessage < Minitest::Test
     # TODO: Add more asserts
   end
 
+  def test_text_attachment_decoding
+    message = fixture('text-attachments-with-charset.eml')
+
+    source = DummySource.new("sup-test://test_text_attachment_decoding")
+    source.messages = [ message ]
+    source_info = 0
+
+    sup_message = Message.build_from_source(source, source_info)
+    sup_message.load_from_source!
+
+    chunks = sup_message.load_from_source!
+    assert_equal(5, chunks.length)
+    assert(chunks[0].is_a? Redwood::Chunk::Text)
+    ## The first attachment declares charset=us-ascii
+    assert(chunks[1].is_a? Redwood::Chunk::Attachment)
+    assert_equal(["This is ASCII"], chunks[1].lines)
+    ## The second attachment declares charset=koi8-r and has some Cyrillic
+    assert(chunks[2].is_a? Redwood::Chunk::Attachment)
+    assert_equal(["\u041f\u0440\u0438\u0432\u0435\u0442"], chunks[2].lines)
+    ## The third attachment declares charset=utf-8 and has an emoji
+    assert(chunks[3].is_a? Redwood::Chunk::Attachment)
+    assert_equal(["\u{1f602}"], chunks[3].lines)
+    ## The fourth attachment declares no charset and has a non-ASCII byte,
+    ## which will be replaced with U+FFFD REPLACEMENT CHARACTER
+    assert(chunks[4].is_a? Redwood::Chunk::Attachment)
+    assert_equal(["Embedded\ufffdgarbage"], chunks[4].lines)
+  end
+
+  def test_mailing_list_header
+    message = fixture('mailing-list-header.eml')
+
+    source = DummySource.new("sup-test://test_mailing_list_header")
+    source.messages = [ message ]
+    source_info = 0
+
+    sup_message = Message.build_from_source(source, source_info)
+    sup_message.load_from_source!
+
+    assert(sup_message.list_subscribe.nil?)
+    assert_equal("<https://lists.openembedded.org/g/openembedded-devel/unsub>",
+                 sup_message.list_unsubscribe)
+    assert_equal("openembedded-devel@lists.openembedded.org", sup_message.list_address.email)
+    assert_equal("openembedded-devel", sup_message.list_address.name)
+  end
+
   def test_blank_header_lines
     message = fixture('blank-header-fields.eml')
 
@@ -225,6 +270,35 @@ class TestMessage < Minitest::Test
   # TODO: test different quoting styles, see that they are all divided
   # to chunks properly
 
+  def test_zimbra_quote_with_bottom_post
+    # Zimbra does an Outlook-style "Original Message" delimiter and then *also*
+    # prefixes each quoted line with a > marker. That's okay until the sender
+    # tries to do the right thing and reply after the quote.
+    # In this case we want to just look at the > markers when determining where
+    # the quoted chunk ends.
+    message = fixture('zimbra-quote-with-bottom-post.eml')
+
+    source = DummySource.new("sup-test://test_zimbra_quote_with_bottom_post")
+    source.messages = [ message ]
+    source_info = 0
+
+    sup_message = Message.build_from_source(source, source_info)
+    chunks = sup_message.load_from_source!
+
+    assert_equal(3, chunks.length)
+
+    # TODO this chunk should ideally be part of the quote chunk after it.
+    assert(chunks[0].is_a? Redwood::Chunk::Text)
+    assert_equal(1, chunks[0].lines.length)
+    assert_equal("----- Original Message -----", chunks[0].lines.first)
+
+    assert(chunks[1].is_a? Redwood::Chunk::Quote)
+
+    assert(chunks[2].is_a? Redwood::Chunk::Text)
+    assert_equal(3, chunks[2].lines.length)
+    assert_equal("This is the reply from the Zimbra user.",
+                 chunks[2].lines[2])
+  end
 end
 
 end

data/test/unit/util/test_query.rb

@@ -24,9 +24,14 @@ describe Redwood::Util::Query do
       query = Xapian::Query.new msg
       life = 'hæi'
 
-      # this is now possibly UTF-8 string with possibly invalid chars
-      assert_raises Redwood::Util::Query::QueryDescriptionError do
-        desc = Redwood::Util::Query.describe (query)
+      if query.description.force_encoding("UTF-8").valid_encoding?
+        # xapian 1.4 internally handles this bad input
+        assert true
+      else
+        # xapian 1.2 doesn't handle this bad input, so we do
+        assert_raises Redwood::Util::Query::QueryDescriptionError do
+          desc = Redwood::Util::Query.describe (query)
+        end
       end
 
       assert_raises Encoding::CompatibilityError do
@@ -40,7 +45,8 @@ describe Redwood::Util::Query do
 
       desc = Redwood::Util::Query.describe(query, "invalid query")
 
-      assert_equal("invalid query", desc)
+      assert desc.force_encoding("UTF-8").valid_encoding?
+
     end
   end
 end

data/test/unit/util/test_string.rb

@@ -11,6 +11,8 @@ describe "Sup's String extension" do
         ['some words', 10,],
         ['中文', 4,],
         ['ä', 1,],
+        ['😱', 2],
+        #['🏳️‍🌈', 2],  # Emoji ZWJ sequence not yet supported (see PR #563)
       ]
     end
 
@@ -27,6 +29,8 @@ describe "Sup's String extension" do
         ['some words', 6, 'some w'],
         ['中文', 2, '中'],
         ['älpha', 3, 'älp'],
+        ['😱😱', 2, '😱'],
+        #['🏳️‍🌈', 2, '🏳️‍🌈'],  # Emoji ZWJ sequence not yet supported (see PR #563)
       ]
     end
 
@@ -45,6 +49,8 @@ describe "Sup's String extension" do
         ['中文', 2, ['中', '文']],
         ['中文', 5, ['中文']],
         ['älpha', 3, ['älp', 'ha']],
+        ['😱😱', 2, ['😱', '😱']],
+        #['🏳️‍🌈🏳️‍🌈', 2, ['🏳️‍🌈', '🏳️‍🌈']],  # Emoji ZWJ sequence not yet supported (see PR #563)
       ]
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sup
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: '0.23'
 platform: ruby
 authors:
 - William Morgan
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ncursesw
@@ -28,19 +28,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: rmail-sup
+  name: rmail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -56,19 +56,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: lockfile
   requirement: !ruby/object:Gem::Requirement
@@ -115,16 +115,16 @@ dependencies:
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: unicode
   requirement: !ruby/object:Gem::Requirement
@@ -139,20 +139,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.4
+- !ruby/object:Gem::Dependency
+  name: unicode-display_width
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -247,15 +267,15 @@ executables:
 extensions:
 - ext/mkrf_conf_xapian.rb
 extra_rdoc_files:
-- man/sup-tweak-labels.1
-- man/sup-sync.1
-- man/sup-psych-ify-config-files.1
+- man/sup-add.1
 - man/sup-config.1
-- man/sup-import-dump.1
 - man/sup-dump.1
-- man/sup-sync-back-maildir.1
-- man/sup-add.1
+- man/sup-import-dump.1
+- man/sup-psych-ify-config-files.1
 - man/sup-recover-sources.1
+- man/sup-sync-back-maildir.1
+- man/sup-sync.1
+- man/sup-tweak-labels.1
 - man/sup.1
 files:
 - ".gitignore"
@@ -351,6 +371,7 @@ files:
 - lib/sup/undo.rb
 - lib/sup/update.rb
 - lib/sup/util.rb
+- lib/sup/util/axe.rb
 - lib/sup/util/locale_fiddler.rb
 - lib/sup/util/ncurses.rb
 - lib/sup/util/path.rb
@@ -373,6 +394,7 @@ files:
 - test/fixtures/binary-content-transfer-encoding-2.eml
 - test/fixtures/blank-header-fields.eml
 - test/fixtures/contacts.txt
+- test/fixtures/mailing-list-header.eml
 - test/fixtures/malicious-attachment-names.eml
 - test/fixtures/missing-from-to.eml
 - test/fixtures/missing-line.eml
@@ -380,15 +402,11 @@ files:
 - test/fixtures/multi-part.eml
 - test/fixtures/no-body.eml
 - test/fixtures/simple-message.eml
+- test/fixtures/text-attachments-with-charset.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/key1.gen
-- test/gnupg_test_home/key2.gen
-- test/gnupg_test_home/key_ecc.gen
-- test/gnupg_test_home/private-keys-v1.d/719C7455A7169C6EE8819C6E91002E4F9DD00A65.key
-- test/gnupg_test_home/private-keys-v1.d/8A130806A754AA29D59487D76BD355040D9F26C0.key
-- test/gnupg_test_home/private-keys-v1.d/B7AA46B22BD8A6AD1B4F266C19A3B124A32DDD71.key
-- test/gnupg_test_home/private-keys-v1.d/FA64ACD7CC871371BDF57285A6CDF0E618827783.key
+- test/gnupg_test_home/private-keys-v1.d/306D2EE90FF0014B5B9FD07E265C751791674140.key
 - test/gnupg_test_home/pubring.gpg
 - test/gnupg_test_home/receiver_pubring.gpg
 - test/gnupg_test_home/receiver_secring.gpg
@@ -413,9 +431,9 @@ files:
 - test/unit/util/test_query.rb
 - test/unit/util/test_string.rb
 - test/unit/util/test_uri.rb
-homepage: http://supmua.org
+homepage: https://sup-heliotrope.github.io/
 licenses:
-- GPL-2
+- GPL-2.0
 metadata: {}
 post_install_message: |
   SUP: please note that our old mailing lists have been shut down,
@@ -440,8 +458,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A console-based email client with the best features of GMail, mutt and Emacs
@@ -451,6 +468,7 @@ test_files:
 - test/fixtures/binary-content-transfer-encoding-2.eml
 - test/fixtures/blank-header-fields.eml
 - test/fixtures/contacts.txt
+- test/fixtures/mailing-list-header.eml
 - test/fixtures/malicious-attachment-names.eml
 - test/fixtures/missing-from-to.eml
 - test/fixtures/missing-line.eml
@@ -458,15 +476,11 @@ test_files:
 - test/fixtures/multi-part.eml
 - test/fixtures/no-body.eml
 - test/fixtures/simple-message.eml
+- test/fixtures/text-attachments-with-charset.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/key1.gen
-- test/gnupg_test_home/key2.gen
-- test/gnupg_test_home/key_ecc.gen
-- test/gnupg_test_home/private-keys-v1.d/719C7455A7169C6EE8819C6E91002E4F9DD00A65.key
-- test/gnupg_test_home/private-keys-v1.d/8A130806A754AA29D59487D76BD355040D9F26C0.key
-- test/gnupg_test_home/private-keys-v1.d/B7AA46B22BD8A6AD1B4F266C19A3B124A32DDD71.key
-- test/gnupg_test_home/private-keys-v1.d/FA64ACD7CC871371BDF57285A6CDF0E618827783.key
+- test/gnupg_test_home/private-keys-v1.d/306D2EE90FF0014B5B9FD07E265C751791674140.key
 - test/gnupg_test_home/pubring.gpg
 - test/gnupg_test_home/receiver_pubring.gpg
 - test/gnupg_test_home/receiver_secring.gpg

data/test/gnupg_test_home/key1.gen

@@ -1,15 +0,0 @@
- %echo Generating a standard key
- Key-Type: DSA
- Key-Length: 1024
- Subkey-Type: ELG-E
- Subkey-Length: 1024
- Name-Real: Sup Test Sender 1 
- Name-Comment: Test sender key
- Name-Email: sup-test-1@foo.bar 
- Expire-Date: 1y
- %no-protection
- %pubring pubring.gpg
- %secring secring.gpg
- # Do a commit here, so that we can later print "done" :-)
- %commit
- %echo done

data/test/gnupg_test_home/key2.gen

@@ -1,15 +0,0 @@
- %echo Generating a standard key
- Key-Type: DSA
- Key-Length: 1024
- Subkey-Type: ELG-E
- Subkey-Length: 1024
- Name-Real: Sup Test Receiver
- Name-Comment: Test receiver for Sup
- Name-Email: sup-test-2@foo.bar
- Expire-Date: 1y
- %no-protection
- %pubring pubring.gpg
- %secring secring.gpg
- # Do a commit here, so that we can later print "done" :-)
- %commit
- %echo done