diff options
| author | Rizwan Reza <rizwanreza@gmail.com> | 2010-06-05 04:04:49 +0430 |
|---|---|---|
| committer | Rizwan Reza <rizwanreza@gmail.com> | 2010-06-05 04:04:49 +0430 |
| commit | e6f2102178b19ac8d49363b5fa145f22483c30ee (patch) | |
| tree | b5dff24210eb3f521087fe66a9b734165ad22967 /railties/lib/rails/commands | |
| parent | 1535b02a9f8e0eaa3cd3182a45d2bd7855c3809c (diff) | |
| parent | 8e8cb1769f3a78c53e5b79d0ce6a08589045cfca (diff) | |
| download | rails-e6f2102178b19ac8d49363b5fa145f22483c30ee.tar.gz rails-e6f2102178b19ac8d49363b5fa145f22483c30ee.tar.bz2 rails-e6f2102178b19ac8d49363b5fa145f22483c30ee.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/rails/commands')
| -rw-r--r-- | railties/lib/rails/commands/application.rb | 7 | ||||
| -rw-r--r-- | railties/lib/rails/commands/destroy.rb | 1 | ||||
| -rwxr-xr-x | railties/lib/rails/commands/generate.rb | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb index 8a8143e00e..a3a5aed399 100644 --- a/railties/lib/rails/commands/application.rb +++ b/railties/lib/rails/commands/application.rb @@ -4,7 +4,12 @@ if %w(--version -v).include? ARGV.first exit(0) end -ARGV << "--help" if ARGV.empty? +if ARGV.first != "new" || ARGV.empty? + ARGV[0] = "--help" +else + ARGV.shift +end + require 'rubygems' if ARGV.include?("--dev") require 'rails/generators' diff --git a/railties/lib/rails/commands/destroy.rb b/railties/lib/rails/commands/destroy.rb index 9023c61bf2..db59cd8ad9 100644 --- a/railties/lib/rails/commands/destroy.rb +++ b/railties/lib/rails/commands/destroy.rb @@ -1,4 +1,5 @@ require 'rails/generators' +Rails::Generators.configure! if [nil, "-h", "--help"].include?(ARGV.first) Rails::Generators.help 'destroy' diff --git a/railties/lib/rails/commands/generate.rb b/railties/lib/rails/commands/generate.rb index 7d05a30de8..1b3eef504a 100755 --- a/railties/lib/rails/commands/generate.rb +++ b/railties/lib/rails/commands/generate.rb @@ -1,4 +1,5 @@ require 'rails/generators' +Rails::Generators.configure! if [nil, "-h", "--help"].include?(ARGV.first) Rails::Generators.help 'generate' |