diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-18 10:43:10 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-18 16:21:10 +0100 |
| commit | a2e2e73c5ef7c9082810d77c831c50c91011e6d9 (patch) | |
| tree | 86eb986b1cc598859c3930c52f09e243dce40f9a /railties/lib/rails/generators.rb | |
| parent | 4c00c65c58055b341b4ca59a38c3c93082049c84 (diff) | |
| download | rails-a2e2e73c5ef7c9082810d77c831c50c91011e6d9.tar.gz rails-a2e2e73c5ef7c9082810d77c831c50c91011e6d9.tar.bz2 rails-a2e2e73c5ef7c9082810d77c831c50c91011e6d9.zip | |
Ensure generators can be invoked by their shortcut and remove attr_reader tasks.
Diffstat (limited to 'railties/lib/rails/generators.rb')
| -rw-r--r-- | railties/lib/rails/generators.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index 3713a38b33..ecd0a1c6ea 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -168,6 +168,8 @@ module Rails # Rails looks for is the first and last parts of the namespace. # def self.find_by_namespace(name, base=nil, context=nil) #:nodoc: + base = "rails" unless base || context || name.to_s.include?(?:) + # Mount regexps to lookup regexps = [] regexps << /^#{base}:[\w:]*#{name}$/ if base @@ -203,8 +205,7 @@ module Rails # commands. def self.invoke(namespace, args=ARGV, config={}) names = namespace.to_s.split(':') - - if klass = find_by_namespace(names.pop, names.shift || "rails") + if klass = find_by_namespace(names.pop, names.shift) args << "--help" if klass.arguments.any? { |a| a.required? } && args.empty? klass.start(args, config) else |