sup 0.6 → 0.7

data/lib/sup/label.rb

@@ -78,7 +78,7 @@ class LabelManager
 
   def save
     return unless @modified
-    File.open(@fn, "w") { |f| f.puts @labels.keys }
+    File.open(@fn, "w") { |f| f.puts @labels.keys.sort_by { |l| l.to_s } }
   end
 end
 

data/lib/sup/mbox.rb

@@ -11,7 +11,7 @@ module Redwood
 ## TODO: move functionality to somewhere better, like message.rb
 module MBox
   BREAK_RE = /^From \S+/
-  HEADER_RE = /\s*(.*?\S)\s*/
+  HEADER_RE = /\s*(.*?)\s*/
 
   def read_header f
     header = {}
@@ -21,6 +21,11 @@ module MBox
     ## when scanning over large mbox files.
     while(line = f.gets)
       case line
+      ## these three can occur multiple times, and we want the first one
+      when /^(Delivered-To):#{HEADER_RE}$/i,
+        /^(X-Original-To):#{HEADER_RE}$/i,
+        /^(Envelope-To):#{HEADER_RE}$/i: header[last = $1] ||= $2
+
       when /^(From):#{HEADER_RE}$/i,
         /^(To):#{HEADER_RE}$/i,
         /^(Cc):#{HEADER_RE}$/i,
@@ -33,15 +38,10 @@ module MBox
         /^(List-Post):#{HEADER_RE}$/i,
         /^(List-Subscribe):#{HEADER_RE}$/i,
         /^(List-Unsubscribe):#{HEADER_RE}$/i,
-        /^(Status):#{HEADER_RE}$/i: header[last = $1] = $2
+        /^(Status):#{HEADER_RE}$/i,
+        /^(X-\S+):#{HEADER_RE}$/: header[last = $1] = $2
       when /^(Message-Id):#{HEADER_RE}$/i: header[mid_field = last = $1] = $2
 
-      ## these next three can occur multiple times, and we want the
-      ## first one
-      when /^(Delivered-To):#{HEADER_RE}$/i,
-        /^(X-Original-To):#{HEADER_RE}$/i,
-        /^(Envelope-To):#{HEADER_RE}$/i: header[last = $1] ||= $2
-
       when /^\r*$/: break
       when /^\S+:/: last = nil # some other header we don't care about
       else

data/lib/sup/message-chunks.rb

@@ -41,6 +41,8 @@ end
 
 module Redwood
 module Chunk
+  WRAP_LEN = 80 # wrap messages and text attachments at this width
+
   class Attachment
     HookManager.register "mime-decode", <<EOS
 Executes when decoding a MIME attachment.
@@ -95,6 +97,7 @@ EOS
       @lines = nil
       if text
         @lines = text.gsub("\r\n", "\n").gsub(/\t/, "        ").gsub(/\r/, "").split("\n")
+        @lines = lines.map {|l| l.chomp.wrap WRAP_LEN}.flatten
         @quotable = true
       end
     end
@@ -116,7 +119,7 @@ EOS
     def initial_state; :open end
     def viewable?; @lines.nil? end
     def view_default! path
-      cmd = "/usr/bin/run-mailcap --action=view '#{@content_type}:#{path}' > /dev/null 2> /dev/null"
+      cmd = "/usr/bin/run-mailcap --action=view '#{@content_type}:#{path}' 2>/dev/null"
       Redwood::log "running: #{cmd.inspect}"
       system cmd
       $? == 0
@@ -143,7 +146,6 @@ EOS
   end
 
   class Text
-    WRAP_LEN = 80 # wrap at this width
 
     attr_reader :lines
     def initialize lines
@@ -206,7 +208,7 @@ EOS
     def inlineable?; false end
     def quotable?; false end
     def expandable?; true end
-    def initial_state; :open end
+    def initial_state; :closed end
     def viewable?; false end
 
     def patina_color; :generic_notice_patina_color end

data/lib/sup/message.rb

@@ -64,7 +64,7 @@ class Message
   end
 
   def parse_header header
-    header.each { |k, v| header[k.downcase] = v }
+    header.keys.each { |k| header[k.downcase] = header[k] } # canonicalize
 
     fakeid = nil
     fakename = nil
@@ -392,7 +392,8 @@ private
       payload = RMail::Parser.read(m.body)
       from = payload.header.from.first
       from_person = from ? PersonManager.person_for(from.format) : nil
-      [Chunk::EnclosedMessage.new(from_person, payload.to_s)]
+      [Chunk::EnclosedMessage.new(from_person, payload.to_s)] +
+        message_to_chunks(payload, encrypted)
     else
       filename =
         ## first, paw through the headers looking for a filename
@@ -433,11 +434,10 @@ private
   end
 
   def self.convert_from body, charset
-    charset = "utf-8" if charset =~ /UTF_?8/i
     begin
       raise MessageFormatError, "RubyMail decode returned a null body" unless body
       return body unless charset
-      Iconv.iconv($encoding + "//IGNORE", charset, body + " ").join[0 .. -2]
+      Iconv.easy_decode($encoding, charset, body)
     rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::IllegalSequence, MessageFormatError => e
       Redwood::log "warning: error (#{e.class.name}) decoding message body from #{charset}: #{e.message}"
       File.open(File.join(BASE_DIR,"unable-to-decode.txt"), "w") { |f| f.write body }

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

@@ -386,6 +386,7 @@ EOS
   end
 
   def save
+    BufferManager.say("Saving contacts...") { ContactManager.instance.save }
     dirty_threads = @mutex.synchronize { (@threads + @hidden_threads.keys).select { |t| t.dirty? } }
     return if dirty_threads.empty?
 
@@ -566,7 +567,7 @@ protected
   def add_or_unhide m
     @ts_mutex.synchronize do
       if (is_relevant?(m) || @ts.is_relevant?(m)) && !@ts.contains?(m)
-        @ts.load_thread_for_message m
+        @ts.load_thread_for_message m, @load_thread_opts
       end
 
       @hidden_threads.delete @ts.thread_for(m)

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

@@ -30,6 +30,7 @@ EOS
     k.add :activate_chunk, "Expand/collapse or activate item", :enter
     k.add :expand_all_messages, "Expand/collapse all messages", 'E'
     k.add :edit_draft, "Edit draft", 'e'
+    k.add :send_draft, "Send draft", 'y'
     k.add :edit_labels, "Edit or add labels for a thread", 'l'
     k.add :expand_all_quotes, "Expand/collapse all quotes in a message", 'o'
     k.add :jump_to_next_open, "Jump to next open message", 'n'
@@ -259,7 +260,8 @@ EOS
     chunk = @chunk_lines[curpos] or return
     case chunk
     when Chunk::Attachment
-      fn = BufferManager.ask_for_filename :filename, "Save attachment to file: ", chunk.filename
+      default_dir = File.join(($config[:default_attachment_save_dir] || "."), chunk.filename)
+      fn = BufferManager.ask_for_filename :filename, "Save attachment to file: ", default_dir
       save_to_file(fn) { |f| f.print chunk.raw_content } if fn
     else
       m = @message_lines[curpos]
@@ -283,6 +285,18 @@ EOS
     end
   end
 
+  def send_draft
+    m = @message_lines[curpos] or return
+    if m.is_draft?
+      mode = ResumeMode.new m
+      BufferManager.spawn "Send message", mode
+      BufferManager.kill_buffer self.buffer
+      mode.send_message
+    else
+      BufferManager.flash "Not a draft message!"
+    end
+  end
+
   def jump_to_first_open loose_alignment=false
     m = @message_lines[0] or return
     if @layout[m].state != :closed
@@ -642,7 +656,7 @@ private
       [[[:missing_message_color, "#{prefix}<an unreceived message>"]]]
     when Message
       message_patina_lines(chunk, state, start, parent, prefix, color, star_color) +
-        (chunk.is_draft? ? [[[:draft_notification_color, prefix + " >>> This message is a draft. To edit, hit 'e'. <<<"]]] : [])
+        (chunk.is_draft? ? [[[:draft_notification_color, prefix + " >>> This message is a draft. Hit 'e' to edit, 'y' to send. <<<"]]] : [])
 
     else
       raise "Bad chunk: #{chunk.inspect}" unless chunk.respond_to?(:inlineable?) ## debugging

data/lib/sup/rfc2047.rb

@@ -52,13 +52,8 @@ module Rfc2047
         # WORD.
       end
 
-      charset = "utf-8" if charset =~ /UTF_?8/i
-
-      # Convert:
-      #
-      # Remember - Iconv.open(to, from)!
       begin
-        text = Iconv.iconv(target + "//IGNORE", charset, text + " ").join[0 .. -2]
+        Iconv.easy_decode(target, charset, text)
       rescue Iconv::InvalidCharacter
         text
       end

data/lib/sup/textfield.rb

@@ -33,7 +33,7 @@ class TextField
     @w, @y, @x, @width = window, y, x, width
     @question = question
     @completion_block = block
-    @field = Ncurses::Form.new_field 1, @width - question.length, @y, @x + question.length, 0, 0
+    @field = Ncurses::Form.new_field 1, @width - question.length, @y, @x + question.length, 256, 0
     @form = Ncurses::Form.new_form [@field]
     @value = default
     Ncurses::Form.post_form @form

data/lib/sup/util.rb

@@ -617,3 +617,20 @@ class FinishLine
     @m.synchronize { !@over && @over = true }
   end
 end
+
+class Iconv
+  def self.easy_decode target, charset, text
+    return text if charset =~ /^(x-unknown|unknown[-_]?8bit|ascii[-_]?7[-_]?bit)$/i
+    charset = case charset
+                when /UTF[-_]?8/i: "utf-8"
+                when /(iso[-_])?latin[-_]?1$/i: "ISO-8859-1"
+                when /unicode[-_]1[-_]1[-_]utf[-_]7/i: "utf-7"
+                else charset
+              end
+
+    # Convert:
+    #
+    # Remember - Iconv.open(to, from)!
+    Iconv.iconv(target + "//IGNORE", charset, text + " ").join[0 .. -2]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sup
 version: !ruby/object:Gem::Version 
-  version: "0.6"
+  version: "0.7"
 platform: ruby
 authors: 
 - William Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-03 00:00:00 -07:00
+date: 2009-03-25 06:21:53 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.13
+        version: 0.11.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: ncurses
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.7"
+        version: "1.12"
     version: 
 - !ruby/object:Gem::Dependency 
   name: lockfile
@@ -88,9 +88,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "1"
     version: 
 - !ruby/object:Gem::Dependency 
   name: gettext
@@ -112,16 +112,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.7.0
-    version: 
 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, IMAP folders, 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: 
@@ -135,22 +125,13 @@ executables:
 - sup-tweak-labels
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-- doc/FAQ.txt
-- doc/Hooks.txt
-- doc/NewUserGuide.txt
-- doc/Philosophy.txt
+extra_rdoc_files: []
+
 files: 
 - CONTRIBUTORS
-- HACKING
-- History.txt
-- LICENSE
-- Manifest.txt
 - README.txt
-- Rakefile
+- LICENSE
+- History.txt
 - ReleaseNotes
 - bin/sup
 - bin/sup-add
@@ -160,71 +141,66 @@ files:
 - bin/sup-sync
 - bin/sup-sync-back
 - bin/sup-tweak-labels
-- doc/FAQ.txt
-- doc/Hooks.txt
-- doc/NewUserGuide.txt
-- doc/Philosophy.txt
 - lib/sup.rb
+- lib/sup/draft.rb
+- lib/sup/imap.rb
+- lib/sup/thread.rb
+- lib/sup/logger.rb
+- lib/sup/person.rb
+- lib/sup/rfc2047.rb
 - lib/sup/account.rb
 - lib/sup/buffer.rb
+- lib/sup/horizontal-selector.rb
+- lib/sup/textfield.rb
+- lib/sup/source.rb
+- lib/sup/suicide.rb
+- lib/sup/maildir.rb
+- lib/sup/tagger.rb
 - lib/sup/colormap.rb
-- lib/sup/contact.rb
-- lib/sup/crypto.rb
-- lib/sup/draft.rb
 - lib/sup/hook.rb
-- lib/sup/horizontal-selector.rb
-- lib/sup/imap.rb
 - lib/sup/index.rb
-- lib/sup/keymap.rb
+- lib/sup/update.rb
+- lib/sup/util.rb
+- lib/sup/message-chunks.rb
 - lib/sup/label.rb
-- lib/sup/logger.rb
-- lib/sup/maildir.rb
 - lib/sup/mbox.rb
-- lib/sup/mbox/loader.rb
-- lib/sup/mbox/ssh-file.rb
-- lib/sup/mbox/ssh-loader.rb
-- lib/sup/message-chunks.rb
+- lib/sup/poll.rb
 - lib/sup/message.rb
+- lib/sup/crypto.rb
+- lib/sup/sent.rb
 - lib/sup/mode.rb
-- lib/sup/modes/buffer-list-mode.rb
-- lib/sup/modes/completion-mode.rb
-- lib/sup/modes/compose-mode.rb
-- lib/sup/modes/contact-list-mode.rb
-- lib/sup/modes/edit-message-mode.rb
-- lib/sup/modes/file-browser-mode.rb
-- lib/sup/modes/forward-mode.rb
-- lib/sup/modes/help-mode.rb
-- lib/sup/modes/inbox-mode.rb
-- lib/sup/modes/label-list-mode.rb
+- lib/sup/contact.rb
+- lib/sup/keymap.rb
+- lib/sup/modes/resume-mode.rb
+- lib/sup/modes/poll-mode.rb
+- lib/sup/modes/thread-view-mode.rb
 - lib/sup/modes/label-search-results-mode.rb
-- lib/sup/modes/line-cursor-mode.rb
+- lib/sup/modes/label-list-mode.rb
+- lib/sup/modes/help-mode.rb
 - lib/sup/modes/log-mode.rb
+- lib/sup/modes/edit-message-mode.rb
+- lib/sup/modes/forward-mode.rb
 - lib/sup/modes/person-search-results-mode.rb
-- lib/sup/modes/poll-mode.rb
-- lib/sup/modes/reply-mode.rb
-- lib/sup/modes/resume-mode.rb
+- lib/sup/modes/inbox-mode.rb
+- lib/sup/modes/buffer-list-mode.rb
 - lib/sup/modes/scroll-mode.rb
 - lib/sup/modes/search-results-mode.rb
-- lib/sup/modes/text-mode.rb
+- lib/sup/modes/compose-mode.rb
+- lib/sup/modes/line-cursor-mode.rb
 - lib/sup/modes/thread-index-mode.rb
-- lib/sup/modes/thread-view-mode.rb
-- lib/sup/person.rb
-- lib/sup/poll.rb
-- lib/sup/rfc2047.rb
-- lib/sup/sent.rb
-- lib/sup/source.rb
-- lib/sup/suicide.rb
-- lib/sup/tagger.rb
-- lib/sup/textfield.rb
-- lib/sup/thread.rb
-- lib/sup/update.rb
-- lib/sup/util.rb
-has_rdoc: true
-homepage: http://sup.rubyforge.org
+- lib/sup/modes/contact-list-mode.rb
+- lib/sup/modes/completion-mode.rb
+- lib/sup/modes/file-browser-mode.rb
+- lib/sup/modes/reply-mode.rb
+- lib/sup/modes/text-mode.rb
+- lib/sup/mbox/ssh-loader.rb
+- lib/sup/mbox/loader.rb
+- lib/sup/mbox/ssh-file.rb
+has_rdoc: false
+homepage: http://sup.rubyforge.org/
 post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -241,11 +217,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: sup
+rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 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: 
-- test/test_message.rb
-- test/test_mbox_parsing.rb
+test_files: []
+