Merge pull request #4023 from landongrindheim/move-description-into-query-command

Omit deprecated commands from command help output

(cherry picked from commit a3427c7)

Author: hsbt

lib/rubygems/commands/help_command.rb

@@ -332,6 +332,8 @@ def show_commands # :nodoc:
     @command_manager.command_names.each do |cmd_name|
       command = @command_manager[cmd_name]
 
+      next if command.deprecated?
+
       summary =
         if command
           command.summary

lib/rubygems/commands/query_command.rb

@@ -31,4 +31,13 @@ def initialize(name = 'query',
 
     add_query_options
   end
+
+  def description # :nodoc:
+    <<-EOF
+The query command is the basis for the list and search commands.
+
+You should really use the list and search commands instead.  This command
+is too hard to use.
+    EOF
+  end
 end

lib/rubygems/query_utils.rb

@@ -57,15 +57,6 @@ def defaults_str # :nodoc:
     "--local --name-matches // --no-details --versions --no-installed"
   end
 
-  def description # :nodoc:
-    <<-EOF
-The query command is the basis for the list and search commands.
-
-You should really use the list and search commands instead.  This command
-is too hard to use.
-    EOF
-  end
-
   def execute
     gem_names = Array(options[:name])
 

test/rubygems/test_gem_commands_help_command.rb

@@ -40,7 +40,9 @@ def test_gem_help_commands
 
     util_gem 'commands' do |out, err|
       mgr.command_names.each do |cmd|
-        assert_match(/\s+#{cmd}\s+\S+/, out)
+        unless mgr[cmd].deprecated?
+          assert_match(/\s+#{cmd}\s+\S+/, out)
+        end
       end
 
       if defined?(OpenSSL::SSL)
@@ -51,6 +53,17 @@ def test_gem_help_commands
     end
   end
 
+  def test_gem_help_commands_omits_deprecated_commands
+    mgr = Gem::CommandManager.new
+
+    util_gem 'commands' do |out, err|
+      deprecated_commands = mgr.command_names.select {|cmd| mgr[cmd].deprecated? }
+      deprecated_commands.each do |cmd|
+        refute_match(/\s+#{cmd}\s+\S+/, out)
+      end
+    end
+  end
+
   def test_gem_no_args_shows_help
     util_gem do |out, err|
       assert_match(/Usage:/, out)