From 9f53e09eb9b4eb2e1711a8e92b7244a1f1301bbc Mon Sep 17 00:00:00 2001 From: Marcel Molina Date: Sat, 3 Mar 2007 02:53:06 +0000 Subject: 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 --- railties/lib/initializer.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'railties/lib/initializer.rb') 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 -- cgit v1.2.3