1 files changed, 67 insertions, 69 deletions
diff --git a/lib/rubygems/commands/cleanup_command.rb b/lib/rubygems/commands/cleanup_command.rb
index f6deac9829..40dcb9db34 100644
--- a/lib/rubygems/commands/cleanup_command.rb
+++ b/lib/rubygems/commands/cleanup_command.rb
@@ -2,92 +2,90 @@ require 'rubygems/command'
 require 'rubygems/source_index'
 require 'rubygems/dependency_list'
 
-module Gem
-  module Commands
-    class CleanupCommand < Command
-      def initialize
-        super(
-          'cleanup',
+class Gem::Commands::CleanupCommand < Gem::Command
+
+  def initialize
+    super 'cleanup',
           'Clean up old versions of installed gems in the local repository',
-          {
-            :force => false, 
-            :test => false, 
-            :install_dir => Gem.dir
-          })
-        add_option('-d', '--dryrun', "") do |value, options|
-          options[:dryrun] = true
-        end
-      end
+          :force => false, :test => false, :install_dir => Gem.dir
 
-      def arguments # :nodoc:
-        "GEMNAME       name of gem to cleanup"
-      end
+    add_option('-d', '--dryrun', "") do |value, options|
+      options[:dryrun] = true
+    end
+  end
 
-      def defaults_str # :nodoc:
-        "--no-dryrun"
-      end
+  def arguments # :nodoc:
+    "GEMNAME       name of gem to cleanup"
+  end
+
+  def defaults_str # :nodoc:
+    "--no-dryrun"
+  end
+
+  def usage # :nodoc:
+    "#{program_name} [GEMNAME ...]"
+  end
+
+  def execute
+    say "Cleaning up installed gems..."
+    primary_gems = {}
 
-      def usage # :nodoc:
-        "#{program_name} [GEMNAME ...]"
+    Gem.source_index.each do |name, spec|
+      if primary_gems[spec.name].nil? or
+         primary_gems[spec.name].version < spec.version then
+        primary_gems[spec.name] = spec
       end
+    end
 
-      def execute
-        say "Cleaning up installed gems..."
-        srcindex = Gem::SourceIndex.from_installed_gems
-        primary_gems = {}
+    gems_to_cleanup = []
 
-        srcindex.each do |name, spec|
-          if primary_gems[spec.name].nil? or primary_gems[spec.name].version < spec.version
-            primary_gems[spec.name] = spec
-          end
+    unless options[:args].empty? then
+      options[:args].each do |gem_name|
+        specs = Gem.cache.search(/^#{gem_name}$/i)
+        specs.each do |spec|
+          gems_to_cleanup << spec
         end
+      end
+    else
+      Gem.source_index.each do |name, spec|
+        gems_to_cleanup << spec
+      end
+    end
 
-        gems_to_cleanup = []
-
-        unless options[:args].empty? then
-          options[:args].each do |gem_name|
-            specs = Gem.cache.search(/^#{gem_name}$/i)
-            specs.each do |spec|
-              gems_to_cleanup << spec
-            end
-          end
-        else
-          srcindex.each do |name, spec|
-              gems_to_cleanup << spec
-          end
-        end
+    gems_to_cleanup = gems_to_cleanup.select { |spec|
+      primary_gems[spec.name].version != spec.version
+    }
 
-        gems_to_cleanup = gems_to_cleanup.select { |spec|
-          primary_gems[spec.name].version != spec.version
-        }
+    uninstall_command = Gem::CommandManager.instance['uninstall']
+    deplist = Gem::DependencyList.new
+    gems_to_cleanup.uniq.each do |spec| deplist.add spec end
 
-        uninstall_command = Gem::CommandManager.instance['uninstall']
-        deplist = DependencyList.new
-        gems_to_cleanup.uniq.each do |spec| deplist.add(spec) end
+    deps = deplist.strongly_connected_components.flatten.reverse
 
-        deplist.dependency_order.each do |spec|
-          if options[:dryrun] then
-            say "Dry Run Mode: Would uninstall #{spec.full_name}"
-          else
-            say "Attempting uninstall on #{spec.full_name}"
+    deps.each do |spec|
+      if options[:dryrun] then
+        say "Dry Run Mode: Would uninstall #{spec.full_name}"
+      else
+        say "Attempting to uninstall #{spec.full_name}"
 
-            options[:args] = [spec.name]
-            options[:version] = "= #{spec.version}"
-            options[:executables] = true
+        options[:args] = [spec.name]
+        options[:version] = "= #{spec.version}"
+        options[:executables] = false
 
-            uninstall_command.merge_options(options)
+        uninstaller = Gem::Uninstaller.new spec.name, options
 
-            begin
-              uninstall_command.execute
-            rescue Gem::DependencyRemovalException => ex
-              say "Unable to uninstall #{spec.full_name} ... continuing with remaining gems"
-            end
-          end
+        begin
+          uninstaller.uninstall
+        rescue Gem::DependencyRemovalException,
+               Gem::GemNotInHomeException => e
+          say "Unable to uninstall #{spec.full_name}:"
+          say "\t#{e.class}: #{e.message}"
         end
-
-        say "Clean Up Complete"
       end
     end
-      
+
+    say "Clean Up Complete"
   end
+
 end
+