diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-07-13 02:12:00 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-07-13 02:12:00 +0000 |
| commit | f29ce1f35670866cb86faedeabb28a33215a143f (patch) | |
| tree | 5d561e22accb212f6b50250cffa77eacce967a59 /railties/lib/rails_generator/lookup.rb | |
| parent | cb0f8fda9652c4d24d04693bdb82cecd3b067e5c (diff) | |
| download | rails-f29ce1f35670866cb86faedeabb28a33215a143f.tar.gz rails-f29ce1f35670866cb86faedeabb28a33215a143f.tar.bz2 rails-f29ce1f35670866cb86faedeabb28a33215a143f.zip | |
r3023@asus: jeremy | 2005-07-12 23:43:39 -0700
Remove superfluous inherited override in Dependencies.
r3024@asus: jeremy | 2005-07-12 23:54:28 -0700
Make test the default railties rake target.
r3025@asus: jeremy | 2005-07-12 23:55:27 -0700
Encapsulate dispatch call in dispatcher test.
r3026@asus: jeremy | 2005-07-12 23:56:14 -0700
Expand dispatcher mock to match full method signature for process.
r3027@asus: jeremy | 2005-07-12 23:57:24 -0700
Look for app-specific generators in RAILS_ROOT/generators instead of RAILS_ROOT/script/generators.
r3028@asus: jeremy | 2005-07-13 00:00:47 -0700
Update changelog.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1819 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/rails_generator/lookup.rb')
| -rw-r--r-- | railties/lib/rails_generator/lookup.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails_generator/lookup.rb b/railties/lib/rails_generator/lookup.rb index 538e0f55ea..47cf870bd6 100644 --- a/railties/lib/rails_generator/lookup.rb +++ b/railties/lib/rails_generator/lookup.rb @@ -4,7 +4,7 @@ class Object class << self # Lookup missing generators using const_missing. This allows any # generator to reference another without having to know its location: - # RubyGems, ~/.rails/generators, and RAILS_ROOT/script/generators. + # RubyGems, ~/.rails/generators, and RAILS_ROOT/generators. def lookup_missing_generator(class_id) if md = /(.+)Generator$/.match(class_id.to_s) name = md.captures.first.demodulize.underscore @@ -92,13 +92,13 @@ module Rails # Use component generators (model, controller, etc). # 1. Rails application. If RAILS_ROOT is defined we know we're # generating in the context of a Rails application, so search - # RAILS_ROOT/script/generators. + # RAILS_ROOT/generators. # 2. User home directory. Search ~/.rails/generators. # 3. RubyGems. Search for gems named *_generator. # 4. Builtins. Model, controller, mailer, scaffold. def use_component_sources! reset_sources - sources << PathSource.new(:app, "#{::RAILS_ROOT}/script/generators") if defined? ::RAILS_ROOT + sources << PathSource.new(:app, "#{::RAILS_ROOT}/generators") if defined? ::RAILS_ROOT sources << PathSource.new(:user, "#{Dir.user_home}/.rails/generators") sources << GemSource.new if Object.const_defined?(:Gem) sources << PathSource.new(:builtin, "#{File.dirname(__FILE__)}/generators/components") |