1 files changed, 29 insertions, 4 deletions

diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index a03be59a2b..71366a4480 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -5,12 +5,9 @@ require 'pathname'
 $LOAD_PATH.unshift File.dirname(__FILE__)
 require 'railties_path'
 require 'rails/version'
-require 'rails/plugin/locator'
-require 'rails/plugin/loader'
 require 'rails/gem_dependency'
 require 'rails/rack'
 
-
 RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV)
 
 module Rails
@@ -159,6 +156,8 @@ module Rails
 
       add_support_load_paths
 
+      check_for_unbuilt_gems
+
       load_gems
       load_plugins
 
@@ -244,6 +243,7 @@ module Rails
     # Set the paths from which Rails will automatically load source files, and
     # the load_once paths.
     def set_autoload_paths
+      require 'active_support/dependencies'
       ActiveSupport::Dependencies.load_paths = configuration.load_paths.uniq
       ActiveSupport::Dependencies.load_once_paths = configuration.load_once_paths.uniq
 
@@ -263,6 +263,8 @@ module Rails
     # list. By default, all frameworks (Active Record, Active Support,
     # Action Pack, Action Mailer, and Active Resource) are loaded.
     def require_frameworks
+      require 'active_support'
+      require 'active_support/core/all'
       configuration.frameworks.each { |framework| require(framework.to_s) }
     rescue LoadError => e
       # Re-raise as RuntimeError because Mongrel would swallow LoadError.
@@ -289,10 +291,12 @@ module Rails
     # Adds all load paths from plugins to the global set of load paths, so that
     # code from plugins can be required (explicitly or automatically via ActiveSupport::Dependencies).
     def add_plugin_load_paths
+      require 'active_support/dependencies'
       plugin_loader.add_plugin_load_paths
     end
 
     def add_gem_load_paths
+      require 'rails/gem_dependency'
       Rails::GemDependency.add_frozen_gem_path
       unless @configuration.gems.empty?
         require "rubygems"
@@ -306,6 +310,25 @@ module Rails
       end
     end
 
+    def check_for_unbuilt_gems
+      unbuilt_gems = @configuration.gems.select(&:frozen?).reject(&:built?)
+      if unbuilt_gems.size > 0
+        # don't print if the gems:build rake tasks are being run
+        unless $gems_build_rake_task
+          abort <<-end_error
+The following gems have native components that need to be built
+  #{unbuilt_gems.map { |gem| "#{gem.name}  #{gem.requirement}" } * "\n  "}
+
+You're running:
+  ruby #{Gem.ruby_version} at #{Gem.ruby}
+  rubygems #{Gem::RubyGemsVersion} at #{Gem.path * ', '}
+
+Run `rake gems:build` to build the unbuilt gems.
+          end_error
+        end
+      end
+    end
+
     def check_gem_dependencies
       unloaded_gems = @configuration.gems.reject { |g| g.loaded? }
       if unloaded_gems.size > 0
@@ -568,7 +591,7 @@ Run `rake gems:install` to install the missing gems.
       Rails::Rack::Metal.metal_paths += plugin_loader.engine_metal_paths
 
       configuration.middleware.insert_before(
-        :"ActionDispatch::RewindableInput",
+        :"ActionDispatch::ParamsParser",
         Rails::Rack::Metal, :if => Rails::Rack::Metal.metals.any?)
     end
 
@@ -1037,12 +1060,14 @@ Run `rake gems:install` to install the missing gems.
       end
 
       def default_plugin_locators
+        require 'rails/plugin/locator'
         locators = []
         locators << Plugin::GemLocator if defined? Gem
         locators << Plugin::FileSystemLocator
       end
 
       def default_plugin_loader
+        require 'rails/plugin/loader'
         Plugin::Loader
       end