Merge pull request #1982 from reitermarkus/fix-zap

Fix `uninstall` also running `zap`.

Library/Homebrew/cask/lib/hbc/artifact/uninstall.rb

@@ -3,6 +3,9 @@ require "hbc/artifact/uninstall_base"
 module Hbc
   module Artifact
     class Uninstall < UninstallBase
+      def uninstall_phase
+        dispatch_uninstall_directives
+      end
     end
   end
 end

Library/Homebrew/cask/lib/hbc/artifact/uninstall_base.rb

@@ -54,10 +54,6 @@ module Hbc
         path_strings - undeletable
       end
 
-      def uninstall_phase
-        dispatch_uninstall_directives
-      end
-
       def dispatch_uninstall_directives(expand_tilde: true)
         directives_set = @cask.artifacts[stanza]
         ohai "Running #{stanza} process for #{@cask}; your password may be necessary"

Library/Homebrew/cask/lib/hbc/artifact/zap.rb

@@ -3,7 +3,7 @@ require "hbc/artifact/uninstall_base"
 module Hbc
   module Artifact
     class Zap < UninstallBase
-      def uninstall_phase
+      def zap_phase
         dispatch_uninstall_directives(expand_tilde: true)
       end
     end

Library/Homebrew/cask/lib/hbc/installer.rb

@@ -331,7 +331,7 @@ module Hbc
       uninstall_artifacts
       if Artifact::Zap.me?(@cask)
         ohai "Dispatching zap stanza"
-        Artifact::Zap.new(@cask, command: @command).uninstall_phase
+        Artifact::Zap.new(@cask, command: @command).zap_phase
       else
         opoo "No zap stanza present for Cask '#{@cask}'"
       end

Library/Homebrew/cask/spec/cask/artifact/uninstall_no_zap_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+describe Hbc::Artifact::Zap do
+  let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-installable.rb") }
+
+  let(:zap_artifact) {
+    Hbc::Artifact::Zap.new(cask)
+  }
+
+  before do
+    shutup do
+      InstallHelper.install_without_artifacts(cask)
+    end
+  end
+
+  describe "#uninstall_phase" do
+    subject { zap_artifact }
+
+    it { is_expected.not_to respond_to(:uninstall_phase) }
+  end
+end

Library/Homebrew/cask/test/cask/artifact/zap_test.rb

@@ -14,10 +14,10 @@ describe Hbc::Artifact::Zap do
     end
   end
 
-  describe "uninstall_phase" do
+  describe "#zap_phase" do
     subject {
       shutup do
-        zap_artifact.uninstall_phase
+        zap_artifact.zap_phase
       end
     }