Merge branch 'master' into next

diff --git a/README.txt b/README.txt
index 05349d787e9d3aee6086fb118f0f5ad61f59447f..0437de9f0c91b87b300c99077a88d7df82162100 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -108,7 +108,7 @@ Current limitations which will be fixed:
 
 == INSTALL:
 
-* gem install sup -y
+* gem install sup
 
 == PROBLEMS:
 
@@ -116,7 +116,7 @@ See FAQ.txt for some common problems and their solutions.
 
 == LICENSE:
 
-Copyright (c) 2006, 2007 William Morgan.
+Copyright (c) 2006--2009 William Morgan.
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

diff --git a/bin/sup b/bin/sup
index b2b2f626d79ff3675d8edbc6bb18bf1a40483ae9..0d2366e4ebe81840904ee562a8eeed6d72fd09e1 100644 (file)
--- a/bin/sup
+++ b/bin/sup
@@ -182,11 +182,6 @@ begin
     PollManager.start
     SuicideManager.start
     Index.start_lock_update_thread
-    Redwood::reporting_thread("be friendly") do
-      id = BufferManager.say "Welcome to Sup! Press '?' at any point for help."
-      sleep 10
-      BufferManager.clear id
-    end
   end
 
   if $opts[:search]

diff --git a/release-script.txt b/release-script.txt
index b1f09dd5953839e85076a72050a4acadefb02ea8..c94b23f7d622107831a47ac2e5975ef17b47a7ca 100644 (file)
--- a/release-script.txt
+++ b/release-script.txt
@@ -14,9 +14,8 @@ vi www/index.html # and include CONTRIBUTORS
 git checkout -b release-<releasename>
 vi lib/sup.rb bin/sup # and bump BOTH version numbers
 # ... git add, commit, etc
-rake release VERSION=<releasename>
+gem1.8 build sup.gemspec
+# manually upload
 git publish-branch
 rake upload_webpage
 rake upload_report
-git checkout next
-git merge master

diff --git a/sup.gemspec b/sup.gemspec
new file mode 100644 (file)
index 0000000..71b79ed
--- /dev/null
+++ b/sup.gemspec
@@ -0,0 +1,34 @@
+$:.push "lib"
+require "sup"
+
+LIB_DIRS = %w(lib lib/sup lib/sup/modes lib/sup/mbox)
+EXECUTABLES = %w(sup sup-add sup-config sup-dump sup-recover-sources sup-sync sup-sync-back sup-tweak-labels)
+EXTRA_FILES = %w(CONTRIBUTORS README.txt LICENSE History.txt ReleaseNotes)
+
+FILES = EXTRA_FILES + EXECUTABLES.map { |f| "bin/#{f}" } + LIB_DIRS.map { |d| Dir["#{d}/*.rb"] }.flatten
+
+Gem::Specification.new do |s|
+  s.name = %q{sup}
+  s.version = Redwood::VERSION
+  s.date = Time.now.to_s
+  s.authors = ["William Morgan"]
+  s.email = %q{wmorgan-sup@masanjin.net}
+  s.summary = %q{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.}
+  s.homepage = %q{http://sup.rubyforge.org/}
+  s.description = %q{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.}
+  s.files = FILES
+  s.executables = EXECUTABLES
+
+  s.add_dependency "ferret", ">= 0.11.6"
+  s.add_dependency "ncurses", ">= 0.9.1"
+  s.add_dependency "rmail", ">= 0.17"
+  s.add_dependency "highline"
+  s.add_dependency "net-ssh"
+  s.add_dependency "trollop", ">= 1.12"
+  s.add_dependency "lockfile"
+  s.add_dependency "mime-types", "~> 1"
+  s.add_dependency "gettext"
+  s.add_dependency "fastthread"
+
+  puts s.files
+end 

diff --git a/test/test_mbox_parsing.rb b/test/test_mbox_parsing.rb
index 3a6c2f854d4c00600f97aa608b3061e22d29d8ab..32687e5f1559ee340ff572ca6e79b801deb19140 100644 (file)
--- a/test/test_mbox_parsing.rb
+++ b/test/test_mbox_parsing.rb
@@ -74,15 +74,19 @@ EOS
     end
   end
 
-  def test_ignore_empty_lines
+  def test_blank_lines
+    h = MBox.read_header StringIO.new("")
+    assert_equal nil, h["Message-Id"]
+  end
+
+  def test_empty_headers
     variants = [
-      "",
       "Message-Id:       \n",
       "Message-Id:\n",
     ]
     variants.each do |s|
       h = MBox.read_header StringIO.new(s)
-      assert_nil h["Message-Id"]
+      assert_equal "", h["Message-Id"]
     end
   end
 

diff --git a/www/index.html b/www/index.html
index 0b5c22532aa8c09e901df6db6424eac031574d9b..6767dcad568a85d5d6ac4cfba04a34b4caeb820b 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -143,22 +143,22 @@
                <p>
                Sup is brought to you by <a href="http://cs.stanford.edu/~ruby/">William Morgan</a> and the following honorable contributors:
         <ul>
-William Morgan &lt;wmorgan-sup at the masanjin dot nets&gt;
-Ismo Puustinen &lt;ismo at the iki dot fis&gt;
-Nicolas Pouillard &lt;nicolas.pouillard at the gmail dot coms&gt;
-Marcus Williams &lt;marcus-sup at the bar-coded dot nets&gt;
-Lionel Ott &lt;white.magic at the gmx dot des&gt;
-Christopher Warrington &lt;chrisw at the rice dot edus&gt;
-Marc Hartstein &lt;marc.hartstein at the alum.vassar dot edus&gt;
-Ben Walton &lt;bwalton at the artsci.utoronto dot cas&gt;
-Grant Hollingworth &lt;grant at the antiflux dot orgs&gt;
-Steve Goldman &lt;sgoldman at the tower-research dot coms&gt;
-Decklin Foster &lt;decklin at the red-bean dot coms&gt;
-Jeff Balogh &lt;its.jeff.balogh at the gmail dot coms&gt;
-Giorgio Lando &lt;patroclo7 at the gmail dot coms&gt;
-Israel Herraiz &lt;israel.herraiz at the gmail dot coms&gt;
-Ian Taylor &lt;ian at the lorf dot orgs&gt;
-Rich Lane &lt;rlane at the club.cc.cmu dot edus&gt;
+<li>William Morgan &lt;wmorgan-sup at the masanjin dot nets&gt;</li>
+<li>Ismo Puustinen &lt;ismo at the iki dot fis&gt;</li>
+<li>Nicolas Pouillard &lt;nicolas.pouillard at the gmail dot coms&gt;</li>
+<li>Marcus Williams &lt;marcus-sup at the bar-coded dot nets&gt;</li>
+<li>Lionel Ott &lt;white.magic at the gmx dot des&gt;</li>
+<li>Christopher Warrington &lt;chrisw at the rice dot edus&gt;</li>
+<li>Marc Hartstein &lt;marc.hartstein at the alum.vassar dot edus&gt;</li>
+<li>Ben Walton &lt;bwalton at the artsci.utoronto dot cas&gt;</li>
+<li>Grant Hollingworth &lt;grant at the antiflux dot orgs&gt;</li>
+<li>Steve Goldman &lt;sgoldman at the tower-research dot coms&gt;</li>
+<li>Decklin Foster &lt;decklin at the red-bean dot coms&gt;</li>
+<li>Jeff Balogh &lt;its.jeff.balogh at the gmail dot coms&gt;</li>
+<li>Giorgio Lando &lt;patroclo7 at the gmail dot coms&gt;</li>
+<li>Israel Herraiz &lt;israel.herraiz at the gmail dot coms&gt;</li>
+<li>Ian Taylor &lt;ian at the lorf dot orgs&gt;</li>
+<li>Rich Lane &lt;rlane at the club.cc.cmu dot edus&gt;</li>
         </ul>
         </p>