ar_mailer 1.3.1 → 1.3.2

data.tar.gz.sig

@@ -0,0 +1,2 @@
+mC��	��|���G�T��8����}\�����WL�/�C�<�n�ٛ��:����S��m
r�S���7/E���t��&�	�O<��Mœ�ž�
+$k~⚲��l��� �]_j��pl��
�R��C�e���i%�*m)�@�ySs��Ge���+�Da^�eX0�	�י� ����Xγ�bʓ�-�^��u����Q�106�,z���q�����

data/History.txt

@@ -1,3 +1,12 @@
+= 1.3.2
+
+* Terminate SMTP connection on TimeoutError since Net::SMTP may be in a bogus
+  state.  Issue by Eric O'Connell.
+* Don't require Email class to exist.  Bug #22843 by Joachim Glauche.
+* Switched to minitest
+* Upgraded to modern Hoe
+* Updated configuration information for Rails > 2.0
+
 = 1.3.1
 
 * Fix bug #12530, gmail causes SSL errors.  Submitted by Kyle Maxwell

data/README.txt

@@ -1,39 +1,28 @@
 = ar_mailer
 
-A two-phase delivery agent for ActionMailer
+* http://seattlerb.rubyforge.org/ar_mailer
+* http://rubyforge.org/projects/seattlerb
+* http://rubyforge.org/tracker/?func=add&group_id=1513&atid=5921
 
-Rubyforge Project:
+== DESCRIPTION:
 
-http://rubyforge.org/projects/seattlerb
+ar_mailer is a two-phase delivery agent for ActionMailer.  Even delivering
+email to the local machine may take too long when you have to send hundreds of
+messages.  ar_mailer allows you to store messages into the database for later
+delivery by a separate process, ar_sendmail.
 
-Documentation:
+== SYNOPSIS:
 
-http://seattlerb.org/ar_mailer
+See ActionMailer::ARMailer for instructions on using ar_mailer.
 
-Bugs:
-
-http://rubyforge.org/tracker/?func=add&group_id=1513&atid=5921
-
-== About
-
-Even delivering email to the local machine may take too long when you have to
-send hundreds of messages.  ar_mailer allows you to store messages into the
-database for later delivery by a separate process, ar_sendmail.
-
-== Installing ar_mailer
-
-Just install the gem:
+See ar_sendmail -h for options to ar_sendmail.
 
-  $ sudo gem install ar_mailer
+An rc.d script is included in share/ar_sendmail for *BSD operating systems.
 
-See ActionMailer::ARMailer for instructions on converting to ARMailer.
+== INSTALL:
 
-See ar_sendmail -h for options to ar_sendmail.
+* gem install ar_mailer
 
 NOTE: You may need to delete an smtp_tls.rb file if you have one lying
 around.  ar_mailer supplies it own.
 
-=== ar_sendmail on FreeBSD or NetBSD
-
-An rc.d script is included in share/ar_sendmail.
-

data/Rakefile

@@ -1,14 +1,12 @@
 require 'hoe'
 
-require './lib/action_mailer/ar_sendmail'
+$:.unshift 'lib'
+require 'action_mailer/ar_sendmail'
 
-Hoe.new 'ar_mailer', ActionMailer::ARSendmail::VERSION do |s|
-  s.rubyforge_name = 'seattlerb'
-  s.summary = s.paragraphs_of('README.txt', 1).join(' ')
-  s.description = s.paragraphs_of('README.txt', 9).join(' ')
-  s.url = s.paragraphs_of('README.txt', 5).join(' ')
-  s.author = 'Eric Hodel'
-  s.email = 'drbrain@segment7.net'
-  s.changes = s.paragraphs_of('History.txt', 0..1).join("\n\n")
+Hoe.new 'ar_mailer', ActionMailer::ARSendmail::VERSION do |ar_mailer|
+  ar_mailer.rubyforge_name = 'seattlerb'
+  ar_mailer.developer 'Eric Hodel', 'drbrain@segment7.net'
+  ar_mailer.testlib = :minitest
+  ar_mailer.extra_dev_deps << ['minitest', '~> 1.3']
 end
 

data/lib/action_mailer/ar_mailer.rb

@@ -50,6 +50,11 @@ require 'action_mailer'
 # Edit config/environments/production.rb and set the delivery agent:
 #
 #   $ grep delivery_method config/environments/production.rb
+#   config.action_mailer.delivery_method = :activerecord
+#
+# For Rails 1.x and older:
+#
+#   $ grep delivery_method config/environments/production.rb
 #   ActionMailer::Base.delivery_method = :activerecord
 #
 # Run ar_sendmail:
@@ -67,20 +72,20 @@ require 'action_mailer'
 
 class ActionMailer::ARMailer < ActionMailer::Base
 
-  @@email_class = Email
+  @email_class = nil
 
   ##
   # Current email class for deliveries.
 
   def self.email_class
-    @@email_class
+    @email_class ||= Email
   end
 
   ##
   # Sets the email class for deliveries.
 
   def self.email_class=(klass)
-    @@email_class = klass
+    @email_class = klass
   end
 
   ##
@@ -88,9 +93,11 @@ class ActionMailer::ARMailer < ActionMailer::Base
   # used.
 
   def perform_delivery_activerecord(mail)
+    email_class = ActionMailer::ARMailer.email_class
+
     mail.destinations.each do |destination|
-      @@email_class.create :mail => mail.encoded, :to => destination,
-                           :from => mail.from.first
+      email_class.create :mail => mail.encoded, :to => destination,
+                         :from => mail.from.first
     end
   end
 

data/lib/action_mailer/ar_sendmail.rb

@@ -54,7 +54,7 @@ class ActionMailer::ARSendmail
   ##
   # The version of ActionMailer::ARSendmail you are running.
 
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 
   ##
   # Maximum number of times authentication will be consecutively retried
@@ -432,6 +432,9 @@ end
           email.save rescue nil
           log "error sending email %d: %p(%s):\n\t%s" %
                 [email.id, e.message, e.class, e.backtrace.join("\n\t")]
+
+          raise e if TimeoutError === e
+
           smtp.reset
         end
       end
@@ -447,6 +450,9 @@ end
     sleep delay
   rescue Net::SMTPServerBusy, SystemCallError, OpenSSL::SSL::SSLError
     # ignore SMTPServerBusy/EPIPE/ECONNRESET from Net::SMTP.start's ensure
+  rescue TimeoutError
+    # terminate our connection since Net::SMTP may be in a bogus state.
+    sleep delay
   end
 
   ##

data/test/test_armailer.rb

@@ -1,6 +1,7 @@
-require 'test/unit'
 require 'action_mailer'
 require 'action_mailer/ar_mailer'
+require 'rubygems'
+require 'minitest/autorun'
 
 ##
 # Pretend mailer
@@ -16,7 +17,7 @@ class Mailer < ActionMailer::ARMailer
 
 end
 
-class TestARMailer < Test::Unit::TestCase
+class TestARMailer < MiniTest::Unit::TestCase
 
   def setup
     Mailer.email_class = Email

data/test/test_arsendmail.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
 require 'action_mailer'
 require 'action_mailer/ar_sendmail'
 require 'rubygems'
-require 'test/zentest_assertions'
+require 'minitest/autorun'
 
 class ActionMailer::ARSendmail
   attr_accessor :slept
@@ -12,7 +11,7 @@ class ActionMailer::ARSendmail
   end
 end
 
-class TestARSendmail < Test::Unit::TestCase
+class TestARSendmail < MiniTest::Unit::TestCase
 
   def setup
     ActionMailer::Base.reset
@@ -31,7 +30,7 @@ class TestARSendmail < Test::Unit::TestCase
   end
 
   def test_class_create_migration
-    out, = util_capture do
+    out, = capture_io do
       ActionMailer::ARSendmail.create_migration 'Mail'
     end
 
@@ -53,11 +52,11 @@ class AddMail < ActiveRecord::Migration
 end
     EOF
 
-    assert_equal expected, out.string
+    assert_equal expected, out
   end
 
   def test_class_create_model
-    out, = util_capture do
+    out, = capture_io do
       ActionMailer::ARSendmail.create_model 'Mail'
     end
 
@@ -66,7 +65,7 @@ class Mail < ActiveRecord::Base
 end
     EOF
 
-    assert_equal expected, out.string
+    assert_equal expected, out
   end
 
   def test_class_mailq
@@ -79,7 +78,7 @@ end
 
     last.last_send_attempt = Time.parse('Thu Aug 10 2006 11:40:05').to_i
 
-    out, err = util_capture do
+    out, err = capture_io do
       ActionMailer::ARSendmail.mailq 'Email'
     end
 
@@ -98,15 +97,15 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 -- 0 Kbytes in 3 Requests.
     EOF
 
-    assert_equal expected, out.string
+    assert_equal expected, out
   end
 
   def test_class_mailq_empty
-    out, err = util_capture do
+    out, err = capture_io do
       ActionMailer::ARSendmail.mailq 'Email'
     end
 
-    assert_equal "Mail queue is empty\n", out.string
+    assert_equal "Mail queue is empty\n", out
   end
 
   def test_class_new
@@ -141,20 +140,20 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
   def test_class_parse_args_chdir
     argv = %w[-c /tmp]
-    
+
     options = ActionMailer::ARSendmail.process_args argv
 
     assert_equal '/tmp', options[:Chdir]
 
     argv = %w[--chdir /tmp]
-    
+
     options = ActionMailer::ARSendmail.process_args argv
 
     assert_equal '/tmp', options[:Chdir]
 
     argv = %w[-c /nonexistent]
-    
-    out, err = util_capture do
+
+    out, err = capture_io do
       assert_raises SystemExit do
         ActionMailer::ARSendmail.process_args argv
       end
@@ -163,13 +162,13 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
   def test_class_parse_args_daemon
     argv = %w[-d]
-    
+
     options = ActionMailer::ARSendmail.process_args argv
 
     assert_equal true, options[:Daemon]
 
     argv = %w[--daemon]
-    
+
     options = ActionMailer::ARSendmail.process_args argv
 
     assert_equal true, options[:Daemon]
@@ -177,7 +176,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
   def test_class_parse_args_delay
     argv = %w[--delay 75]
-    
+
     options = ActionMailer::ARSendmail.process_args argv
 
     assert_equal 75, options[:Delay]
@@ -187,7 +186,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
     assert_equal nil, ENV['RAILS_ENV']
 
     argv = %w[-e production]
-    
+
     options = ActionMailer::ARSendmail.process_args argv
 
     assert_equal 'production', options[:RailsEnv]
@@ -195,7 +194,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
     assert_equal 'production', ENV['RAILS_ENV']
 
     argv = %w[--environment production]
-    
+
     options = ActionMailer::ARSendmail.process_args argv
 
     assert_equal 'production', options[:RailsEnv]
@@ -203,10 +202,10 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
   def test_class_parse_args_mailq
     options = ActionMailer::ARSendmail.process_args []
-    deny_includes :MailQ, options
+    refute_includes options, :MailQ
 
     argv = %w[--mailq]
-    
+
     options = ActionMailer::ARSendmail.process_args argv
 
     assert_equal true, options[:MailQ]
@@ -225,10 +224,10 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
   def test_class_parse_args_migration
     options = ActionMailer::ARSendmail.process_args []
-    deny_includes :Migration, options
+    refute_includes options, :Migration
 
     argv = %w[--create-migration]
-    
+
     options = ActionMailer::ARSendmail.process_args argv
 
     assert_equal true, options[:Migrate]
@@ -236,10 +235,10 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
   def test_class_parse_args_model
     options = ActionMailer::ARSendmail.process_args []
-    deny_includes :Model, options
+    refute_includes options, :Model
 
     argv = %w[--create-model]
-    
+
     options = ActionMailer::ARSendmail.process_args argv
 
     assert_equal true, options[:Model]
@@ -248,8 +247,8 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
   def test_class_parse_args_no_config_environment
     $".delete 'config/environment.rb'
 
-    out, err = util_capture do
-      assert_raise SystemExit do
+    out, err = capture_io do
+      assert_raises SystemExit do
         ActionMailer::ARSendmail.process_args []
       end
     end
@@ -261,7 +260,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
   def test_class_parse_args_no_config_environment_migrate
     $".delete 'config/environment.rb'
 
-    out, err = util_capture do
+    out, err = capture_io do
       ActionMailer::ARSendmail.process_args %w[--create-migration]
     end
 
@@ -274,7 +273,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
   def test_class_parse_args_no_config_environment_model
     $".delete 'config/environment.rb'
 
-    out, err = util_capture do
+    out, err = capture_io do
       ActionMailer::ARSendmail.process_args %w[--create-model]
     end
 
@@ -289,13 +288,13 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
   def test_class_parse_args_once
     argv = %w[-o]
-    
+
     options = ActionMailer::ARSendmail.process_args argv
 
     assert_equal true, options[:Once]
 
     argv = %w[--once]
-    
+
     options = ActionMailer::ARSendmail.process_args argv
 
     assert_equal true, options[:Once]
@@ -303,36 +302,36 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
   def test_class_parse_args_table_name
     argv = %w[-t Email]
-    
+
     options = ActionMailer::ARSendmail.process_args argv
 
     assert_equal 'Email', options[:TableName]
 
     argv = %w[--table-name=Email]
-    
+
     options = ActionMailer::ARSendmail.process_args argv
 
     assert_equal 'Email', options[:TableName]
   end
 
   def test_class_usage
-    out, err = util_capture do
+    out, err = capture_io do
       assert_raises SystemExit do
         ActionMailer::ARSendmail.usage 'opts'
       end
     end
 
-    assert_equal '', out.string
-    assert_equal "opts\n", err.string
+    assert_equal '', out
+    assert_equal "opts\n", err
 
-    out, err = util_capture do
+    out, err = capture_io do
       assert_raises SystemExit do
         ActionMailer::ARSendmail.usage 'opts', 'hi'
       end
     end
 
-    assert_equal '', out.string
-    assert_equal "hi\n\nopts\n", err.string
+    assert_equal '', out
+    assert_equal "hi\n\nopts\n", err
   end
 
   def test_cleanup
@@ -342,12 +341,12 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
     e3 = Email.create :mail => 'body', :to => 'to', :from => 'from'
     e3.last_send_attempt = Time.now
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.cleanup
     end
 
-    assert_equal '', out.string
-    assert_equal "expired 1 emails from the queue\n", err.string
+    assert_equal '', out
+    assert_equal "expired 1 emails from the queue\n", err
     assert_equal 2, Email.records.length
 
     assert_equal [e1, e2], Email.records
@@ -360,18 +359,18 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
     @sm.max_age = 0
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.cleanup
     end
 
-    assert_equal '', out.string
+    assert_equal '', out
     assert_equal 2, Email.records.length
   end
 
   def test_deliver
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email]
     end
 
@@ -380,8 +379,8 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
     assert_equal 0, Email.records.length
     assert_equal 0, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
 
-    assert_equal '', out.string
-    assert_equal "sent email 00000000001 from from to to: \"queued\"\n", err.string
+    assert_equal '', out
+    assert_equal "sent email 00000000001 from from to to: \"queued\"\n", err
   end
 
   def test_deliver_auth_error
@@ -395,7 +394,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email]
     end
 
@@ -406,15 +405,15 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
     assert_equal 1, @sm.failed_auth_count
     assert_equal [60], @sm.slept
 
-    assert_equal '', out.string
-    assert_equal "authentication error, retrying: try again\n", err.string
+    assert_equal '', out
+    assert_equal "authentication error, retrying: try again\n", err
   end
 
   def test_deliver_auth_error_recover
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
     @sm.failed_auth_count = 1
 
-    out, err = util_capture do @sm.deliver [email] end
+    out, err = capture_io do @sm.deliver [email] end
 
     assert_equal 0, @sm.failed_auth_count
     assert_equal 1, Net::SMTP.deliveries.length
@@ -429,14 +428,14 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
     @sm.failed_auth_count = 1
 
-    out, err = util_capture do
-      assert_raise Net::SMTPAuthenticationError do
+    out, err = capture_io do
+      assert_raises Net::SMTPAuthenticationError do
         @sm.deliver []
       end
     end
 
     assert_equal 2, @sm.failed_auth_count
-    assert_equal "authentication error, giving up: try again\n", err.string
+    assert_equal "authentication error, giving up: try again\n", err
   end
 
   def test_deliver_4xx_error
@@ -450,7 +449,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email]
     end
 
@@ -459,8 +458,8 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
     assert_operator now, :<=, Email.records.first.last_send_attempt
     assert_equal 1, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
 
-    assert_equal '', out.string
-    assert_equal "error sending email 1: \"try again\"(Net::SMTPSyntaxError):\n\tone\n\ttwo\n\tthree\n", err.string
+    assert_equal '', out
+    assert_equal "error sending email 1: \"try again\"(Net::SMTPSyntaxError):\n\tone\n\ttwo\n\tthree\n", err
   end
 
   def test_deliver_5xx_error
@@ -474,7 +473,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email]
     end
 
@@ -482,8 +481,8 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
     assert_equal 0, Email.records.length
     assert_equal 1, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
 
-    assert_equal '', out.string
-    assert_equal "5xx error sending email 1, removing from queue: \"unknown recipient\"(Net::SMTPFatalError):\n\tone\n\ttwo\n\tthree\n", err.string
+    assert_equal '', out
+    assert_equal "5xx error sending email 1, removing from queue: \"unknown recipient\"(Net::SMTPFatalError):\n\tone\n\ttwo\n\tthree\n", err
   end
 
   def test_deliver_errno_epipe
@@ -495,7 +494,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email]
     end
 
@@ -504,8 +503,8 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
     assert_operator now, :>=, Email.records.first.last_send_attempt
     assert_equal 0, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
 
-    assert_equal '', out.string
-    assert_equal '', err.string
+    assert_equal '', out
+    assert_equal '', err
   end
 
   def test_deliver_server_busy
@@ -519,7 +518,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email]
     end
 
@@ -529,8 +528,8 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
     assert_equal 0, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
     assert_equal [60], @sm.slept
 
-    assert_equal '', out.string
-    assert_equal "server too busy, sleeping 60 seconds\n", err.string
+    assert_equal '', out
+    assert_equal "server too busy, sleeping 60 seconds\n", err
   end
 
   def test_deliver_syntax_error
@@ -546,7 +545,7 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
     email1 = Email.create :mail => 'body', :to => 'to', :from => 'from'
     email2 = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email1, email2]
     end
 
@@ -555,8 +554,8 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
     assert_equal 1, Net::SMTP.reset_called, 'Reset connection on SyntaxError'
     assert_operator now, :<=, Email.records.first.last_send_attempt
 
-    assert_equal '', out.string
-    assert_equal "error sending email 1: \"blah blah blah\"(Net::SMTPSyntaxError):\n\tone\n\ttwo\n\tthree\nsent email 00000000002 from from to to: \"queued\"\n", err.string
+    assert_equal '', out
+    assert_equal "error sending email 1: \"blah blah blah\"(Net::SMTPSyntaxError):\n\tone\n\ttwo\n\tthree\nsent email 00000000002 from from to to: \"queued\"\n", err
   end
 
   def test_deliver_timeout
@@ -570,36 +569,36 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
     email = Email.create :mail => 'body', :to => 'to', :from => 'from'
 
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.deliver [email]
     end
 
     assert_equal 0, Net::SMTP.deliveries.length
     assert_equal 1, Email.records.length
     assert_operator now, :>=, Email.records.first.last_send_attempt
-    assert_equal 1, Net::SMTP.reset_called, 'Reset connection on Timeout'
+    assert_equal 0, Net::SMTP.reset_called, 'SMTP terminated on Timeout'
 
-    assert_equal '', out.string
-    assert_equal "error sending email 1: \"timed out\"(Timeout::Error):\n\tone\n\ttwo\n\tthree\n", err.string
+    assert_equal '', out
+    assert_equal "error sending email 1: \"timed out\"(Timeout::Error):\n\tone\n\ttwo\n\tthree\n", err
   end
 
   def test_do_exit
-    out, err = util_capture do
-      assert_raise SystemExit do
+    out, err = capture_io do
+      assert_raises SystemExit do
         @sm.do_exit
       end
     end
 
-    assert_equal '', out.string
-    assert_equal "caught signal, shutting down\n", err.string
+    assert_equal '', out
+    assert_equal "caught signal, shutting down\n", err
   end
 
   def test_log
-    out, err = util_capture do
+    out, err = capture_io do
       @sm.log 'hi'
     end
 
-    assert_equal "hi\n", err.string
+    assert_equal "hi\n", err
   end
 
   def test_find_emails
@@ -618,14 +617,14 @@ Last send attempt: Thu Aug 10 11:40:05 -0700 2006
 
     found_emails = []
 
-    out, err = util_capture do
+    out, err = capture_io do
       found_emails = @sm.find_emails
     end
 
     assert_equal emails, found_emails
 
-    assert_equal '', out.string
-    assert_equal "found 3 emails to send\n", err.string
+    assert_equal '', out
+    assert_equal "found 3 emails to send\n", err
   end
 
   def test_smtp_settings

metadata

@@ -1,39 +1,74 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4.3
-specification_version: 1
 name: ar_mailer
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
-date: 2007-07-31 00:00:00 -07:00
-summary: A two-phase delivery agent for ActionMailer
-require_paths: 
-- lib
-email: drbrain@segment7.net
-homepage: http://seattlerb.org/ar_mailer
-rubyforge_project: seattlerb
-description: Even delivering email to the local machine may take too long when you have to send hundreds of messages.  ar_mailer allows you to store messages into the database for later delivery by a separate process, ar_sendmail.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.3.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Eric Hodel
+autorequire: 
+bindir: bin
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
+  YWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZFgNu
+  ZXQwHhcNMDcxMjIxMDIwNDE0WhcNMDgxMjIwMDIwNDE0WjBBMRAwDgYDVQQDDAdk
+  cmJyYWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZ
+  FgNuZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbbgLrGLGIDE76
+  LV/cvxdEzCuYuS3oG9PrSZnuDweySUfdp/so0cDq+j8bqy6OzZSw07gdjwFMSd6J
+  U5ddZCVywn5nnAQ+Ui7jMW54CYt5/H6f2US6U0hQOjJR6cpfiymgxGdfyTiVcvTm
+  Gj/okWrQl0NjYOYBpDi+9PPmaH2RmLJu0dB/NylsDnW5j6yN1BEI8MfJRR+HRKZY
+  mUtgzBwF1V4KIZQ8EuL6I/nHVu07i6IkrpAgxpXUfdJQJi0oZAqXurAV3yTxkFwd
+  g62YrrW26mDe+pZBzR6bpLE+PmXCzz7UxUq3AE0gPHbiMXie3EFE0oxnsU3lIduh
+  sCANiQ8BAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBS5k4Z75VSpdM0AclG2UvzFA/VW5DANBgkqhkiG9w0BAQUFAAOCAQEAHagT4lfX
+  kP/hDaiwGct7XPuVGbrOsKRVD59FF5kETBxEc9UQ1clKWngf8JoVuEoKD774dW19
+  bU0GOVWO+J6FMmT/Cp7nuFJ79egMf/gy4gfUfQMuvfcr6DvZUPIs9P/TlK59iMYF
+  DIOQ3DxdF3rMzztNUCizN4taVscEsjCcgW6WkUJnGdqlu3OHWpQxZBJkBTjPCoc6
+  UW6on70SFPmAy/5Cq0OJNGEWBfgD9q7rrs/X8GGwUWqXb85RXnUVi/P8Up75E0ag
+  14jEc90kN+C7oI/AGCBN0j6JnEtYIEJZibjjDJTSMWlUKKkj30kq7hlUC2CepJ4v
+  x52qPcexcYZR7w==
+  -----END CERTIFICATE-----
+
+date: 2009-04-29 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.3"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.12.1
+    version: 
+description: |-
+  ar_mailer is a two-phase delivery agent for ActionMailer.  Even delivering
+  email to the local machine may take too long when you have to send hundreds of
+  messages.  ar_mailer allows you to store messages into the database for later
+  delivery by a separate process, ar_sendmail.
+email: 
+- drbrain@segment7.net
+executables: 
+- ar_sendmail
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- LICENSE.txt
+- Manifest.txt
+- README.txt
 files: 
 - History.txt
 - LICENSE.txt
@@ -48,30 +83,35 @@ files:
 - test/action_mailer.rb
 - test/test_armailer.rb
 - test/test_arsendmail.rb
-test_files: 
-- test/test_armailer.rb
-- test/test_arsendmail.rb
+has_rdoc: true
+homepage: http://seattlerb.rubyforge.org/ar_mailer
+licenses: []
+
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- LICENSE.txt
-- Manifest.txt
-- README.txt
-executables: 
-- ar_sendmail
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.2
-    version: 
+rubyforge_project: seattlerb
+rubygems_version: 1.3.2
+signing_key: 
+specification_version: 3
+summary: ar_mailer is a two-phase delivery agent for ActionMailer
+test_files: 
+- test/test_armailer.rb
+- test/test_arsendmail.rb