Move responsibility for ensuring that all registered gems were loaded from the FileSystemLocator into the Initializer once all locators have had a chance to load the gems they located. [Marcel Molina Jr.]

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

1 files changed, 11 insertions, 0 deletions

diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 36797026c4..4e4e260056 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -192,6 +192,7 @@ module Rails
           plugin.load
         end
       end
+      ensure_all_registered_plugins_are_loaded!
       $LOAD_PATH.uniq!      
     end
 
@@ -339,6 +340,16 @@ module Rails
         load(initializer)
       end
     end
+    
+    private
+      def ensure_all_registered_plugins_are_loaded!
+        unless configuration.plugins.nil?
+          unless loaded_plugins == configuration.plugins
+            missing_plugins = configuration.plugins - loaded_plugins
+            raise LoadError, "Could not locate the following plugins: #{missing_plugins.to_sentence}"
+          end
+        end
+      end
   end
 
   # The Configuration class holds all the parameters for the Initializer and