gurgitate-mail 1.9.0 → 1.9.1

data/lib/gurgitate-mail.rb

@@ -126,7 +126,7 @@ module Gurgitate
             @rules       = []
 
             input_text = ""
-            input.each do |l| input_text << l end
+            input.each_line do |l| input_text << l end
             super(input_text, recipient, sender)
             instance_eval(&block) if block_given?
         end
@@ -218,8 +218,12 @@ module Gurgitate
         def filter(program,&block)
             self.log "Filtering with "+program
             IO.popen("-","w+") do |filter|
-                if filter.nil? then
-                    exec(program)
+                unless filter then
+                    begin
+                        exec(program)
+                    rescue
+                        exit! # should not get here anyway
+                    end
                 else
                     if fork
                         filter.close_write
@@ -227,10 +231,15 @@ module Gurgitate
                         g.instance_eval(&block) if block_given?
                         return g
                     else
-                        filter.close_read
-                        filter.print(self.to_s)
-                        filter.close
-                        exit!
+                        begin
+                            filter.close_read
+                            filter.print to_s
+                            filter.close
+                        rescue
+                            nil
+                        ensure
+                            exit!
+                        end
                     end
                 end
             end

data/lib/gurgitate/deliver.rb

@@ -76,7 +76,7 @@ module Gurgitate
             begin
                 deliver_message(mailbox)
             rescue SystemCallError
-                self.log "Gack!  Something went wrong: "+$!
+                self.log "Gack!  Something went wrong: " + $!.to_s
                 raise
                 # exit 75
             end

data/lib/gurgitate/headers.rb

@@ -31,6 +31,12 @@ module Gurgitate
             )
         end
 
+        def to_s
+            map do |member|
+                member.to_s
+            end.join ""
+        end
+
     end
 
     # A slightly bigger class for all of a message's headers
@@ -63,7 +69,7 @@ module Gurgitate
         end
 
         def parse_headers
-            @headertext.each do |h|
+            @headertext.each_line do |h|
                 h.chomp!
                 if(h=~/^\s+/) then
                     @lastheader << h
@@ -262,8 +268,8 @@ module Gurgitate
         # the "From " line
         def to_s
             if @headers_changed then
-                return @headers.map do |n,h|
-                    h.map do |h| h.to_s end.join("\n")
+                return @headers.map do |name,hdr|
+                    hdr.map do |hdr_content| hdr_content.to_s end.join("\n")
                 end.join("\n")
             else
                 return @headertext

data/lib/gurgitate/mailmessage.rb

@@ -58,13 +58,15 @@ module Gurgitate
         end
 
         def initialize(text=nil, recipient=nil, sender=nil)
+
+            @recipient = recipient
+            @sender = sender
+
             if text
                 (@headertext,@body)=text.split(/\n\n/,2)
                 @headers=Headers.new(@headertext);
                 Fromregex.match(@headers["From"][0].contents);
                 @from=$+
-                    @recipient = recipient
-                @sender = sender
             else
                 @headers = Headers.new
                 @body = ""

data/test/test_headers.rb

@@ -8,9 +8,14 @@ require 'test/unit'
 require 'test/unit/ui/console/testrunner'
 require 'stringio'
 
+builddir = File.join(File.dirname(__FILE__),"..")
+unless $:[0] == builddir
+    $:.unshift builddir
+end
+
 class TC_Headers < Test::Unit::TestCase
     def setup
-        require './gurgitate-mail'
+        require 'gurgitate-mail'
     end
 
     def test_single_header
@@ -387,7 +392,7 @@ EOF
             "headers contains toline")
         assert_equal(false,h["From","To"] =~ /nonexistent@example.com/,
             "headers do not contain nonexistent value")
-        assert_equal(false,h["Rabbit"] =~ /nonexistent/,
+        assert(!(h["Rabbit"] =~ /nonexistent/),
             "Asking for a nonexistent header")
     end
 
@@ -422,7 +427,7 @@ EOF
 
         assert_equal(false,h["To"] =~ /\blunar@lunar-linux.org\b/i,
             "There should be no Lunar Linux mailing list in To line")
-        assert_equal(false,h["Cc"] =~ /\blunar@lunar-linux.org\b/i,
+        assert(!(h["Cc"] =~ /\blunar@lunar-linux.org\b/i),
             "There should be no Lunar Linux mailing list in Cc line")
     end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: gurgitate-mail
 version: !ruby/object:Gem::Version 
-  version: 1.9.0
-date: 2007-12-12 00:00:00 +09:00
+  version: 1.9.1
+date: 2007-12-27 00:00:00 +09:00
 summary: gurgitate-mail is a mail filter (and a mail-delivery agent)
 require_paths: 
 - lib
@@ -30,23 +30,23 @@ authors:
 - Dave Brown
 files: 
 - lib/gurgitate-mail.rb
-- lib/gurgitate/deliver.rb
 - lib/gurgitate/headers.rb
-- lib/gurgitate/header.rb
 - lib/gurgitate/mailmessage.rb
 - lib/gurgitate/deliver/maildir.rb
 - lib/gurgitate/deliver/mbox.rb
-- test/test_header.rb
-- test/runtests.rb
-- test/test_rules.rb
-- test/test_process.rb
+- lib/gurgitate/deliver.rb
+- lib/gurgitate/header.rb
 - test/test_configuration.rb
 - test/test_headers.rb
+- test/test_gurgitate_delivery.rb
+- test/test_delivery.rb
+- test/test_process.rb
+- test/runtests.rb
 - test/gurgitate-test.rb
 - test/test_deliver.rb
-- test/test_gurgitate_delivery.rb
+- test/test_rules.rb
 - test/test_writing.rb
-- test/test_delivery.rb
+- test/test_header.rb
 test_files: 
 - test/runtests.rb
 rdoc_options: []