diff options
| author | twinturbo <me@broadcastingadam.com> | 2012-04-28 22:33:11 -0700 |
|---|---|---|
| committer | twinturbo <me@broadcastingadam.com> | 2012-04-28 22:33:11 -0700 |
| commit | d7532c189f26e008fc6ef50336ed5e8168b8221c (patch) | |
| tree | 681436aa5d80ed5e4c9a867ccc891eab6852f124 /railties/lib/rails/commands.rb | |
| parent | 2c136ae0543ea53dcb3a3ef9372b216b54d66172 (diff) | |
| parent | 6659252d9f0e6d77bee268adf587e03cfeb8f9ad (diff) | |
| download | rails-d7532c189f26e008fc6ef50336ed5e8168b8221c.tar.gz rails-d7532c189f26e008fc6ef50336ed5e8168b8221c.tar.bz2 rails-d7532c189f26e008fc6ef50336ed5e8168b8221c.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/lib/rails/commands.rb')
| -rw-r--r-- | railties/lib/rails/commands.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb index 71fe604e69..82cdd6053b 100644 --- a/railties/lib/rails/commands.rb +++ b/railties/lib/rails/commands.rb @@ -64,9 +64,13 @@ when 'application', 'runner' require "rails/commands/#{command}" when 'new' - puts "Can't initialize a new Rails application within the directory of another, please change to a non-Rails directory first.\n" - puts "Type 'rails' for help." - exit(1) + if ARGV.first.in?(['-h', '--help']) + require 'rails/commands/application' + else + puts "Can't initialize a new Rails application within the directory of another, please change to a non-Rails directory first.\n" + puts "Type 'rails' for help." + exit(1) + end when '--version', '-v' ARGV.unshift '--version' |