Ticket #8730: gem_generators2.patch

CHANGELOG

@@ -1 +1 @@
-*SVN*
-
+* Plugin generators can be placed in /rails_generators folder, in addition to /generators folder; to allow RubyGems with rails_generators (see below) to be directly usable as plugins, and have their generators available. [Dr Nic, topfunky]
+
+* RubyGems can include Rails generators within /rails_generators/<generator_name>_generator.rb files (or /generators/... for generic generators), like you can do with plugins. GemSource renamed to GemGeneratorSource to free up meaningful namespace of Source subclasses [Dr Nic]
+
-* MySQL, PostgreSQL: database.yml defaults to utf-8.  #8701 [matt]
-
-* Added db:version to get the current schema number [via Err The Blog]

lib/rails_generator/scripts.rb

@@ -43 +43 @@
-
-          def usage_message
-            usage = "\nInstalled Generators\n"
-each do |
+inject({}) do |mem, 
-              label = source.label.to_s.capitalize
-
+
+
+
+
-              usage << "  #{label}: #{names.join(', ')}\n" unless names.empty?
-            end
-

lib/rails_generator/lookup.rb

@@ -46 +46 @@
-    #
-    # A spec is not a generator:  it's a description of where to find
-    # the generator and how to create it.  A source is anything that
-
+Generator
-    module Lookup
-      def self.included(base)
-        base.extend(ClassMethods)
@@ -101 +101 @@
-            sources << PathSource.new(:lib, "#{::RAILS_ROOT}/lib/generators")
-            sources << PathSource.new(:vendor, "#{::RAILS_ROOT}/vendor/generators")
-            sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/*/**/generators")
+            sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/*/**/rails_generators")
-          end
-          sources << PathSource.new(:user, "#{Dir.user_home}/.rails/generators")
-
+
+
+
+
-          sources << PathSource.new(:builtin, "#{File.dirname(__FILE__)}/generators/components")
-        end
-
@@ -185 +189 @@
-      end
-    end
-
-
-
-
-
+
-      def initialize
-        super :RubyGems
-      end
+    end
-
+    # GemGeneratorSource hits the mines to quarry for generators.  The latest versions
+    # of gems named *_generator are selected.
+    class GemGeneratorSource < AbstractGemSource
-      # Yield latest versions of generator gems.
-      def each
-        Gem::cache.search(/_generator$/).inject({}) { |latest, gem|
@@ -205 +210 @@
-      end
-    end
-
+    # GemPathSource looks for generators within any RubyGem's /rails_generators/<generator_name>_generator.rb file.
+    class GemPathSource < AbstractGemSource
+      # Yield each generator within rails_generator subdirectories.
+      def each
+        generator_full_paths.each do |generator|
+          yield Spec.new(File.basename(generator).sub(/_generator.rb$/, ''), File.dirname(generator), label)
+        end
+      end
+
+      private
+      def generator_full_paths
+        @generator_full_paths ||= 
+          begin
+            Gem::cache.inject({}) do |latest, name_gem|
+              name, gem = name_gem
+              hem = latest[gem.name]
+              latest[gem.name] = gem if hem.nil? or gem.version > hem.version
+              latest
+            end.values.inject([]) do |mem, gem|
+              Dir[gem.full_gem_path + '/{rails_,}generators/**/*_generator.rb'].each do |generator|
+                mem << generator
+              end
+              mem
+            end
+          end
+      end
+    end
+
-  end
-end

lib/rails_generator/spec.rb

@@ -2 +2 @@
-  module Generator
-    # A spec knows where a generator was found and how to instantiate it.
-    # Metadata include the generator's name, its base path, and the source
-
+Path
-    class Spec
-      attr_reader :name, :path, :source
-