sup 1.0 → 1.2

data/test/test_messages_dir.rb

@@ -13,19 +13,22 @@ class TestMessagesDir < ::Minitest::Test
   def setup
     @path = Dir.mktmpdir
     Redwood::HookManager.init File.join(@path, 'hooks')
+    @log = StringIO.new
+    Redwood::Logger.add_sink @log
+    Redwood::Logger.remove_sink $stderr
   end
 
   def teardown
+    Redwood::Logger.clear!
+    Redwood::Logger.remove_sink @log
+    Redwood::Logger.add_sink $stderr
     Redwood::HookManager.deinstantiate!
     FileUtils.rm_r @path
   end
 
   def test_binary_content_transfer_encoding
-    message = ''
-    File.open('test/fixtures/binary-content-transfer-encoding-2.eml') { |f| message = f.read }
-
     source = DummySource.new("sup-test://test_messages")
-    source.messages = [ message ]
+    source.messages = [ fixture_path('binary-content-transfer-encoding-2.eml') ]
     source_info = 0
 
     sup_message = Message.build_from_source(source, source_info)
@@ -41,7 +44,6 @@ class TestMessagesDir < ::Minitest::Test
     assert_equal("Important", subj)
 
     chunks = sup_message.load_from_source!
-    indexable_chunks = sup_message.indexable_chunks
 
     # there should be only one chunk
     #assert_equal(1, chunks.length)
@@ -50,14 +52,13 @@ class TestMessagesDir < ::Minitest::Test
 
     # lines should contain an error message
     assert (lines.join.include? "An error occurred while loading this message."), "This message should not load successfully"
+
+    assert_match(/WARNING: problem reading message/, @log.string)
   end
 
   def test_bad_content_transfer_encoding
-    message = ''
-    File.open('test/fixtures/bad-content-transfer-encoding-1.eml') { |f| message = f.read }
-
     source = DummySource.new("sup-test://test_messages")
-    source.messages = [ message ]
+    source.messages = [ fixture_path('bad-content-transfer-encoding-1.eml') ]
     source_info = 0
 
     sup_message = Message.build_from_source(source, source_info)
@@ -73,7 +74,6 @@ class TestMessagesDir < ::Minitest::Test
     assert_equal("Content-Transfer-Encoding:-bug in sup", subj)
 
     chunks = sup_message.load_from_source!
-    indexable_chunks = sup_message.indexable_chunks
 
     # there should be only one chunk
     #assert_equal(1, chunks.length)
@@ -82,14 +82,13 @@ class TestMessagesDir < ::Minitest::Test
 
     # lines should contain an error message
     assert (lines.join.include? "An error occurred while loading this message."), "This message should not load successfully"
+
+    assert_match(/WARNING: problem reading message/, @log.string)
   end
 
   def test_missing_line
-    message = ''
-    File.open('test/fixtures/missing-line.eml') { |f| message = f.read }
-
     source = DummySource.new("sup-test://test_messages")
-    source.messages = [ message ]
+    source.messages = [ fixture_path('missing-line.eml') ]
     source_info = 0
 
     sup_message = Message.build_from_source(source, source_info)
@@ -105,7 +104,6 @@ class TestMessagesDir < ::Minitest::Test
     assert_equal("Encoding bug", subj)
 
     chunks = sup_message.load_from_source!
-    indexable_chunks = sup_message.indexable_chunks
 
     # there should be only one chunk
     #assert_equal(1, chunks.length)

data/test/unit/test_horizontal_selector.rb

@@ -13,18 +13,18 @@ describe Redwood::HorizontalSelector do
 
   it "init w/ the first value selected" do
     first_value = values.first
-    @selector.val.must_equal first_value
+    assert_equal first_value, @selector.val
   end
 
   it "stores value for selection" do
     second_value = values[1]
     @selector.set_to second_value
-    @selector.val.must_equal second_value
+    assert_equal second_value, @selector.val
   end
 
   describe "for unknown value" do
     it "cannot select unknown value" do
-      @selector.wont_be :can_set_to?, strange_value
+      assert_equal false, @selector.can_set_to?(strange_value)
     end
 
     it "refuses selecting unknown value" do
@@ -34,7 +34,7 @@ describe Redwood::HorizontalSelector do
         @selector.set_to strange_value
       end
 
-      @selector.val.must_equal old_value
+      assert_equal old_value, @selector.val
     end
   end
 end

data/test/unit/test_locale_fiddler.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'sup/util/locale_fiddler'
 
-class TestFiddle < ::Minitest::Unit::TestCase
+class TestFiddle < Minitest::Test
   # TODO this is a silly test
   def test_fiddle_set_locale
     before = LocaleDummy.setlocale(6, nil).to_s

data/test/unit/util/test_query.rb

@@ -30,7 +30,7 @@ describe Redwood::Util::Query do
       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)
+          _desc = Redwood::Util::Query.describe (query)
         end
       end
 

data/test/unit/util/test_string.rb

@@ -18,7 +18,7 @@ describe "Sup's String extension" do
 
     it "calculates display length of a string" do
       data.each do |(str, length)|
-        str.display_length.must_equal length
+        assert_equal length, str.display_length
       end
     end
   end
@@ -36,7 +36,7 @@ describe "Sup's String extension" do
 
     it "slices string by display length" do
       data.each do |(str, length, sliced)|
-        str.slice_by_display_length(length).must_equal sliced
+        assert_equal sliced, str.slice_by_display_length(length)
       end
     end
   end
@@ -56,7 +56,7 @@ describe "Sup's String extension" do
 
     it "wraps string by display length" do
       data.each do |(str, length, wrapped)|
-        str.wrap(length).must_equal wrapped
+        assert_equal wrapped, str.wrap(length)
       end
     end
   end

data/test/unit/util/test_uri.rb

@@ -7,13 +7,13 @@ describe Redwood::Util::Uri do
     it "builds uri from hash" do
       components = {:path => "/var/mail/foo", :scheme => "mbox"}
       uri = Redwood::Util::Uri.build(components)
-      uri.to_s.must_equal "mbox:/var/mail/foo"
+      assert_equal "mbox:/var/mail/foo", uri.to_s
     end
 
     it "expands ~ in path" do
       components = {:path => "~/foo", :scheme => "maildir"}
       uri = Redwood::Util::Uri.build(components)
-      uri.to_s.must_equal "maildir:#{ENV["HOME"]}/foo"
+      assert_equal "maildir:#{ENV["HOME"]}/foo", uri.to_s
     end
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: sup
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.2'
 platform: ruby
 authors:
 - William Morgan
 - Gaute Hope
 - Hamish Downer
 - Matthieu Rakotojaona
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-12 00:00:00.000000000 Z
+date: 2024-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ncursesw
@@ -31,16 +31,22 @@ dependencies:
   name: rmail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -193,14 +199,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.5.1
+        version: '5.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.5.1
+        version: '5.5'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +249,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  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.
 
@@ -259,7 +279,6 @@ executables:
 - sup-config
 - sup-dump
 - sup-import-dump
-- sup-psych-ify-config-files
 - sup-recover-sources
 - sup-sync
 - sup-sync-back-maildir
@@ -278,14 +297,16 @@ extra_rdoc_files:
 - man/sup-tweak-labels.1
 - man/sup.1
 files:
+- ".github/workflows/checks.yml"
 - ".gitignore"
 - ".gitmodules"
-- ".travis.yml"
+- ".rubocop.yml"
 - CONTRIBUTORS
 - Gemfile
 - HACKING
 - History.txt
 - LICENSE
+- Manifest.txt
 - README.md
 - Rakefile
 - ReleaseNotes
@@ -294,7 +315,6 @@ files:
 - bin/sup-config
 - bin/sup-dump
 - bin/sup-import-dump
-- bin/sup-psych-ify-config-files
 - bin/sup-recover-sources
 - bin/sup-sync
 - bin/sup-sync-back-maildir
@@ -302,6 +322,26 @@ files:
 - contrib/colorpicker.rb
 - contrib/completion/_sup.bash
 - contrib/completion/_sup.zsh
+- contrib/nix/Gemfile
+- contrib/nix/Gemfile.lock
+- contrib/nix/README
+- contrib/nix/gem-install-shell.nix
+- contrib/nix/gemset.nix
+- contrib/nix/ruby2.4-Gemfile.lock
+- contrib/nix/ruby2.4-gemset.nix
+- contrib/nix/ruby2.4-shell.nix
+- contrib/nix/ruby2.5-Gemfile.lock
+- contrib/nix/ruby2.5-gemset.nix
+- 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-shell.nix
+- contrib/nix/ruby3.0-shell.nix
+- contrib/nix/ruby3.1-shell.nix
+- contrib/nix/ruby3.2-shell.nix
+- contrib/nix/ruby3.3-shell.nix
+- contrib/nix/test-all-rubies.sh
 - devel/console.sh
 - devel/count-loc.sh
 - devel/load-index.rb
@@ -388,12 +428,14 @@ files:
 - man/sup-sync.1
 - man/sup-tweak-labels.1
 - man/sup.1
+- shell.nix
 - 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/embedded-message.eml
 - test/fixtures/mailing-list-header.eml
 - test/fixtures/malicious-attachment-names.eml
 - test/fixtures/missing-from-to.eml
@@ -401,8 +443,12 @@ files:
 - test/fixtures/multi-part-2.eml
 - test/fixtures/multi-part.eml
 - test/fixtures/no-body.eml
+- test/fixtures/non-ascii-header-in-nested-message.eml
+- test/fixtures/non-ascii-header.eml
+- test/fixtures/rfc2047-header-encoding.eml
 - test/fixtures/simple-message.eml
 - test/fixtures/text-attachments-with-charset.eml
+- 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
@@ -413,15 +459,15 @@ files:
 - 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_label_service.rb
 - test/integration/test_maildir.rb
 - test/integration/test_mbox.rb
+- test/integration/test_sup-add.rb
+- test/integration/test_sup-sync-back-maildir.rb
 - test/test_crypto.rb
 - test/test_header_parsing.rb
 - test/test_helper.rb
 - test/test_message.rb
 - test/test_messages_dir.rb
-- test/test_yaml_migration.rb
 - test/test_yaml_regressions.rb
 - test/unit/service/test_label_service.rb
 - test/unit/test_contact.rb
@@ -458,8 +504,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.22
+signing_key:
 specification_version: 4
 summary: A console-based email client with the best features of GMail, mutt and Emacs
 test_files:
@@ -468,6 +514,7 @@ test_files:
 - test/fixtures/binary-content-transfer-encoding-2.eml
 - test/fixtures/blank-header-fields.eml
 - test/fixtures/contacts.txt
+- test/fixtures/embedded-message.eml
 - test/fixtures/mailing-list-header.eml
 - test/fixtures/malicious-attachment-names.eml
 - test/fixtures/missing-from-to.eml
@@ -475,8 +522,12 @@ test_files:
 - test/fixtures/multi-part-2.eml
 - test/fixtures/multi-part.eml
 - test/fixtures/no-body.eml
+- test/fixtures/non-ascii-header-in-nested-message.eml
+- test/fixtures/non-ascii-header.eml
+- test/fixtures/rfc2047-header-encoding.eml
 - test/fixtures/simple-message.eml
 - test/fixtures/text-attachments-with-charset.eml
+- 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
@@ -487,15 +538,15 @@ test_files:
 - 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_label_service.rb
 - test/integration/test_maildir.rb
 - test/integration/test_mbox.rb
+- test/integration/test_sup-add.rb
+- test/integration/test_sup-sync-back-maildir.rb
 - test/test_crypto.rb
 - test/test_header_parsing.rb
 - test/test_helper.rb
 - test/test_message.rb
 - test/test_messages_dir.rb
-- test/test_yaml_migration.rb
 - test/test_yaml_regressions.rb
 - test/unit/service/test_label_service.rb
 - test/unit/test_contact.rb

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-
-dist: focal
-
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-
-before_install:
-  - sudo apt update -qq
-  - sudo apt install -qq uuid-dev uuid libncursesw5-dev libncursesw5 gnupg2 pandoc
-  - git submodule update --init --recursive
-
-script:
-  - bundle exec rake travis
-  - bundle exec gem install pkg/sup-*.gem
-

data/bin/sup-psych-ify-config-files

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-
-require "sup"
-require "fileutils"
-
-if RUBY_VERSION >= "2.1"
-  puts "YAML migration is deprecated by Ruby 2.1 and newer."
-  exit
-end
-
-Redwood.start
-
-fn = Redwood::SOURCE_FN
-FileUtils.cp fn, "#{fn}.syck_bak"
-
-Redwood::SourceManager.load_sources fn
-Redwood::SourceManager.save_sources fn, true
-
-Redwood.finish

data/test/integration/test_label_service.rb

@@ -1,18 +0,0 @@
-require "test_helper"
-
-require "sup/service/label_service"
-
-require "tmpdir"
-
-describe Redwood::LabelService do
-  let(:tmpdir) { Dir.mktmpdir }
-  after do
-    require "fileutils"
-    FileUtils.remove_entry_secure @tmpdir unless @tmpdir.nil?
-  end
-
-  describe "#add_labels" do
-    # Integration tests are hard to write at this moment :(
-    it "add labels to all messages matching the query"
-  end
-end

data/test/test_yaml_migration.rb

@@ -1,85 +0,0 @@
-require "test_helper"
-
-require "sup"
-require "psych"
-
-if RUBY_VERSION < "2.1"
-describe "Sup's YAML util" do
-  describe "Module#yaml_properties" do
-    def build_class_with_name name, &b
-      Class.new do
-        meta_cls = class << self; self; end
-        meta_cls.send(:define_method, :name) { name }
-        class_exec(&b) unless b.nil?
-      end
-    end
-
-    after do
-      Psych.load_tags = {}
-      Psych.dump_tags = {}
-    end
-
-    it "defines YAML tag for class" do
-      cls = build_class_with_name 'Cls' do
-        yaml_properties
-      end
-
-      expected_yaml_tag = "!supmua.org,2006-10-01/Cls"
-
-      Psych.load_tags[expected_yaml_tag].must_equal cls
-      Psych.dump_tags[cls].must_equal expected_yaml_tag
-
-    end
-
-    it "Loads legacy YAML format as well" do
-      cls = build_class_with_name 'Cls' do
-        yaml_properties :id
-        attr_accessor :id
-        def initialize id
-          @id = id
-        end
-      end
-
-      Psych.load_tags["!masanjin.net,2006-10-01/Cls"].must_equal cls
-
-      yaml = <<EOF
---- !masanjin.net,2006-10-01/Cls
-id: ID
-EOF
-      loaded = YAML.load(yaml)
-
-      loaded.id.must_equal 'ID'
-      loaded.must_be_kind_of cls
-    end
-
-    it "Dumps & loads w/ state re-initialized" do
-      cls = build_class_with_name 'Cls' do
-        yaml_properties :id
-        attr_accessor :id
-        attr_reader :flag
-
-        def initialize id
-          @id = id
-          @flag = true
-        end
-      end
-
-      instance = cls.new 'ID'
-
-      dumped = YAML.dump(instance)
-      loaded = YAML.load(dumped)
-
-      dumped.must_equal <<-EOF
---- !supmua.org,2006-10-01/Cls
-id: ID
-      EOF
-
-      loaded.id.must_equal 'ID'
-      assert loaded.flag
-    end
-  end
-end
-
-else
-  puts "Some YAML tests are skipped on Ruby 2.1.0 and newer."
-end