sup 0.9 → 0.9.1

data/CONTRIBUTORS

@@ -14,16 +14,24 @@ Marc Hartstein <marc.hartstein at the alum.vassar dot edus>
 Israel Herraiz <israel.herraiz at the gmail dot coms>
 Grant Hollingworth <grant at the antiflux dot orgs>
 Adeodato Simó <dato at the net.com.org dot ess>
-Steve Goldman <sgoldman at the tower-research dot coms>
 Edward Z. Yang <ezyang at the mit dot edus>
+Steve Goldman <sgoldman at the tower-research dot coms>
 Decklin Foster <decklin at the red-bean dot coms>
+Cameron Matheson <cam+sup at the cammunism dot orgs>
+Tero Tilus <tero at the tilus dot nets>
 Alex Vandiver <alex at the chmrr dot nets>
 Jeff Balogh <its.jeff.balogh at the gmail dot coms>
+Andrew Pimlott <andrew at the pimlott dot nets>
+Peter Harkins <ph at the malaprop dot orgs>
+Anthony Martinez <pi at the pihost dot uss>
 Carl Worth <cworth at the cworth dot orgs>
 Kornilios Kourtis <kkourt at the cslab.ece.ntua dot grs>
 Giorgio Lando <patroclo7 at the gmail dot coms>
 Benoît PIERRE <benoit.pierre at the gmail dot coms>
-Ian Taylor <ian at the lorf dot orgs>
-Stefan Lundström
+ian <ian at the lorf dot orgs>
+Steven Walter <swalter at the monarch.(none)>
 Michael Hamann <michael at the content-space dot des>
+Stefan Lundström <lundst at the snabb.(none)>
+William Erik Baxter <web at the superscript dot coms>
+Jon M. Dugan <jdugan at the es dot nets>
 Kirill Smelkov <kirr at the landau.phys.spbu dot rus>

data/History.txt

@@ -1,3 +1,16 @@
+== 0.9.1 / 2009-12-10
+* Make textfield behave more like readline, including C-w
+* Add ask_for_to config option. You can set all ask_for_* options to false, and
+  composing a message will go immediately to the editor.
+* RFC 2047 decode attachment file names
+        * default ask_for_to to true
+* add undo power to thread-view-mode
+* display labels of polled messages
+* increase numbers in contact-list-mode
+* fix --compose option, and add a --subject option
+* include hook filename in error messages
+* As always, many bugfixes and tweaks.
+
 == 0.9 / 2009-10-01
 * Experimental Xapian backend to replace Ferret. Not everything works with it,
   but it's fast and less likely to barf. See release notes.

data/ReleaseNotes

@@ -1,3 +1,10 @@
+Release 0.9.1:
+
+This is mainly a bugfix release, with a couple minor new features rolled up.
+
+If you are using the Ferret backend, consider convering soon. I will probably
+add a deprecation notice in 0.10, and you support will be dropped in 0.11.
+
 Release 0.9:
 
 There's a new Xapian backend as an alternative to the Ferret one. It's still in

data/bin/sup

@@ -7,7 +7,7 @@ require 'fileutils'
 require 'trollop'
 require "sup"
 
-BIN_VERSION = "0.9"
+BIN_VERSION = "0.9.1"
 
 unless Redwood::VERSION == BIN_VERSION
   $stderr.puts <<EOS
@@ -36,8 +36,11 @@ EOS
   opt :no_initial_poll, "Don't poll for new messages when starting."
   opt :search, "Search for this query upon startup", :type => String
   opt :compose, "Compose message to this recipient upon startup", :type => String
+  opt :subject, "When composing, use this subject", :type => String, :short => "j"
 end
 
+Trollop::die :subject, "requires --compose" if $opts[:subject] && !$opts[:compose]
+
 Redwood::HookManager.register "startup", <<EOS
 Executes at startup
 No variables.
@@ -196,7 +199,10 @@ begin
   imode.load_threads :num => ibuf.content_height, :when_done => lambda { |num| reporting_thread("poll after loading inbox") { sleep 1; PollManager.poll } unless $opts[:no_threads] || $opts[:no_initial_poll] }
 
   if $opts[:compose]
-    ComposeMode.spawn_nicely :to_default => $opts[:compose]
+    to = Person.from_address_list $opts[:compose]
+    mode = ComposeMode.new :to => to, :subj => $opts[:subject]
+    BufferManager.spawn "New Message", mode
+    mode.edit_message
   end
 
   unless $opts[:no_threads]
@@ -354,7 +360,7 @@ unless Redwood::exceptions.empty?
 ----------------------------------------------------------------
 I'm very sorry. It seems that an error occurred in Sup. Please
 accept my sincere apologies. If you don't mind, please send the
-contents of ~/.sup/exception-log.txt and a brief report of the
+contents of #{BASE_DIR}/exception-log.txt and a brief report of the
 circumstances to sup-talk at rubyforge dot orgs so that I might
 address this problem. Thank you!
 

data/lib/sup.rb

@@ -37,7 +37,7 @@ class Module
 end
 
 module Redwood
-  VERSION = "0.9"
+  VERSION = "0.9.1"
 
   BASE_DIR   = ENV["SUP_BASE"] || File.join(ENV["HOME"], ".sup")
   CONFIG_FN  = File.join(BASE_DIR, "config.yaml")
@@ -221,6 +221,7 @@ else
     :editor => ENV["EDITOR"] || "/usr/bin/vim -f -c 'setlocal spell spelllang=en_us' -c 'set filetype=mail'",
     :thread_by_subject => false,
     :edit_signature => false,
+    :ask_for_to => true,
     :ask_for_cc => true,
     :ask_for_bcc => false,
     :ask_for_subject => true,

data/lib/sup/account.rb

@@ -10,6 +10,17 @@ class Account < Person
     @sendmail = h[:sendmail]
     @signature = h[:signature]
   end
+
+  # Default sendmail command for bouncing mail,
+  # deduced from #sendmail
+  def bounce_sendmail
+    sendmail.sub(/\s(\-(ti|it|t))\b/) do |match|
+      case $1
+      when '-t' then ''
+      else ' -i'
+      end
+    end
+  end
 end
 
 class AccountManager

data/lib/sup/ferret_index.rb

@@ -340,7 +340,7 @@ EOS
     query = {}
 
     subs = HookManager.run("custom-search", :subs => s) || s
-    subs = s.gsub(/\b(to|from):(\S+)\b/) do
+    subs = subs.gsub(/\b(to|from):(\S+)\b/) do
       field, name = $1, $2
       if(p = ContactManager.contact_for(name))
         [field, p.email]

data/lib/sup/hook.rb

@@ -78,10 +78,11 @@ class HookManager
     context = @contexts[hook] ||= HookContext.new(name)
 
     result = nil
+    fn = fn_for name
     begin
-      result = context.__run hook, fn_for(name), locals
+      result = context.__run hook, fn, locals
     rescue Exception => e
-      log "error running hook: #{e.message}"
+      log "error running #{fn}: #{e.message}"
       log e.backtrace.join("\n")
       @hooks[name] = nil # disable it
       BufferManager.flash "Error running hook: #{e.message}" if BufferManager.instantiated?

data/lib/sup/mbox.rb

@@ -14,7 +14,7 @@ module MBox
       ## hack -- make Time.parse fail when trying to substitute values from Time.now
       Time.parse time, 0
       true
-    rescue NoMethodError
+    rescue NoMethodError, ArgumentError
       warn "found invalid date in potential mbox split line, not splitting: #{l.inspect}"
       false
     end

data/lib/sup/message.rb

@@ -494,12 +494,14 @@ private
 
       ## if there's a filename, we'll treat it as an attachment.
       if filename
+        ## filename could be 2047 encoded
+        filename = Rfc2047.decode_to $encoding, filename
         # add this to the attachments list if its not a generated html
         # attachment (should we allow images with generated names?).
         # Lowercase the filename because searches are easier that way 
         @attachments.push filename.downcase unless filename =~ /^sup-attachment-/
         add_label :attachment unless filename =~ /^sup-attachment-/
-        content_type = m.header.content_type.downcase || "application/unknown" # sometimes RubyMail gives us nil
+        content_type = (m.header.content_type || "application/unknown").downcase # sometimes RubyMail gives us nil
         [Chunk::Attachment.new(content_type, filename, m, sibling_types)]
 
       ## otherwise, it's body text

data/lib/sup/modes/compose-mode.rb

@@ -21,7 +21,7 @@ class ComposeMode < EditMessageMode
   end
 
   def self.spawn_nicely opts={}
-    to = opts[:to] || BufferManager.ask_for_contacts(:people, "To: ", [opts[:to_default]]) or return
+    to = opts[:to] || (BufferManager.ask_for_contacts(:people, "To: ", [opts[:to_default]]) or return if ($config[:ask_for_to] != false))
     cc = opts[:cc] || (BufferManager.ask_for_contacts(:people, "Cc: ") or return if $config[:ask_for_cc])
     bcc = opts[:bcc] || (BufferManager.ask_for_contacts(:people, "Bcc: ") or return if $config[:ask_for_bcc])
     subj = opts[:subj] || (BufferManager.ask(:subject, "Subject: ") or return if $config[:ask_for_subject])

data/lib/sup/modes/contact-list-mode.rb

@@ -16,7 +16,7 @@ module CanAliasContacts
 end
 
 class ContactListMode < LineCursorMode
-  LOAD_MORE_CONTACTS_NUM = 10
+  LOAD_MORE_CONTACTS_NUM = 100
 
   register_keymap do |k|
     k.add :load_more, "Load #{LOAD_MORE_CONTACTS_NUM} more contacts", 'M'
@@ -106,7 +106,7 @@ class ContactListMode < LineCursorMode
   end
 
   def load
-    @num ||= buffer.content_height
+    @num ||= (buffer.content_height * 2)
     @user_contacts = ContactManager.contacts_with_aliases
     num = [@num - @user_contacts.length, 0].max
     BufferManager.say("Loading #{num} contacts from index...") do

data/lib/sup/modes/forward-mode.rb

@@ -29,9 +29,9 @@ class ForwardMode < EditMessageMode
   end
 
   def self.spawn_nicely opts={}
-    to = opts[:to] || BufferManager.ask_for_contacts(:people, "To: ") or return
-    cc = opts[:cc] || BufferManager.ask_for_contacts(:people, "Cc: ") or return if $config[:ask_for_cc]
-    bcc = opts[:bcc] || BufferManager.ask_for_contacts(:people, "Bcc: ") or return if $config[:ask_for_bcc]
+    to = opts[:to] || (BufferManager.ask_for_contacts(:people, "To: ") or return if ($config[:ask_for_to] != false))
+    cc = opts[:cc] || (BufferManager.ask_for_contacts(:people, "Cc: ") or return if $config[:ask_for_cc])
+    bcc = opts[:bcc] || (BufferManager.ask_for_contacts(:people, "Bcc: ") or return if $config[:ask_for_bcc])
     
     attachment_hash = {}
     attachments = opts[:attachments] || []

data/lib/sup/modes/thread-view-mode.rb

@@ -10,7 +10,7 @@ class ThreadViewMode < LineCursorMode
     attr_accessor :state
   end
 
-  DATE_FORMAT = "%B %e %Y %l:%M%P"
+  DATE_FORMAT = "%B %e %Y %l:%M%p"
   INDENT_SPACES = 2 # how many spaces to indent child messages
 
   HookManager.register "detailed-headers", <<EOS
@@ -202,12 +202,7 @@ EOS
     m = @message_lines[curpos] or return
     to = BufferManager.ask_for_contacts(:people, "Bounce To: ") or return
 
-    defcmd = AccountManager.default_account.sendmail.sub(/\s(\-(ti|it|t))\b/) do |match|
-      case "$1"
-        when '-t' then ''
-        else ' -i'
-      end
-    end
+    defcmd = AccountManager.default_account.bounce_sendmail
 
     cmd = case (hookcmd = HookManager.run "bounce-command", :from => m.from, :to => to)
           when nil, /^$/ then defcmd
@@ -254,7 +249,8 @@ EOS
   end    
 
   def edit_labels
-    reserved_labels = @thread.labels.select { |l| LabelManager::RESERVED_LABELS.include? l }
+    old_labels = @thread.labels
+    reserved_labels = old_labels.select { |l| LabelManager::RESERVED_LABELS.include? l }
     new_labels = BufferManager.ask_for_labels :label, "Labels for thread: ", @thread.labels
 
     return unless new_labels
@@ -262,6 +258,10 @@ EOS
     new_labels.each { |l| LabelManager << l }
     update
     UpdateManager.relay self, :labeled, @thread.first
+    UndoManager.register "labeling thread" do
+      @thread.labels = old_labels
+      UpdateManager.relay self, :labeled, @thread.first
+    end
   end
 
   def toggle_starred
@@ -476,6 +476,10 @@ EOS
     dispatch op do
       @thread.remove_label :inbox
       UpdateManager.relay self, :archived, @thread.first
+      UndoManager.register "archiving 1 thread" do
+        @thread.apply_label :inbox
+        UpdateManager.relay self, :unarchived, @thread.first
+      end
     end
   end
 
@@ -483,6 +487,10 @@ EOS
     dispatch op do
       @thread.apply_label :spam
       UpdateManager.relay self, :spammed, @thread.first
+      UndoManager.register "marking 1 thread as spam" do
+        @thread.remove_label :spam
+        UpdateManager.relay self, :unspammed, @thread.first
+      end
     end
   end
 
@@ -490,6 +498,10 @@ EOS
     dispatch op do
       @thread.apply_label :deleted
       UpdateManager.relay self, :deleted, @thread.first
+      UndoManager.register "deleting 1 thread" do
+        @thread.remove_label :deleted
+        UpdateManager.relay self, :undeleted, @thread.first
+      end
     end
   end
 

data/lib/sup/poll.rb

@@ -45,9 +45,9 @@ EOS
     HookManager.run "before-poll"
 
     BufferManager.flash "Polling for new messages..."
-    num, numi, from_and_subj, from_and_subj_inbox = @mode.poll
+    num, numi, from_and_subj, from_and_subj_inbox, loaded_labels = @mode.poll
     if num > 0
-      BufferManager.flash "Loaded #{num.pluralize 'new message'}, #{numi} to inbox." 
+      BufferManager.flash "Loaded #{num.pluralize 'new message'}, #{numi} to inbox. Labels: #{loaded_labels.map{|l| l.to_s}.join(', ')}"
     else
       BufferManager.flash "No new messages." 
     end
@@ -76,6 +76,7 @@ EOS
     total_num = total_numi = 0
     from_and_subj = []
     from_and_subj_inbox = []
+    loaded_labels = Set.new
 
     @mutex.synchronize do
       SourceManager.usual_sources.each do |source|
@@ -107,6 +108,7 @@ EOS
           else
             yield "Found new message at #{m.source_info} with labels #{m.labels.to_a * ','}"
             add_new_message m
+            loaded_labels.merge m.labels
             num += 1
             from_and_subj << [m.from && m.from.longname, m.subj]
             if (m.labels & [:inbox, :spam, :deleted, :killed]) == Set.new([:inbox])
@@ -121,11 +123,12 @@ EOS
         total_numi += numi
       end
 
+      loaded_labels = loaded_labels - LabelManager::HIDDEN_RESERVED_LABELS - [:inbox, :killed]
       yield "Done polling; loaded #{total_num} new messages total"
       @last_poll = Time.now
       @polling = false
     end
-    [total_num, total_numi, from_and_subj, from_and_subj_inbox]
+    [total_num, total_numi, from_and_subj, from_and_subj_inbox, loaded_labels]
   end
 
   ## like Source#each, but yields successive Message objects, which have their

data/lib/sup/textfield.rb

@@ -102,12 +102,21 @@ class TextField
         Ncurses::Form::REQ_DEL_CHAR
       when Ncurses::KEY_BACKSPACE, 127 # 127 is also a backspace keysym
         Ncurses::Form::REQ_DEL_PREV
-      when 1 #ctrl-a
+      when ?\C-a
+        nop
         Ncurses::Form::REQ_BEG_FIELD
-      when 5 #ctrl-e
+      when ?\C-e
         Ncurses::Form::REQ_END_FIELD
-      when 11 # ctrl-k
+      when ?\C-k
         Ncurses::Form::REQ_CLR_EOF
+      when ?\C-u
+        set_cursed_value cursed_value_after_point
+        Ncurses::Form.form_driver @form, Ncurses::Form::REQ_END_FIELD
+        nop
+        Ncurses::Form::REQ_BEG_FIELD
+      when ?\C-w
+        Ncurses::Form.form_driver @form, Ncurses::Form::REQ_PREV_CHAR
+        Ncurses::Form.form_driver @form, Ncurses::Form::REQ_DEL_WORD
       when Ncurses::KEY_UP, Ncurses::KEY_DOWN
         unless @history.empty?
           value = get_cursed_value
@@ -156,5 +165,17 @@ private
   def set_cursed_value v
     @field.set_field_buffer 0, v
   end
+
+  def cursed_value_after_point
+    point = Ncurses.curx - @question.length
+    get_cursed_value[point..-1]
+  end
+
+  ## this is almost certainly unnecessary, but it's the only way
+  ## i could get ncurses to remember my form's value
+  def nop
+    Ncurses::Form.form_driver @form, " "[0]
+    Ncurses::Form.form_driver @form, Ncurses::Form::REQ_DEL_PREV
+  end
 end
 end

data/lib/sup/xapian_index.rb

@@ -3,7 +3,7 @@ require 'set'
 
 module Redwood
 
-# This index implementation uses Xapian for searching and GDBM for storage. It
+# This index implementation uses Xapian for searching and storage. It
 # tends to be slightly faster than Ferret for indexing and significantly faster
 # for searching due to precomputing thread membership.
 class XapianIndex < BaseIndex
@@ -193,7 +193,7 @@ EOS
     query = {}
 
     subs = HookManager.run("custom-search", :subs => s) || s
-    subs = s.gsub(/\b(to|from):(\S+)\b/) do
+    subs = subs.gsub(/\b(to|from):(\S+)\b/) do
       field, name = $1, $2
       if(p = ContactManager.contact_for(name))
         [field, p.email]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sup
 version: !ruby/object:Gem::Version 
-  version: "0.9"
+  version: 0.9.1
 platform: ruby
 authors: 
 - William Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 14:34:52 -04:00
+date: 2009-12-11 10:02:24 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -209,8 +209,10 @@ files:
 - lib/sup/mbox/ssh-file.rb
 - lib/sup/mbox/loader.rb
 - lib/sup/mbox/ssh-loader.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://sup.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -231,9 +233,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A console-based email client with the best features of GMail, mutt, and emacs. Features full text search, labels, tagged operations, multiple buffers, recent contacts, and more.
 test_files: []