sup 0.22.1 → 1.1

data/bin/sup-config

@@ -2,11 +2,11 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'highline/import'
-require 'trollop'
+require 'optimist'
 require "sup"
+require 'sup/util/axe'
 
-$opts = Trollop::options do
+$opts = Optimist::options do
   version "sup-config (sup #{Redwood::VERSION})"
   banner <<EOS
 Interactive configuration tool for Sup. Won't destroy existing
@@ -19,20 +19,6 @@ No options.
 EOS
 end
 
-def axe q, default=nil
-  question = if default && !default.empty?
-               "#{q} (enter for \"#{default}\"): "
-             else
-               "#{q}: "
-             end
-  ans = ask question
-  ans.empty? ? default : ans.to_s
-end
-
-def axe_yes q, default="n"
-  axe(q, default) =~ /^y|yes$/i
-end
-
 def build_cmd cmd
   (ENV["RUBY_INVOCATION"] ? ENV["RUBY_INVOCATION"] + " " : "") + File.join(File.dirname($0), cmd)
 end
@@ -42,8 +28,8 @@ def add_source
 
   type = nil
 
-  say "Ok, adding a new source."
-  choose do |menu|
+  @cli.say "Ok, adding a new source."
+  @cli.choose do |menu|
     menu.prompt = "What type of mail source is it? "
     menu.choice("mbox file") { type = :mbox }
     menu.choice("maildir directory") { type = :maildir }
@@ -51,7 +37,7 @@ def add_source
   end
 
   while true do
-    say "Ok, now for the details."
+    @cli.say "Ok, now for the details."
 
     default_labels, components = case type
     when :mbox
@@ -75,11 +61,11 @@ def add_source
     uri = begin
       Redwood::Util::Uri.build components
     rescue URI::Error => e
-      say "Whoopsie! I couldn't build a URI from that: #{e.message}"
+      @cli.say "Whoopsie! I couldn't build a URI from that: #{e.message}"
       if axe_yes("Try again?") then next else return end
     end
 
-    say "I'm going to add this source: #{uri}"
+    @cli.say "I'm going to add this source: #{uri}"
     unless axe("Does that look right?", "y") =~ /^y|yes$/i
       if axe_yes("Try again?") then next else return end
     end
@@ -108,21 +94,21 @@ def add_source
 
     system cmd
     if $?.success?
-      say "Great! Added!"
+      @cli.say "Great! Added!"
       break
     else
-      say "Rats, that failed. You may have to do it manually."
+      @cli.say "Rats, that failed. You may have to do it manually."
       if axe_yes("Try again?") then next else return end
     end
   end
 end
 
-$terminal.wrap_at = :auto
+@cli.wrap_at = :auto
 Redwood::start
 index = Redwood::Index.init
 Redwood::SourceManager.load_sources
 
-say <<EOS
+@cli.say <<EOS
 Howdy neighbor! This here's sup-config, ready to help you jack in to
 the next generation of digital cyberspace: the text-based email
 program. Get ready to be the envy of everyone in your internets
@@ -138,11 +124,11 @@ account = $config[:accounts][:default]
 name = axe "What's your name?", account[:name]
 email = axe "What's your (primary) email address?", account[:email]
 
-say "Ok, your from header will look like this:"
-say "  From: #{name} <#{email}>"
+@cli.say "Ok, your from header will look like this:"
+@cli.say "  From: #{name} <#{email}>"
 
-say "\nDo you have any alternate email addresses that also receive email?"
-say "If so, enter them now, separated by spaces."
+@cli.say "\nDo you have any alternate email addresses that also receive email?"
+@cli.say "If so, enter them now, separated by spaces."
 alts = axe("Alternate email addresses", account[:alternates].join(" ")).split(/\s+/)
 
 sigfn = axe "What file contains your signature?", account[:signature]
@@ -159,36 +145,36 @@ $config[:time_mode] = time_mode
 
 done = false
 until done
-  say "\nNow, we'll tell Sup where to find all your email."
+  @cli.say "\nNow, we'll tell Sup where to find all your email."
   Redwood::SourceManager.load_sources
-  say "Current sources:"
+  @cli.say "Current sources:"
   if Redwood::SourceManager.sources.empty?
-    say "  No sources!"
+    @cli.say "  No sources!"
   else
     Redwood::SourceManager.sources.each { |s| puts "* #{s}" }
   end
 
-  say "\n"
-  choose do |menu|
+  @cli.say "\n"
+  @cli.choose do |menu|
     menu.prompt = "Your wish? "
     menu.choice("Add a new source.") { add_source }
     menu.choice("Done adding sources!") { done = true }
   end
 end
 
-say "\nSup needs to know where to store your sent messages."
-say "Only sources capable of storing mail will be listed.\n\n"
+@cli.say "\nSup needs to know where to store your sent messages."
+@cli.say "Only sources capable of storing mail will be listed.\n\n"
 
 Redwood::SourceManager.load_sources
 if Redwood::SourceManager.sources.empty?
-  say "\nUsing the default sup://sent, since you haven't configured other sources yet."
+  @cli.say "\nUsing the default sup://sent, since you haven't configured other sources yet."
   $config[:sent_source] = 'sup://sent'
 else
   # this handles the event that source.yaml already contains the SentLoader
   # source.
   have_sup_sent = false
 
-  choose do |menu|
+  @cli.choose do |menu|
     menu.prompt = "Store my sent mail in? "
 
     menu.choice('Default (an mbox in ~/.sup, aka sup://sent)') { $config[:sent_source] = 'sup://sent'} unless have_sup_sent
@@ -202,9 +188,9 @@ end
 
 Redwood::save_yaml_obj $config, Redwood::CONFIG_FN, false, true
 
-say "Ok, I've saved you up a nice lil' #{Redwood::CONFIG_FN}."
+@cli.say "Ok, I've saved you up a nice lil' #{Redwood::CONFIG_FN}."
 
-say <<EOS
+@cli.say <<EOS
 
 The final step is to import all your messages into the Sup index.
 Depending on how many messages are in the sources, this could take
@@ -218,10 +204,10 @@ if axe_yes "Run sup-sync to import all messages now?"
     puts "Ok, trying to run \"#{cmd}\"..."
     system cmd
     if $?.success?
-      say "Great! It worked!"
+      @cli.say "Great! It worked!"
       break
     else
-      say "Rats, that failed. You may have to do it manually."
+      @cli.say "Rats, that failed. You may have to do it manually."
       if axe_yes("Try again?") then next else break end
     end
   end
@@ -229,7 +215,7 @@ end
 
 index.load
 
-say <<EOS
+@cli.say <<EOS
 
 Okee doke, you've got yourself an index of #{index.size} messages. Looks
 like you're ready to jack in to cyberspace there, cowboy.

data/bin/sup-dump

@@ -3,12 +3,12 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'xapian'
-require 'trollop'
+require 'optimist'
 require 'set'
 
 BASE_DIR = ENV["SUP_BASE"] || File.join(ENV["HOME"], ".sup")
 
-$opts = Trollop::options do
+$opts = Optimist::options do
   version "sup-dump"
   banner <<EOS
 Dumps all message state from the sup index to standard out. You can

data/bin/sup-import-dump

@@ -3,7 +3,7 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'uri'
-require 'trollop'
+require 'optimist'
 require "sup"
 
 PROGRESS_UPDATE_INTERVAL = 15 # seconds
@@ -11,7 +11,7 @@ PROGRESS_UPDATE_INTERVAL = 15 # seconds
 class AbortExecution < SystemExit
 end
 
-opts = Trollop::options do
+opts = Optimist::options do
   version "sup-import-dump (sup #{Redwood::VERSION})"
   banner <<EOS
 Imports message state previously exported by sup-dump into the index.
@@ -36,8 +36,8 @@ EOS
 
   conflicts :ignore_missing, :warn_missing, :abort_missing
 end
-Trollop::die "No dump file given" if ARGV.empty?
-Trollop::die "Extra arguments given" if ARGV.length > 1
+Optimist::die "No dump file given" if ARGV.empty?
+Optimist::die "Extra arguments given" if ARGV.length > 1
 dump_name = ARGV.shift
 missing_action = [:ignore_missing, :warn_missing, :abort_missing].find { |x| opts[x] } || :abort_missing
 

data/bin/sup-sync

@@ -3,7 +3,7 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'uri'
-require 'trollop'
+require 'optimist'
 require "sup"
 
 PROGRESS_UPDATE_INTERVAL = 15 # seconds
@@ -30,7 +30,7 @@ def time
   Time.now - startt
 end
 
-opts = Trollop::options do
+opts = Optimist::options do
   version "sup-sync (sup #{Redwood::VERSION})"
   banner <<EOS
 Synchronizes the Sup index with one or more message sources by adding
@@ -112,7 +112,7 @@ begin
     Redwood::SourceManager.usual_sources
   else
     ARGV.map do |uri|
-      Redwood::SourceManager.source_for uri or Trollop::die "Unknown source: #{uri}. Did you add it with sup-add first?"
+      Redwood::SourceManager.source_for uri or Optimist::die "Unknown source: #{uri}. Did you add it with sup-add first?"
     end
   end
 

data/bin/sup-sync-back-maildir

@@ -3,10 +3,10 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'trollop'
+require 'optimist'
 require "sup"
 
-opts = Trollop::options do
+opts = Optimist::options do
   version "sup-sync-back-maildir (sup #{Redwood::VERSION})"
   banner <<EOS
 Export Xapian entries to Maildir sources on disk.

data/bin/sup-tweak-labels

@@ -2,7 +2,7 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'trollop'
+require 'optimist'
 require "sup"
 
 class Float
@@ -25,7 +25,7 @@ def time
   Time.now - startt
 end
 
-opts = Trollop::options do
+opts = Optimist::options do
   version "sup-tweak-labels (sup #{Redwood::VERSION})"
   banner <<EOS
 Batch modification of message state for messages already in the index.
@@ -58,7 +58,7 @@ opts[:verbose] = true if opts[:very_verbose]
 add_labels = opts[:add].to_set_of_symbols ","
 remove_labels = opts[:remove].to_set_of_symbols ","
 
-Trollop::die "nothing to do: no labels to add or remove" if add_labels.empty? && remove_labels.empty?
+Optimist::die "nothing to do: no labels to add or remove" if add_labels.empty? && remove_labels.empty?
 
 Redwood::start
 index = Redwood::Index.init
@@ -71,10 +71,10 @@ begin
     Redwood::SourceManager.sources
   else
     ARGV.map do |uri|
-      Redwood::SourceManager.source_for uri or Trollop::die "Unknown source: #{uri}. Did you add it with sup-add first?"
+      Redwood::SourceManager.source_for uri or Optimist::die "Unknown source: #{uri}. Did you add it with sup-add first?"
     end
   end.map { |s| s.id }
-  Trollop::die "nothing to do: no sources" if source_ids.empty?
+  Optimist::die "nothing to do: no sources" if source_ids.empty?
 
   query = "(" + source_ids.map { |id| "source_id:#{id}" }.join(" OR ") + ")"
   if add_labels.empty?

data/ext/mkrf_conf_xapian.rb

@@ -10,13 +10,19 @@ end
 
 puts "xapian: platform specific dependencies.."
 
-inst = Gem::DependencyInstaller.new
+destination = File.writable?(Gem.dir) ? Gem.dir : Gem.user_dir
+inst = Gem::DependencyInstaller.new(:install_dir => destination)
 begin
 
   if !RbConfig::CONFIG['arch'].include?('openbsd')
     # update version in Gemfile as well
     name    = "xapian-ruby"
-    version = "~> 1.2.15"
+    version =
+      if /^2\.0\./ =~ RUBY_VERSION
+        ["~> 1.2", "< 1.3.6"]
+      else
+        "~> 1.2"
+      end
 
     begin
       # try to load gem
@@ -34,8 +40,8 @@ begin
     STDERR.puts "xapian: openbsd: you have to install xapian-core and xapian-bindings manually, have a look at: https://github.com/sup-heliotrope/sup/wiki/Installation%3A-OpenBSD"
   end
 
-rescue
-
+rescue StandardError => e
+  STDERR.puts "Unable to install #{name} gem: #{e.inspect}"
   exit(1)
 
 end

data/lib/sup/colormap.rb

@@ -236,7 +236,7 @@ class Colormap
     @@instance.send meth, *a
   end
   # Performance shortcut
-  def self.color_for *a; @@instance.color_for *a; end
+  def self.color_for(*a); @@instance.color_for(*a); end
 end
 
 end

data/lib/sup/crypto.rb

@@ -127,18 +127,27 @@ EOS
   def sign from, to, payload
     return unknown_status(@not_working_reason) unless @not_working_reason.nil?
 
+    # We grab this from the GPG::Ctx below after signing, so that we can set
+    # micalg in Content-Type to match the hash algorithm GPG decided to use.
+    hash_algo = nil
+
     gpg_opts = {:protocol => GPGME::PROTOCOL_OpenPGP, :armor => true, :textmode => true}
     gpg_opts.merge!(gen_sign_user_opts(from))
     gpg_opts = HookManager.run("gpg-options",
                                {:operation => "sign", :options => gpg_opts}) || gpg_opts
     begin
-      if GPGME.respond_to?('detach_sign')
-        sig = GPGME.detach_sign(format_payload(payload), gpg_opts)
-      else
-        crypto = GPGME::Crypto.new
-        gpg_opts[:mode] = GPGME::SIG_MODE_DETACH
-        sig = crypto.sign(format_payload(payload), gpg_opts).read
+      input = GPGME::Data.new(format_payload(payload))
+      output = GPGME::Data.new()
+      GPGME::Ctx.new(gpg_opts) do |ctx|
+        if gpg_opts[:signer]
+          signers = GPGME::Key.find(:secret, gpg_opts[:signer], :sign)
+          ctx.add_signer(*signers)
+        end
+        ctx.sign(input, output, GPGME::SIG_MODE_DETACH)
+        hash_algo = GPGME::hash_algo_name(ctx.sign_result.signatures[0].hash_algo)
       end
+      output.seek(0)
+      sig = output.read
     rescue GPGME::Error => exc
       raise Error, gpgme_exc_msg(exc.message)
     end
@@ -150,7 +159,7 @@ EOS
     end
 
     envelope = RMail::Message.new
-    envelope.header["Content-Type"] = 'multipart/signed; protocol=application/pgp-signature'
+    envelope.header["Content-Type"] = "multipart/signed; protocol=application/pgp-signature; micalg=pgp-#{hash_algo.downcase}"
 
     envelope.add_part payload
     signature = RMail::Message.make_attachment sig, "application/pgp-signature", nil, "signature.asc"
@@ -233,7 +242,7 @@ EOS
     end
 
     if valid || !unknown
-      summary_line = simplify_sig_line(verify_result.signatures[0].to_s, all_trusted)
+      summary_line = simplify_sig_line(verify_result.signatures[0].to_s.dup, all_trusted)
     end
 
     if all_output_lines.length == 0

data/lib/sup/hook.rb

@@ -109,20 +109,20 @@ class HookManager
     @descs[name] = desc
   end
 
-  def print_hooks f=$stdout
-puts <<EOS
-Have #{HookManager.descs.size} registered hooks:
-
-EOS
-
-    HookManager.descs.sort.each do |name, desc|
-      f.puts <<EOS
+  def print_hooks pattern="", f=$stdout
+    matching_hooks = HookManager.descs.sort.keep_if {|name, desc| pattern.empty? or name.match(pattern)}.map do |name, desc|
+      <<EOS
 #{name}
 #{"-" * name.length}
 File: #{fn_for name}
 #{desc}
 EOS
     end
+
+    showing_str = matching_hooks.size == HookManager.descs.size ? "" : " (showing #{matching_hooks.size})"
+    f.puts "Have #{HookManager.descs.size} registered hooks#{showing_str}:"
+    f.puts
+    matching_hooks.each { |text| f.puts text }
   end
 
   def enabled? name; !hook_for(name).nil? end
@@ -138,7 +138,7 @@ private
         returning IO.read(fn_for(name)) do
           debug "read '#{name}' from #{fn_for(name)}"
         end
-      rescue SystemCallError => e
+      rescue SystemCallError
         #debug "disabled hook for '#{name}': #{e.message}"
         nil
       end

data/lib/sup/index.rb

@@ -425,7 +425,7 @@ EOS
 
     ## gmail style "is" operator
     subs = subs.gsub(/\b(is|has):(\S+)\b/) do
-      field, label = $1, $2
+      _field, label = $1, $2
       case label
       when "read"
         "-label:unread"
@@ -516,19 +516,32 @@ EOS
     qp.stemmer = Xapian::Stem.new($config[:stem_language])
     qp.stemming_strategy = Xapian::QueryParser::STEM_SOME
     qp.default_op = Xapian::Query::OP_AND
-    qp.add_valuerangeprocessor(Xapian::NumberValueRangeProcessor.new(DATE_VALUENO, 'date:', true))
-    NORMAL_PREFIX.each { |k,info| info[:prefix].each { |v| qp.add_prefix k, v } }
-    BOOLEAN_PREFIX.each { |k,info| info[:prefix].each { |v| qp.add_boolean_prefix k, v, info[:exclusive] } }
+    valuerangeprocessor = Xapian::NumberValueRangeProcessor.new(DATE_VALUENO,
+                                                                'date:', true)
+    qp.add_valuerangeprocessor(valuerangeprocessor)
+    NORMAL_PREFIX.each { |k,info| info[:prefix].each {
+      |v| qp.add_prefix k, v }
+    }
+    BOOLEAN_PREFIX.each { |k,info| info[:prefix].each {
+      |v| qp.add_boolean_prefix k, v, info[:exclusive] }
+    }
 
     begin
-      xapian_query = qp.parse_query(subs, Xapian::QueryParser::FLAG_PHRASE|Xapian::QueryParser::FLAG_BOOLEAN|Xapian::QueryParser::FLAG_LOVEHATE|Xapian::QueryParser::FLAG_WILDCARD)
+      xapian_query = qp.parse_query(subs, Xapian::QueryParser::FLAG_PHRASE   |
+                                          Xapian::QueryParser::FLAG_BOOLEAN  |
+                                          Xapian::QueryParser::FLAG_LOVEHATE |
+                                          Xapian::QueryParser::FLAG_WILDCARD)
     rescue RuntimeError => e
       raise ParseError, "xapian query parser error: #{e}"
     end
 
     debug "parsed xapian query: #{Util::Query.describe(xapian_query, subs)}"
 
-    raise ParseError if xapian_query.nil? or xapian_query.empty?
+    if xapian_query.nil? or xapian_query.empty?
+      raise ParseError, "couldn't parse \"#{s}\" as xapian query " \
+                        "(special characters aren't indexed)"
+    end
+
     query[:qobj] = xapian_query
     query[:text] = s
     query
@@ -636,7 +649,7 @@ EOS
   end
 
   def synchronize &b
-    @index_mutex.synchronize &b
+    @index_mutex.synchronize(&b)
   end
 
   def run_query xapian_query, offset, limit, checkatleast=0

data/lib/sup/keymap.rb

@@ -98,7 +98,7 @@ EOS
   end
 
   def action_for kc
-    action, help, keys = @map[kc.code]
+    action, help, _keys = @map[kc.code]
     [action, help]
   end
 

data/lib/sup/logger.rb

@@ -71,7 +71,7 @@ end
 
 ## include me to have top-level #debug, #info, etc. methods.
 module LogsStuff
-  Logger::LEVELS.each { |l| define_method(l) { |s| Logger.instance.send(l, s) } }
+  Logger::LEVELS.each { |l| define_method(l) { |s, uplevel = 0| Logger.instance.send(l, s) } }
 end
 
 end

data/lib/sup/maildir.rb

@@ -12,13 +12,13 @@ class Maildir < Source
   def initialize uri, usual=true, archived=false, sync_back=true, id=nil, labels=[]
     super uri, usual, archived, id
     @expanded_uri = Source.expand_filesystem_uri(uri)
-    parts = @expanded_uri.match /^([a-zA-Z0-9]*:(\/\/)?)(.*)/
+    parts = /^([a-zA-Z0-9]*:(\/\/)?)(.*)/.match @expanded_uri
     if parts
       prefix = parts[1]
       @path = parts[3]
-      uri = URI(prefix + URI.encode(@path, URI_ENCODE_CHARS))
+      uri = URI(prefix + Source.encode_path_for_uri(@path))
     else
-      uri = URI(URI.encode @expanded_uri, URI_ENCODE_CHARS)
+      uri = URI(Source.encode_path_for_uri @path)
       @path = uri.path
     end
 
@@ -30,7 +30,7 @@ class Maildir < Source
     # sync by default if not specified
     @sync_back = true if @sync_back.nil?
 
-    @dir = URI.decode uri.path
+    @dir = URI.decode_www_form_component uri.path
     @labels = Set.new(labels || [])
     @mutex = Mutex.new
     @ctimes = { 'cur' => Time.at(0), 'new' => Time.at(0) }

data/lib/sup/mbox.rb

@@ -19,13 +19,13 @@ class MBox < Source
     case uri_or_fp
     when String
       @expanded_uri = Source.expand_filesystem_uri(uri_or_fp)
-      parts = @expanded_uri.match /^([a-zA-Z0-9]*:(\/\/)?)(.*)/
+      parts = /^([a-zA-Z0-9]*:(\/\/)?)(.*)/.match @expanded_uri
       if parts
         prefix = parts[1]
         @path = parts[3]
-        uri = URI(prefix + URI.encode(@path, URI_ENCODE_CHARS))
+        uri = URI(prefix + Source.encode_path_for_uri(@path))
       else
-        uri = URI(URI.encode @expanded_uri, URI_ENCODE_CHARS)
+        uri = URI(Source.encode_path_for_uri @expanded_uri)
         @path = uri.path
       end
 
@@ -36,7 +36,7 @@ class MBox < Source
     else
       @f = uri_or_fp
       @path = uri_or_fp.path
-      @expanded_uri = "mbox://#{URI.encode @path, URI_ENCODE_CHARS}"
+      @expanded_uri = "mbox://#{Source.encode_path_for_uri @path}"
     end
 
     super uri_or_fp, usual, archived, id