1 files changed, 53 insertions, 7 deletions
diff --git a/lib/rubygems/commands/check_command.rb b/lib/rubygems/commands/check_command.rb
index 4bdfcfa645..d7677d47a1 100644
--- a/lib/rubygems/commands/check_command.rb
+++ b/lib/rubygems/commands/check_command.rb
@@ -1,25 +1,44 @@
 require 'rubygems/command'
 require 'rubygems/version_option'
 require 'rubygems/validator'
+require 'rubygems/doctor'
 
 class Gem::Commands::CheckCommand < Gem::Command
 
   include Gem::VersionOption
 
   def initialize
-    super 'check', 'Check installed gems',
-          :alien => true
+    super 'check', 'Check a gem repository for added or missing files',
+          :alien => true, :doctor => false, :dry_run => false, :gems => true
 
-    add_option('-a', '--alien', "Report 'unmanaged' or rogue files in the",
-               "gem repository") do |value, options|
-      options[:alien] = true
+    add_option('-a', '--[no-]alien',
+               'Report "unmanaged" or rogue files in the',
+               'gem repository') do |value, options|
+      options[:alien] = value
+    end
+
+    add_option('--[no-]doctor',
+               'Clean up uninstalled gems and broken',
+               'specifications') do |value, options|
+      options[:doctor] = value
+    end
+
+    add_option('--[no-]dry-run',
+               'Do not remove files, only report what',
+               'would be removed') do |value, options|
+      options[:dry_run] = value
+    end
+
+    add_option('--[no-]gems',
+               'Check installed gems for problems') do |value, options|
+      options[:gems] = value
     end
 
     add_version_option 'check'
   end
 
-  def execute
-    say "Checking gems..."
+  def check_gems
+    say 'Checking gems...'
     say
     gems = get_all_gem_names rescue []
 
@@ -37,4 +56,31 @@ class Gem::Commands::CheckCommand < Gem::Command
     end
   end
 
+  def doctor
+    say 'Checking for files from uninstalled gems...'
+    say
+
+    Gem.path.each do |gem_repo|
+      doctor = Gem::Doctor.new gem_repo, options[:dry_run]
+      doctor.doctor
+    end
+  end
+
+  def execute
+    check_gems if options[:gems]
+    doctor if options[:doctor]
+  end
+
+  def arguments # :nodoc:
+    'GEMNAME       name of gem to check'
+  end
+
+  def defaults_str # :nodoc:
+    '--gems --alien'
+  end
+
+  def usage # :nodoc:
+    "#{program_name} [OPTIONS] [GEMNAME ...]"
+  end
+
 end