aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-05-13 13:33:20 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2012-05-13 13:33:20 -0300
commit6e55d30ca8a5a165211dfd0ba7a2beef3ad23cda (patch)
tree9578be36044d41788ebace24f5d793085ad3857d
parent59b773705e4d91c458a9572dc63c11eab85e633f (diff)
downloadrails-6e55d30ca8a5a165211dfd0ba7a2beef3ad23cda.tar.gz
rails-6e55d30ca8a5a165211dfd0ba7a2beef3ad23cda.tar.bz2
rails-6e55d30ca8a5a165211dfd0ba7a2beef3ad23cda.zip
Remove remaining require 'rubygems'
-rw-r--r--guides/code/getting_started/config/boot.rb2
-rw-r--r--guides/rails_guides.rb3
-rw-r--r--guides/source/initialization.textile2
-rw-r--r--guides/w3c_validator.rb1
-rw-r--r--railties/lib/rails/generators/app_base.rb2
5 files changed, 1 insertions, 9 deletions
diff --git a/guides/code/getting_started/config/boot.rb b/guides/code/getting_started/config/boot.rb
index 4489e58688..3596736667 100644
--- a/guides/code/getting_started/config/boot.rb
+++ b/guides/code/getting_started/config/boot.rb
@@ -1,5 +1,3 @@
-require 'rubygems'
-
# Set up gems listed in the Gemfile.
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
diff --git a/guides/rails_guides.rb b/guides/rails_guides.rb
index e662ad2ed9..1955309865 100644
--- a/guides/rails_guides.rb
+++ b/guides/rails_guides.rb
@@ -8,9 +8,6 @@ def bundler?
File.exists?('Gemfile')
end
-# Loading Action Pack requires rack and erubis.
-require 'rubygems'
-
begin
# Guides generation in the Rails repo.
as_lib = File.join(pwd, "../activesupport/lib")
diff --git a/guides/source/initialization.textile b/guides/source/initialization.textile
index 69e5c1edcc..155a439e64 100644
--- a/guides/source/initialization.textile
+++ b/guides/source/initialization.textile
@@ -137,8 +137,6 @@ h4. +config/boot.rb+
+config/boot.rb+ contains this:
<ruby>
-require 'rubygems'
-
# Set up gems listed in the Gemfile.
gemfile = File.expand_path('../../Gemfile', __FILE__)
begin
diff --git a/guides/w3c_validator.rb b/guides/w3c_validator.rb
index 84f34f9293..5e340499c4 100644
--- a/guides/w3c_validator.rb
+++ b/guides/w3c_validator.rb
@@ -26,7 +26,6 @@
#
# ---------------------------------------------------------------------------
-require 'rubygems'
require 'w3c_validators'
include W3CValidators
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 6df33d65e9..2c1742c6be 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -247,7 +247,7 @@ module Rails
# end-user gets the bundler commands called anyway, so no big deal.
#
# Thanks to James Tucker for the Gem tricks involved in this call.
- print `"#{Gem.ruby}" -rubygems "#{Gem.bin_path('bundler', 'bundle')}" #{command}`
+ print `"#{Gem.ruby}" "#{Gem.bin_path('bundler', 'bundle')}" #{command}`
end
def run_bundle