Merge pull request #15044 from Homebrew/revert-15040-move_cask/cmd/reinstall

Revert "move `cask/cmd/reinstall`"

Library/Homebrew/cask/cmd.rb

@@ -12,6 +12,7 @@ require "cask/config"
 require "cask/cmd/abstract_command"
 require "cask/cmd/audit"
 require "cask/cmd/install"
+require "cask/cmd/reinstall"
 
 module Cask
   # Implementation of the `brew cask` command-line interface.

Library/Homebrew/cask/cmd/reinstall.rb

@@ -0,0 +1,56 @@
+# typed: true
+# frozen_string_literal: true
+
+module Cask
+  class Cmd
+    # Cask implementation of the `brew reinstall` command.
+    #
+    # @api private
+    class Reinstall < Install
+      extend T::Sig
+
+      sig { void }
+      def run
+        self.class.reinstall_casks(
+          *casks,
+          binaries:       args.binaries?,
+          verbose:        args.verbose?,
+          force:          args.force?,
+          skip_cask_deps: args.skip_cask_deps?,
+          require_sha:    args.require_sha?,
+          quarantine:     args.quarantine?,
+          zap:            args.zap?,
+        )
+      end
+
+      def self.reinstall_casks(
+        *casks,
+        verbose: nil,
+        force: nil,
+        skip_cask_deps: nil,
+        binaries: nil,
+        require_sha: nil,
+        quarantine: nil,
+        zap: nil
+      )
+        require "cask/installer"
+
+        options = {
+          binaries:       binaries,
+          verbose:        verbose,
+          force:          force,
+          skip_cask_deps: skip_cask_deps,
+          require_sha:    require_sha,
+          quarantine:     quarantine,
+          zap:            zap,
+        }.compact
+
+        options[:quarantine] = true if options[:quarantine].nil?
+
+        casks.each do |cask|
+          Installer.new(cask, **options).reinstall
+        end
+      end
+    end
+  end
+end

Library/Homebrew/cask/reinstall.rb

@@ -1,34 +0,0 @@
-# typed: true
-# frozen_string_literal: true
-
-module Cask
-  #
-  # @api private
-  class Reinstall
-    def self.reinstall_casks(
-      *casks,
-      verbose: nil,
-      force: nil,
-      skip_cask_deps: nil,
-      binaries: nil,
-      require_sha: nil,
-      quarantine: nil,
-      zap: nil
-    )
-      require "cask/installer"
-
-      quarantine = true if quarantine.nil?
-
-      casks.each do |cask|
-        Installer.new(cask,
-                      binaries:       binaries,
-                      verbose:        verbose,
-                      force:          force,
-                      skip_cask_deps: skip_cask_deps,
-                      require_sha:    require_sha,
-                      quarantine:     quarantine,
-                      zap:            zap).reinstall
-      end
-    end
-  end
-end

Library/Homebrew/cmd/reinstall.rb

@@ -150,7 +150,7 @@ module Homebrew
     )
 
     if casks.any?
-      Cask::Reinstall.reinstall_casks(
+      Cask::Cmd::Reinstall.reinstall_casks(
         *casks,
         binaries:       args.binaries?,
         verbose:        args.verbose?,

Library/Homebrew/test/cask/cmd/reinstall_spec.rb

@@ -1,10 +1,7 @@
 # typed: false
 # frozen_string_literal: true
 
-require "cask/installer"
+describe Cask::Cmd::Reinstall, :cask do
-require "cask/reinstall"
-
-describe Cask::Reinstall, :cask do
   it "displays the reinstallation progress" do
     caffeine = Cask::CaskLoader.load(cask_path("local-caffeine"))
 
@@ -23,7 +20,7 @@ describe Cask::Reinstall, :cask do
     EOS
 
     expect do
-      described_class.reinstall_casks(Cask::CaskLoader.load("local-caffeine"))
+      described_class.run("local-caffeine")
     end.to output(output).to_stdout
   end
 
@@ -48,7 +45,7 @@ describe Cask::Reinstall, :cask do
     EOS
 
     expect do
-      described_class.reinstall_casks(Cask::CaskLoader.load("local-caffeine"), zap: true)
+      described_class.run("local-caffeine", "--zap")
     end.to output(output).to_stdout
   end
 
@@ -57,14 +54,14 @@ describe Cask::Reinstall, :cask do
 
     expect(Cask::CaskLoader.load(cask_path("local-transmission"))).to be_installed
 
-    described_class.reinstall_casks(Cask::CaskLoader.load("local-transmission"))
+    described_class.run("local-transmission")
     expect(Cask::CaskLoader.load(cask_path("local-transmission"))).to be_installed
   end
 
   it "allows reinstalling a non installed Cask" do
     expect(Cask::CaskLoader.load(cask_path("local-transmission"))).not_to be_installed
 
-    described_class.reinstall_casks(Cask::CaskLoader.load("local-transmission"))
+    described_class.run("local-transmission")
     expect(Cask::CaskLoader.load(cask_path("local-transmission"))).to be_installed
   end
 end