Allow references to casks when running uninstall and reinstall

Library/Homebrew/cli/args.rb

@@ -36,9 +36,11 @@ def freeze_named_args!(named_args)
         # Reset cache values reliant on named_args
         @formulae = nil
         @resolved_formulae = nil
+        @resolved_formulae_and_unknowns = nil
         @formulae_paths = nil
         @casks = nil
         @kegs = nil
+        @kegs_and_unknowns = nil
 
         self[:named_args] = named_args
         self[:named_args].freeze
@@ -96,6 +98,19 @@ def resolved_formulae
         end.uniq(&:name).freeze
       end
 
+      def resolved_formulae_and_unknowns
+        return @resolved_formulae_and_unknowns if @resolved_formulae_and_unknowns
+
+        resolved_formulae = []
+        unknowns = []
+        downcased_unique_named.each do |name|
+          resolved_formulae << Formulary.resolve(name, spec: spec(nil))
+        rescue FormulaUnavailableError
+          unknowns << name
+        end
+        @resolved_formulae_and_unknowns = [resolved_formulae.freeze, unknowns.freeze].freeze
+      end
+
       def formulae_paths
         @formulae_paths ||= (downcased_unique_named - casks).map do |name|
           Formulary.path(name)
@@ -108,55 +123,73 @@ def casks
       end
 
       def kegs
+        @kegs ||= downcased_unique_named.map do |name|
+          resolve_keg name
+        rescue NoSuchKegError => e
+          if (reason = Homebrew::MissingFormula.suggest_command(name, "uninstall"))
+            $stderr.puts reason
+          end
+          raise e
+        end.freeze
+      end
+
+      def kegs_and_unknowns
+        return @kegs_and_unknowns if @kegs_and_unknowns
+
+        kegs = []
+        unknowns = []
+        downcased_unique_named.each do |name|
+          kegs << resolve_keg(name)
+        rescue NoSuchKegError
+          unknowns << name
+        end
+
+        @kegs_and_unknowns = [kegs.freeze, unknowns.freeze].freeze
+      end
+
+      def resolve_keg(name)
         require "keg"
         require "formula"
         require "missing_formula"
 
-        @kegs ||= downcased_unique_named.map do |name|
-          raise UsageError if name.empty?
+        raise UsageError if name.empty?
 
-          rack = Formulary.to_rack(name.downcase)
+        rack = Formulary.to_rack(name.downcase)
 
-          dirs = rack.directory? ? rack.subdirs : []
+        dirs = rack.directory? ? rack.subdirs : []
 
-          if dirs.empty?
-            if (reason = Homebrew::MissingFormula.suggest_command(name, "uninstall"))
-              $stderr.puts reason
-            end
-            raise NoSuchKegError, rack.basename
-          end
+        raise NoSuchKegError, rack.basename if dirs.empty?
 
-          linked_keg_ref = HOMEBREW_LINKED_KEGS/rack.basename
-          opt_prefix = HOMEBREW_PREFIX/"opt/#{rack.basename}"
+        linked_keg_ref = HOMEBREW_LINKED_KEGS/rack.basename
+        opt_prefix = HOMEBREW_PREFIX/"opt/#{rack.basename}"
 
-          begin
-            if opt_prefix.symlink? && opt_prefix.directory?
-              Keg.new(opt_prefix.resolved_path)
-            elsif linked_keg_ref.symlink? && linked_keg_ref.directory?
-              Keg.new(linked_keg_ref.resolved_path)
-            elsif dirs.length == 1
-              Keg.new(dirs.first)
+        begin
+          if opt_prefix.symlink? && opt_prefix.directory?
+            Keg.new(opt_prefix.resolved_path)
+          elsif linked_keg_ref.symlink? && linked_keg_ref.directory?
+            Keg.new(linked_keg_ref.resolved_path)
+          elsif dirs.length == 1
+            Keg.new(dirs.first)
+          else
+            f = if name.include?("/") || File.exist?(name)
+              Formulary.factory(name)
             else
-              f = if name.include?("/") || File.exist?(name)
-                Formulary.factory(name)
-              else
-                Formulary.from_rack(rack)
-              end
-
-              unless (prefix = f.installed_prefix).directory?
-                raise MultipleVersionsInstalledError, rack.basename
-              end
+              Formulary.from_rack(rack)
+            end
 
-              Keg.new(prefix)
+            unless (prefix = f.installed_prefix).directory?
+              raise MultipleVersionsInstalledError, rack.basename
             end
-          rescue FormulaUnavailableError
-            raise <<~EOS
-              Multiple kegs installed to #{rack}
-              However we don't know which one you refer to.
-              Please delete (with rm -rf!) all but one and then try again.
-            EOS
+
+            Keg.new(prefix)
           end
-        end.freeze
+        rescue FormulaUnavailableError
+          raise <<~EOS
+            Multiple kegs installed to #{rack}
+            However we don't know which one you refer to.
+            Please delete (with rm -rf!) all but one and then try again.
+          EOS
+        end
       end
 
       def build_stable?

Library/Homebrew/cmd/reinstall.rb

@@ -6,6 +6,7 @@
 require "reinstall"
 require "cli/parser"
 require "cleanup"
+require "cask/all"
 
 module Homebrew
   module_function
@@ -56,7 +57,8 @@ def reinstall
 
     Install.perform_preinstall_checks
 
-    args.resolved_formulae.each do |f|
+    resolved_formulae, possible_casks = args.resolved_formulae_and_unknowns
+    resolved_formulae.each do |f|
       if f.pinned?
         onoe "#{f.full_name} is pinned. You must unpin it to reinstall."
         next
@@ -66,5 +68,14 @@ def reinstall
       Cleanup.install_formula_clean!(f)
     end
     Homebrew.messages.display_messages
+
+    possible_casks.each do |name|
+      reinstall_cmd = Cask::Cmd::Reinstall.new(name)
+      reinstall_cmd.verbose = args.verbose?
+      reinstall_cmd.force = args.force?
+      reinstall_cmd.run
+    rescue Cask::CaskUnavailableError
+      ofail "No installed keg or cask with the name \"#{name}\""
+    end
   end
 end

Library/Homebrew/cmd/uninstall.rb

@@ -5,6 +5,9 @@
 require "diagnostic"
 require "migrator"
 require "cli/parser"
+require "cask/all"
+require "cask/cmd"
+require "cask/cask_loader"
 
 module Homebrew
   module_function
@@ -29,15 +32,21 @@ def uninstall_args
   def uninstall
     uninstall_args.parse
 
-    kegs_by_rack = if args.force?
-      Hash[args.named.map do |name|
+    if args.force?
+      possible_casks = []
+      kegs_by_rack = Hash[args.named.map do |name|
         rack = Formulary.to_rack(name)
-        next unless rack.directory?
+
+        unless rack.directory?
+          possible_casks << name
+          next
+        end
 
         [rack, rack.subdirs.map { |d| Keg.new(d) }]
       end]
     else
-      args.kegs.group_by(&:rack)
+      kegs_, possible_casks = args.kegs_and_unknowns
+      kegs_by_rack = kegs_.group_by(&:rack)
     end
 
     handle_unsatisfied_dependents(kegs_by_rack)
@@ -108,6 +117,15 @@ def uninstall
         end
       end
     end
+
+    possible_casks.each do |name|
+      cmd = Cask::Cmd::Uninstall.new(name)
+      cmd.force = args.force?
+      cmd.verbose = args.verbose?
+      cmd.run
+    rescue Cask::CaskUnavailableError
+      ofail "No installed keg or cask with the name \"#{name}\""
+    end
   rescue MultipleVersionsInstalledError => e
     ofail e
     puts "Run `brew uninstall --force #{e.name}` to remove all versions."

Library/Homebrew/test/cmd/uninstall_spec.rb

@@ -19,6 +19,41 @@
   end
 end
 
+describe "brew uninstall cask", :integration_test, :needs_macos do
+  it "uninstalls a given Cask" do
+    caffeine = Cask::CaskLoader.load(cask_path("local-caffeine"))
+    Cask::Installer.new(caffeine).install
+
+    expect { brew "uninstall", "local-caffeine" }
+      .to output(/Uninstalling Cask local-caffeine/).to_stdout
+            .and not_to_output.to_stderr
+                   .and be_a_success
+
+    expect(caffeine).not_to be_installed
+
+    rm_r(TEST_TMPDIR + "/cask-appdir")
+  end
+
+  it "uninstalls given Formulae and Casks" do
+    install_test_formula "testball"
+
+    caffeine = Cask::CaskLoader.load(cask_path("local-caffeine"))
+    Cask::Installer.new(caffeine).install
+
+    expect { brew "uninstall", "testball", "local-caffeine" }
+      .to output(%r{
+        Uninstalling\s#{TEST_TMPDIR}/cellar/testball/.*\n
+        ==>\sUninstalling\sCask\slocal-caffeine
+      }x).to_stdout
+            .and not_to_output.to_stderr
+                   .and be_a_success
+
+    expect(caffeine).not_to be_installed
+
+    rm_r(TEST_TMPDIR + "/cask-appdir")
+  end
+end
+
 describe Homebrew do
   let(:dependency) { formula("dependency") { url "f-1" } }
   let(:dependent) do