4 files changed, 22 insertions, 21 deletions
diff --git a/railties/lib/generators.rb b/railties/lib/generators.rb
index 879abb1c41..2a196f65ea 100644
--- a/railties/lib/generators.rb
+++ b/railties/lib/generators.rb
@@ -1,17 +1,15 @@
 activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-$:.unshift(activesupport_path) if File.directory?(activesupport_path)
-
-begin
-  require 'active_support/mini'
-rescue LoadError
-  require 'rubygems'
-  gem 'activesupport'
-  require 'active_support/mini'
-end
-
-$:.unshift(File.dirname(__FILE__))
-
-require 'vendor/thor-0.11.6/lib/thor'
+$LOAD_PATH.unshift(activesupport_path) if File.directory?(activesupport_path)
+require 'active_support'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/metaclass'
+require 'active_support/core_ext/array'
+require 'active_support/core_ext/hash'
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/string/inflections'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/vendor/thor-0.11.6/lib")
 require 'generators/base'
 require 'generators/named_base'
 
diff --git a/railties/lib/generators/base.rb b/railties/lib/generators/base.rb
index c5d769b6ed..cb6a129264 100644
--- a/railties/lib/generators/base.rb
+++ b/railties/lib/generators/base.rb
@@ -1,3 +1,4 @@
+require 'thor'
 require 'generators/actions'
 
 module Rails
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index a258574dce..2a9d680c6a 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -9,10 +9,12 @@ else
 end
 
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
+require 'generators'
+
+require 'rubygems'
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../../activerecord/lib"
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../../actionpack/lib"
-require 'generators'
-require 'activerecord'
+require 'active_record'
 require 'action_dispatch'
 
 CURRENT_PATH = File.expand_path(Dir.pwd)
diff --git a/railties/test/initializer/test_helper.rb b/railties/test/initializer/test_helper.rb
index 4cb9c1b814..f6a2547efc 100644
--- a/railties/test/initializer/test_helper.rb
+++ b/railties/test/initializer/test_helper.rb
@@ -2,16 +2,16 @@
 # boot from scratch in vendored mode. This file should really only be
 # required in test cases that use the isolation helper so that requires
 # can be reset correctly.
-RAILS_ROOT = File.join(File.dirname(__FILE__), "root")
-RAILS_FRAMEWORK_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..'))
+RAILS_ROOT = "#{File.dirname(__FILE__)}/root"
+RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../..")
 
 require 'rubygems'
 gem 'rack', '~> 1.0.0'
 
 require "test/unit"
 # We are purposely avoiding adding things to the load path to catch bugs that only happen in the genuine article
-require File.join(RAILS_FRAMEWORK_ROOT, 'activesupport', 'lib', 'active_support', 'testing', 'isolation')
-require File.join(RAILS_FRAMEWORK_ROOT, 'activesupport', 'lib', 'active_support', 'testing', 'declarative')
+require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/isolation"
+require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/declarative"
 
 class Test::Unit::TestCase
   extend ActiveSupport::Testing::Declarative
@@ -38,7 +38,7 @@ module Rails
 
     def boot!
       # Require the initializer
-      require File.join(RAILS_FRAMEWORK_ROOT, 'railties', 'lib', 'initializer')
+      require "#{RAILS_FRAMEWORK_ROOT}/railties/lib/initializer"
       # Run the initializer the same way boot.rb does it
       Rails::Initializer.run(:install_gem_spec_stubs)
       Rails::GemDependency.add_frozen_gem_path
@@ -48,4 +48,4 @@ module Rails
 end
 
 # All that for this:
-Rails.boot!
-\ No newline at end of file
+Rails.boot!