Ticket #8511: gems_loaded_from_vendor_like_plugins.diff

test/plugin_locator_test.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/plugin_test_helper'
+require 'fileutils'
+require 'rubygems/builder'
-
-class TestPluginFileSystemLocator < Test::Unit::TestCase
-  def setup
@@ -9 +11 @@
-    @initializer = Rails::Initializer.new(configuration)
-    @locator     = new_locator
-  end
-
+
-  def test_no_plugins_are_loaded_if_the_configuration_has_an_empty_plugin_list
-    only_load_the_following_plugins! []
-    assert_equal [], @locator.plugins
@@ -37 +39 @@
-  private
-    def new_locator(initializer = @initializer)
-      Rails::Plugin::FileSystemLocator.new(initializer)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-end

test/fixtures/gems/gem_with_version_constraint_on_dep_that_can_not_be_satisfied/dependency_one/dependency_one.gemspec

@@ +1 @@
+Gem::Specification.new do |s|
+  s.name     = 'dependency_one'
+  s.version  = '1.0.0'
+  s.summary  = 'This gem is a terminal dependency on top_level_gem but its version is too low'
+  s.files    = Dir['*.rb'] + Dir['lib/*']
+end

test/fixtures/gems/gem_with_version_constraint_on_dep_that_can_not_be_satisfied/top_level_gem_with_unsatisfiable_dependency/top_level_gem_with_unsatisfiable_dependency.gemspec

@@ +1 @@
+Gem::Specification.new do |s|
+  s.name     = 'top_level_gem_with_unsatisfiable_dependency'
+  s.version  = '1.0.0'
+  s.summary  = 'This gem has a dependency on dependency_one'
+  s.files    = Dir['*.rb'] + Dir['lib/*']
+  s.add_dependency 'dependency_one', '> 3.0.0'
+end

test/fixtures/gems/gem_with_version_constraint_on_dep_that_can_not_be_satisfied/dependency_loading_order.yml

@@ +1 @@
+- dependency_one-1.0.0
+- top_level_gem_with_unsatisfiable_dependency-1.0.0

test/fixtures/gems/gem_with_dep_that_has_its_own_deps/dependency_loading_order.yml

@@ +1 @@
+- second_generation_dep-1.0.0
+- first_generation_dep-1.0.0
+- top_level_gem_with_nested_deps-1.0.0

test/fixtures/gems/gem_with_dep_that_has_its_own_deps/top_level_gem_with_nested_deps/top_level_gem_with_nested_deps.gemspec

@@ +1 @@
+Gem::Specification.new do |s|
+  s.name     = 'top_level_gem_with_nested_deps'
+  s.version  = '1.0.0'
+  s.summary  = 'This gem has a depency on first_generation_dep which has its own dependency'
+  s.files    = Dir['*.rb'] + Dir['lib/*']
+  s.add_dependency 'first_generation_dep'
+end

test/fixtures/gems/gem_with_dep_that_has_its_own_deps/first_generation_dep/first_generation_dep.gemspec

@@ +1 @@
+Gem::Specification.new do |s|
+  s.name     = 'first_generation_dep'
+  s.version  = '1.0.0'
+  s.summary  = 'This gem is an intermediary dependency'
+  s.files    = Dir['*.rb'] + Dir['lib/*']
+  s.add_dependency 'second_generation_dep'
+end

test/fixtures/gems/gem_with_dep_that_has_its_own_deps/second_generation_dep/second_generation_dep.gemspec

@@ +1 @@
+Gem::Specification.new do |s|
+  s.name     = 'second_generation_dep'
+  s.version  = '1.0.0'
+  s.summary  = 'This is the terminal dependency in multiple levels of dependencies'
+  s.files    = Dir['*.rb'] + Dir['lib/*']
+end

test/fixtures/gems/gem_with_a_missing_dep/dependency_loading_order.yml

@@ +1 @@
+- dependency_one-1.0.0
+- top_level_gem_with_missing_dep-1.0.0

test/fixtures/gems/gem_with_a_missing_dep/top_level_gem_with_missing_dep/top_level_gem_with_missing_dep.gemspec

@@ +1 @@
+Gem::Specification.new do |s|
+  s.name     = 'top_level_gem_with_missing_dep'
+  s.version  = '1.0.0'
+  s.summary  = 'This gem has a dependency on dependency_one but dependency_one is missing'
+  s.files    = Dir['*.rb'] + Dir['lib/*']
+  s.add_dependency 'dependency_one'
+end

test/fixtures/gems/gem_with_no_deps/top_level_gem_with_no_deps/top_level_gem_with_no_deps.gemspec

@@ +1 @@
+Gem::Specification.new do |s|
+  s.name     = 'top_level_gem_with_no_deps'
+  s.version  = '1.0.0'
+  s.summary  = 'This gem has no depencies'
+  s.files    = Dir['*.rb'] + Dir['lib/*']
+end

test/fixtures/gems/gem_with_one_level_of_deps/dependency_one/dependency_one.gemspec

@@ +1 @@
+Gem::Specification.new do |s|
+  s.name     = 'dependency_one'
+  s.version  = '1.0.0'
+  s.summary  = 'This gem is a terminal dependency on top_level_gem'
+  s.files    = Dir['*.rb'] + Dir['lib/*']
+end

test/fixtures/gems/gem_with_one_level_of_deps/top_level_gem/top_level_gem.gemspec

@@ +1 @@
+Gem::Specification.new do |s|
+  s.name     = 'top_level_gem'
+  s.version  = '1.0.0'
+  s.summary  = 'This gem has a dependency on dependency_one'
+  s.files    = Dir['*.rb'] + Dir['lib/*']
+  s.add_dependency 'dependency_one'
+end

test/fixtures/gems/gem_with_one_level_of_deps/dependency_loading_order.yml

@@ +1 @@
+- dependency_one-1.0.0
+- top_level_gem-1.0.0

test/plugin_test_helper.rb

@@ -9 +9 @@
-RAILS_ROOT = '.' unless defined?(RAILS_ROOT)
-class Test::Unit::TestCase
-  def plugin_fixture_root_path
-File.dirname(__FILE__), 'fixtures'
+fixture_path
-  end
-  
+  def fixture_path
+    File.join(File.dirname(__FILE__), 'fixtures')
+  end
+  
-  def only_load_the_following_plugins!(plugins)
-    @initializer.configuration.plugins = plugins
-  end

lib/rails_generator/generators/applications/app/app_generator.rb

@@ -155 +155 @@
-    test/unit
-    vendor
-    vendor/plugins
+    vendor/gems
+    vendor/gems/home
-    tmp/sessions
-    tmp/sockets
-    tmp/cache

lib/initializer.rb

@@ -1 +1 @@
-require 'logger'
-require 'set'
+require 'fileutils'
-require 'pathname'
-
-$LOAD_PATH.unshift File.dirname(__FILE__)
@@ -346 +347 @@
-        unless configuration.plugins.nil?
-          unless loaded_plugins == configuration.plugins
-            missing_plugins = configuration.plugins - loaded_plugins
-
+
+
+
+
+
+
+
+
+
+
-          end
-        end
-      end
@@ -442 +452 @@
-    # <tt>vendor/plugins</tt>.
-    attr_accessor :plugin_paths
-
+    # The path to the root of the bundled gems directory. By default, it is in
+    # <tt>vendor/gems</tt>.
+    attr_accessor :bundled_gem_path
+
+    # The path into which Rails will on-the-fly install gems from its 
+    # bundled_gem_path on startup.  By default, it is in <tt>vendor/gems/home</tt>
+    attr_accessor :gem_home
+        
-    # The classes that handle finding the desired plugins that you'd like to load for
-    # your application. By default it is the Rails::Plugin::FileSystemLocator which finds
-    # plugins to load in <tt>vendor/plugins</tt>. You can hook into gem location by subclassing
@@ -479 +497 @@
-      self.whiny_nils                   = default_whiny_nils
-      self.plugins                      = default_plugins
-      self.plugin_paths                 = default_plugin_paths
+      self.bundled_gem_path             = default_bundled_gem_path      
+      self.gem_home                     = default_gem_home      
-      self.plugin_locators              = default_plugin_locators
-      self.plugin_loader                = default_plugin_loader
-      self.database_configuration_file  = default_database_configuration_file
@@ -647 +667 @@
-        ["#{root_path}/vendor/plugins"]
-      end
-
+      def default_bundled_gem_path
+        "#{root_path}/vendor/gems/"
+      end
+      
+      def default_gem_home
+        "#{root_path}/vendor/gems/home"
+      end
+      
-      def default_plugin_locators
-
+GemLocator, Plugin::
-      end
-
-      def default_plugin_loader

lib/rails/plugin/locator.rb

@@ -27 +27 @@
-    end
-    
-    class FileSystemLocator < Locator
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-              plugins.concat locate_plugins_under(path)
-  plugins
-end.flatten
+end
+plugins
-          end
+        end
+    end
+    
+    class GemLocator < Locator
+      require 'rubygems/dependency_list'
+      require 'rubygems/format'
+      require 'rubygems/installer'
+      
+      attr_reader :installer
+      
+      def initialize(*args)
+        super
+        @installer = Installer.new(self)
+      end
+      
+      def plugins
+        # Unlike the parent class, we don't want to sort the loaders, 
+        # as RubyGems takes care of sorting them in depency order already.
+        located_plugins.select(&:enabled?)
+      end
+          
+      def spec_to_path_mapping
+        @spec_to_path_mapping ||= Dir[File.join(initializer.configuration.bundled_gem_path, "*.gem")].inject({}) do |mapping, gem_path|
+          mapping[specification_for(gem_path)] = gem_path
+          mapping
+        end
+      end
+      
+      def specification_for(gem_path)
+        Gem::Format.from_file_by_path(gem_path).spec
+      end
+      
+      def bundled_gems
+        spec_to_path_mapping.values
+      end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-              end
-              plugins
-            end
-
+
+
+
+
+
+
+
+
+
-    end
-  end
-end

lib/rails/plugin/loader.rb

@@ -28 +28 @@
-      def loaded?
-        initializer.loaded_plugins.include?(name)
-      end
+      
+      def loadable?
+        plugin_path? && enabled?
+      end
-  
-      def plugin_path?
-        File.directory?(directory) && (has_lib_directory? || has_init_file?)