sup 0.19.0 → 0.23

data/lib/sup/search.rb

@@ -12,7 +12,7 @@ class SearchManager
   def initialize fn
     @fn = fn
     @searches = {}
-    if File.exists? fn
+    if File.exist? fn
       IO.foreach(fn) do |l|
         l =~ /^([^:]*): (.*)$/ or raise "can't parse #{fn} line #{l.inspect}"
         @searches[$1] = $2

data/lib/sup/sent.rb

@@ -40,7 +40,7 @@ class SentLoader < MBox
 
   def initialize
     @filename = Redwood::SENT_FN
-    File.open(@filename, "w") { } unless File.exists? @filename
+    File.open(@filename, "w") { } unless File.exist? @filename
     super "mbox://" + @filename, true, $config[:archive_sent]
   end
 

data/lib/sup/source.rb

@@ -58,7 +58,7 @@ class Source
   attr_accessor :id
 
   def initialize uri, usual=true, archived=false, id=nil
-    raise ArgumentError, "id must be an integer: #{id.inspect}" unless id.is_a? Fixnum if id
+    raise ArgumentError, "id must be an integer: #{id.inspect}" unless id.is_a? Integer if id
 
     @uri = uri
     @usual = usual

data/lib/sup/util.rb

@@ -8,17 +8,9 @@ require 'set'
 require 'enumerator'
 require 'benchmark'
 require 'unicode'
+require 'unicode/display_width'
 require 'fileutils'
 
-## time for some monkeypatching!
-class Symbol
-  unless method_defined? :to_proc
-    def to_proc
-      proc {  |obj, *args| obj.send(self, *args) }
-    end
-  end
-end
-
 class Lockfile
   def gen_lock_id
     Hash[
@@ -89,7 +81,7 @@ module RMail
     end
 
     def charset
-      if header.field?("content-type") && header.fetch("content-type") =~ /charset="?(.*?)"?(;|$)/i
+      if header.field?("content-type") && header.fetch("content-type") =~ /charset\s*=\s*"?(.*?)"?(;|$)/i
         $1
       end
     end
@@ -170,13 +162,6 @@ module RMail
   end
 end
 
-class Range
-  ## only valid for integer ranges (unless I guess it's exclusive)
-  def size
-    last - first + (exclude_end? ? 0 : 1)
-  end
-end
-
 class Module
   def bool_reader *args
     args.each { |sym| class_eval %{ def #{sym}?; @#{sym}; end } }
@@ -198,17 +183,6 @@ class Module
 end
 
 class Object
-  def ancestors
-    ret = []
-    klass = self.class
-
-    until klass == Object
-      ret << klass
-      klass = klass.superclass
-    end
-    ret
-  end
-
   ## "k combinator"
   def returning x; yield x; x; end
 
@@ -266,21 +240,14 @@ end
 
 class String
   def display_length
-    @display_length ||= Unicode.width(self.fix_encoding!, false)
-
-    # if Unicode.width fails and returns -1, fall back to
-    # regular String#length, see pull-request: #256.
-    if @display_length < 0
-      @display_length = self.length
-    end
-
-    @display_length
+    @display_length ||= Unicode::DisplayWidth.of(self)
   end
 
   def slice_by_display_length len
     each_char.each_with_object "" do |c, buffer|
-      len -= c.display_length
-      buffer << c if len >= 0
+      len -= Unicode::DisplayWidth.of(c)
+      return buffer if len < 0
+      buffer << c
     end
   end
 
@@ -368,13 +335,14 @@ class String
     ret = []
     s = self
     while s.display_length > len
-      cut = s.slice_by_display_length(len).rindex(/\s/)
+      slice = s.slice_by_display_length(len)
+      cut = slice.rindex(/\s/)
       if cut
         ret << s[0 ... cut]
         s = s[(cut + 1) .. -1]
       else
-        ret << s.slice_by_display_length(len)
-        s = s[ret.last.length .. -1]
+        ret << slice
+        s = s[slice.length .. -1]
       end
     end
     ret << s
@@ -382,8 +350,6 @@ class String
 
   # Fix the damn string! make sure it is valid utf-8, then convert to
   # user encoding.
-  #
-  # Not Ruby 1.8 compatible
   def fix_encoding!
     # first try to encode to utf-8 from whatever current encoding
     encode!('UTF-8', :invalid => :replace, :undef => :replace)
@@ -406,8 +372,6 @@ class String
 
   # transcode the string if original encoding is know
   # fix if broken.
-  #
-  # Not Ruby 1.8 compatible
   def transcode to_encoding, from_encoding
     begin
       encode!(to_encoding, from_encoding, :invalid => :replace, :undef => :replace)
@@ -474,13 +438,6 @@ class String
     out = out.fix_encoding! # this should now be an utf-8 string of ascii
                            # compat chars.
   end
-
-  unless method_defined? :ascii_only?
-    def ascii_only?
-      size.times { |i| return false if self[i] & 128 != 0 }
-      return true
-    end
-  end
 end
 
 class Numeric
@@ -498,18 +455,18 @@ class Numeric
 
   def to_human_size
     if self < 1024
-      to_s + "b"
+      to_s + "B"
     elsif self < (1024 * 1024)
-      (self / 1024).to_s + "k"
+      (self / 1024).to_s + "KiB"
     elsif self < (1024 * 1024 * 1024)
-      (self / 1024 / 1024).to_s + "m"
+      (self / 1024 / 1024).to_s + "MiB"
     else
-      (self / 1024 / 1024 / 1024).to_s + "g"
+      (self / 1024 / 1024 / 1024).to_s + "GiB"
     end
   end
 end
 
-class Fixnum
+class Integer
   def to_character
     if self < 128 && self >= 0
       chr
@@ -518,12 +475,6 @@ class Fixnum
     end
   end
 
-  unless method_defined?(:ord)
-    def ord
-      self
-    end
-  end
-
   ## hacking the english language
   def pluralize s
     to_s + " " +
@@ -607,10 +558,6 @@ module Enumerable
   end
 end
 
-unless Object.const_defined? :Enumerator
-  Enumerator = Enumerable::Enumerator
-end
-
 class Array
   def flatten_one_level
     inject([]) { |a, e| a + e }
@@ -706,32 +653,6 @@ class SavingHash
   defer_all_other_method_calls_to :hash
 end
 
-class OrderedHash < Hash
-  alias_method :store, :[]=
-  alias_method :each_pair, :each
-  attr_reader :keys
-
-  def initialize *a
-    @keys = []
-    a.each { |k, v| self[k] = v }
-  end
-
-  def []= key, val
-    @keys << key unless member?(key)
-    super
-  end
-
-  def values; keys.map { |k| self[k] } end
-  def index key; @keys.index key end
-
-  def delete key
-    @keys.delete key
-    super
-  end
-
-  def each; @keys.each { |k| yield k, self[k] } end
-end
-
 ## easy thread-safe class for determining who's the "winner" in a race (i.e.
 ## first person to hit the finish line
 class FinishLine

data/lib/sup/util/axe.rb

@@ -0,0 +1,17 @@
+require 'highline'
+@cli = HighLine.new
+
+def axe q, default=nil
+  question = if default && !default.empty?
+               "#{q} (enter for \"#{default}\"): "
+             else
+               "#{q}: "
+             end
+  ans = @cli.ask question
+  ans.empty? ? default : ans.to_s
+end
+
+def axe_yes q, default="n"
+  axe(q, default) =~ /^y|yes$/i
+end
+

data/lib/sup/util/locale_fiddler.rb

@@ -0,0 +1,24 @@
+## the following magic enables wide characters when used with a ruby
+## ncurses.so that's been compiled against libncursesw. (note the w.) why
+## this works, i have no idea. much like pretty much every aspect of
+## dealing with curses.  cargo cult programming at its best.
+require 'fiddle'
+require 'fiddle/import'
+
+module LocaleFiddler
+  extend Fiddle::Importer
+
+  SETLOCALE_LIB = case RbConfig::CONFIG['arch']
+                  when /darwin/; "libc.dylib"
+                  when /cygwin/; "cygwin1.dll"
+                  when /freebsd/; "libc.so.7"
+                  else; "libc.so.6"
+                  end
+
+  dlload SETLOCALE_LIB
+  extern "char *setlocale(int, char const *)"
+
+  def setlocale(type, string)
+    LocaleFiddler.setlocale(type, string)
+  end
+end

data/lib/sup/util/ncurses.rb

@@ -76,7 +76,7 @@ module Ncurses
       @status = status
       c = "" if c.nil?
       return super("") if status == Ncurses::ERR
-      c = enc_char(c) if c.is_a?(Fixnum)
+      c = enc_char(c) if c.is_a?(Integer)
       super c.length > 1 ? c[0,1] : c
     end
 
@@ -89,7 +89,7 @@ module Ncurses
       else
         @status = Ncurses::OK
         c = "" if c.nil?
-        c = enc_char(c) if c.is_a?(Fixnum)
+        c = enc_char(c) if c.is_a?(Integer)
         super c.length > 1 ? c[0,1] : c
       end
     end
@@ -260,7 +260,7 @@ module Ncurses
       ## Ncurses::Form.form_driver_w wrapper for printable characters.
       def form_driver_char c
         form_driver CharCode.character(c)
-        #c.is_a?(Fixnum) ? c : c.ord
+        #c.is_a?(Integer) ? c : c.ord
       end
 
       ## Ncurses::Form.form_driver_w wrapper for charcodes.

data/lib/sup/version.rb

@@ -1,3 +1,12 @@
+def git_suffix
+  revision = `GIT_DIR=#{__dir__}/../../.git git rev-parse HEAD 2>/dev/null`
+  if revision.empty?
+    "-git-unknown"
+  else
+    "-git-#{revision[0..7]}"
+  end
+end
+
 module Redwood
-  VERSION = "0.19.0"
+  VERSION = "0.23"
 end

data/sup.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.authors = ["William Morgan", "Gaute Hope", "Hamish Downer", "Matthieu Rakotojaona"]
   s.email   = "supmua@googlegroups.com"
   s.summary = "A console-based email client with the best features of GMail, mutt and Emacs"
-  s.homepage = "http://supmua.org"
-  s.license = 'GPL-2'
+  s.homepage = "https://sup-heliotrope.github.io/"
+  s.license = 'GPL-2.0'
   s.description = <<-DESC
     Sup is a console-based email client for people with a lot of email.
 
@@ -25,29 +25,47 @@ DESC
 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.
   EOF
 
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
+  s.extra_rdoc_files = Dir.glob("man/*")
+
+  s.required_ruby_version = '>= 2.0.0'
 
-  s.required_ruby_version = '>= 1.9.3'
+  # this is here to support skipping the xapian-ruby installation on OpenBSD
+  # because the xapian-ruby gem doesn't install on OpenBSD, you must install
+  # xapian-core and xapian-bindings manually on OpenBSD
+  # see https://github.com/sup-heliotrope/sup/wiki/Installation%3A-OpenBSD
+  # and https://en.wikibooks.org/wiki/Ruby_Programming/RubyGems#How_to_install_different_versions_of_gems_depending_on_which_version_of_ruby_the_installee_is_using
+  s.extensions = %w[ext/mkrf_conf_xapian.rb]
+
+  ## remember to update the xapian dependency in
+  ## ext/mkrf_conf_xapian.rb and Gemfile.
 
-  s.add_runtime_dependency "xapian-ruby", "~> 1.2.15"
   s.add_runtime_dependency "ncursesw", "~> 1.4.0"
-  s.add_runtime_dependency "rmail-sup", "~> 1.0.1"
+  s.add_runtime_dependency "rmail", "~> 1.1"
   s.add_runtime_dependency "highline"
-  s.add_runtime_dependency "trollop", ">= 1.12"
+  s.add_runtime_dependency "optimist"
   s.add_runtime_dependency "lockfile"
-  s.add_runtime_dependency "mime-types", "~> 1.0"
+  s.add_runtime_dependency "mime-types", "> 2.0"
   s.add_runtime_dependency "locale", "~> 2.0"
-  s.add_runtime_dependency "chronic", "~> 0.9.1"
+  s.add_runtime_dependency "chronic"
   s.add_runtime_dependency "unicode", "~> 0.4.4"
+  s.add_runtime_dependency "unicode-display_width"
 
-  s.add_development_dependency "bundler", "~> 1.3"
+  s.add_development_dependency "bundler", ">= 1.3", "< 3"
   s.add_development_dependency "rake"
-  s.add_development_dependency "minitest", "~> 4.7"
-  s.add_development_dependency "rr", "~> 1.0.5"
+  s.add_development_dependency 'minitest', '~> 5.5.1'
+  s.add_development_dependency "rr", "~> 1.1"
   s.add_development_dependency "gpgme", ">= 2.0.2"
+  s.add_development_dependency "pry"
+
 end

data/test/fixtures/blank-header-fields.eml

@@ -0,0 +1,71 @@
+Return-Path: <monitor-list-bounces@widget.com>
+X-Original-To: nobody@localhost
+Delivered-To: nobody@localhost.eng.widget.com
+Received: from localhost (localhost.localdomain [127.0.0.1])
+	by soquel.eng.widget.com (Postfix) with ESMTP id 609BC13C0DB1
+	for <nobody@localhost>; Thu, 19 Mar 2009 13:43:21 -0700 (PDT)
+MIME-Version: 1.0
+Received: from pa-excas-vip.widget.com [10.16.67.200]
+	by localhost with IMAP (fetchmail-6.2.5)
+	for nobody@localhost (single-drop); Thu, 19 Mar 2009 13:43:21 -0700 (PDT)
+Received: from pa-exht01.widget.com (10.113.81.167) by pa-excaht11.widget.com
+ (10.113.81.197) with Microsoft SMTP Server (TLS) id 8.1.311.2; Thu, 19 Mar
+ 2009 13:42:30 -0700
+Received: from mailman2.widget.com (10.16.64.159) by pa-exht01.widget.com
+ (10.113.81.167) with Microsoft SMTP Server id 8.1.336.0; Thu, 19 Mar 2009
+ 13:42:30 -0700
+Received: by mailman2.widget.com (Postfix)	id 47095AE30856; Thu, 19 Mar 2009
+ 13:42:29 -0700 (PDT)
+Received: from countchocula.widget.com (localhost.localdomain [127.0.0.1])	by
+ mailman2.widget.com (Postfix) with ESMTP id 5F782ABC5948;	Thu, 19 Mar 2009
+ 13:42:28 -0700 (PDT)
+Received: from mailhost4.widget.com (mailhost4.widget.com [10.16.67.124])	by
+ mailman2.widget.com (Postfix) with ESMTP id 6CDCCABC5948	for
+ <monitor-list@mailman2.widget.com>;	Thu, 19 Mar 2009 13:42:26 -0700 (PDT)
+Received: by mailhost4.widget.com (Postfix)	id 2364AC9AC4; Thu, 19 Mar 2009
+ 13:42:26 -0700 (PDT)
+Received: from pa-exht01.widget.com (pa-exht01.widget.com [10.113.81.167])	by
+ mailhost4.widget.com (Postfix) with ESMTP id 17A68C9AC3	for
+ <monitor-list@widget.com>; Thu, 19 Mar 2009 13:42:26 -0700 (PDT)
+Received: from PA-EXMBX04.widget.com ([10.113.81.142]) by pa-exht01.widget.com
+	([10.113.81.167]) with mapi; Thu, 19 Mar 2009 13:42:26 -0700
+From: Some User <someuser@widget.com>
+To: "monitor-list@widget.com" <monitor-list@widget.com>
+Sender: "monitor-list-bounces@widget.com" <monitor-list-bounces@widget.com>
+Date: Thu, 19 Mar 2009 13:42:25 -0700
+Subject: Looking for a mac
+Thread-Topic: Looking for a mac
+Thread-Index: AQHJqNM1xIqqjNRWuUCUBaxzPFK5eQ==
+Message-ID:
+ <D3C12B2AD838B44DA9D6B2CA334246D011E72A73A4@PA-EXMBX04.widget.com>
+List-Help: <mailto:monitor-list-request@widget.com?subject=help>
+List-Subscribe: <http://mailman2.widget.com/mailman/listinfo/monitor-list>,
+	<mailto:monitor-list-request@widget.com?subject=subscribe>
+List-Unsubscribe:
+ <http://mailman2.widget.com/mailman/listinfo/monitor-list>,
+	<mailto:monitor-list-request@widget.com?subject=unsubscribe>
+Accept-Language: en-US
+Content-Language: en-US
+X-MS-Exchange-Organization-AuthAs: Anonymous
+X-MS-Exchange-Organization-AuthSource: pa-exht01.widget.com
+X-MS-Has-Attach:
+X-Auto-Response-Suppress: All
+X-MS-TNEF-Correlator:
+acceptlanguage: en-US
+delivered-to: monitor-list@widget.com
+errors-to: monitor-list-bounces@widget.com
+list-id: engineering monitor related <monitor-list.widget.com>
+x-mailman-version: 2.1.8
+x-beenthere: monitor-list@widget.com
+x-original-to: monitor-list@mailman2.widget.com
+list-post: <mailto:monitor-list@widget.com>
+list-archive: <http://mailman2.widget.com/pipermail/monitor-list>
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+Hi all,
+
+		Just wondering if anybody can lend me a mac to reproduce PR 384931 ?
+		Thanks.
+
+Michael=