sup

commit 117b4f08efb948c8aabf432beb64c74ee18c3aeb
parent 72af2e3b11be6d86b2b78f60709d8a4dee3b657a
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Tue, 26 Jan 2010 09:01:09 -0500

Merge branch 'master' into next

Diffstat:

5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/History.txt b/History.txt
@@ -1,3 +1,12 @@
+== 0.10.2 / 2010-01-26
+* Update gem dependencies to pull in xapian-full and ncursesw instead of ferret
+  and ncurses.
+* Fix a minor problem when running with Ruby 1.8.5.
+* Fix a warning.
+
+== 0.10.1 / 2010-01-24
+* Fix a missing file in the gem.
+
 == 0.10 / 2010-01-22
 * Make Xapian backend the default, and add deprecation notice to Ferret indexes.
 * Now Ruby 1.9 compatible (Xapian backend only).
diff --git a/Rakefile b/Rakefile
@@ -47,8 +47,8 @@ spec = Gem::Specification.new do |s|
   s.files = SUP_FILES
   s.executables = SUP_EXECUTABLES
 
-  s.add_dependency "ferret", ">= 0.11.6"
-  s.add_dependency "ncurses", ">= 0.9.1"
+  s.add_dependency "xapian-full", ">= 1.1.3.1"
+  s.add_dependency "ncursesw"
   s.add_dependency "rmail", ">= 0.17"
   s.add_dependency "highline"
   s.add_dependency "net-ssh"
@@ -56,7 +56,6 @@ spec = Gem::Specification.new do |s|
   s.add_dependency "lockfile"
   s.add_dependency "mime-types", "~> 1"
   s.add_dependency "gettext"
-  s.add_dependency "fastthread"
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
diff --git a/lib/sup/message.rb b/lib/sup/message.rb
@@ -450,9 +450,9 @@ private
         subj = decode_header_field(payload.header.subject) || DEFAULT_SUBJECT
         subj = Message.normalize_subj(subj.gsub(/\s+/, " ").gsub(/\s+$/, ""))
         msgdate = payload.header.date
-        from_person = from ? Person.from_address(decode_header_field from) : nil
-        to_people = to ? Person.from_address_list(decode_header_field to) : nil
-        cc_people = cc ? Person.from_address_list(decode_header_field cc) : nil
+        from_person = from ? Person.from_address(decode_header_field(from)) : nil
+        to_people = to ? Person.from_address_list(decode_header_field(to)) : nil
+        cc_people = cc ? Person.from_address_list(decode_header_field(cc)) : nil
         [Chunk::EnclosedMessage.new(from_person, to_people, cc_people, msgdate, subj)] + message_to_chunks(payload, encrypted)
       else
         debug "no body for message/rfc822 enclosure; skipping"
diff --git a/lib/sup/util.rb b/lib/sup/util.rb
@@ -366,6 +366,12 @@ class Fixnum
     end
   end
 
+  unless method_defined?(:ord)
+    def ord
+      self
+    end
+  end
+
   ## hacking the english language
   def pluralize s
     to_s + " " +
diff --git a/www/index.html b/www/index.html
@@ -109,7 +109,7 @@
 		<h2>Status</h2>
 
 		<p>
-		The current version of Sup is 0.10.1, released 2010-01-24. This is a
+		The current version of Sup is 0.10.2, released 2010-01-26. This is a
 		beta release. It supports mbox, IMAP, IMAPS, and Maildir mailstores.
 		</p>