sup 0.10.2 → 0.11

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

@@ -35,6 +35,14 @@ Return value:
   which will be appended by sup.
 EOS
 
+  HookManager.register "publish", <<EOS
+Executed when a message or a chunk is requested to be published.
+Variables:
+     chunk: Redwood::Message or Redwood::Chunk::* to be published.
+Return value:
+  None.
+EOS
+
   register_keymap do |k|
     k.add :toggle_detailed_header, "Toggle detailed header", 'h'
     k.add :show_header, "Show full message header", 'H'
@@ -59,6 +67,7 @@ EOS
     k.add :edit_as_new, "Edit message as new", 'D'
     k.add :save_to_disk, "Save message/attachment to disk", 's'
     k.add :save_all_to_disk, "Save all attachments to disk", 'A'
+    k.add :publish, "Publish message/attachment using publish-hook", 'P'
     k.add :search, "Search for messages from particular people", 'S'
     k.add :compose, "Compose message to person", 'm'
     k.add :subscribe_to_list, "Subscribe to/unsubscribe from mailing list", "("
@@ -74,6 +83,7 @@ EOS
       kk.add :delete_and_kill, "Delete this thread and kill buffer", 'd'
       kk.add :spam_and_kill, "Mark this thread as spam and kill buffer", 's'
       kk.add :unread_and_kill, "Mark this thread as unread and kill buffer", 'N'
+      kk.add :do_nothing_and_kill, "Just kill this buffer", '.'
     end
 
     k.add_multi "(a)rchive/(d)elete/mark as (s)pam/mark as u(N)read/do (n)othing:", ',' do |kk|
@@ -81,7 +91,7 @@ EOS
       kk.add :delete_and_next, "Delete this thread, kill buffer, and view next", 'd'
       kk.add :spam_and_next, "Mark this thread as spam, kill buffer, and view next", 's'
       kk.add :unread_and_next, "Mark this thread as unread, kill buffer, and view next", 'N'
-      kk.add :do_nothing_and_next, "Kill buffer, and view next", 'n'
+      kk.add :do_nothing_and_next, "Kill buffer, and view next", 'n', ','
     end
 
     k.add_multi "(a)rchive/(d)elete/mark as (s)pam/mark as u(N)read/do (n)othing:", ']' do |kk|
@@ -89,7 +99,7 @@ EOS
       kk.add :delete_and_prev, "Delete this thread, kill buffer, and view previous", 'd'
       kk.add :spam_and_prev, "Mark this thread as spam, kill buffer, and view previous", 's'
       kk.add :unread_and_prev, "Mark this thread as unread, kill buffer, and view previous", 'N'
-      kk.add :do_nothing_and_prev, "Kill buffer, and view previous", 'n'
+      kk.add :do_nothing_and_prev, "Kill buffer, and view previous", 'n', ']'
     end
   end
 
@@ -330,7 +340,7 @@ EOS
     elsif chunk.viewable?
       view chunk
     end
-    if chunk.is_a?(Message)
+    if chunk.is_a?(Message) && $config[:jump_to_open_message]
       jump_to_message chunk
       jump_to_next_open if layout.state == :closed
     end
@@ -388,6 +398,15 @@ EOS
     end
   end
 
+  def publish
+    chunk = @chunk_lines[curpos] or return
+    if HookManager.enabled? "publish"
+      HookManager.run "publish", :chunk => chunk
+    else
+      BufferManager.flash "Publishing hook not defined."
+    end
+  end
+
   def edit_draft
     m = @message_lines[curpos] or return
     if m.is_draft?
@@ -508,6 +527,7 @@ EOS
   def spam_and_kill; spam_and_then :kill end
   def delete_and_kill; delete_and_then :kill end
   def unread_and_kill; unread_and_then :kill end
+  def do_nothing_and_kill; do_nothing_and_then :kill end
 
   def archive_and_next; archive_and_then :next end
   def spam_and_next; spam_and_then :next end
@@ -792,7 +812,12 @@ private
       if chunk.inlineable?
         lines = chunk.lines
         if @wrap
-          width = buffer.content_width
+          config_width = $config[:wrap_width]
+          if config_width and config_width != 0
+            width = [config_width, buffer.content_width].min
+          else
+            width = buffer.content_width
+          end
           lines = lines.map { |l| l.chomp.wrap width }.flatten
         end
         lines.map { |line| [[chunk.color, "#{prefix}#{line}"]] }

data/lib/sup/poll.rb

@@ -37,6 +37,9 @@ EOS
     @polling = false
     @poll_sources = nil
     @mode = nil
+    @should_clear_running_totals = false
+    clear_running_totals # defines @running_totals
+    UpdateManager.register self
   end
 
   def poll_with_sources
@@ -45,8 +48,12 @@ EOS
 
     BufferManager.flash "Polling for new messages..."
     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. Labels: #{loaded_labels.map{|l| l.to_s}.join(', ')}"
+    clear_running_totals if @should_clear_running_totals
+    @running_totals[:num] += num
+    @running_totals[:numi] += numi
+    @running_totals[:loaded_labels] += loaded_labels || []
+    if @running_totals[:num] > 0
+      BufferManager.flash "Loaded #{@running_totals[:num].pluralize 'new message'}, #{@running_totals[:numi]} to inbox. Labels: #{@running_totals[:loaded_labels].map{|l| l.to_s}.join(', ')}"
     else
       BufferManager.flash "No new messages." 
     end
@@ -183,6 +190,10 @@ EOS
     Index.add_message m
     UpdateManager.relay self, :added, m
   end
+
+  def handle_idle_update sender, idle_since; @should_clear_running_totals = false; end
+  def handle_unidle_update sender, idle_since; @should_clear_running_totals = true; clear_running_totals; end
+  def clear_running_totals; @running_totals = {:num => 0, :numi => 0, :loaded_labels => Set.new}; end
 end
 
 end

data/lib/sup/search.rb

@@ -0,0 +1,73 @@
+module Redwood
+
+class SearchManager
+  include Singleton
+
+  class ExpansionError < StandardError; end
+
+  def initialize fn
+    @fn = fn
+    @searches = {}
+    if File.exists? fn
+      IO.foreach(fn) do |l|
+        l =~ /^([^:]*): (.*)$/ or raise "can't parse #{fn} line #{l.inspect}"
+        @searches[$1] = $2
+      end
+    end
+    @modified = false
+  end
+
+  def all_searches; return @searches.keys.sort; end
+  def search_string_for name; return @searches[name]; end
+  def valid_name? name; name =~ /^[\w-]+$/; end
+  def name_format_hint; "letters, numbers, underscores and dashes only"; end
+
+  def add name, search_string
+    return unless valid_name? name
+    @searches[name] = search_string
+    @modified = true
+  end
+
+  def rename old, new
+    return unless @searches.has_key? old
+    search_string = @searches[old]
+    delete old if add new, search_string
+  end
+
+  def edit name, search_string
+    return unless @searches.has_key? name
+    @searches[name] = search_string
+    @modified = true
+  end
+
+  def delete name
+    return unless @searches.has_key? name
+    @searches.delete name
+    @modified = true
+  end
+
+  def expand search_string
+    expanded = search_string.dup
+    until (matches = expanded.scan(/\{([\w-]+)\}/).flatten).empty?
+      if !(unknown = matches - @searches.keys).empty?
+        error_message = "Unknown \"#{unknown.join('", "')}\" when expanding \"#{search_string}\""
+      elsif expanded.size >= 2048
+        error_message = "Check for infinite recursion in \"#{search_string}\""
+      end
+      if error_message
+        warn error_message
+        raise ExpansionError, error_message
+      end
+      matches.each { |n| expanded.gsub! "{#{n}}", "(#{@searches[n]})" if @searches.has_key? n }
+    end
+    return expanded
+  end
+
+  def save
+    return unless @modified
+    File.open(@fn, "w") { |f| @searches.sort.each { |(n, s)| f.puts "#{n}: #{s}" } }
+    @modified = false
+  end
+end
+
+end

data/lib/sup/textfield.rb

@@ -33,7 +33,11 @@ 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, 256, 0
+    @field = Ncurses::Form.new_field 1, @width - question.length, @y, @x + question.length, 0, 0
+    if @field.respond_to? :opts_off
+      @field.opts_off Ncurses::Form::O_STATIC
+      @field.opts_off Ncurses::Form::O_BLANK
+    end
     @form = Ncurses::Form.new_form [@field]
     @value = default || ''
     Ncurses::Form.post_form @form
@@ -63,6 +67,7 @@ class TextField
     when Ncurses::KEY_ENTER # submit!
       @value = get_cursed_value
       @history.push @value unless @value =~ /^\s*$/
+      @i = @history.size
       return false
     when Ncurses::KEY_CANCEL # cancel
       @value = nil
@@ -102,29 +107,29 @@ class TextField
         Ncurses::Form::REQ_DEL_CHAR
       when Ncurses::KEY_BACKSPACE, 127 # 127 is also a backspace keysym
         Ncurses::Form::REQ_DEL_PREV
-      when ?\C-a
+      when ?\C-a.ord, Ncurses::KEY_HOME
         nop
         Ncurses::Form::REQ_BEG_FIELD
-      when ?\C-e
+      when ?\C-e.ord, Ncurses::KEY_END
         Ncurses::Form::REQ_END_FIELD
-      when ?\C-k
+      when ?\C-k.ord
         Ncurses::Form::REQ_CLR_EOF
-      when ?\C-u
+      when ?\C-u.ord
         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
+      when ?\C-w.ord
         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?
+        unless !@i || @history.empty?
           value = get_cursed_value
-          @i ||= @history.size
           #debug "history before #{@history.inspect}"
-          @history[@i] = value #unless value =~ /^\s*$/
-          @i = (@i + (c == Ncurses::KEY_UP ? -1 : 1)) % @history.size
-          @value = @history[@i]
+          @i = @i + (c == Ncurses::KEY_UP ? -1 : 1)
+          @i = 0 if @i < 0
+          @i = @history.size if @i > @history.size
+          @value = @history[@i] || ''
           #debug "history after #{@history.inspect}"
           set_cursed_value @value
           Ncurses::Form::REQ_END_FIELD
@@ -174,7 +179,7 @@ private
   ## 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, " ".ord
     Ncurses::Form.form_driver @form, Ncurses::Form::REQ_DEL_PREV
   end
 end

data/lib/sup/util.rb

@@ -132,6 +132,10 @@ class Object
   ## "k combinator"
   def returning x; yield x; x; end
 
+  unless method_defined? :tap
+    def tap; yield self; self; end
+  end
+
   ## clone of java-style whole-method synchronization
   ## assumes a @mutex variable
   ## TODO: clean up, try harder to avoid namespace collisions
@@ -329,6 +333,13 @@ class String
   def transcode src_encoding=$encoding
     Iconv.easy_decode $encoding, src_encoding, self
   end
+
+  unless method_defined? :ascii_only?
+    def ascii_only?
+      size.times { |i| return false if self[i] & 128 != 0 }
+      return true
+    end
+  end
 end
 
 class Numeric

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sup
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
+  version: "0.11"
 platform: ruby
 authors: 
 - William Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 08:56:01 -05:00
+date: 2010-03-07 16:07:55 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
         version: 1.1.3.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: ncursesw
+  name: ncurses
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -113,7 +113,6 @@ executables:
 - sup-sync
 - sup-sync-back
 - sup-tweak-labels
-- sup-convert-ferret-index
 extensions: []
 
 extra_rdoc_files: []
@@ -132,64 +131,64 @@ files:
 - bin/sup-sync
 - bin/sup-sync-back
 - bin/sup-tweak-labels
-- bin/sup-convert-ferret-index
 - lib/sup.rb
-- lib/ncurses.rb
-- lib/sup/poll.rb
-- lib/sup/source.rb
-- lib/sup/crypto.rb
-- lib/sup/horizontal-selector.rb
-- lib/sup/mode.rb
-- lib/sup/interactive-lock.rb
 - lib/sup/account.rb
-- lib/sup/imap.rb
-- lib/sup/maildir.rb
-- lib/sup/contact.rb
+- lib/sup/interactive-lock.rb
 - lib/sup/message.rb
-- lib/sup/label.rb
-- lib/sup/index.rb
-- lib/sup/keymap.rb
 - lib/sup/rfc2047.rb
-- lib/sup/tagger.rb
-- lib/sup/util.rb
+- lib/sup/buffer.rb
 - lib/sup/textfield.rb
-- lib/sup/xapian_index.rb
 - lib/sup/sent.rb
-- lib/sup/undo.rb
+- lib/sup/colormap.rb
+- lib/sup/logger.rb
 - lib/sup/mbox.rb
-- lib/sup/person.rb
-- lib/sup/ferret_index.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/search.rb
+- lib/sup/util.rb
 - lib/sup/update.rb
+- lib/sup/idle.rb
 - lib/sup/hook.rb
-- lib/sup/message-chunks.rb
-- lib/sup/colormap.rb
-- lib/sup/buffer.rb
-- lib/sup/logger.rb
-- lib/sup/draft.rb
-- lib/sup/modes/label-search-results-mode.rb
+- lib/sup/index.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/modes/file-browser-mode.rb
 - lib/sup/modes/completion-mode.rb
+- lib/sup/modes/resume-mode.rb
+- lib/sup/modes/console-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/reply-mode.rb
-- lib/sup/modes/forward-mode.rb
+- lib/sup/modes/line-cursor-mode.rb
+- lib/sup/modes/text-mode.rb
 - lib/sup/modes/compose-mode.rb
-- lib/sup/modes/thread-view-mode.rb
-- lib/sup/modes/person-search-results-mode.rb
-- lib/sup/modes/help-mode.rb
-- lib/sup/modes/file-browser-mode.rb
+- lib/sup/modes/log-mode.rb
 - lib/sup/modes/edit-message-mode.rb
-- lib/sup/modes/console-mode.rb
-- lib/sup/modes/contact-list-mode.rb
-- lib/sup/modes/poll-mode.rb
 - lib/sup/modes/inbox-mode.rb
-- lib/sup/modes/log-mode.rb
+- lib/sup/modes/poll-mode.rb
+- lib/sup/modes/reply-mode.rb
+- lib/sup/modes/forward-mode.rb
+- lib/sup/modes/buffer-list-mode.rb
 - lib/sup/modes/scroll-mode.rb
-- lib/sup/modes/text-mode.rb
-- lib/sup/modes/label-list-mode.rb
-- lib/sup/modes/resume-mode.rb
-- lib/sup/modes/line-cursor-mode.rb
 - lib/sup/modes/search-results-mode.rb
-- lib/sup/modes/buffer-list-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
@@ -217,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.3
 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.

data/bin/sup-convert-ferret-index

@@ -1,84 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'trollop'
-require "sup"; Redwood::check_library_version_against "0.10.2"
-
-STATE_BACKUP_FN = "/tmp/sup-state.txt"
-SOURCE_BACKUP_FN = "sources.yaml-before-xapian-upgrade"
-BIN_DIR = File.dirname __FILE__
-
-$opts = Trollop::options do
-  version "sup-convert-ferret-index (sup #{Redwood::VERSION})"
-  banner <<EOS
-Convert an Sup Ferret index to a Xapian index.
-
-This will be a very slow process, but it will be lossless.
-
-If you interrupt it, nothing bad will happen. However, you will have to
-restart it from scratch.
-
-Usage:
-  sup-convert-ferret-index
-
-Options:
-EOS
-  opt :verbose, "Be verbose", :short => "-v"
-  opt :dry_run, "Don't actually do anything, just print out what would happen.", :short => "-n"
-  opt :force, "Force overwrite of an old Xapian index"
-  opt :version, "Show version information", :short => :none
-end
-
-def build_cmd cmd
-  (ENV["RUBY_INVOCATION"] ? ENV["RUBY_INVOCATION"] + " " : "") + File.join(BIN_DIR, cmd)
-end
-
-def run cmd
-  puts cmd
-  unless $opts[:dry_run]
-    startt = Time.now
-    system cmd or abort
-    printf "(completed in %.1fs)\n", (Time.now - startt)
-  end
-  puts
-end
-
-begin
-  require 'xapian'
-rescue LoadError
-  Trollop::die "you don't have the xapian gem installed, so this script won't do much for you--`gem install xapian` (or xapian-full) first"
-end
-
-Redwood::start
-index = Redwood::Index.init
-Trollop::die "you appear to already have a Xapian index--delete #{File.join(Redwood::BASE_DIR, "xapian")} or use --force if you really want to do this" unless Redwood::Index.is_a_deprecated_ferret_index? || $opts[:force]
-
-puts "## Step one: back up all message state to #{STATE_BACKUP_FN}"
-run "#{build_cmd 'sup-dump'} --index ferret > #{STATE_BACKUP_FN}"
-puts "## message state saved to #{STATE_BACKUP_FN}"
-
-source_backup_fn = File.join Redwood::BASE_DIR, SOURCE_BACKUP_FN
-puts "## Step two: back up sources.yaml file to #{source_backup_fn}"
-run "cp #{Redwood::SOURCE_FN} #{source_backup_fn}"
-
-puts "## Step three: build the Xapian index"
-run "#{build_cmd 'sup-sync'} --all --all-sources --index xapian --restore #{STATE_BACKUP_FN} #{$opts[:verbose] ? '--verbose' : ''}"
-puts "## xapian index successfully built!"
-
-puts <<EOS
-
-Congratulations, your index has been upgraded to the Xapian backend.
-From now on, running sup should detect this index automatically.
-
-If you want to revert to the Ferret index:
-1. overwrite #{Redwood::SOURCE_FN} with #{source_backup_fn}
-2. use sup --index ferret, OR delete your #{Redwood::BASE_DIR}/xapian directory"
-Note that the Ferret index will not be supported as of the next Sup release, so
-you probably shouldn't do this.
-
-If you are happy with Xapian and want to reclaim precious hard drive space:
-1. rm #{source_backup_fn}
-2. rm -r #{Redwood::BASE_DIR}/ferret
-
-Happy supping!
-EOS