From 0aa864443caedb16970ff8da93d14e2ba3122469 Mon Sep 17 00:00:00 2001 From: Josh Nichols Date: Tue, 1 Jul 2008 16:45:44 -0400 Subject: [PATCH] Support generators from gems named like foo_generators, bar-generator, bar-generators. --- railties/lib/rails_generator/lookup.rb | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/railties/lib/rails_generator/lookup.rb b/railties/lib/rails_generator/lookup.rb index 1f28c39..e1f8900 100644 --- a/railties/lib/rails_generator/lookup.rb +++ b/railties/lib/rails_generator/lookup.rb @@ -97,8 +97,8 @@ module Rails # 2. Look in plugins, either for generators/ or rails_generators/ # directories within each plugin # 3. User home directory. Search ~/.rails/generators. - # 4. RubyGems. Search for gems named *_generator, and look for - # generators within any RubyGem's + # 4. RubyGems. Search for gems named *_generator and *_generators, + # and look for generators within any RubyGem's # /rails_generators/_generator.rb file. # 5. Builtins. Model, controller, mailer, scaffold, and so on. def use_component_sources! @@ -208,12 +208,12 @@ module Rails class GemGeneratorSource < AbstractGemSource # Yield latest versions of generator gems. def each - Gem::cache.search(/_generator$/).inject({}) { |latest, gem| + Gem::cache.search(/[_-]generators?$/).inject({}) { |latest, gem| hem = latest[gem.name] latest[gem.name] = gem if hem.nil? or gem.version > hem.version latest }.values.each { |gem| - yield Spec.new(gem.name.sub(/_generator$/, ''), gem.full_gem_path, label) + yield Spec.new(gem.name.sub(/[_-]generators?$/, ''), gem.full_gem_path, label) } end end -- 1.5.3.8