sup 0.12 → 0.12.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.12.1 / 2011-01-23
+* Depend on ncursesw rather than ncurses (Ruby 1.9 compatibility)
+* Add sup-import-dump
+
 == 0.12 / 2011-01-13
 * Remove deprecated IMAP, IMAPS, and mbox+ssh sources
 * Inline GPG support

data/ReleaseNotes

@@ -1,3 +1,11 @@
+Release 0.12.1:
+
+This release changes the gem dependency on ncurses to ncursesw, which
+allows the gem to install cleanly on Ruby 1.9.
+
+The new sup-import-dump program applies labels to an existing index,
+which could be done with sup-sync before 0.12.
+
 Release 0.12:
 
 Deprecated remote sources have been removed.

data/bin/sup

@@ -12,7 +12,7 @@ end
 
 require 'fileutils'
 require 'trollop'
-require "sup"; Redwood::check_library_version_against "0.12"
+require "sup"; Redwood::check_library_version_against "0.12.1"
 
 if ENV['SUP_PROFILE']
   require 'ruby-prof'

data/bin/sup-add

@@ -4,7 +4,7 @@ require 'uri'
 require 'rubygems'
 require 'highline/import'
 require 'trollop'
-require "sup"; Redwood::check_library_version_against "0.12"
+require "sup"; Redwood::check_library_version_against "0.12.1"
 
 $opts = Trollop::options do
   version "sup-add (sup #{Redwood::VERSION})"

data/bin/sup-cmd

@@ -0,0 +1,138 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'trollop'
+require 'sup'
+require 'sup/client'
+require 'pp'
+require 'yaml'
+include Redwood
+
+SUB_COMMANDS = %w(query count label add)
+global_opts = Trollop::options do
+  #version = "sup-cmd (sup #{Redwood::VERSION})"
+  banner <<EOS
+Connect to a running sup-server.
+
+Usage:
+  sup-cmd [global options] command [options]
+
+  Valid commands: #{SUB_COMMANDS * ', '}
+
+  Global options:
+EOS
+
+  opt :host, "server address", :type => :string, :default => 'localhost', :short => 'o'
+  opt :port, "server port", :type => :int, :default => 4300
+  opt :socket, "unix domain socket path", :type => :string, :default => nil
+  opt :verbose
+
+  conflicts :host, :socket
+  conflicts :port, :socket
+
+  stop_on SUB_COMMANDS
+end
+
+cmd = ARGV.shift
+cmd_opts = case cmd
+when "query"
+  Trollop.options do
+    opt :offset, "Offset", :default => 0, :type => :int
+    opt :limit, "Limit", :type => :int
+    opt :raw, "Retrieve raw message text", :default => false
+  end
+when "count"
+  Trollop.options do
+  end
+when "label"
+  Trollop.options do
+    opt :add_labels, "Labels to add", :default => ""
+    opt :remove_labels, "Labels to remove", :default => ""
+  end
+when "add"
+  Trollop.options do
+    opt :labels, "Labels separated by commas", :default => ""
+    opt :mbox, "Treat input files as mboxes", :default => false
+  end
+else
+  Trollop::die "unrecognized command #{cmd.inspect}"
+end
+
+class SupCmd < Redwood::Client
+  def initialize cmd, args, opts
+    @cmd = cmd
+    @opts = opts
+    @args = args
+    super()
+  end
+
+  def get_query
+    @args.first or fail "query argument required"
+  end
+
+  def connection_established
+    case @cmd
+    when "query"
+      query get_query, @opts[:offset], @opts[:limit], @opts[:raw] do |result|
+        if result
+          puts YAML.dump(result['summary'])
+          puts YAML.dump(result['raw']) if @opts[:raw]
+        else
+          close_connection
+        end
+      end
+    when "count"
+      count(get_query) do |x|
+        puts x
+        close_connection
+      end
+    when "label"
+      label get_query, @opts[:remove_labels].split(','), @opts[:add_labels].split(',') do
+        close_connection
+      end
+    when "add"
+      ARGF.binmode
+      labels = @opts[:labels].split(',')
+      get_message = lambda do
+        return ARGF.gets(nil) unless @opts[:mbox]
+        str = ""
+        l = ARGF.gets
+        str << l until ARGF.closed? || ARGF.eof? || MBox::is_break_line?(l = ARGF.gets)
+        str.empty? ? nil : str
+      end
+      i_s = i = 0
+      t = Time.now
+      while raw = get_message[]
+        i += 1
+        t_d = Time.now - t
+        if t_d >= 5
+          i_d = i - i_s
+          puts "indexed #{i} messages (#{i_d/t_d} m/s)" if global_opts[:verbose]
+          t = Time.now
+          i_s = i
+        end
+        add raw, labels do
+          close_connection
+        end
+      end
+    else
+      fail "#{@cmd} command unimplemented"
+      close_connection
+    end
+  end
+
+  def unbind
+    EM.stop
+  end
+end
+
+
+EM.run do
+  if global_opts[:socket]
+    EM.connect global_opts[:socket], SupCmd, cmd, ARGV, cmd_opts.merge(global_opts)
+  else
+    EM.connect global_opts[:host], global_opts[:port], SupCmd, cmd, ARGV, cmd_opts.merge(global_opts)
+  end
+end
+
+exit 0
+

data/bin/sup-config

@@ -191,7 +191,7 @@ else
   end
 end
 
-Redwood::save_yaml_obj $config, Redwood::CONFIG_FN
+Redwood::save_yaml_obj $config, Redwood::CONFIG_FN, false, true
 
 say "Ok, I've saved you up a nice lil' #{Redwood::CONFIG_FN}."
 

data/bin/sup-import-dump

@@ -0,0 +1,99 @@
+#!/usr/bin/env ruby
+
+require 'uri'
+require 'rubygems'
+require 'trollop'
+require "sup"; Redwood::check_library_version_against "git"
+
+PROGRESS_UPDATE_INTERVAL = 15 # seconds
+
+class AbortExecution < SystemExit
+end
+
+opts = Trollop::options do
+  version "sup-import-dump (sup #{Redwood::VERSION})"
+  banner <<EOS
+Imports message state previously exported by sup-dump into the index.
+sup-import-dump operates on the index only, so the messages must have already
+been added using sup-sync. If you need to recreate the index, see sup-sync
+--restore <filename> instead.
+
+Messages not mentioned in the dump file will not be modified.
+
+Usage:
+  sup-import-dump [options] <dump file>
+
+Options:
+EOS
+  opt :verbose, "Print message ids as they're processed."
+  opt :ignore_missing, "Silently skip over messages that are not in the index."
+  opt :warn_missing, "Warn about messages that are not in the index, but continue."
+  opt :abort_missing, "Abort on encountering messages that are not in the index. (default)"
+  opt :atomic, "Use transaction to apply all changes atomically."
+  opt :dry_run, "Don't actually modify the index. Probably only useful with --verbose.", :short => "-n"
+  opt :version, "Show version information", :short => :none
+
+  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
+dump_name = ARGV.shift
+missing_action = [:ignore_missing, :warn_missing, :abort_missing].find { |x| opts[x] } || :abort_missing
+
+Redwood::start
+index = Redwood::Index.init
+
+index.lock_interactively or exit
+begin
+  num_read = 0
+  num_changed = 0
+  index.load
+  index.begin_transaction if opts[:atomic]
+
+  IO.foreach dump_name do |l|
+    l =~ /^(\S+) \((.*?)\)$/ or raise "Can't read dump line: #{l.inspect}"
+    mid, labels = $1, $2
+    num_read += 1
+
+    unless index.contains_id? mid
+      if missing_action == :abort_missing
+        $stderr.puts "Message #{mid} not found in index, aborting."
+        raise AbortExecution, 10
+      elsif missing_action == :warn_missing
+        $stderr.puts "Message #{mid} not found in index, skipping."
+      end
+
+      next
+    end
+
+    m = index.build_message mid
+    new_labels = labels.to_set_of_symbols
+
+    if m.labels == new_labels
+      puts "#{mid} unchanged" if opts[:verbose]
+      next
+    end
+
+    puts "Changing flags for #{mid} from '#{m.labels.to_a * ' '}' to '#{new_labels.to_a * ' '}'" if opts[:verbose]
+    num_changed += 1
+
+    next if opts[:dry_run]
+
+    m.labels = new_labels
+    index.update_message_state m
+  end
+
+  index.commit_transaction if opts[:atomic]
+  puts "Updated #{num_changed} of #{num_read} messages."
+rescue AbortExecution
+  index.cancel_transaction if opts[:atomic]
+  raise
+rescue Exception => e
+  index.cancel_transaction if opts[:atomic]
+  File.open("sup-exception-log.txt", "w") { |f| f.puts e.backtrace }
+  raise
+ensure
+  index.save_index unless opts[:atomic]
+  Redwood::finish
+  index.unlock
+end

data/bin/sup-server

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'trollop'
+require 'sup'
+require 'sup/server'
+require 'pp'
+require 'yaml'
+include Redwood
+
+global_opts = Trollop::options do
+  #version = "sup-cmd (sup #{Redwood::VERSION})"
+  banner <<EOS
+Interact with a Sup index.
+
+Usage:
+  sup-server [options]
+EOS
+
+  opt :host, "address to listen on", :type => :string, :default => 'localhost', :short => 'o'
+  opt :port, "port to listen on", :type => :int, :default => 4300
+  opt :verbose
+end
+
+Redwood.start
+Index.init
+Index.lock_interactively or exit
+begin
+  if(s = Redwood::SourceManager.source_for SentManager.source_uri)
+    SentManager.source = s
+  else
+    Redwood::SourceManager.add_source SentManager.default_source
+  end
+
+  Index.load
+
+  EM.run do
+    EM.start_server global_opts[:host], global_opts[:port],
+                    Redwood::Server, Index.instance
+    EM.next_tick { puts "ready" }
+  end
+
+ensure
+  Index.unlock
+end

data/bin/sup-sync

@@ -3,7 +3,7 @@
 require 'uri'
 require 'rubygems'
 require 'trollop'
-require "sup"; Redwood::check_library_version_against "0.12"
+require "sup"; Redwood::check_library_version_against "0.12.1"
 
 PROGRESS_UPDATE_INTERVAL = 15 # seconds
 
@@ -117,14 +117,15 @@ begin
 
   sources.each do |source|
     puts "Scanning #{source}..."
-    num_added = num_updated = num_scanned = num_restored = 0
+    num_added = num_updated = num_deleted = num_scanned = num_restored = 0
     last_info_time = start_time = Time.now
 
     Redwood::PollManager.poll_from source do |action,m,old_m,progress|
+      num_scanned += 1
       if action == :delete
-        puts "Deleting #{m.id}"
+        num_deleted += 1
+        puts "Deleting #{m.id}" if opts[:verbose]
       elsif action == :add
-        num_scanned += 1
         seen[m.id] = true
 
         ## tweak source labels according to commandline arguments if necessary
@@ -172,20 +173,20 @@ begin
           puts "Changing flags for #{source}##{m.source_info} from #{old_m.labels} to #{m.labels}" if opts[:verbose]
           num_updated += 1
         end
-
-        if Time.now - last_info_time > PROGRESS_UPDATE_INTERVAL
-          last_info_time = Time.now
-          elapsed = last_info_time - start_time
-          pctdone = progress * 100.0
-          remaining = (100.0 - pctdone) * (elapsed.to_f / pctdone)
-          printf "## read %dm (~%.0f%%) @ %.1fm/s. %s elapsed, ~%s remaining\n", num_scanned, pctdone, num_scanned / elapsed, elapsed.to_time_s, remaining.to_time_s
-        end
       else fail
       end
+
+      if Time.now - last_info_time > PROGRESS_UPDATE_INTERVAL
+        last_info_time = Time.now
+        elapsed = last_info_time - start_time
+        pctdone = progress * 100.0
+        remaining = (100.0 - pctdone) * (elapsed.to_f / pctdone)
+        printf "## scanned %dm (~%.0f%%) @ %.1fm/s. %s elapsed, ~%s remaining\n", num_scanned, pctdone, num_scanned / elapsed, elapsed.to_time_s, remaining.to_time_s
+      end
       next if opts[:dry_run]
     end
 
-    puts "Scanned #{num_scanned}, added #{num_added}, updated #{num_updated} messages from #{source}."
+    puts "Scanned #{num_scanned}, added #{num_added}, updated #{num_updated}, deleted #{num_deleted} messages from #{source}."
     puts "Restored state on #{num_restored} (#{100.0 * num_restored / num_scanned}%) messages." if num_restored > 0
   end
 

data/bin/sup-sync-back

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'uri'
 require 'tempfile'
 require 'trollop'
-require "sup"; Redwood::check_library_version_against "0.12"
+require "sup"; Redwood::check_library_version_against "0.12.1"
 
 fail "not working yet"
 

data/bin/sup-tweak-labels

@@ -2,7 +2,7 @@
 
 require 'rubygems'
 require 'trollop'
-require "sup"; Redwood::check_library_version_against "0.12"
+require "sup"; Redwood::check_library_version_against "0.12.1"
 
 class Float
   def to_s; sprintf '%.2f', self; end

data/lib/sup.rb

@@ -38,7 +38,7 @@ class Module
 end
 
 module Redwood
-  VERSION = "0.12"
+  VERSION = "0.12.1"
 
   BASE_DIR   = ENV["SUP_BASE"] || File.join(ENV["HOME"], ".sup")
   CONFIG_FN  = File.join(BASE_DIR, "config.yaml")
@@ -86,7 +86,7 @@ module Redwood
   module_function :reporting_thread, :record_exception, :exceptions
 
 ## one-stop shop for yamliciousness
-  def save_yaml_obj o, fn, safe=false
+  def save_yaml_obj o, fn, safe=false, backup=false
     o = if o.is_a?(Array)
       o.map { |x| (x.respond_to?(:before_marshal) && x.before_marshal) || x }
     elsif o.respond_to? :before_marshal
@@ -95,13 +95,36 @@ module Redwood
       o
     end
 
-    if safe
+    mode = if File.exists? fn
+      File.stat(fn).mode
+    else
+      0600
+    end
+
+    if backup
+      backup_fn = fn + '.bak'
+      if File.exists?(fn) && File.size(fn) > 0
+        File.open(backup_fn, "w", mode) do |f|
+          File.open(fn, "r") { |old_f| FileUtils.copy_stream old_f, f }
+          f.fsync
+        end
+      end
+      File.open(fn, "w") do |f|
+        f.puts o.to_yaml
+        f.fsync
+      end
+    elsif safe
       safe_fn = "#{File.dirname fn}/safe_#{File.basename fn}"
-      mode = File.stat(fn).mode if File.exists? fn
-      File.open(safe_fn, "w", mode) { |f| f.puts o.to_yaml }
+      File.open(safe_fn, "w", mode) do |f|
+        f.puts o.to_yaml
+        f.fsync
+      end
       FileUtils.mv safe_fn, fn
     else
-      File.open(fn, "w") { |f| f.puts o.to_yaml }
+      File.open(fn, "w", mode) do |f|
+        f.puts o.to_yaml
+        f.fsync
+      end
     end
   end
 
@@ -285,7 +308,7 @@ EOS
         :slip_rows => 0
       }
       begin
-        Redwood::save_yaml_obj config, filename
+        Redwood::save_yaml_obj config, filename, false, true
       rescue StandardError => e
         $stderr.puts "warning: #{e.message}"
       end

data/lib/sup/buffer.rb

@@ -575,6 +575,7 @@ EOS
   ## screen
   def ask domain, question, default=nil, &block
     raise "impossible!" if @asking
+    raise "Question too long" if Ncurses.cols <= question.length
     @asking = true
 
     @textfields[domain] ||= TextField.new

data/lib/sup/index.rb

@@ -256,6 +256,21 @@ EOS
     end
   end
 
+  # wrap all future changes inside a transaction so they're done atomically
+  def begin_transaction
+    synchronize { @xapian.begin_transaction }
+  end
+
+  # complete the transaction and write all previous changes to disk
+  def commit_transaction
+    synchronize { @xapian.commit_transaction }
+  end
+
+  # abort the transaction and revert all changes made since begin_transaction
+  def cancel_transaction
+    synchronize { @xapian.cancel_transaction }
+  end
+
   ## xapian-compact takes too long, so this is a no-op
   ## until we think of something better
   def optimize

data/lib/sup/maildir.rb

@@ -10,7 +10,8 @@ class Maildir < Source
   yaml_properties :uri, :usual, :archived, :id, :labels
   def initialize uri, usual=true, archived=false, id=nil, labels=[]
     super uri, usual, archived, id
-    uri = URI(Source.expand_filesystem_uri(uri))
+    @expanded_uri = Source.expand_filesystem_uri(uri)
+    uri = URI(@expanded_uri)
 
     raise ArgumentError, "not a maildir URI" unless uri.scheme == "maildir"
     raise ArgumentError, "maildir URI cannot have a host: #{uri.host}" if uri.host
@@ -24,7 +25,7 @@ class Maildir < Source
 
   def file_path; @dir end
   def self.suggest_labels_for path; [] end
-  def is_source_for? uri; super || (URI(Source.expand_filesystem_uri(uri)) == URI(self.uri)); end
+  def is_source_for? uri; super || (uri == @expanded_uri); end
 
   def store_message date, from_email, &block
     stored = false

data/lib/sup/mbox.rb

@@ -18,22 +18,24 @@ class MBox < Source
 
     case uri_or_fp
     when String
-      uri = URI(Source.expand_filesystem_uri(uri_or_fp))
+      @expanded_uri = Source.expand_filesystem_uri(uri_or_fp)
+      uri = URI(@expanded_uri)
       raise ArgumentError, "not an mbox uri" unless uri.scheme == "mbox"
       raise ArgumentError, "mbox URI ('#{uri}') cannot have a host: #{uri.host}" if uri.host
       raise ArgumentError, "mbox URI must have a path component" unless uri.path
-      @f = File.open uri.path, 'rb'
+      @f = nil
       @path = uri.path
     else
       @f = uri_or_fp
       @path = uri_or_fp.path
+      @expanded_uri = "mbox://#{@path}"
     end
 
     super uri_or_fp, usual, archived, id
   end
 
   def file_path; @path end
-  def is_source_for? uri; super || (self.uri.is_a?(String) && (URI(Source.expand_filesystem_uri(uri)) == URI(Source.expand_filesystem_uri(self.uri)))) end
+  def is_source_for? uri; super || (uri == @expanded_uri) end
 
   def self.suggest_labels_for path
     ## heuristic: use the filename as a label, unless the file
@@ -45,9 +47,23 @@ class MBox < Source
     end
   end
 
+  def ensure_open
+    @f = File.open @path, 'rb' if @f.nil?
+  end
+  private :ensure_open
+
+  def go_idle
+    @mutex.synchronize do
+      return if @f.nil? or @path.nil?
+      @f.close
+      @f = nil
+    end
+  end
+
   def load_header offset
     header = nil
     @mutex.synchronize do
+      ensure_open
       @f.seek offset
       header = parse_raw_email_header @f
     end
@@ -56,6 +72,7 @@ class MBox < Source
 
   def load_message offset
     @mutex.synchronize do
+      ensure_open
       @f.seek offset
       begin
         ## don't use RMail::Mailbox::MBoxReader because it doesn't properly ignore
@@ -74,6 +91,7 @@ class MBox < Source
   def raw_header offset
     ret = ""
     @mutex.synchronize do
+      ensure_open
       @f.seek offset
       until @f.eof? || (l = @f.gets) =~ /^\r*$/
         ret << l
@@ -105,6 +123,7 @@ class MBox < Source
   ## sup-sync-back has to do it.
   def each_raw_message_line offset
     @mutex.synchronize do
+      ensure_open
       @f.seek offset
       until @f.eof? || MBox::is_break_line?(l = @f.gets)
         yield l
@@ -118,7 +137,7 @@ class MBox < Source
 
   def poll
     first_offset = first_new_message
-		offset = first_offset
+    offset = first_offset
     end_offset = File.size @f
     while offset and offset < end_offset
       yield :add,
@@ -131,6 +150,7 @@ class MBox < Source
 
   def next_offset offset
     @mutex.synchronize do
+      ensure_open
       @f.seek offset
       nil while line = @f.gets and not MBox::is_break_line? line
       offset = @f.tell

data/lib/sup/poll.rb

@@ -115,10 +115,11 @@ EOS
             yield "Deleting #{m.id}"
           elsif action == :add
             if old_m
-              if not old_m.locations.member? m.location
-                yield "Message at #{m.source_info} is an updated of an old message. Updating labels from #{old_m.labels.to_a * ','} => #{m.labels.to_a * ','}"
+              new_locations = (m.locations - old_m.locations)
+              if not new_locations.empty?
+                yield "Message at #{new_locations[0].info} is an update of an old message. Updating labels from #{old_m.labels.to_a * ','} => #{m.labels.to_a * ','}"
               else
-                yield "Skipping already-imported message at #{m.source_info}"
+                yield "Skipping already-imported message at #{m.locations[-1].info}"
               end
             else
               yield "Found new message at #{m.source_info} with labels #{m.labels.to_a * ','}"
@@ -182,6 +183,8 @@ EOS
           end
         end
       end
+
+      source.go_idle
     rescue SourceError => e
       warn "problem getting messages from #{source}: #{e.message}"
     end

data/lib/sup/source.rb

@@ -40,6 +40,7 @@ class Source
   ## - raw_header offset
   ## - raw_message offset
   ## - check (optional)
+  ## - go_idle (optional)
   ## - next (or each, if you prefer): should return a message and an
   ##   array of labels.
   ##
@@ -81,6 +82,11 @@ class Source
 
   def read?; false; end
 
+  ## release resources that are easy to reacquire. it is called
+  ## after processing a source (e.g. polling) to prevent resource
+  ## leaks (esp. file descriptors).
+  def go_idle; end
+
   ## Yields values of the form [Symbol, Hash]
   ## add: info, labels, progress
   ## delete: info, progress
@@ -149,7 +155,7 @@ end
 module SerializeLabelsNicely
   def before_marshal # can return an object
     c = clone
-    c.instance_eval { @labels = @labels.to_a.map { |l| l.to_s } }
+    c.instance_eval { @labels = (@labels.to_a.map { |l| l.to_s }).sort }
     c
   end
 
@@ -187,7 +193,11 @@ class SourceManager
     @source_mutex.synchronize { @sources.values }.sort_by { |s| s.id }.partition { |s| !s.archived? }.flatten
   end
 
-  def source_for uri; sources.find { |s| s.is_source_for? uri }; end
+  def source_for uri
+    expanded_uri = Source.expand_filesystem_uri(uri)
+    sources.find { |s| s.is_source_for? expanded_uri }
+  end
+
   def usual_sources; sources.find_all { |s| s.usual? }; end
   def unusual_sources; sources.find_all { |s| !s.usual? }; end
 
@@ -202,13 +212,7 @@ class SourceManager
   def save_sources fn=Redwood::SOURCE_FN
     @source_mutex.synchronize do
       if @sources_dirty
-        bakfn = fn + ".bak"
-        if File.exists? fn
-          File.chmod 0600, fn
-          FileUtils.mv fn, bakfn, :force => true unless File.exists?(bakfn) && File.size(fn) == 0
-        end
-        Redwood::save_yaml_obj sources, fn, true
-        File.chmod 0600, fn
+        Redwood::save_yaml_obj sources, fn, false, true
       end
       @sources_dirty = false
     end

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 12
-  version: "0.12"
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - William Morgan
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 21:13:42 -08:00
+date: 2011-01-23 21:12:40 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +34,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ncurses
+  name: ncursesw
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -72,23 +73,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: trollop
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -98,11 +86,11 @@ dependencies:
         - 12
         version: "1.12"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: lockfile
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,11 +99,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mime-types
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -124,11 +112,11 @@ dependencies:
         - 1
         version: "1"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: gettext
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -137,15 +125,18 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id008
 description: "Sup is a console-based email client for people with a lot of email. It supports tagging, very fast full-text search, automatic contact-list management, and more. If you're the type of person who treats email as an extension of your long-term memory, Sup is for you.  Sup makes it easy to: - Handle massive amounts of email.  - Mix email from different sources: mbox files (even across different machines), Maildir directories, POP accounts, and GMail accounts.  - Instantaneously search over your entire email collection. Search over body text, or use a query language to combine search predicates in any way.  - Handle multiple accounts. Replying to email sent to a particular account will use the correct SMTP server, signature, and from address.  - Add custom code to handle certain types of messages or to handle certain types of text within messages.  - Organize email with user-defined labels, automatically track recent contacts, and much more!  The goal of Sup is to become the email client of choice for nerds everywhere."
 email: wmorgan-sup@masanjin.net
 executables: 
 - sup
 - sup-add
+- sup-cmd
 - sup-config
 - sup-dump
+- sup-import-dump
 - sup-recover-sources
+- sup-server
 - sup-sync
 - sup-sync-back
 - sup-tweak-labels
@@ -161,9 +152,12 @@ files:
 - ReleaseNotes
 - bin/sup
 - bin/sup-add
+- bin/sup-cmd
 - bin/sup-config
 - bin/sup-dump
+- bin/sup-import-dump
 - bin/sup-recover-sources
+- bin/sup-server
 - bin/sup-sync
 - bin/sup-sync-back
 - bin/sup-tweak-labels