sup 0.17.0 → 0.18.0

data/test/test_messages_dir.rb

@@ -0,0 +1,147 @@
+#!/usr/bin/ruby
+
+require 'test_helper'
+require 'sup'
+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
+
+  def setup
+    @path = Dir.mktmpdir
+    Redwood::HookManager.init File.join(@path, 'hooks')
+  end
+
+  def teardown
+    Redwood::HookManager.deinstantiate!
+    FileUtils.rm_r @path
+  end
+
+  def test_binary_content_transfer_encoding
+    message = ''
+    File.open 'test/messages/binary-content-transfer-encoding-2.eml' do |f|
+      message = f.read
+    end
+
+    source = DummySource.new("sup-test://test_messages")
+    source.messages = [ message ]
+    source_info = 0
+
+    sup_message = Message.build_from_source(source, source_info)
+    sup_message.load_from_source!
+
+    from = sup_message.from
+    # "from" is just a simple person item
+
+    assert_equal("foo@example.org", from.email)
+    #assert_equal("Fake Sender", from.name)
+
+    subj = sup_message.subj
+    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)
+
+    lines = chunks[0].lines
+
+    # lines should contain an error message
+    assert (lines.join.include? "An error occurred while loading this message."), "This message should not load successfully"
+  end
+
+  def test_bad_content_transfer_encoding
+    message = ''
+    File.open 'test/messages/bad-content-transfer-encoding-1.eml' do |f|
+      message = f.read
+    end
+
+    source = DummySource.new("sup-test://test_messages")
+    source.messages = [ message ]
+    source_info = 0
+
+    sup_message = Message.build_from_source(source, source_info)
+    sup_message.load_from_source!
+
+    from = sup_message.from
+    # "from" is just a simple person item
+
+    assert_equal("foo@example.org", from.email)
+    #assert_equal("Fake Sender", from.name)
+
+    subj = sup_message.subj
+    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)
+
+    lines = chunks[0].lines
+
+    # lines should contain an error message
+    assert (lines.join.include? "An error occurred while loading this message."), "This message should not load successfully"
+  end
+
+  def test_missing_line
+    message = ''
+    File.open 'test/messages/missing-line.eml' do |f|
+      message = f.read
+    end
+
+    source = DummySource.new("sup-test://test_messages")
+    source.messages = [ message ]
+    source_info = 0
+
+    sup_message = Message.build_from_source(source, source_info)
+    sup_message.load_from_source!
+
+    from = sup_message.from
+    # "from" is just a simple person item
+
+    assert_equal("foo@aol.com", from.email)
+    #assert_equal("Fake Sender", from.name)
+
+    subj = sup_message.subj
+    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)
+
+    lines = chunks[0].lines
+
+    badline = lines[0]
+    assert (badline.display_length > 0), "The length of this line should greater than 0: #{badline}"
+
+  end
+end
+
+end
+
+# vim:noai:ts=2:sw=2:

data/test/test_yaml_migration.rb

@@ -0,0 +1,85 @@
+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

data/test/test_yaml_regressions.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+# Requiring 'yaml' before 'sup' in 1.9.x would get Psych loaded first
+# and becoming the default yamler.
+require 'yaml'
+require 'sup'
+
+module Redwood
+  class TestYamlRegressions < ::Minitest::Unit::TestCase
+    def test_yamling_hash
+      hsh = {:foo => 42}
+      reloaded = YAML.load(hsh.to_yaml)
+
+      assert_equal reloaded, hsh
+    end
+  end
+end

data/test/unit/service/test_label_service.rb

@@ -0,0 +1,19 @@
+require "test_helper"
+
+require "sup/service/label_service"
+
+describe Redwood::LabelService do
+  describe "#add_labels" do
+    it "add labels to all messages matching the query" do
+      q = 'is:starred'
+      label = 'superstarred'
+      message = mock!.add_label(label).subject
+      index = mock!.find_messages(q){ [message] }.subject
+      mock(index).update_message_state(message)
+      mock(index).save_index
+
+      service = Redwood::LabelService.new(index)
+      service.add_labels q, label
+    end
+  end
+end

data/test/unit/test_horizontal_selector.rb

@@ -0,0 +1,40 @@
+require "test_helper" 
+
+require "sup/horizontal_selector"
+
+describe Redwood::HorizontalSelector do
+  let(:values) { %w[foo@example.com bar@example.com] }
+  let(:strange_value) { "strange@example.com" }
+
+  before do
+    @selector = Redwood::HorizontalSelector.new(
+      'Acc:', values, [])
+  end
+
+  it "init w/ the first value selected" do
+    first_value = values.first
+    @selector.val.must_equal first_value
+  end
+
+  it "stores value for selection" do
+    second_value = values[1]
+    @selector.set_to second_value
+    @selector.val.must_equal second_value
+  end
+
+  describe "for unknown value" do
+    it "cannot select unknown value" do
+      @selector.wont_be :can_set_to?, strange_value
+    end
+
+    it "refuses selecting unknown value" do
+      old_value = @selector.val
+
+      assert_raises Redwood::HorizontalSelector::UnknownValue do
+        @selector.set_to strange_value
+      end
+
+      @selector.val.must_equal old_value
+    end
+  end
+end

data/test/unit/util/test_query.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+
+require "test_helper"
+
+require "sup/util/query"
+require "xapian"
+
+describe Redwood::Util::Query do
+  describe ".describe" do
+    it "returns a UTF-8 description of query" do
+      query = Xapian::Query.new "テスト"
+      life = "生活: "
+
+      assert_raises Encoding::CompatibilityError do
+        _ = life + query.description
+      end
+
+      desc = Redwood::Util::Query.describe(query)
+      _ = (life + desc) # No exception thrown
+    end
+
+    it "returns a valid UTF-8 description of bad input" do
+      msg = "asdfa \xc3\x28 åasdf"
+      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)
+      end
+
+      assert_raises Encoding::CompatibilityError do
+        _ = life + query.description
+      end
+    end
+
+    it "returns a valid UTF-8 fallback description of bad input" do
+      msg = "asdfa \xc3\x28 åasdf"
+      query = Xapian::Query.new msg
+
+      desc = Redwood::Util::Query.describe(query, "invalid query")
+
+      assert_equal("invalid query", desc)
+    end
+  end
+end

data/test/unit/util/test_string.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+
+require "test_helper"
+
+require "sup/util"
+
+describe "Sup's String extension" do
+  describe "#display_length" do
+    let :data do
+      [
+        ['some words', 10,],
+        ['中文', 4,],
+        ['ä', 1,],
+      ]
+    end
+
+    it "calculates display length of a string" do
+      data.each do |(str, length)|
+        str.display_length.must_equal length
+      end
+    end
+  end
+
+  describe "#slice_by_display_length(len)" do
+    let :data do
+      [
+        ['some words', 6, 'some w'],
+        ['中文', 2, '中'],
+        ['älpha', 3, 'älp'],
+      ]
+    end
+
+    it "slices string by display length" do
+      data.each do |(str, length, sliced)|
+        str.slice_by_display_length(length).must_equal sliced
+      end
+    end
+  end
+
+  describe "#wrap" do
+    let :data do
+      [
+        ['some words', 6, ['some', 'words']],
+        ['some words', 80, ['some words']],
+        ['中文', 2, ['中', '文']],
+        ['中文', 5, ['中文']],
+        ['älpha', 3, ['älp', 'ha']],
+      ]
+    end
+
+    it "wraps string by display length" do
+      data.each do |(str, length, wrapped)|
+        str.wrap(length).must_equal wrapped
+      end
+    end
+  end
+end

data/test/unit/util/test_uri.rb

@@ -0,0 +1,19 @@
+require "test_helper.rb"
+
+require "sup/util/uri"
+
+describe Redwood::Util::Uri do
+  describe ".build" 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"
+    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"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sup
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - William Morgan
@@ -10,29 +10,8 @@ authors:
 - Matthieu Rakotojaona
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDVDCCAjygAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQDDAJlZzEV
-  MBMGCgmSJomT8ixkARkWBWdhdXRlMRUwEwYKCZImiZPyLGQBGRYFdmV0c2oxEzAR
-  BgoJkiaJk/IsZAEZFgNjb20wHhcNMTMwNTA4MTAzODQ3WhcNMTQwNTA4MTAzODQ3
-  WjBQMQswCQYDVQQDDAJlZzEVMBMGCgmSJomT8ixkARkWBWdhdXRlMRUwEwYKCZIm
-  iZPyLGQBGRYFdmV0c2oxEzARBgoJkiaJk/IsZAEZFgNjb20wggEiMA0GCSqGSIb3
-  DQEBAQUAA4IBDwAwggEKAoIBAQC7sNc5zY4MrYB7eywE/aK2IoDqpM9lq4ZFlHzt
-  Pmq1LG6ah2lu/HfjqxiPoqwY7QkdSOGDLSk7G8YBqDA/tODhkPPSTqxBDzYyCO46
-  haWTtoN5tJkxIDJKp1nVXHi0Mlb4GJVKd9P0q95BeBYBfs8vyPN+y4b4Gebgx9U3
-  KqMDbe5h9MAPZGmtiRFMb3ugmiujDm7v8fACa5EtSvK/lxMkRDglecT/knE99NYI
-  l35SO/Bune1bxYmkwW64mQ4wRlGVeAnX+19msALfS9rdJL26dfW2LgqWi5QoVTBH
-  KNKTl/i3fxK0mzgtnoRCWdMJQFNNonFTnPUUawi1c9Kh4AdPAgMBAAGjOTA3MAkG
-  A1UdEwQCMAAwHQYDVR0OBBYEFJNCOxL0SWcbW2M+DIEUzAMz1bZsMAsGA1UdDwQE
-  AwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAr3QUayd0geBDExO+WwzaEPAuUZ3zWQYG
-  G9vrplCkmJtjS/X/wVAef7Jn/V5MNkXKXsiOgXJXki+n7HulNZUf1rzr7Un96gVJ
-  1hq/ZTuapnPpstBqqdv60RB8HNGydHQeEz6us5z3nj+KchPqJ657Dz8oX/Nm6/24
-  7QSQpCh8xBYdSWEpoIE0zUSY77LtVTRVwIr9uDpWTTr9kCVBINBsOQNjWKruEWjV
-  +JMuDs+iWefpF4R3BySoOc1Q4WoES3+oc0qo37MsAZyfnQIPTZkyLZCMxeL6Mha4
-  hFc2yANBj8voaY5C74Cg2VqExtcnSaxUtW9wC4w5hOlg0AVfb1JWzg==
-  -----END CERTIFICATE-----
-date: 2014-04-11 00:00:00.000000000 Z
+cert_chain: []
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xapian-ruby
@@ -245,14 +224,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.2
 description: |2
-        Sup is a console-based email client for people with a lot of email.
+      Sup is a console-based email client for people with a lot of email.
 
-        * GMail-like thread-centered archiving, tagging and muting
-        * Handling mail from multiple mbox and Maildir sources
-        * Blazing fast full-text search with a rich query language
-        * Multiple accounts - pick the right one when sending mail
-        * Ruby-programmable hooks
-        * Automatically tracking recent contacts
+      * GMail-like thread-centered archiving, tagging and muting
+      * Handling mail from multiple mbox and Maildir sources
+      * Blazing fast full-text search with a rich query language
+      * Multiple accounts - pick the right one when sending mail
+      * Ruby-programmable hooks
+      * Automatically tracking recent contacts
 email: sup-talk@rubyforge.org
 executables:
 - sup
@@ -260,18 +239,23 @@ executables:
 - sup-config
 - sup-dump
 - sup-import-dump
+- sup-psych-ify-config-files
 - sup-recover-sources
 - sup-sync
 - sup-sync-back-maildir
 - sup-tweak-labels
-- sup-psych-ify-config-files
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
 - CONTRIBUTORS
+- Gemfile
+- HACKING
 - History.txt
 - LICENSE
 - README.md
+- Rakefile
 - ReleaseNotes
 - bin/sup
 - bin/sup-add
@@ -283,6 +267,16 @@ files:
 - bin/sup-sync
 - bin/sup-sync-back-maildir
 - bin/sup-tweak-labels
+- contrib/colorpicker.rb
+- contrib/completion/_sup.zsh
+- devel/console.sh
+- devel/count-loc.sh
+- devel/load-index.rb
+- devel/profile.rb
+- devel/start-console.rb
+- doc/FAQ.txt
+- doc/Hooks.txt
+- doc/Philosophy.txt
 - lib/sup.rb
 - lib/sup/account.rb
 - lib/sup/buffer.rb
@@ -348,16 +342,42 @@ files:
 - lib/sup/util/query.rb
 - lib/sup/util/uri.rb
 - lib/sup/version.rb
+- sup.gemspec
+- test/dummy_source.rb
+- test/gnupg_test_home/gpg.conf
+- 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/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/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_horizontal_selector.rb
+- test/unit/util/test_query.rb
+- test/unit/util/test_string.rb
+- test/unit/util/test_uri.rb
 homepage: http://supmua.org
 licenses:
 - GPL-2
 metadata: {}
 post_install_message: |
   SUP: If you are upgrading Sup from before version 0.14.0: Please
-       run `sup-psych-ify-config-files` to migrate from 0.13.
+     run `sup-psych-ify-config-files` to migrate from 0.13.
 
-       Check https://github.com/sup-heliotrope/sup/wiki/Migration-0.13-to-0.14
-       for more detailed and up-to-date instructions.
+     Check https://github.com/sup-heliotrope/sup/wiki/Migration-0.13-to-0.14
+     for more detailed and up-to-date instructions.
 rdoc_options: []
 require_paths:
 - lib
@@ -377,4 +397,29 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A console-based email client with the best features of GMail, mutt and Emacs
-test_files: []
+test_files:
+- test/dummy_source.rb
+- test/gnupg_test_home/gpg.conf
+- 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/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/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_horizontal_selector.rb
+- test/unit/util/test_query.rb
+- test/unit/util/test_string.rb
+- test/unit/util/test_uri.rb