sup 0.11 → 0.12

data/lib/sup/sent.rb

@@ -19,29 +19,24 @@ class SentManager
   end
 
   def default_source
-    @source = Recoverable.new SentLoader.new
+    @source = SentLoader.new
     @source_uri = @source.uri
     @source
   end
 
   def write_sent_message date, from_email, &block
     @source.store_message date, from_email, &block
-
-    PollManager.each_message_from(@source) do |m|
-      m.remove_label :unread
-      m.add_label :sent
-      PollManager.add_new_message m
-    end
+    PollManager.poll_from @source
   end
 end
 
-class SentLoader < MBox::Loader
-  yaml_properties :cur_offset
+class SentLoader < MBox
+  yaml_properties
 
-  def initialize cur_offset=0
+  def initialize
     @filename = Redwood::SENT_FN
     File.open(@filename, "w") { } unless File.exists? @filename
-    super "mbox://" + @filename, cur_offset, true, true
+    super "mbox://" + @filename, true, true
   end
 
   def file_path; @filename end
@@ -51,6 +46,8 @@ class SentLoader < MBox::Loader
 
   def id; 9998; end
   def labels; [:inbox, :sent]; end
+  def default_labels; []; end
+  def read?; true; end
 end
 
 end

data/lib/sup/server.rb

@@ -0,0 +1,116 @@
+require 'sup/protocol'
+
+module Redwood
+
+class Server < EM::P::RedwoodServer
+  def initialize index
+    super
+    @index = index
+  end
+
+  def receive_message type, tag, params
+    if respond_to? :"request_#{type}"
+      send :"request_#{type}", tag, params
+    else
+      send_message 'error', tag, 'description' => "invalid request type #{type.inspect}"
+    end
+  end
+
+  def request_query tag, a
+    q = @index.parse_query a['query']
+    query q, a['offset'], a['limit'], a['raw'] do |r|
+      send_message 'message', tag, r
+    end
+    send_message 'done', tag
+  end
+
+  def request_count tag, a
+    q = @index.parse_query a['query']
+    c = count q
+    send_message 'count', tag, 'count' => c
+  end
+
+  def request_label tag, a
+    q = @index.parse_query a['query']
+    label q, a['add'], a['remove']
+    send_message 'done', tag
+  end
+
+  def request_add tag, a
+    add a['raw'], a['labels']
+    send_message 'done', tag
+  end
+
+  def request_thread tag, a
+    thread a['message_id'], a['raw'] do |r|
+      send_message 'message', tag, r
+    end
+    send_message 'done', tag
+  end
+
+private
+
+  def result_from_message m, raw
+    mkperson = lambda { |p| { :email => p.email, :name => p.name } }
+    {
+      'summary' => {
+        'message_id' => m.id,
+        'date' => m.date,
+        'from' => mkperson[m.from],
+        'to' => m.to.map(&mkperson),
+        'cc' => m.cc.map(&mkperson),
+        'bcc' => m.bcc.map(&mkperson),
+        'subject' => m.subj,
+        'refs' => m.refs,
+        'replytos' => m.replytos,
+        'labels' => m.labels.map(&:to_s),
+      },
+      'raw' => raw ? m.raw_message : nil,
+    }
+  end
+
+  def query query, offset, limit, raw
+    c = 0
+    @index.each_message query do |m|
+      next if c < offset
+      break if c >= offset + limit if limit
+      yield result_from_message(m, raw)
+      c += 1
+    end
+    nil
+  end
+
+  def count query
+    @index.num_results_for query
+  end
+
+  def label query, remove_labels, add_labels
+    @index.each_message query do |m|
+      remove_labels.each { |l| m.remove_label l }
+      add_labels.each { |l| m.add_label l }
+      @index.update_message_state m
+    end
+    nil
+  end
+
+  def add raw, labels
+    SentManager.source.store_message Time.now, "test@example.com" do |io|
+      io.write raw
+    end
+    PollManager.poll_from SentManager.source do |sym,m,old_m,progress|
+      next unless sym == :add
+      m.labels = labels
+    end
+    nil
+  end
+
+  def thread msg_id, raw
+    msg = @index.build_message msg_id
+    @index.each_message_in_thread_for msg do |id, builder|
+      m = builder.call
+      yield result_from_message(m, raw)
+    end
+  end
+end
+
+end

data/lib/sup/source.rb

@@ -59,50 +59,37 @@ class Source
   ## Examples for you to look at: mbox/loader.rb, imap.rb, and
   ## maildir.rb.
 
-  ## let's begin!
-  ##
-  ## dirty? means cur_offset has changed, so the source info needs to
-  ## be re-saved to sources.yaml.
-  bool_reader :usual, :archived, :dirty
-  attr_reader :uri, :cur_offset
+  bool_accessor :usual, :archived
+  attr_reader :uri
   attr_accessor :id
 
-  def initialize uri, initial_offset=nil, usual=true, archived=false, id=nil
+  def initialize uri, usual=true, archived=false, id=nil
     raise ArgumentError, "id must be an integer: #{id.inspect}" unless id.is_a? Fixnum if id
 
     @uri = uri
-    @cur_offset = initial_offset
     @usual = usual
     @archived = archived
     @id = id
-    @dirty = false
   end
 
   ## overwrite me if you have a disk incarnation (currently used only for sup-sync-back)
   def file_path; nil end
 
   def to_s; @uri.to_s; end
-  def seek_to! o; self.cur_offset = o; end
-  def reset!; seek_to! start_offset; end
   def == o; o.uri == uri; end
-  def done?; start_offset.nil? || (self.cur_offset ||= start_offset) >= end_offset; end
   def is_source_for? uri; uri == @uri; end
 
-  ## check should throw a FatalSourceError or an OutOfSyncSourcError
-  ## if it can detect a problem. it is called when the sup starts up
-  ## to proactively notify the user of any source problems.
-  def check; end
+  def read?; false; end
 
-  ## yields successive offsets and labels, starting at #cur_offset.
-  ##
-  ## when implementing a source, you can overwrite either #each or #next. the
-  ## default #each just calls next over and over.
-  def each
-    self.cur_offset ||= start_offset
-    until done?
-      offset, labels = self.next
-      yield offset, labels
-    end
+  ## Yields values of the form [Symbol, Hash]
+  ## add: info, labels, progress
+  ## delete: info, progress
+  def poll
+    unimplemented
+  end
+
+  def valid? info
+    true
   end
 
   ## utility method to read a raw email header from an IO stream and turn it
@@ -154,11 +141,6 @@ protected
   def Source.expand_filesystem_uri uri
     uri.gsub "~", File.expand_path("~")
   end
-
-  def cur_offset= o
-    @cur_offset = o
-    @dirty = true
-  end
 end
 
 ## if you have a @labels instance variable, include this
@@ -210,7 +192,7 @@ class SourceManager
   def unusual_sources; sources.find_all { |s| !s.usual? }; end
 
   def load_sources fn=Redwood::SOURCE_FN
-    source_array = (Redwood::load_yaml_obj(fn) || []).map { |o| Recoverable.new o }
+    source_array = Redwood::load_yaml_obj(fn) || []
     @source_mutex.synchronize do
       @sources = Hash[*(source_array).map { |s| [s.id, s] }.flatten]
       @sources_dirty = false
@@ -219,7 +201,7 @@ class SourceManager
 
   def save_sources fn=Redwood::SOURCE_FN
     @source_mutex.synchronize do
-      if @sources_dirty || @sources.any? { |id, s| s.dirty? }
+      if @sources_dirty
         bakfn = fn + ".bak"
         if File.exists? fn
           File.chmod 0600, fn

data/lib/sup/thread.rb

@@ -85,6 +85,7 @@ class Thread
   end
 
   def first; each { |m, *o| return m if m }; nil; end
+  def has_message?; any? { |m, *o| m.is_a? Message }; end
   def dirty?; any? { |m, *o| m && m.dirty? }; end
   def date; map { |m, *o| m.date if m }.compact.max; end
   def snippet
@@ -146,6 +147,11 @@ class Thread
   def to_s
     "<thread containing: #{@containers.join ', '}>"
   end
+
+  def sort_key
+    m = latest_message
+    m ? [-m.date.to_i, m.id] : [-Time.now.to_i, ""]
+  end
 end
 
 ## recursive structure used internally to represent message trees as

data/lib/sup/util.rb

@@ -3,8 +3,18 @@ require 'lockfile'
 require 'mime/types'
 require 'pathname'
 require 'set'
+require 'enumerator'
+require 'benchmark'
 
 ## time for some monkeypatching!
+class Symbol
+  unless method_defined? :to_proc
+    def to_proc
+      proc {  |obj, *args| obj.send(self, *args) }
+    end
+  end
+end
+
 class Lockfile
   def gen_lock_id
     Hash[
@@ -88,6 +98,19 @@ module RMail
       a
     end
   end
+
+  class Serialize
+    ## Don't add MIME-Version headers on serialization. Sup sometimes want's to serialize
+    ## message parts where these headers are not needed and messing with the message on
+    ## serialization breaks gpg signatures. The commented section shows the original RMail
+    ## code.
+    def calculate_boundaries(message)
+      calculate_boundaries_low(message, [])
+      # unless message.header['MIME-Version']
+      #   message.header['MIME-Version'] = "1.0"
+      # end
+    end
+  end
 end
 
 class Range
@@ -175,6 +198,13 @@ class Object
       EOF
     end
   end
+
+  def benchmark s, &b
+    ret = nil
+    times = Benchmark.measure { ret = b.call }
+    debug "benchmark #{s}: #{times}"
+    ret
+  end
 end
 
 class String
@@ -207,7 +237,7 @@ class String
   ## a very complicated regex found on teh internets to split on
   ## commas, unless they occurr within double quotes.
   def split_on_commas
-    split(/,\s*(?=(?:[^"]*"[^"]*")*(?![^"]*"))/)
+    normalize_whitespace().split(/,\s*(?=(?:[^"]*"[^"]*")*(?![^"]*"))/)
   end
 
   ## ok, here we do it the hard way. got to have a remainder for purposes of
@@ -301,7 +331,7 @@ class String
   end
 
   ## takes a list of words, and returns an array of symbols.  typically used in
-  ## Sup for translating Ferret's representation of a list of labels (a string)
+  ## Sup for translating Xapian's representation of a list of labels (a string)
   ## to an array of label symbols.
   ##
   ## split_on will be passed to String#split, so you can leave this nil for space.
@@ -459,6 +489,15 @@ module Enumerable
   def max_of
     map { |e| yield e }.max
   end
+
+  ## returns all the entries which are equal to startline up to endline
+  def between startline, endline
+    select { |l| true if l == startline .. l == endline }
+  end
+end
+
+unless Object.const_defined? :Enumerator
+  Enumerator = Enumerable::Enumerator
 end
 
 class Array
@@ -570,7 +609,7 @@ module Singleton
       @instance.send meth, *a, &b
     end
     def init *args
-      raise "there can be only one! (instance)" if defined? @instance
+      raise "there can be only one! (instance)" if instantiated?
       @instance = new(*args)
     end
   end
@@ -581,40 +620,6 @@ module Singleton
   end
 end
 
-## wraps an object. if it throws an exception, keeps a copy.
-class Recoverable
-  def initialize o
-    @o = o
-    @error = nil
-    @mutex = Mutex.new
-  end
-
-  attr_accessor :error
-
-  def clear_error!; @error = nil; end
-  def has_errors?; !@error.nil?; end
-
-  def method_missing m, *a, &b; __pass m, *a, &b end
-
-  def id; __pass :id; end
-  def to_s; __pass :to_s; end
-  def to_yaml x; __pass :to_yaml, x; end
-  def is_a? c; @o.is_a? c; end
-
-  def respond_to?(m, include_private=false)
-    @o.respond_to?(m, include_private)
-  end
-
-  def __pass m, *a, &b
-    begin
-      @o.send(m, *a, &b)
-    rescue Exception => e
-      @error ||= e
-      raise
-    end
-  end
-end
-
 ## acts like a hash with an initialization block, but saves any
 ## newly-created value even upon lookup.
 ##
@@ -707,9 +712,9 @@ class Iconv
     end
 
     begin
-      returning(Iconv.iconv(target, charset, text + " ").join[0 .. -2]) { |str| str.check }
+      returning(Iconv.iconv(target + "//IGNORE", charset, text + " ").join[0 .. -2]) { |str| str.check }
     rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::InvalidCharacter, Iconv::IllegalSequence, String::CheckError
-      debug "couldn't transcode text from #{orig_charset} (#{charset}) to #{target}) (#{text[0 ... 20].inspect}...) (got #{$!.message} (#{$!.class}))"
+      debug "couldn't transcode text from #{orig_charset} (#{charset}) to #{target} (#{text[0 ... 20].inspect}...): got #{$!.class} (#{$!.message})"
       text.ascii
     end
   end

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: sup
 version: !ruby/object:Gem::Version 
-  version: "0.11"
+  prerelease: false
+  segments: 
+  - 0
+  - 12
+  version: "0.12"
 platform: ruby
 authors: 
 - William Morgan
@@ -9,100 +13,132 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-07 16:07:55 -08:00
+date: 2011-01-14 21:13:42 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xapian-full
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 3
+        - 1
         version: 1.1.3.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ncurses
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rmail
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 17
         version: "0.17"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: trollop
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 12
         version: "1.12"
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: lockfile
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: mime-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
         version: "1"
-    version: 
+  type: :runtime
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: gettext
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "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."
+  type: :runtime
+  version_requirements: *id009
+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
@@ -132,66 +168,64 @@ files:
 - bin/sup-sync-back
 - bin/sup-tweak-labels
 - lib/sup.rb
-- lib/sup/account.rb
-- lib/sup/interactive-lock.rb
-- lib/sup/message.rb
-- lib/sup/rfc2047.rb
-- lib/sup/buffer.rb
-- lib/sup/textfield.rb
-- lib/sup/sent.rb
 - lib/sup/colormap.rb
-- lib/sup/logger.rb
-- lib/sup/mbox.rb
 - lib/sup/draft.rb
-- lib/sup/contact.rb
-- lib/sup/thread.rb
-- lib/sup/mode.rb
-- lib/sup/keymap.rb
-- lib/sup/person.rb
-- lib/sup/connection.rb
-- lib/sup/message-chunks.rb
 - lib/sup/source.rb
-- lib/sup/tagger.rb
-- lib/sup/undo.rb
-- lib/sup/label.rb
+- lib/sup/message-chunks.rb
+- lib/sup/person.rb
+- lib/sup/logger.rb
+- lib/sup/index.rb
+- lib/sup/message.rb
 - lib/sup/search.rb
-- lib/sup/util.rb
-- lib/sup/update.rb
 - lib/sup/idle.rb
+- lib/sup/mode.rb
+- lib/sup/client.rb
+- lib/sup/contact.rb
+- lib/sup/poll.rb
+- lib/sup/update.rb
+- lib/sup/keymap.rb
+- lib/sup/server.rb
+- lib/sup/undo.rb
+- lib/sup/protocol.rb
 - lib/sup/hook.rb
-- lib/sup/index.rb
+- lib/sup/label.rb
+- lib/sup/sent.rb
+- lib/sup/tagger.rb
 - lib/sup/maildir.rb
-- lib/sup/crypto.rb
-- lib/sup/imap.rb
 - lib/sup/horizontal-selector.rb
-- lib/sup/poll.rb
-- lib/sup/modes/person-search-results-mode.rb
+- lib/sup/util.rb
+- lib/sup/crypto.rb
+- lib/sup/mbox.rb
+- lib/sup/textfield.rb
+- lib/sup/account.rb
+- lib/sup/rfc2047.rb
+- lib/sup/thread.rb
+- lib/sup/buffer.rb
+- lib/sup/interactive-lock.rb
+- lib/sup/modes/compose-mode.rb
+- lib/sup/modes/reply-mode.rb
+- lib/sup/modes/forward-mode.rb
+- lib/sup/modes/line-cursor-mode.rb
+- lib/sup/modes/label-list-mode.rb
 - lib/sup/modes/file-browser-mode.rb
+- lib/sup/modes/contact-list-mode.rb
+- lib/sup/modes/thread-view-mode.rb
+- lib/sup/modes/person-search-results-mode.rb
+- lib/sup/modes/inbox-mode.rb
+- lib/sup/modes/search-list-mode.rb
+- lib/sup/modes/poll-mode.rb
+- lib/sup/modes/thread-index-mode.rb
+- lib/sup/modes/scroll-mode.rb
 - lib/sup/modes/completion-mode.rb
-- lib/sup/modes/resume-mode.rb
-- lib/sup/modes/console-mode.rb
+- lib/sup/modes/search-results-mode.rb
 - lib/sup/modes/help-mode.rb
-- lib/sup/modes/label-search-results-mode.rb
-- lib/sup/modes/label-list-mode.rb
-- lib/sup/modes/thread-index-mode.rb
-- lib/sup/modes/line-cursor-mode.rb
-- lib/sup/modes/text-mode.rb
-- lib/sup/modes/compose-mode.rb
 - lib/sup/modes/log-mode.rb
 - lib/sup/modes/edit-message-mode.rb
-- lib/sup/modes/inbox-mode.rb
-- lib/sup/modes/poll-mode.rb
-- lib/sup/modes/reply-mode.rb
-- lib/sup/modes/forward-mode.rb
+- lib/sup/modes/text-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/search-list-mode.rb
-- lib/sup/modes/thread-view-mode.rb
-- lib/sup/modes/contact-list-mode.rb
-- lib/sup/mbox/ssh-file.rb
-- lib/sup/mbox/loader.rb
-- lib/sup/mbox/ssh-loader.rb
+- lib/sup/modes/resume-mode.rb
+- lib/sup/modes/label-search-results-mode.rb
+- lib/sup/modes/console-mode.rb
 has_rdoc: true
 homepage: http://sup.rubyforge.org/
 licenses: []
@@ -202,21 +236,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.3
+rubygems_version: 1.3.7
 signing_key: 
 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.