0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Added that gems can now be plugins if they include rails/init.rb #11444 [jbarnette]
0
+
0
 * Added Plugin#about method to programmatically access the about.yml in a plugin #10979 [lazyatom]
0
 
0
     plugin = Rails::Plugin.new(path_to_my_plugin)

0
@@ -43,6 +43,7 @@ module Rails
0
   class VendorBoot < Boot
0
     def load_initializer
0
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
0
+      Rails::Initializer.run(:install_gem_spec_stubs)
0
     end
0
   end
0
 

0
@@ -72,6 +72,7 @@ module Rails
0
       Rails.configuration = configuration
0
 
0
       check_ruby_version
0
+      install_gem_spec_stubs
0
       set_load_path
0
       
0
       require_frameworks
0
@@ -118,6 +119,26 @@ module Rails
0
       require 'ruby_version_check'
0
     end
0
 
0
+    # If Rails is vendored and RubyGems is available, install stub GemSpecs
0
+    # for Rails, ActiveSupport, ActiveRecord, ActionPack, ActionMailer, and
0
+    # ActiveResource. This allows Gem plugins to depend on Rails even when
0
+    # the Gem version of Rails shouldn't be loaded.
0
+    def install_gem_spec_stubs
0
+      if Rails.vendor_rails?
0
+        begin; require "rubygems"; rescue LoadError; return; end
0
+
0
+        stubs = %w(rails activesupport activerecord actionpack actionmailer activeresource)
0
+        stubs.reject! { |s| Gem.loaded_specs.key?(s) }
0
+
0
+        stubs.each do |stub|
0
+          Gem.loaded_specs[stub] = Gem::Specification.new do |s|
0
+            s.name = stub
0
+            s.version = Rails::VERSION::STRING
0
+          end
0
+        end
0
+      end
0
+    end
0
+
0
     # Set the <tt>$LOAD_PATH</tt> based on the value of
0
     # Configuration#load_paths. Duplicates are removed.
0
     def set_load_path
0
@@ -666,7 +687,9 @@ module Rails
0
       end
0
 
0
       def default_plugin_locators
0
-        [Plugin::FileSystemLocator]
0
+        locators = []
0
+        locators << Plugin::GemLocator if defined? Gem
0
+        locators << Plugin::FileSystemLocator
0
       end
0
 
0
       def default_plugin_loader

0
@@ -97,4 +97,24 @@ module Rails
0
          end
0
       end               
0
   end
0
+
0
+  # This Plugin subclass represents a Gem plugin. It behaves exactly like a
0
+  # "traditional" Rails plugin, but doesn't expose any additional load paths,
0
+  # since RubyGems has already taken care of things.
0
+  class GemPlugin < Plugin
0
+
0
+    # Initialize this plugin from a Gem::Specification.
0
+    def initialize(spec)
0
+      super(File.join(spec.full_gem_path, "rails"))
0
+      @name = spec.name
0
+    end
0
+
0
+    def valid?
0
+      true
0
+    end
0
+
0
+    def load_paths
0
+      []
0
+    end
0
+  end
0
 end
0
\ No newline at end of file

0
@@ -72,7 +72,26 @@ module Rails
0
             plugins
0
           end
0
         end
0
-        
0
+    end
0
+
0
+    # The GemLocator scans all the loaded RubyGems, looking for gems with
0
+    # a <tt>rails/init.rb</tt> file.
0
+    class GemLocator < Locator
0
+      def plugins
0
+        specs = Gem.loaded_specs.values.select do |spec|
0
+          spec.loaded_from && # prune stubs
0
+            File.exist?(File.join(spec.full_gem_path, "rails", "init.rb"))
0
+        end
0
+
0
+        require "rubygems/dependency_list"
0
+
0
+        deps = Gem::DependencyList.new
0
+        deps.add(*specs)
0
+
0
+        deps.dependency_order.collect do |spec|
0
+          Rails::GemPlugin.new(spec)
0
+        end
0
+      end
0
     end
0
   end
0
 end
0
\ No newline at end of file