sup 0.19.0 → 0.23

data/bin/sup-add

@@ -3,12 +3,11 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'uri'
-require 'rubygems'
-require 'highline/import'
-require 'trollop'
+require 'optimist'
 require "sup"
+require 'sup/util/axe'
 
-$opts = Trollop::options do
+$opts = Optimist::options do
   version "sup-add (sup #{Redwood::VERSION})"
   banner <<EOS
 Adds a source to the Sup source list.
@@ -36,7 +35,7 @@ EOS
   opt :force_account, "Reuse previously defined account user@hostname.", :type => String
 end
 
-Trollop::die "require one or more sources" if ARGV.empty?
+Optimist::die "require one or more sources" if ARGV.empty?
 
 ## for sources that require login information, prompt the user for
 ## that. also provide a list of previously-defined login info to
@@ -54,11 +53,11 @@ def get_login_info uri, sources
     if $opts[:force_account]
       host, username, password = accounts.find { |h, u, p| $opts[:force_account] == "#{u}@#{h}" }
       unless username && password
-        say "No previous account #{$opts[:force_account].inspect} found."
+        @cli.say "No previous account #{$opts[:force_account].inspect} found."
       end
     else
-      say "Would you like to use the same account as for a previous source for #{uri}?"
-      choose do |menu|
+      @cli.say "Would you like to use the same account as for a previous source for #{uri}?"
+      @cli.choose do |menu|
         accounts.each do |host, olduser, oldpw|
           menu.choice("Use the account info for #{olduser}@#{host}") { username, password = olduser, oldpw }
         end
@@ -69,15 +68,15 @@ def get_login_info uri, sources
   end
 
   unless username && password
-    username = ask("Username for #{uri.host}: ");
-    password = ask("Password for #{uri.host}: ") { |q| q.echo = false }
+    username = @cli.ask("Username for #{uri.host}: ");
+    password = @cli.ask("Password for #{uri.host}: ") { |q| q.echo = false }
     puts # why?
   end
 
   [username, password]
 end
 
-$terminal.wrap_at = :auto
+@cli.wrap_at = :auto
 Redwood::start
 index = Redwood::Index.init
 index.load
@@ -91,11 +90,11 @@ begin
     labels = $opts[:labels] ? $opts[:labels].split(/\s*,\s*/).uniq : []
 
     if !$opts[:force_new] && Redwood::SourceManager.source_for(uri)
-      say "Already know about #{uri}; skipping."
+      @cli.say "Already know about #{uri}; skipping."
       next
     end
 
-    parsed_uri = URI(uri)
+    parsed_uri = URI(URI.escape(uri))
 
     source =
       case parsed_uri.scheme
@@ -104,11 +103,11 @@ begin
       when "mbox"
         Redwood::MBox.new uri, !$opts[:unusual], $opts[:archive], nil, labels
       when nil
-        Trollop::die "Sources must be specified with an URI"
+        Optimist::die "Sources must be specified with an URI"
       else
-        Trollop::die "Unknown source type #{parsed_uri.scheme.inspect}"
+        Optimist::die "Unknown source type #{parsed_uri.scheme.inspect}"
       end
-    say "Adding #{source}..."
+    @cli.say "Adding #{source}..."
     Redwood::SourceManager.add_source source
   end
 ensure

data/bin/sup-config

@@ -2,12 +2,11 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'rubygems'
-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
@@ -20,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
@@ -43,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 }
@@ -52,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
@@ -76,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
@@ -109,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
@@ -139,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]
@@ -160,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
@@ -203,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
@@ -219,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
@@ -230,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

@@ -2,14 +2,13 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'rubygems'
 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,8 +3,7 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'uri'
-require 'rubygems'
-require 'trollop'
+require 'optimist'
 require "sup"
 
 PROGRESS_UPDATE_INTERVAL = 15 # seconds
@@ -12,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.
@@ -37,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
 
@@ -82,7 +81,7 @@ begin
     next if opts[:dry_run]
 
     m.labels = new_labels
-    index.update_message_state m
+    index.update_message_state [m, false]
   end
 
   index.commit_transaction if opts[:atomic]

data/bin/sup-sync

@@ -3,8 +3,7 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'uri'
-require 'rubygems'
-require 'trollop'
+require 'optimist'
 require "sup"
 
 PROGRESS_UPDATE_INTERVAL = 15 # seconds
@@ -31,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
@@ -113,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,11 +3,10 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'rubygems'
-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.
@@ -60,7 +59,7 @@ $config[:sync_back_to_maildir] = true
 
 begin
   sync_performed = []
-  sync_performed = File.readlines(Redwood::SYNC_OK_FN).collect { |e| e.strip }.find_all { |e| not e.empty? } if File.exists? Redwood::SYNC_OK_FN
+  sync_performed = File.readlines(Redwood::SYNC_OK_FN).collect { |e| e.strip }.find_all { |e| not e.empty? } if File.exist? Redwood::SYNC_OK_FN
   sources = []
 
   ## Try to find out sources given in parameters

data/bin/sup-tweak-labels

@@ -2,8 +2,7 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'rubygems'
-require 'trollop'
+require 'optimist'
 require "sup"
 
 class Float
@@ -26,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.
@@ -59,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
@@ -72,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?
@@ -83,7 +82,7 @@ begin
     ## query to only messages with those labels
     query += " (" + remove_labels.map { |l| "label:#{l}" }.join(" OR ") + ")"
   end
-  query += ' ' + opts[:query] if opts[:query]
+  query += ' AND ' + opts[:query] if opts[:query]
 
   parsed_query = index.parse_query query
   parsed_query.merge! :load_spam => true, :load_deleted => true, :load_killed => true

data/contrib/colorpicker.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-
 require 'ncursesw'
 
 Ncurses.initscr

data/contrib/completion/_sup.bash

@@ -0,0 +1,102 @@
+# Sup Bash completion
+#
+# * Complete options for all Sup commands.
+# * Disable completion for next option when current option takes an argument.
+# * Complete sources, directories, and files, where applicable.
+
+_sup_cmds() {
+    local cur prev opts sources
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    sources="$(sed -n '/uri:/ {s/.*uri:\s*//p}' $HOME/.sup/sources.yaml)"
+
+    case "${1##/*}" in
+        sup-add)
+            opts="--archive -a --unusual -u --sync-back --no-sync-back -s
+                  --labels -l --force-new -f --force-account -o --version -v
+                  --help -h mbox: maildir:"
+
+            case $prev in
+                --labels|-l|--force-account|-o)
+                    COMPREPLY=()
+                    return 0
+                    ;;
+            esac
+            ;;
+        sup-config|sup-dump)
+            opts="--version -v --help -h"
+            ;;
+        sup-import-dump)
+           opts="--verbose -v --ignore-missing -i --warn-missing -w
+                 --abort-missing -a --atomic -t --dry-run -n --version --help
+                 -h"
+            ;;
+        sup)
+            opts="--list-hooks -l --no-threads -n --no-initial-poll -o --search
+                  -s --compose -c --subject -j --version -v --help -h"
+
+            case $prev in
+                --search|-s|--compose|-c|--subject|-j)
+                    COMPREPLY=()
+                    return 0
+                    ;;
+            esac
+            ;;
+        sup-recover-sources)
+            opts="--unusual --archive --scan-num --help -h $sources"
+
+            case $prev in
+                --scan-num)
+                    COMPREPLY=()
+                    return 0
+                    ;;
+            esac
+            ;;
+        sup-sync)
+            opts="--asis --restore --discard --archive -x --read -r
+                  --extra-labels --verbose -v --optimize -o --all-sources
+                  --dry-run -n --version --help -h ${sources}"
+
+
+            case $prev in
+                --restore|--extra-labels)
+                    COMPREPLY=()
+                    return 0
+                    ;;
+            esac
+            ;;
+        sup-sync-back-maildir)
+            maildir_sources="$(echo $sources | tr ' ' '\n' | grep maildir)"
+            opts="--no-confirm -n --no-merge -m --list-sources -l
+                  --unusual-sources-too -u --version -v --help -h
+                  $maildir_sources"
+            ;;
+        sup-tweak-labels)
+            opts="--add -a --remove -r --query -q --verbose -v --very-verbose
+                  -e --all-sources --dry-run -n --no-sync-back -o --version
+                  --help -h $sources"
+
+            case $prev in
+                --add|-a|--remove|-r|--query|-q)
+                    COMPREPLY=()
+                    return 0
+                    ;;
+            esac
+            ;;
+    esac
+
+    COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
+    return 0
+}
+
+complete -F _sup_cmds sup \
+                      sup-add \
+                      sup-config \
+                      sup-dump \
+                      sup-recover-sources \
+                      sup-sync \
+                      sup-sync-back-maildir \
+                      sup-tweak-labels
+
+complete -F _sup_cmds -o filenames -o plusdirs sup-import-dump