From 8f614a80e725228c0cc0c03fd731c6cbad0ffcb7 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 4 Feb 2007 20:44:45 +0000
Subject: [PATCH] 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                | 2 +-
 actionpack/lib/action_controller.rb              | 2 +-
 actionpack/test/controller/assert_select_test.rb | 2 +-
 actionwebservice/lib/action_web_service.rb       | 6 +++---
 activerecord/benchmarks/benchmark.rb             | 2 +-
 activerecord/lib/active_record.rb                | 2 +-
 activeresource/lib/active_resource.rb            | 2 +-
 railties/CHANGELOG                               | 2 ++
 railties/environments/boot.rb                    | 4 ++--
 railties/lib/rails_generator.rb                  | 2 +-
 10 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 5cf9f4d9a3..2825d74707 100755
--- a/actionmailer/lib/action_mailer.rb
+++ b/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
 
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 90c23604db..4fb8542382 100755
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -30,7 +30,7 @@
     require 'active_support'
   rescue LoadError
     require 'rubygems'
-    require_gem 'activesupport'
+    gem 'activesupport'
   end
 end
 
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
index 7056bfa08b..f3b525ab92 100644
--- a/actionpack/test/controller/assert_select_test.rb
+++ b/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
 
diff --git a/actionwebservice/lib/action_web_service.rb b/actionwebservice/lib/action_web_service.rb
index 874518e0b1..0632dd1ec0 100644
--- a/actionwebservice/lib/action_web_service.rb
+++ b/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/")
diff --git a/activerecord/benchmarks/benchmark.rb b/activerecord/benchmarks/benchmark.rb
index 241d915208..de390c11b2 100644
--- a/activerecord/benchmarks/benchmark.rb
+++ b/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
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 4bd5b6a1af..c4a228053b 100755
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -30,7 +30,7 @@
     require 'active_support'  
   rescue LoadError
     require 'rubygems'
-    require_gem 'activesupport'
+    gem 'activesupport'
   end
 end
 
diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb
index 89fd6f7722..a1af676086 100644
--- a/activeresource/lib/active_resource.rb
+++ b/activeresource/lib/active_resource.rb
@@ -30,7 +30,7 @@
     require 'active_support'  
   rescue LoadError
     require 'rubygems'
-    require_gem 'activesupport'
+    gem 'activesupport'
   end
 end
 
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index f3f78d0606..2b7ef8f8dd 100644
--- a/railties/CHANGELOG
+++ b/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]
diff --git a/railties/environments/boot.rb b/railties/environments/boot.rb
index 128fe76459..1e2a641823 100644
--- a/railties/environments/boot.rb
+++ b/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
diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb
index 9c587c9552..9f0ffc1562 100644
--- a/railties/lib/rails_generator.rb
+++ b/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'
-- 
GitLab