diff --git a/Library/Homebrew/cask/lib/hbc/cli.rb b/Library/Homebrew/cask/lib/hbc/cli.rb index 2173a52d00..3773ebd934 100644 --- a/Library/Homebrew/cask/lib/hbc/cli.rb +++ b/Library/Homebrew/cask/lib/hbc/cli.rb @@ -15,6 +15,7 @@ require "hbc/cli/home" require "hbc/cli/info" require "hbc/cli/install" require "hbc/cli/list" +require "hbc/cli/reinstall" require "hbc/cli/search" require "hbc/cli/style" require "hbc/cli/uninstall" diff --git a/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb b/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb new file mode 100644 index 0000000000..61a7c2d71b --- /dev/null +++ b/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb @@ -0,0 +1,48 @@ +module Hbc + class CLI + class Reinstall < Install + def self.install_casks(cask_tokens, force, skip_cask_deps, require_sha) + count = 0 + cask_tokens.each do |cask_token| + begin + cask = Hbc.load(cask_token) + + if cask.installed? + # use copy of cask for uninstallation to avoid 'No such file or directory' bug + installed_cask = cask; + latest_installed_version = installed_cask.timestamped_versions.last + + unless latest_installed_version.nil? + latest_installed_cask_file = installed_cask.metadata_master_container_path + .join(latest_installed_version.join(File::Separator), + "Casks", "#{cask_token}.rb") + + # use the same cask file that was used for installation, if possible + installed_cask = Hbc.load(latest_installed_cask_file) if latest_installed_cask_file.exist? + end + + # Always force uninstallation, ignore method parameter + Installer.new(installed_cask, force: true).uninstall + end + + Installer.new(cask, + force: force, + skip_cask_deps: skip_cask_deps, + require_sha: require_sha).install + count += 1 + rescue CaskUnavailableError => e + warn_unavailable_with_suggestion cask_token, e + rescue CaskNoShasumError => e + opoo e.message + count += 1 + end + end + count.zero? ? nil : count == cask_tokens.length + end + + def self.help + "reinstalls the given Cask" + end + end + end +end diff --git a/Library/Homebrew/cask/test/cask/cli/reinstall_test.rb b/Library/Homebrew/cask/test/cask/cli/reinstall_test.rb new file mode 100644 index 0000000000..1798adda0e --- /dev/null +++ b/Library/Homebrew/cask/test/cask/cli/reinstall_test.rb @@ -0,0 +1,17 @@ +require "test_helper" + +describe Hbc::CLI::Reinstall do + it "allows reinstalling a Cask" do + Hbc::CLI::Install.run("local-transmission") + Hbc.load("local-transmission").must_be :installed? + Hbc::CLI::Reinstall.run("local-transmission") + Hbc.load("local-transmission").must_be :installed? + end + + it "allows reinstalling a non installed Cask" do + Hbc::CLI::Uninstall.run("local-transmission") + Hbc.load("local-transmission").wont_be :installed? + Hbc::CLI::Reinstall.run("local-transmission") + Hbc.load("local-transmission").must_be :installed? + end +end