Fix gem deprecation warnings, which also means depending on RubyGems …

…0.9.0+ [Chad Fowler]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6119 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionmailer/lib/action_mailer.rb

@@ -27,7 +27,7 @@
     require 'action_controller'
   rescue LoadError
     require 'rubygems'
-    require_gem 'actionpack', '>= 1.12.5'
+    gem 'actionpack', '>= 1.12.5'
   end
 end
 

actionpack/lib/action_controller.rb

@@ -30,7 +30,7 @@
     require 'active_support'
   rescue LoadError
     require 'rubygems'
-    require_gem 'activesupport'
+    gem 'activesupport'
   end
 end
 

actionpack/test/controller/assert_select_test.rb

@@ -13,7 +13,7 @@
     require 'action_mailer'
   rescue LoadError
     require 'rubygems'
-    require_gem 'actionmailer'
+    gem 'actionmailer'
   end
 end
 

actionwebservice/lib/action_web_service.rb

@@ -27,9 +27,9 @@
   require 'active_record'
 rescue LoadError
   require 'rubygems'
-  require_gem 'activesupport', '>= 1.0.2'
-  require_gem 'actionpack', '>= 1.6.0'
-  require_gem 'activerecord', '>= 1.9.0'
+  gem 'activesupport', '>= 1.0.2'
+  gem 'actionpack', '>= 1.6.0'
+  gem 'activerecord', '>= 1.9.0'
 end
 
 $:.unshift(File.dirname(__FILE__) + "/action_web_service/vendor/")

activerecord/benchmarks/benchmark.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 if ARGV[2]
   require 'rubygems'
-  require_gem 'activerecord', ARGV[2]
+  gem 'activerecord', ARGV[2]
 else
   require 'active_record'
 end

activerecord/lib/active_record.rb

@@ -30,7 +30,7 @@
     require 'active_support'  
   rescue LoadError
     require 'rubygems'
-    require_gem 'activesupport'
+    gem 'activesupport'
   end
 end
 

activeresource/lib/active_resource.rb

@@ -30,7 +30,7 @@
     require 'active_support'  
   rescue LoadError
     require 'rubygems'
-    require_gem 'activesupport'
+    gem 'activesupport'
   end
 end
 

railties/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Fix gem deprecation warnings, which also means depending on RubyGems 0.9.0+ [Chad Fowler]
+
 * Plugins may be symlinked in vendor/plugins.  #4245 [brandon, progrium@gmail.com]
 
 * Resource generator depends on the model generator rather than duplicating it.  #7269 [bscofield]

railties/environments/boot.rb

@@ -26,7 +26,7 @@
       rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last
 
       if rails_gem
-        require_gem "rails", "=#{rails_gem.version.version}"
+        gem "rails", "=#{rails_gem.version.version}"
         require rails_gem.full_gem_path + '/lib/initializer'
       else
         STDERR.puts %(Cannot find gem for Rails ~>#{version}.0:
@@ -36,7 +36,7 @@
         exit 1
       end
     else
-      require_gem "rails"
+      gem "rails"
       require 'initializer'
     end
   end

railties/lib/rails_generator.rb

@@ -28,7 +28,7 @@
   require 'active_support'  
 rescue LoadError
   require 'rubygems'
-  require_gem 'activesupport'
+  gem 'activesupport'
 end
 
 require 'rails_generator/base'