upgrade to rails 2.3.12 and fix deprecation warning and fix some version numbers of gems used for testing

vendor/rails/railties/Rakefile

@@ -1,7 +1,7 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
+require 'rdoc/task'
+require 'rubygems/package_task'
 
 require 'date'
 require 'rbconfig'
@@ -267,7 +267,7 @@ task :generate_app_doc do
   system %{cd #{PKG_DESTINATION}; rake doc:app}
 end
 
-Rake::RDocTask.new { |rdoc|
+RDoc::Task.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Railties -- Gluing the Engine to the Rails"
   rdoc.options << '--line-numbers' << '--inline-source' << '--accessor' << 'cattr_accessor=object'
@@ -313,20 +313,18 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.8.3')
-  s.add_dependency('activesupport',    '= 2.3.11' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 2.3.11' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 2.3.11' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 2.3.11' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 2.3.11' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 2.3.12' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.3.12' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.3.12' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.3.12' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.3.12' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
-  s.has_rdoc = false
 
   s.files = PKG_FILES
   s.require_path = 'lib'
   s.bindir = "bin"                               # Use these for applications.
   s.executables = ["rails"]
-  s.default_executable = "rails"
 
   s.author = "David Heinemeier Hansson"
   s.email = "david@loudthinking.com"
@@ -334,7 +332,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "rails"
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 

vendor/rails/railties/lib/rails/gem_dependency.rb

@@ -38,7 +38,7 @@ module Rails
       result = self.new(name, :version => version)
       spec_filename = File.join(directory_name, '.specification')
       if load_spec
-        raise "Missing specification file in #{File.dirname(spec_filename)}. Perhaps you need to do a 'rake gems:refresh_specs'?" unless File.exists?(spec_filename)
+        raise "Missing specification file in #{File.dirname(spec_filename)}. Perhaps you need to do a 'rake gems:refresh_specs'\?" unless File.exists?(spec_filename)
         spec = YAML::load_file(spec_filename)
         result.specification = spec
       end
@@ -72,7 +72,15 @@ module Rails
         @load_paths_added = @loaded = @frozen = true
         return
       end
-      gem self
+
+      begin
+        dep = Gem::Dependency.new(name, requirement)
+        spec = Gem.source_index.find { |_,s| s.satisfies_requirement?(dep) }.last
+        spec.activate           # a way that exists
+      rescue
+        gem self.name, self.requirement # <  1.8 unhappy way
+      end
+
       @spec = Gem.loaded_specs[name]
       @frozen = @spec.loaded_from.include?(self.class.unpacked_path) if @spec
       @load_paths_added = true
@@ -117,18 +125,6 @@ module Rails
       @spec = s
     end
 
-    if method_defined?(:requirement)
-      def requirement
-        req = super
-        req unless req == Gem::Requirement.default
-      end
-    else
-      def requirement
-        req = version_requirements
-        req unless req == Gem::Requirement.default
-      end
-    end
-
     def built?
       return false unless frozen?
 
@@ -274,9 +270,10 @@ module Rails
     end
 
     def ==(other)
-      self.name == other.name && self.requirement == other.requirement
+      Gem::Dependency === other.class &&
+        self.name == other.name && self.requirement == other.requirement
     end
-    alias_method :"eql?", :"=="
+    alias_method :eql?, :"=="
 
     private
 

vendor/rails/railties/lib/rails/vendor_gem_source_index.rb

@@ -31,7 +31,7 @@ module Rails
 
     def refresh!
       # reload the installed gems
-      @installed_source_index.refresh!
+      # HACK: I don't think this is needed: @installed_source_index.refresh!
       vendor_gems = {}
 
       # handle vendor Rails gems - they are identified by having loaded_from set to ""

vendor/rails/railties/lib/rails/version.rb

@@ -2,7 +2,7 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 11
+    TINY  = 12
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -14,7 +14,7 @@ Rake::TestTask.new(:test) do |t|
 end
 
 desc 'Generate documentation for the <%= file_name %> plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = '<%= class_name %>'
   rdoc.options << '--line-numbers' << '--inline-source'

vendor/rails/railties/lib/tasks/documentation.rake

@@ -1,6 +1,6 @@
 namespace :doc do
   desc "Generate documentation for the application. Set custom template with TEMPLATE=/path/to/rdoc/template.rb or title with TITLE=\"Custom Title\""
-  Rake::RDocTask.new("app") { |rdoc|
+  RDoc::Task.new("app") { |rdoc|
     rdoc.rdoc_dir = 'doc/app'
     rdoc.template = ENV['template'] if ENV['template']
     rdoc.title    = ENV['title'] || "Rails Application Documentation"
@@ -12,7 +12,7 @@ namespace :doc do
   }
 
   desc "Generate documentation for the Rails framework"
-  Rake::RDocTask.new("rails") { |rdoc|
+  RDoc::Task.new("rails") { |rdoc|
     rdoc.rdoc_dir = 'doc/api'
     rdoc.template = "#{ENV['template']}.rb" if ENV['template']
     rdoc.title    = "Rails Framework Documentation"

vendor/rails/railties/lib/tasks/framework.rake

@@ -24,7 +24,7 @@ namespace :rails do
       begin
         chdir("vendor/rails") do
           rails.dependencies.select { |g| deps.include? g.name }.each do |g|
-            Gem::GemRunner.new.run(["unpack", g.name, "--version", g.version_requirements.to_s])
+            Gem::GemRunner.new.run(["unpack", g.name, "--version", g.respond_to?(:requirement) ? g.requirement.to_s : g.version_requirements.to_s])
             mv(Dir.glob("#{g.name}*").first, g.name)
           end