sup 0.19.0 → 0.23

data/test/test_messages_dir.rb

@@ -6,27 +6,9 @@ require 'stringio'
 
 require 'dummy_source'
 
-# override File.exists? to make it work with StringIO for testing.
-# FIXME: do aliasing to avoid breaking this when sup moves from
-# File.exists? to File.exist?
-
-class File
-
-  def File.exists? file
-    # puts "fake File::exists?"
-
-    if file.is_a?(StringIO)
-      return false
-    end
-    # use the different function
-    File.exist?(file)
-  end
-
-end
-
 module Redwood
 
-class TestMessagesDir < ::Minitest::Unit::TestCase
+class TestMessagesDir < ::Minitest::Test
 
   def setup
     @path = Dir.mktmpdir
@@ -40,9 +22,7 @@ class TestMessagesDir < ::Minitest::Unit::TestCase
 
   def test_binary_content_transfer_encoding
     message = ''
-    File.open 'test/messages/binary-content-transfer-encoding-2.eml' do |f|
-      message = f.read
-    end
+    File.open('test/fixtures/binary-content-transfer-encoding-2.eml') { |f| message = f.read }
 
     source = DummySource.new("sup-test://test_messages")
     source.messages = [ message ]
@@ -74,9 +54,7 @@ class TestMessagesDir < ::Minitest::Unit::TestCase
 
   def test_bad_content_transfer_encoding
     message = ''
-    File.open 'test/messages/bad-content-transfer-encoding-1.eml' do |f|
-      message = f.read
-    end
+    File.open('test/fixtures/bad-content-transfer-encoding-1.eml') { |f| message = f.read }
 
     source = DummySource.new("sup-test://test_messages")
     source.messages = [ message ]
@@ -108,9 +86,7 @@ class TestMessagesDir < ::Minitest::Unit::TestCase
 
   def test_missing_line
     message = ''
-    File.open 'test/messages/missing-line.eml' do |f|
-      message = f.read
-    end
+    File.open('test/fixtures/missing-line.eml') { |f| message = f.read }
 
     source = DummySource.new("sup-test://test_messages")
     source.messages = [ message ]

data/test/test_yaml_regressions.rb

@@ -6,7 +6,7 @@ require 'yaml'
 require 'sup'
 
 module Redwood
-  class TestYamlRegressions < ::Minitest::Unit::TestCase
+  class TestYamlRegressions < ::Minitest::Test
     def test_yamling_hash
       hsh = {:foo => 42}
       reloaded = YAML.load(hsh.to_yaml)

data/test/unit/test_contact.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+require 'sup/contact'
+
+module Redwood
+
+class TestContact < Minitest::Test
+  def setup
+    @contact = ContactManager.init(File.expand_path("../../fixtures/contacts.txt", __FILE__))
+    @person  = Person.new "Terrible Name", "terrible@name.com"
+  end
+
+  def teardown
+    runner = Redwood.const_get "ContactManager".to_sym
+    runner.deinstantiate!
+  end
+
+  def test_contact_manager
+    assert @contact
+    ## 1 contact is imported from the fixture file.
+    assert_equal 1, @contact.contacts.count
+    assert_equal @contact.contact_for("RC").name, "Random Contact"
+
+    assert_nil @contact.contact_for "TN"
+    @contact.update_alias @person, "TN"
+
+    assert @contact.is_aliased_contact?(@person)
+    assert_equal @person, @contact.contact_for("TN")
+
+    assert_equal "TN", @contact.alias_for(@person)
+  end
+end
+
+end

data/test/unit/test_locale_fiddler.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+require 'sup/util/locale_fiddler'
+
+class TestFiddle < ::Minitest::Unit::TestCase
+  # TODO this is a silly test
+  def test_fiddle_set_locale
+    before = LocaleDummy.setlocale(6, nil).to_s
+    after = LocaleDummy.setlocale(6, "").to_s
+    assert(before != after, "Expected locale to be fiddled with")
+  end
+end
+
+class LocaleDummy
+  extend LocaleFiddler
+end

data/test/unit/test_person.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+require 'sup'
+
+module Redwood
+
+class TestPerson < Minitest::Test
+  def setup
+    @person = Person.new("Thomassen, Bob", "bob@thomassen.com")
+    @no_name = Person.new(nil, "alice@alice.com")
+  end
+
+  def test_email_must_be_supplied
+    assert_raises (ArgumentError) { Person.new("Alice", nil) }
+  end
+
+  def test_to_string
+    assert_equal "Thomassen, Bob <bob@thomassen.com>", "#{@person}"
+    assert_equal "alice@alice.com", "#{@no_name}"
+  end
+
+  def test_shortname
+    assert_equal "Bob", @person.shortname
+    assert_equal "alice@alice.com", @no_name.shortname
+  end
+
+  def test_mediumname
+    assert_equal "Thomassen, Bob", @person.mediumname
+    assert_equal "alice@alice.com", @no_name.mediumname
+  end
+
+  def test_fullname
+    assert_equal "\"Thomassen, Bob\" <bob@thomassen.com>", @person.full_address
+    assert_equal "alice@alice.com", @no_name.full_address
+  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.19.0
+  version: '0.23'
 platform: ruby
 authors:
 - William Morgan
@@ -11,22 +11,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: xapian-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.15
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.15
 - !ruby/object:Gem::Dependency
   name: ncursesw
   requirement: !ruby/object:Gem::Requirement
@@ -42,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
@@ -70,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
@@ -101,16 +87,16 @@ dependencies:
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: locale
   requirement: !ruby/object:Gem::Requirement
@@ -129,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
@@ -153,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
@@ -187,28 +193,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: 5.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: 5.5.1
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: gpgme
   requirement: !ruby/object:Gem::Requirement
@@ -223,6 +229,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
       Sup is a console-based email client for people with a lot of email.
 
@@ -244,10 +264,22 @@ executables:
 - sup-sync
 - sup-sync-back-maildir
 - sup-tweak-labels
-extensions: []
-extra_rdoc_files: []
+extensions:
+- ext/mkrf_conf_xapian.rb
+extra_rdoc_files:
+- man/sup-add.1
+- man/sup-config.1
+- man/sup-dump.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"
+- ".gitmodules"
 - ".travis.yml"
 - CONTRIBUTORS
 - Gemfile
@@ -268,6 +300,7 @@ files:
 - bin/sup-sync-back-maildir
 - bin/sup-tweak-labels
 - contrib/colorpicker.rb
+- contrib/completion/_sup.bash
 - contrib/completion/_sup.zsh
 - devel/console.sh
 - devel/count-loc.sh
@@ -277,6 +310,7 @@ files:
 - doc/FAQ.txt
 - doc/Hooks.txt
 - doc/Philosophy.txt
+- ext/mkrf_conf_xapian.rb
 - lib/sup.rb
 - lib/sup/account.rb
 - lib/sup/buffer.rb
@@ -337,25 +371,51 @@ 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
 - lib/sup/util/query.rb
 - lib/sup/util/uri.rb
 - lib/sup/version.rb
+- man/sup-add.1
+- man/sup-config.1
+- man/sup-dump.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
 - sup.gemspec
 - 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/mailing-list-header.eml
+- test/fixtures/malicious-attachment-names.eml
+- test/fixtures/missing-from-to.eml
+- test/fixtures/missing-line.eml
+- test/fixtures/multi-part-2.eml
+- 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/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
-- test/gnupg_test_home/receiver_trustdb.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/gnupg_test_home/trustdb.gpg
 - test/integration/test_label_service.rb
-- test/messages/bad-content-transfer-encoding-1.eml
-- test/messages/binary-content-transfer-encoding-2.eml
-- test/messages/missing-line.eml
+- test/integration/test_maildir.rb
+- test/integration/test_mbox.rb
 - test/test_crypto.rb
 - test/test_header_parsing.rb
 - test/test_helper.rb
@@ -364,18 +424,26 @@ files:
 - test/test_yaml_migration.rb
 - test/test_yaml_regressions.rb
 - test/unit/service/test_label_service.rb
+- test/unit/test_contact.rb
 - test/unit/test_horizontal_selector.rb
+- test/unit/test_locale_fiddler.rb
+- test/unit/test_person.rb
 - 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,
        re-subscribe to supmua@googlegroups.com to discuss and follow
        updates on sup (send email to: supmua+subscribe@googlegroups.com).
+
+       OpenBSD users:
+       If your operating system is OpenBSD you have some
+       additional, manual steps to do before Sup will work, see:
+       https://github.com/sup-heliotrope/sup/wiki/Installation%3A-OpenBSD.
 rdoc_options: []
 require_paths:
 - lib
@@ -383,32 +451,45 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+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
 test_files:
 - 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/mailing-list-header.eml
+- test/fixtures/malicious-attachment-names.eml
+- test/fixtures/missing-from-to.eml
+- test/fixtures/missing-line.eml
+- test/fixtures/multi-part-2.eml
+- 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/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
-- test/gnupg_test_home/receiver_trustdb.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/gnupg_test_home/trustdb.gpg
 - test/integration/test_label_service.rb
-- test/messages/bad-content-transfer-encoding-1.eml
-- test/messages/binary-content-transfer-encoding-2.eml
-- test/messages/missing-line.eml
+- test/integration/test_maildir.rb
+- test/integration/test_mbox.rb
 - test/test_crypto.rb
 - test/test_header_parsing.rb
 - test/test_helper.rb
@@ -417,7 +498,10 @@ test_files:
 - test/test_yaml_migration.rb
 - test/test_yaml_regressions.rb
 - test/unit/service/test_label_service.rb
+- test/unit/test_contact.rb
 - test/unit/test_horizontal_selector.rb
+- test/unit/test_locale_fiddler.rb
+- test/unit/test_person.rb
 - test/unit/util/test_query.rb
 - test/unit/util/test_string.rb
 - test/unit/util/test_uri.rb