Browse files

Merge pull request #7891 from schneems/schneems/rake_command_warning

Prompt to run rake when accidentally typed rails
  • Loading branch information...
2 parents db8dbe7 + 20385ec commit 32b4d464849d976431342aa0cfe2d4e17b10e9f0 @josevalim josevalim committed Oct 12, 2012
Showing with 32 additions and 23 deletions.
  1. +32 −23 railties/lib/rails/commands.rb
View
55 railties/lib/rails/commands.rb
@@ -9,6 +9,30 @@
"r" => "runner"
}
+help_message = <<-EOT
+Usage: rails COMMAND [ARGS]
+
+The most common rails commands are:
+ generate Generate new code (short-cut alias: "g")
+ console Start the Rails console (short-cut alias: "c")
+ server Start the Rails server (short-cut alias: "s")
+ dbconsole Start a console for the database specified in config/database.yml
+ (short-cut alias: "db")
+ new Create a new Rails application. "rails new my_app" creates a
+ new application called MyApp in "./my_app"
+
+In addition to those, there are:
+ application Generate the Rails application code
+ destroy Undo code generated with "generate" (short-cut alias: "d")
+ benchmarker See how fast a piece of code runs
+ profiler Get profile information from a piece of code
+ plugin new Generates skeleton for developing a Rails plugin
+ runner Run a piece of code in the application environment (short-cut alias: "r")
+
+All commands can be run with -h (or --help) for more information.
+EOT
+
+
command = ARGV.shift
command = aliases[command] || command
@@ -81,29 +105,14 @@
ARGV.unshift '--version'
require 'rails/commands/application'
-else
- puts "Error: Command not recognized" unless %w(-h --help).include?(command)
- puts <<-EOT
-Usage: rails COMMAND [ARGS]
-
-The most common rails commands are:
- generate Generate new code (short-cut alias: "g")
- console Start the Rails console (short-cut alias: "c")
- server Start the Rails server (short-cut alias: "s")
- dbconsole Start a console for the database specified in config/database.yml
- (short-cut alias: "db")
- new Create a new Rails application. "rails new my_app" creates a
- new application called MyApp in "./my_app"
+when '-h', '--help'
+ puts help_message
-In addition to those, there are:
- application Generate the Rails application code
- destroy Undo code generated with "generate" (short-cut alias: "d")
- benchmarker See how fast a piece of code runs
- profiler Get profile information from a piece of code
- plugin new Generates skeleton for developing a Rails plugin
- runner Run a piece of code in the application environment (short-cut alias: "r")
-
-All commands can be run with -h (or --help) for more information.
- EOT
+else
+ puts "Error: Command '#{command}' not recognized"
+ if %x{rake #{command} --dry-run 2>&1 } && $?.success?
+ puts "Did you mean: `$ rake #{command}` ?\n\n"
+ end
+ puts help_message
exit(1)
end

0 comments on commit 32b4d46

Please sign in to comment.