[DRE-commits] [SCM] ruby-actionmailer-2.3.git branch, upstream, updated. upstream/2.3.11-1-gd825ed6

[Ondřej Surý]

The following commit has been merged in the upstream branch:
commit d825ed658e457acf229fc42ae7e855bbc1f1752c
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Aug 22 14:36:11 2011 +0200

    Imported Upstream version 2.3.14

diff --git a/Rakefile b/Rakefile
index e7ef2b2..7e0a023 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/packagetask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require File.join(File.dirname(__FILE__), 'lib', 'action_mailer', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
@@ -29,7 +29,7 @@ Rake::TestTask.new { |t|
 
 
 # Generate the RDoc documentation
-Rake::RDocTask.new { |rdoc|
+RDoc::Task.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Action Mailer -- Easy email delivery and testing"
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
@@ -54,19 +54,17 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 2.3.11' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 2.3.14' + PKG_BUILD)
 
-  s.has_rdoc = true
   s.requirements << 'none'
   s.require_path = 'lib'
-  s.autorequire = 'action_mailer'
 
   s.files = [ "Rakefile", "install.rb", "README", "CHANGELOG", "MIT-LICENSE" ]
   s.files = s.files + Dir.glob( "lib/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   s.files = s.files + Dir.glob( "test/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
 end
   
-Rake::GemPackageTask.new(spec) do |p|
+Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
   p.need_tar = true
   p.need_zip = true
diff --git a/lib/action_mailer/version.rb b/lib/action_mailer/version.rb
index da9b986..7627ff2 100644
--- a/lib/action_mailer/version.rb
+++ b/lib/action_mailer/version.rb
@@ -2,7 +2,7 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 11
+    TINY  = 14
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/metadata.yml b/metadata.yml
index 7087efc..ada3611 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,22 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: actionmailer
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 2
   - 3
-  - 11
-  version: 2.3.11
+  - 14
+  version: 2.3.14
 platform: ruby
 authors: 
 - David Heinemeier Hansson
-autorequire: action_mailer
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +13:00
-default_executable: 
+date: 2011-08-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -26,12 +25,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 31
         segments: 
         - 2
         - 3
-        - 11
-        version: 2.3.11
+        - 14
+        version: 2.3.14
   type: :runtime
   version_requirements: *id001
 description: Makes it trivial to test and deliver emails sent from a single service layer.
@@ -190,7 +189,6 @@ files:
 - test/test_helper_test.rb
 - test/tmail_test.rb
 - test/url_test.rb
-has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -220,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: actionmailer
-rubygems_version: 1.3.7
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Service layer for easy email delivery and testing.

-- 
ruby-actionmailer-2.3.git