cleanup: factor out unqualified cleanup code

Library/Homebrew/cmd/cleanup.rb

@@ -7,25 +7,27 @@ module Homebrew extend self
 
   def cleanup
     if ARGV.named.empty?
-      if HOMEBREW_CELLAR.directory?
+      cleanup_all
-        HOMEBREW_CELLAR.children.each do |rack|
+    else
-          begin
+      ARGV.formulae.each { |f| cleanup_formula(f) }
-            cleanup_formula Formula.factory(rack.basename.to_s) if rack.directory?
+    end
-          rescue FormulaUnavailableError
+  end
-            # Don't complain about directories from DIY installs
+
-          end
+  def cleanup_all
+    if HOMEBREW_CELLAR.directory?
+      HOMEBREW_CELLAR.children.each do |rack|
+        begin
+          cleanup_formula Formula.factory(rack.basename.to_s) if rack.directory?
+        rescue FormulaUnavailableError
+          # Don't complain about directories from DIY installs
         end
       end
-      clean_cache
+    end
-      # seems like a good time to do some additional cleanup
+    clean_cache
-      unless ARGV.dry_run?
+    # seems like a good time to do some additional cleanup
-        Homebrew.prune
+    unless ARGV.dry_run?
-        rm_DS_Store
+      Homebrew.prune
-      end
+      rm_DS_Store
-    else
-      ARGV.formulae.each do |f|
-        cleanup_formula f
-      end
     end
   end