1 files changed, 4 insertions, 18 deletions
diff --git a/lib/rubygems/commands/search_command.rb b/lib/rubygems/commands/search_command.rb
index 52e96fd1ef..92d4b3672e 100644
--- a/lib/rubygems/commands/search_command.rb
+++ b/lib/rubygems/commands/search_command.rb
@@ -1,30 +1,16 @@
 require 'rubygems/command'
-require 'rubygems/commands/query_command'
+require 'rubygems/commands/list_command'
 
-class Gem::Commands::SearchCommand < Gem::Commands::QueryCommand
+class Gem::Commands::SearchCommand < Gem::Commands::ListCommand
 
   def initialize
     super 'search', 'Display all gems whose name contains STRING'
 
-    remove_option '--name-matches'
-  end
-
-  def arguments # :nodoc:
-    "STRING        fragment of gem name to search for"
+    @defaults[:domain] = :remote
   end
 
   def defaults_str # :nodoc:
-    "--local --no-details"
-  end
-
-  def usage # :nodoc:
-    "#{program_name} [STRING]"
-  end
-
-  def execute
-    string = get_one_optional_argument
-    options[:name] = /#{string}/i
-    super
+    "--remote --no-details"
   end
 
 end