From af22c5b16a0f138969221e5a17fc159efb5ae347 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Tue, 9 Feb 2010 20:19:54 +0700
Subject: [PATCH] Add missing -h/--help flag to several rails command [#3909
 status:resolved]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 railties/lib/rails/commands/console.rb                 | 2 +-
 railties/lib/rails/commands/destroy.rb                 | 4 ++--
 railties/lib/rails/commands/generate.rb                | 4 ++--
 railties/lib/rails/commands/performance/benchmarker.rb | 4 ++--
 railties/lib/rails/commands/performance/profiler.rb    | 4 ++--
 railties/lib/rails/generators.rb                       | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 3fa4c939a861..50df6ba40599 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -19,7 +19,7 @@ def start
         opt.banner = "Usage: console [environment] [options]"
         opt.on('-s', '--sandbox', 'Rollback database modifications on exit.') { |v| options[:sandbox] = v }
         opt.on("--debugger", 'Enable ruby-debugging for the console.') { |v| options[:debugger] = v }
-        opt.on('--irb') { |v| abort '--irb option is no longer supported. Invoke `/your/choice/of/ruby script/rails console` instead' }
+        opt.on('--irb', "DEPRECATED: Invoke `/your/choice/of/ruby script/rails console` instead") { |v| abort '--irb option is no longer supported. Invoke `/your/choice/of/ruby script/rails console` instead' }
         opt.parse!(ARGV)
       end
 
diff --git a/railties/lib/rails/commands/destroy.rb b/railties/lib/rails/commands/destroy.rb
index 92a06ebdd848..9023c61bf243 100644
--- a/railties/lib/rails/commands/destroy.rb
+++ b/railties/lib/rails/commands/destroy.rb
@@ -1,7 +1,7 @@
 require 'rails/generators'
 
-if ARGV.size == 0
-  Rails::Generators.help
+if [nil, "-h", "--help"].include?(ARGV.first)
+  Rails::Generators.help 'destroy'
   exit
 end
 
diff --git a/railties/lib/rails/commands/generate.rb b/railties/lib/rails/commands/generate.rb
index 5e45d8ab467e..7d05a30de818 100755
--- a/railties/lib/rails/commands/generate.rb
+++ b/railties/lib/rails/commands/generate.rb
@@ -1,7 +1,7 @@
 require 'rails/generators'
 
-if ARGV.size == 0
-  Rails::Generators.help
+if [nil, "-h", "--help"].include?(ARGV.first)
+  Rails::Generators.help 'generate'
   exit
 end
 
diff --git a/railties/lib/rails/commands/performance/benchmarker.rb b/railties/lib/rails/commands/performance/benchmarker.rb
index ad84d94dbfd2..0432261802e8 100644
--- a/railties/lib/rails/commands/performance/benchmarker.rb
+++ b/railties/lib/rails/commands/performance/benchmarker.rb
@@ -1,5 +1,5 @@
-if ARGV.empty?
-  puts "Usage: benchmarker [times] 'Person.expensive_way' 'Person.another_expensive_way' ..."
+if [nil, "-h", "--help"].include?(ARGV.first)
+  puts "Usage: rails benchmarker [times] 'Person.expensive_way' 'Person.another_expensive_way' ..."
   exit 1
 end
 
diff --git a/railties/lib/rails/commands/performance/profiler.rb b/railties/lib/rails/commands/performance/profiler.rb
index 50ae411166db..6d9717b5cdf0 100644
--- a/railties/lib/rails/commands/performance/profiler.rb
+++ b/railties/lib/rails/commands/performance/profiler.rb
@@ -1,5 +1,5 @@
-if ARGV.empty?
-  $stderr.puts "Usage: profiler 'Person.expensive_method(10)' [times] [flat|graph|graph_html]"
+if [nil, "-h", "--help"].include?(ARGV.first)
+  $stderr.puts "Usage: rails profiler 'Person.expensive_method(10)' [times] [flat|graph|graph_html]"
   exit(1)
 end
 
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 57793572261f..c01018aab265 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -166,7 +166,7 @@ def self.invoke(namespace, args=ARGV, config={})
     end
 
     # Show help message with available generators.
-    def self.help
+    def self.help(command = 'generate')
       lookup!
 
       namespaces = subclasses.map{ |k| k.namespace }
@@ -178,7 +178,7 @@ def self.help
         groups[base] << namespace
       end
 
-      puts "Usage: rails generate GENERATOR [args] [options]"
+      puts "Usage: rails #{command} GENERATOR [args] [options]"
       puts
       puts "General options:"
       puts "  -h, [--help]     # Print generators options and usage"