verion 2.1.6

adzap · Jan 16, 2010 · a455452 · a455452
1 parent f4e6257
commit a455452
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 15 deletions.
diff --git a/History.txt b/History.txt
@@ -1,3 +1,13 @@
+= 2.1.6
+
+* Miscellaneous Updates
+  * Use return-path as from address if set, as per default ActionMailer::Base SMTP delivery (Dustin Tinney)
+  * Always wait full delay between deliveries (cyu)
+
+* Bugs fixed
+  * Non-zero return code returned in init.d script (hennk)
+  * Use updated Timeout error class (hennk)
+
 = 2.1.5
 
 * Bugs fixed
@@ -21,7 +31,7 @@
   * Require ar_mailer in ar_sendmail since the change to remove TableName and use email_class
 
 = 2.1.1
- 
+
  * Force gem rebuild
 
 = 2.1.0
@@ -55,7 +65,7 @@
 = 1.4.3
 
 * Bugs fixed
-  * Replaced mistaken call to log when removing pid file artifact for 
+  * Replaced mistaken call to log when removing pid file artifact for
     non-running daemon
 
 = 1.4.2
@@ -65,11 +75,11 @@
     config file. See files share/linux/ar_sendmail and ar_sendmail.conf
 * Bugs fixed
   * Proper handling for relative and absolute paths for the pid file
-* Removed hoe dependency since we need the explicit gemspec file for github and 
+* Removed hoe dependency since we need the explicit gemspec file for github and
   not deploying to RubyForge its not as useful.
-* Moved old BSD rc.d script to share/bsd folder 
+* Moved old BSD rc.d script to share/bsd folder
 * Updated README with github gem install, docs and init script info
- 
+
 = 1.4.1
 
 * Bugs fixed

diff --git a/Rakefile b/Rakefile
@@ -6,7 +6,7 @@ require 'rake/rdoctask'
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/lib'))
 
 require './lib/action_mailer/ar_sendmail'
- 
+
 ar_mailer_gemspec = Gem::Specification.new do |s|
   s.name = %q{adzap-ar_mailer}
   s.version = ActionMailer::ARSendmail::VERSION
@@ -17,27 +17,46 @@ ar_mailer_gemspec = Gem::Specification.new do |s|
   s.email = %q{adam.meehan@gmail.com}
   s.executables = ["ar_sendmail"]
   s.extra_rdoc_files = ["History.txt", "LICENSE.txt", "README.rdoc"]
-  s.files = ["History.txt", "LICENSE.txt", "README.rdoc", "Rakefile", "bin/ar_sendmail", "generators/ar_mailer/ar_mailer_generator.rb", "generators/ar_mailer/templates/migration.rb", "generators/ar_mailer/templates/model.rb", "lib/action_mailer/ar_mailer.rb", "lib/action_mailer/ar_sendmail.rb", "lib/smtp_tls.rb", "share/bsd/ar_sendmail", "share/linux/ar_sendmail", "share/linux/ar_sendmail.conf", "test/resources/action_mailer.rb", "test/test_armailer.rb", "test/test_arsendmail.rb", "test/test_helper.rb"]
+  s.files = [
+    "History.txt",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "bin/ar_sendmail",
+    "generators/ar_mailer/ar_mailer_generator.rb",
+    "generators/ar_mailer/templates/migration.rb",
+    "generators/ar_mailer/templates/model.rb",
+    "lib/action_mailer/ar_mailer.rb",
+    "lib/action_mailer/ar_sendmail.rb",
+    "lib/smtp_tls.rb",
+    "share/bsd/ar_sendmail",
+    "share/linux/ar_sendmail",
+    "share/linux/ar_sendmail.conf",
+    "test/resources/action_mailer.rb",
+    "test/test_armailer.rb",
+    "test/test_arsendmail.rb",
+    "test/test_helper.rb"
+  ]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/adzap/ar_mailer}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{seattlerb}
   s.summary = %q{A two-phase delivery agent for ActionMailer}
   s.test_files = ["test/test_armailer.rb", "test/test_arsendmail.rb"]
-end 
+end
 
 Rake::GemPackageTask.new(ar_mailer_gemspec) do |pkg|
   pkg.gem_spec = ar_mailer_gemspec
 end
- 
+
 desc "Update ar_mailer.gemspec"
 task :make_spec do
-  File.open("ar_mailer.gemspec", "w") do |f|
+  File.open("adzap-ar_mailer.gemspec", "w") do |f|
     f.puts(ar_mailer_gemspec.to_ruby)
   end
 end
- 
+
 desc "Build packages and install"
 task :install => :package do
   sh %{sudo gem install --local --test pkg/ar_mailer-#{ActionMailer::ARSendmail::VERSION}}

diff --git a/adzap-ar_mailer.gemspec b/adzap-ar_mailer.gemspec
@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{adzap-ar_mailer}
-  s.version = "2.1.5"
+  s.version = "2.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Hodel", "Adam Meehan"]
-  s.date = %q{2009-07-06}
+  s.date = %q{2010-01-16}
   s.default_executable = %q{ar_sendmail}
   s.description = %q{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.}
   s.email = %q{adam.meehan@gmail.com}
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{seattlerb}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{A two-phase delivery agent for ActionMailer}
   s.test_files = ["test/test_armailer.rb", "test/test_arsendmail.rb"]
 

diff --git a/lib/action_mailer/ar_sendmail.rb b/lib/action_mailer/ar_sendmail.rb
@@ -42,7 +42,7 @@ class ActionMailer::ARSendmail
   ##
   # The version of ActionMailer::ARSendmail you are running.
 
-  VERSION = '2.1.5'
+  VERSION = '2.1.6'
 
   ##
   # Maximum number of times authentication will be consecutively retried