Merge pull request #3991 from commitay/cask-audit-various

cask audit: various

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

@@ -95,7 +95,7 @@ module Hbc
     def check_version_and_checksum
       return if @cask.sourcefile_path.nil?
 
-      tap = Tap.select { |t| t.cask_file?(@cask.sourcefile_path) }.first
+      tap = @cask.tap
       return if tap.nil?
 
       return if commit_range.nil?

Library/Homebrew/test/cask/audit_spec.rb

@@ -94,17 +94,17 @@ describe Hbc::Audit, :cask do
     describe "preflight stanza checks" do
       let(:error_msg) { "only a single preflight stanza is allowed" }
 
-      context "when the cask has no preflight stanza" do
+      context "when the Cask has no preflight stanza" do
         let(:cask_token) { "with-zap-rmdir" }
         it { should_not warn_with(error_msg) }
       end
 
-      context "when the cask has only one preflight stanza" do
+      context "when the Cask has only one preflight stanza" do
         let(:cask_token) { "with-preflight" }
         it { should_not warn_with(error_msg) }
       end
 
-      context "when the cask has multiple preflight stanzas" do
+      context "when the Cask has multiple preflight stanzas" do
         let(:cask_token) { "with-preflight-multi" }
         it { is_expected.to warn_with(error_msg) }
       end
@@ -113,17 +113,17 @@ describe Hbc::Audit, :cask do
     describe "uninstall_postflight stanza checks" do
       let(:error_msg) { "only a single postflight stanza is allowed" }
 
-      context "when the cask has no postflight stanza" do
+      context "when the Cask has no postflight stanza" do
         let(:cask_token) { "with-zap-rmdir" }
         it { should_not warn_with(error_msg) }
       end
 
-      context "when the cask has only one postflight stanza" do
+      context "when the Cask has only one postflight stanza" do
         let(:cask_token) { "with-postflight" }
         it { should_not warn_with(error_msg) }
       end
 
-      context "when the cask has multiple postflight stanzas" do
+      context "when the Cask has multiple postflight stanzas" do
         let(:cask_token) { "with-postflight-multi" }
         it { is_expected.to warn_with(error_msg) }
       end
@@ -132,17 +132,17 @@ describe Hbc::Audit, :cask do
     describe "uninstall stanza checks" do
       let(:error_msg) { "only a single uninstall stanza is allowed" }
 
-      context "when the cask has no uninstall stanza" do
+      context "when the Cask has no uninstall stanza" do
         let(:cask_token) { "with-zap-rmdir" }
         it { should_not warn_with(error_msg) }
       end
 
-      context "when the cask has only one uninstall stanza" do
+      context "when the Cask has only one uninstall stanza" do
         let(:cask_token) { "with-uninstall-rmdir" }
         it { should_not warn_with(error_msg) }
       end
 
-      context "when the cask has multiple uninstall stanzas" do
+      context "when the Cask has multiple uninstall stanzas" do
         let(:cask_token) { "with-uninstall-multi" }
         it { is_expected.to warn_with(error_msg) }
       end
@@ -151,17 +151,17 @@ describe Hbc::Audit, :cask do
     describe "uninstall_preflight stanza checks" do
       let(:error_msg) { "only a single uninstall_preflight stanza is allowed" }
 
-      context "when the cask has no uninstall_preflight stanza" do
+      context "when the Cask has no uninstall_preflight stanza" do
         let(:cask_token) { "with-zap-rmdir" }
         it { should_not warn_with(error_msg) }
       end
 
-      context "when the cask has only one uninstall_preflight stanza" do
+      context "when the Cask has only one uninstall_preflight stanza" do
         let(:cask_token) { "with-uninstall-preflight" }
         it { should_not warn_with(error_msg) }
       end
 
-      context "when the cask has multiple uninstall_preflight stanzas" do
+      context "when the Cask has multiple uninstall_preflight stanzas" do
         let(:cask_token) { "with-uninstall-preflight-multi" }
         it { is_expected.to warn_with(error_msg) }
       end
@@ -170,17 +170,17 @@ describe Hbc::Audit, :cask do
     describe "uninstall_postflight stanza checks" do
       let(:error_msg) { "only a single uninstall_postflight stanza is allowed" }
 
-      context "when the cask has no uninstall_postflight stanza" do
+      context "when the Cask has no uninstall_postflight stanza" do
         let(:cask_token) { "with-zap-rmdir" }
         it { should_not warn_with(error_msg) }
       end
 
-      context "when the cask has only one uninstall_postflight stanza" do
+      context "when the Cask has only one uninstall_postflight stanza" do
         let(:cask_token) { "with-uninstall-postflight" }
         it { should_not warn_with(error_msg) }
       end
 
-      context "when the cask has multiple uninstall_postflight stanzas" do
+      context "when the Cask has multiple uninstall_postflight stanzas" do
         let(:cask_token) { "with-uninstall-postflight-multi" }
         it { is_expected.to warn_with(error_msg) }
       end
@@ -189,17 +189,17 @@ describe Hbc::Audit, :cask do
     describe "zap stanza checks" do
       let(:error_msg) { "only a single zap stanza is allowed" }
 
-      context "when the cask has no zap stanza" do
+      context "when the Cask has no zap stanza" do
         let(:cask_token) { "with-uninstall-rmdir" }
         it { should_not warn_with(error_msg) }
       end
 
-      context "when the cask has only one zap stanza" do
+      context "when the Cask has only one zap stanza" do
         let(:cask_token) { "with-zap-rmdir" }
         it { should_not warn_with(error_msg) }
       end
 
-      context "when the cask has multiple zap stanzas" do
+      context "when the Cask has multiple zap stanzas" do
         let(:cask_token) { "with-zap-multi" }
         it { is_expected.to warn_with(error_msg) }
       end