sup 0.8 → 0.8.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.8.1 / 2009-06-15
+* make multibyte display "work" for non-utf8 locales
+* fix reply-mode always selecting "Customized"
+* reduce email quote parsing worst-case behavior
+
 == 0.8 / 2009-06-05
 * Undo support on many operations. Yay!
 * Mbox splitting fixes. No more "From "-line problems.

data/ReleaseNotes

@@ -1,3 +1,8 @@
+Release 0.8.1:
+
+A bugfix release with fixes for quote parsing (bad behavior in certain long
+emails), multibyte display for non-utf8 locales, and reply-mode mode selection.
+
 Release 0.8:
 
 The big wins are undo support, mbox splitting fixes, and the various UI

data/bin/sup

@@ -8,7 +8,7 @@ require 'trollop'
 require 'fastthread'
 require "sup"
 
-BIN_VERSION = "0.8"
+BIN_VERSION = "0.8.1"
 
 unless Redwood::VERSION == BIN_VERSION
   $stderr.puts <<EOS

data/lib/ncurses.rb

@@ -0,0 +1,289 @@
+# ncurses-ruby is a ruby module for accessing the FSF's ncurses library
+# (C) 2002, 2003 Tobias Peters <t-peters@users.berlios.de>
+# (C) 2004 Simon Kaczor <skaczor@cox.net>
+#
+# This module is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This module is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this module; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+
+# $Id: ncurses.rb,v 1.5 2004/07/31 08:34:09 t-peters Exp $
+
+require "ncurses.so"
+
+
+# Ncurses constants with leading underscore
+def Ncurses._XOPEN_CURSES
+  Ncurses::XOPEN_CURSES
+end
+def Ncurses._SUBWIN  
+  Ncurses::SUBWIN
+end
+def Ncurses._ENDLINE 
+  Ncurses::ENDLINE
+end
+def Ncurses._FULLWIN 
+  Ncurses::FULLWIN
+end
+def Ncurses._SCROLLWIN
+  Ncurses::SCROLLWIN
+end
+def Ncurses._ISPAD   
+  Ncurses::ISPAD
+end
+def Ncurses._HASMOVED
+  Ncurses::HASMOVED
+end
+def Ncurses._WRAPPED 
+  Ncurses::WRAPPED
+end
+def Ncurses._NOCHANGE
+  Ncurses::NOCHANGE
+end
+def Ncurses._NEWINDEX
+  Ncurses::NEWINDEX
+end
+
+
+module Ncurses
+  module Destroy_checker; def destroyed?; @destroyed; end; end
+  class WINDOW
+    include Destroy_checker
+    def method_missing(name, *args)
+      name = name.to_s
+      if (name[0,2] == "mv")
+        test_name = name.dup
+        test_name[2,0] = "w" # insert "w" after"mv"
+        if (Ncurses.respond_to?(test_name))
+          return Ncurses.send(test_name, self, *args)
+        end
+      end
+      test_name = "w" + name
+      if (Ncurses.respond_to?(test_name))
+        return Ncurses.send(test_name, self, *args)
+      end
+      Ncurses.send(name, self, *args)
+    end
+    def respond_to?(name)
+      name = name.to_s
+      if (name[0,2] == "mv" && Ncurses.respond_to?("mvw" + name[2..-1]))
+        return true
+      end
+      Ncurses.respond_to?("w" + name) || Ncurses.respond_to?(name)
+    end
+    def del
+      Ncurses.delwin(self)
+    end
+    alias delete del
+    def WINDOW.new(*args)
+      Ncurses.newwin(*args)
+    end
+  end
+  class SCREEN
+    include Destroy_checker
+    def del
+      Ncurses.delscreen(self)
+    end
+    alias delete del
+  end
+  class MEVENT
+    attr_accessor :id, :x,:y,:z, :bstate
+  end
+  GETSTR_LIMIT = 1024
+
+  module Panel 
+    class PANEL; end
+  end
+
+  module Form
+    class FORM
+      attr_reader :user_object
+
+      # This placeholder replaces the field_userptr function in curses
+      def user_object=(obj)
+        @user_object = obj
+      end
+    end
+    
+    class FIELD
+      attr_reader :user_object
+
+      # This placeholder replaces the field_userptr function in curses
+      def user_object=(obj)
+        @user_object = obj
+      end
+    end
+
+    class FIELDTYPE
+    end
+  end
+end
+def Ncurses.inchnstr(str,n)
+  Ncurses.winchnstr(Ncurses.stdscr, str, n)
+end
+def Ncurses.inchstr(str)
+  Ncurses.winchstr(Ncurses.stdscr, str)
+end
+def Ncurses.mvinchnstr(y,x, str, n)
+  Ncurses.mvwinchnstr(Ncurses.stdscr, y,x, str, n)
+end
+def Ncurses.mvinchstr(y,x, str)
+  Ncurses.mvwinchstr(Ncurses.stdscr, y,x, str)
+end
+def Ncurses.mvwinchnstr(win, y,x, str, n)
+  if (Ncurses.wmove(win,y,x) == Ncurses::ERR) 
+    Ncurses::ERR
+  else
+    Ncurses.winchnstr(win,str,n)
+  end
+end
+def Ncurses.mvwinchstr(win, y,x, str)
+  maxy = []; maxx = []; getmaxyx(win, maxy,maxx)
+  return Ncurses::ERR if (maxx[0] == Ncurses::ERR)
+  Ncurses.mvwinchnstr(win, y,x, str, maxx[0]+1)
+end
+def Ncurses.winchstr(win, str)
+  maxy = []; maxx = []; getmaxyx(win, maxy,maxx)
+  return Ncurses::ERR if (maxx[0] == Ncurses::ERR)
+  Ncurses.winchnstr(win, str, maxx[0]+1)
+end
+
+def Ncurses.getnstr(str,n)
+  Ncurses.wgetnstr(Ncurses.stdscr, str, n)
+end
+def Ncurses.mvgetnstr(y,x, str, n)
+  Ncurses.mvwgetnstr(Ncurses.stdscr, y,x, str, n)
+end
+def Ncurses.mvwgetnstr(win, y,x, str, n)
+  if (Ncurses.wmove(win,y,x) == Ncurses::ERR) 
+    Ncurses::ERR
+  else
+    Ncurses.wgetnstr(win,str,n)
+  end
+end
+
+def Ncurses.innstr(str,n)
+  Ncurses.winnstr(Ncurses.stdscr, str, n)
+end
+def Ncurses.instr(str)
+  Ncurses.winstr(Ncurses.stdscr, str)
+end
+def Ncurses.mvinnstr(y,x, str, n)
+  Ncurses.mvwinnstr(Ncurses.stdscr, y,x, str, n)
+end
+def Ncurses.mvinstr(y,x, str)
+  Ncurses.mvwinstr(Ncurses.stdscr, y,x, str)
+end
+def Ncurses.mvwinnstr(win, y,x, str, n)
+  if (Ncurses.wmove(win,y,x) == Ncurses::ERR) 
+    Ncurses::ERR
+  else
+    Ncurses.winnstr(win,str,n)
+  end
+end
+def Ncurses.mvwinstr(win, y,x, str)
+  maxy = []; maxx = []; getmaxyx(win, maxy,maxx)
+  return Ncurses::ERR if (maxx[0] == Ncurses::ERR)
+  Ncurses.mvwinnstr(win, y,x, str, maxx[0]+1)
+end
+def Ncurses.winstr(win, str)
+  maxy = []; maxx = []; getmaxyx(win, maxy,maxx)
+  return Ncurses::ERR if (maxx[0] == Ncurses::ERR)
+  Ncurses.winnstr(win, str, maxx[0]+1)
+end
+
+def Ncurses.mouse_trafo(pY, pX, to_screen)
+  Ncurses.wmouse_trafo(Ncurses.stdscr, pY, pX, to_screen)
+end
+
+def Ncurses.getcurx(win)
+  x = []; y = []; Ncurses.getyx(win, y,x); x[0]
+end
+def Ncurses.getcury(win)
+  x = []; y = []; Ncurses.getyx(win, y,x); y[0]
+end
+def Ncurses.getbegx(win)
+  x = []; y = []; Ncurses.getbegyx(win, y,x); x[0]
+end
+def Ncurses.getbegy(win)
+  x = []; y = []; Ncurses.getbegyx(win, y,x); y[0]
+end
+def Ncurses.getmaxx(win)
+  x = []; y = []; Ncurses.getmaxyx(win, y,x); x[0]
+end
+def Ncurses.getmaxy(win)
+  x = []; y = []; Ncurses.getmaxyx(win, y,x); y[0]
+end
+def Ncurses.getparx(win)
+  x = []; y = []; Ncurses.getparyx(win, y,x); x[0]
+end
+def Ncurses.getpary(win)
+  x = []; y = []; Ncurses.getparyx(win, y,x); y[0]
+end
+def Ncurses.erase
+  Ncurses.werase(Ncurses.stdscr)
+end
+def Ncurses.getstr(str)
+  Ncurses.getnstr(str, Ncurses::GETSTR_LIMIT)
+end
+def Ncurses.mvgetstr(y,x, str)
+  Ncurses.mvgetnstr(y,x, str, Ncurses::GETSTR_LIMIT)
+end
+def Ncurses.mvwgetstr(win, y,x, str)
+  Ncurses.mvwgetnstr(win, y,x, str, Ncurses::GETSTR_LIMIT)
+end
+def Ncurses.wgetstr(win, str)
+  Ncurses.wgetnstr(win, str, Ncurses::GETSTR_LIMIT)
+end
+
+def Ncurses.scanw(format, result)
+  Ncurses.wscanw(Ncurses.stdscr, format, result)
+end
+def Ncurses.mvscanw(y,x, format, result)
+  Ncurses.mvwscanw(Ncurses.stdscr, y,x, format, result)
+end
+def Ncurses.mvwscanw(win, y,x, format, result)
+  if (Ncurses.wmove(win, y,x) == Ncurses::ERR) 
+    Ncurses::ERR
+  else
+    Ncurses.wscanw(win, format, result)
+  end
+end
+def Ncurses.wscanw(win, format, result)
+  str = ""
+  if (Ncurses.wgetstr(win, str) == Ncurses::ERR) 
+    Ncurses::ERR
+  else
+    require "scanf.rb" # Use ruby's implementation of scanf
+    result.replace(str.scanf(format))
+  end
+end
+
+def Ncurses.mvprintw(*args)
+  Ncurses.mvwprintw(Ncurses.stdscr, *args)
+end
+def Ncurses.mvwprintw(win, y,x, *args)
+  if (Ncurses.wmove(win,y,x) == Ncurses::ERR) 
+    Ncurses::ERR
+  else
+    wprintw(win, *args)
+  end
+end
+def Ncurses.printw(*args)
+  Ncurses.wprintw(Ncurses.stdscr, *args)
+end
+def Ncurses.touchline(win, start, count)
+  Ncurses.wtouchln(win, start, count, 1)
+end
+def Ncurses.touchwin(win)
+  wtouchln(win, 0, getmaxy(win), 1)
+end

data/lib/sup.rb

@@ -33,7 +33,7 @@ class Module
 end
 
 module Redwood
-  VERSION = "0.8"
+  VERSION = "0.8.1"
 
   BASE_DIR   = ENV["SUP_BASE"] || File.join(ENV["HOME"], ".sup")
   CONFIG_FN  = File.join(BASE_DIR, "config.yaml")
@@ -243,7 +243,7 @@ end
     Redwood::log "using character set encoding #{$encoding.inspect}"
   else
     Redwood::log "warning: can't find character set by using locale, defaulting to utf-8"
-    $encoding = "utf-8"
+    $encoding = "UTF-8"
   end
 
 ## now everything else (which can feel free to call Redwood::log at load time)

data/lib/sup/message.rb

@@ -26,7 +26,6 @@ class Message
 
   QUOTE_PATTERN = /^\s{0,4}[>|\}]/
   BLOCK_QUOTE_PATTERN = /^-----\s*Original Message\s*----+$/
-  QUOTE_START_PATTERN = /\w.*:$/
   SIG_PATTERN = /(^-- ?$)|(^\s*----------+\s*$)|(^\s*_________+\s*$)|(^\s*--~--~-)|(^\s*--\+\+\*\*==)/
 
   MAX_SIG_DISTANCE = 15 # lines from the end
@@ -449,7 +448,11 @@ private
       when :text
         newstate = nil
 
-        if line =~ QUOTE_PATTERN || (line =~ QUOTE_START_PATTERN && nextline =~ QUOTE_PATTERN)
+        ## the following /:$/ followed by /\w/ is an attempt to detect the
+        ## start of a quote. this is split into two regexen because the
+        ## original regex /\w.*:$/ had very poor behavior on long lines
+        ## like ":a:a:a:a:a" that occurred in certain emails.
+        if line =~ QUOTE_PATTERN || (line =~ /:$/ && line =~ /\w/ && nextline =~ QUOTE_PATTERN)
           newstate = :quote
         elsif line =~ SIG_PATTERN && (lines.length - i) < MAX_SIG_DISTANCE
           newstate = :sig

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

@@ -126,7 +126,7 @@ EOS
                "To" => [],
                "Cc" => [],
                "Bcc" => [],
-               "In-Reply-To" => "<#{@m.id}>",
+               "In-reply-to" => "<#{@m.id}>",
                "Subject" => Message.reify_subj(@m.subj),
                "References" => refs,
              }.merge v

data/lib/sup/util.rb

@@ -172,7 +172,15 @@ class Object
 end
 
 class String
-  def display_length; scan(/./u).size end
+  ## nasty multibyte hack for ruby 1.8. if it's utf-8, split into chars using
+  ## the utf8 regex and count those. otherwise, use the byte length.
+  def display_length
+    if $encoding == "UTF-8"
+      scan(/./u).size
+    else
+      size
+    end
+  end
 
   def camel_to_hyphy
     self.gsub(/([a-z])([A-Z0-9])/, '\1-\2').downcase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sup
 version: !ruby/object:Gem::Version 
-  version: "0.8"
+  version: 0.8.1
 platform: ruby
 authors: 
 - William Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-05 12:45:26 -04:00
+date: 2009-06-15 08:11:54 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,62 +141,63 @@ files:
 - bin/sup-sync
 - bin/sup-sync-back
 - bin/sup-tweak-labels
+- lib/ncurses.rb
 - lib/sup.rb
-- lib/sup/poll.rb
-- lib/sup/source.rb
-- lib/sup/crypto.rb
-- lib/sup/horizontal-selector.rb
-- lib/sup/mode.rb
-- lib/sup/account.rb
+- lib/sup/draft.rb
 - lib/sup/imap.rb
-- lib/sup/maildir.rb
-- lib/sup/contact.rb
-- lib/sup/message.rb
-- lib/sup/label.rb
-- lib/sup/index.rb
-- lib/sup/keymap.rb
+- lib/sup/thread.rb
+- lib/sup/logger.rb
+- lib/sup/person.rb
 - lib/sup/rfc2047.rb
-- lib/sup/tagger.rb
-- lib/sup/suicide.rb
-- lib/sup/util.rb
+- lib/sup/account.rb
+- lib/sup/buffer.rb
+- lib/sup/horizontal-selector.rb
 - lib/sup/textfield.rb
-- lib/sup/sent.rb
+- lib/sup/source.rb
+- lib/sup/suicide.rb
+- lib/sup/maildir.rb
+- lib/sup/tagger.rb
 - lib/sup/undo.rb
-- lib/sup/mbox.rb
-- lib/sup/person.rb
-- lib/sup/thread.rb
-- lib/sup/update.rb
+- lib/sup/colormap.rb
 - lib/sup/hook.rb
+- lib/sup/index.rb
+- lib/sup/update.rb
+- lib/sup/util.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/modes/completion-mode.rb
-- lib/sup/modes/thread-index-mode.rb
-- lib/sup/modes/reply-mode.rb
-- lib/sup/modes/forward-mode.rb
-- lib/sup/modes/compose-mode.rb
+- lib/sup/label.rb
+- lib/sup/mbox.rb
+- lib/sup/poll.rb
+- lib/sup/message.rb
+- lib/sup/crypto.rb
+- lib/sup/sent.rb
+- lib/sup/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/person-search-results-mode.rb
+- lib/sup/modes/label-search-results-mode.rb
+- lib/sup/modes/label-list-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/contact-list-mode.rb
-- lib/sup/modes/poll-mode.rb
+- lib/sup/modes/forward-mode.rb
+- lib/sup/modes/person-search-results-mode.rb
 - lib/sup/modes/inbox-mode.rb
-- lib/sup/modes/log-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/mbox/ssh-file.rb
-- lib/sup/mbox/loader.rb
+- lib/sup/modes/compose-mode.rb
+- lib/sup/modes/line-cursor-mode.rb
+- lib/sup/modes/thread-index-mode.rb
+- 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: 
@@ -219,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+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.