From 809e82038894da86a49f634e2b798db21e09a852 Mon Sep 17 00:00:00 2001
From: L. E. Segovia
Date: Fri, 27 Oct 2017 16:53:22 -0300
Subject: Check that a single uninstall_* and zap stanzas is defined

---
 Library/Homebrew/cask/lib/hbc/audit.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'Library/Homebrew/cask')

diff --git a/Library/Homebrew/cask/lib/hbc/audit.rb b/Library/Homebrew/cask/lib/hbc/audit.rb
index 5180c5688..e4349dc2d 100644
--- a/Library/Homebrew/cask/lib/hbc/audit.rb
+++ b/Library/Homebrew/cask/lib/hbc/audit.rb
@@ -31,6 +31,7 @@ module Hbc
       check_generic_artifacts
       check_token_conflicts
       check_download
+      check_single_uninstall_zap
       self
     rescue StandardError => e
       odebug "#{e.message}\n#{e.backtrace.join("\n")}"
@@ -48,6 +49,22 @@ module Hbc
 
     private
 
+    def check_single_uninstall_zap
+      odebug "Auditing single uninstall_* and zap stanzas"
+
+      uninstalls = cask.artifacts.find_all { |k| k.is_a?(Hbc::Artifact::Uninstall) }
+      add_warning "there should be a single uninstall stanza" unless uninstalls.size <= 1
+
+      uninstalls_preflight = cask.artifacts.find_all { |k| k.is_a?(Hbc::Artifact::PreflightBlock) && k.directives.keys.include?("uninstall_preflight") }
+      add_warning "there should be a single uninstall_preflight stanza" unless uninstalls_preflight.size <= 1
+
+      uninstalls_postflight = cask.artifacts.find_all { |k| k.is_a?(Hbc::Artifact::PostflightBlock) && k.directives.keys.include?("uninstall_postflight") }
+      add_warning "there should be a single uninstall_postflight stanza" unless uninstalls_postflight.size <= 1
+
+      zaps = cask.artifacts.find_all { |k| k.is_a?(Hbc::Artifact::Zap) }
+      add_warning "there should be a single zap stanza" unless zaps.size <= 1
+    end
+
     def check_required_stanzas
       odebug "Auditing required stanzas"
       [:version, :sha256, :url, :homepage].each do |sym|
-- 
cgit v1.2.3


From 9b6b0bfed7f0ebf461d21dba9ba12ad340e20508 Mon Sep 17 00:00:00 2001
From: L. E. Segovia
Date: Mon, 30 Oct 2017 20:47:22 -0300
Subject: Use #count, rewrite warning, and add pre/postflight checks too

---
 Library/Homebrew/cask/lib/hbc/audit.rb | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'Library/Homebrew/cask')

diff --git a/Library/Homebrew/cask/lib/hbc/audit.rb b/Library/Homebrew/cask/lib/hbc/audit.rb
index e4349dc2d..4a5a40e4f 100644
--- a/Library/Homebrew/cask/lib/hbc/audit.rb
+++ b/Library/Homebrew/cask/lib/hbc/audit.rb
@@ -31,6 +31,7 @@ module Hbc
       check_generic_artifacts
       check_token_conflicts
       check_download
+      check_single_pre_postflight
       check_single_uninstall_zap
       self
     rescue StandardError => e
@@ -49,20 +50,24 @@ module Hbc
 
     private
 
+    def check_single_pre_postflight
+      odebug "Auditing preflight and postflight stanzas"
+
+      add_warning "only a single preflight stanza is allowed" if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::PreflightBlock) && k.directives.key?(:preflight) } > 1
+
+      add_warning "only a single postflight stanza is allowed" if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::PostflightBlock) && k.directives.key?(:postflight) } > 1
+    end
+
     def check_single_uninstall_zap
       odebug "Auditing single uninstall_* and zap stanzas"
 
-      uninstalls = cask.artifacts.find_all { |k| k.is_a?(Hbc::Artifact::Uninstall) }
-      add_warning "there should be a single uninstall stanza" unless uninstalls.size <= 1
+      add_warning "only a single uninstall stanza is allowed" if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::Uninstall) } > 1
 
-      uninstalls_preflight = cask.artifacts.find_all { |k| k.is_a?(Hbc::Artifact::PreflightBlock) && k.directives.keys.include?("uninstall_preflight") }
-      add_warning "there should be a single uninstall_preflight stanza" unless uninstalls_preflight.size <= 1
+      add_warning "only a single uninstall_preflight stanza is allowed" if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::PreflightBlock) && k.directives.key?(:uninstall_preflight) } > 1
 
-      uninstalls_postflight = cask.artifacts.find_all { |k| k.is_a?(Hbc::Artifact::PostflightBlock) && k.directives.keys.include?("uninstall_postflight") }
-      add_warning "there should be a single uninstall_postflight stanza" unless uninstalls_postflight.size <= 1
+      add_warning "only a single uninstall_postflight stanza is allowed" if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::PostflightBlock) && k.directives.key?(:uninstall_postflight) } > 1
 
-      zaps = cask.artifacts.find_all { |k| k.is_a?(Hbc::Artifact::Zap) }
-      add_warning "there should be a single zap stanza" unless zaps.size <= 1
+      add_warning "only a single zap stanza is allowed" if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::Zap) } > 1
     end
 
     def check_required_stanzas
-- 
cgit v1.2.3


From 7f398d01b8d5970677d490e120be616aa596ef8b Mon Sep 17 00:00:00 2001
From: L. E. Segovia
Date: Wed, 1 Nov 2017 22:35:41 -0300
Subject: Turn ifs into multiple lines

---
 Library/Homebrew/cask/lib/hbc/audit.rb | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'Library/Homebrew/cask')

diff --git a/Library/Homebrew/cask/lib/hbc/audit.rb b/Library/Homebrew/cask/lib/hbc/audit.rb
index 4a5a40e4f..51316baec 100644
--- a/Library/Homebrew/cask/lib/hbc/audit.rb
+++ b/Library/Homebrew/cask/lib/hbc/audit.rb
@@ -53,21 +53,33 @@ module Hbc
     def check_single_pre_postflight
       odebug "Auditing preflight and postflight stanzas"
 
-      add_warning "only a single preflight stanza is allowed" if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::PreflightBlock) && k.directives.key?(:preflight) } > 1
+      if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::PreflightBlock) && k.directives.key?(:preflight) } > 1
+        add_warning "only a single preflight stanza is allowed"
+      end
 
-      add_warning "only a single postflight stanza is allowed" if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::PostflightBlock) && k.directives.key?(:postflight) } > 1
+      if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::PostflightBlock) && k.directives.key?(:postflight) } > 1
+        add_warning "only a single postflight stanza is allowed"
+      end
     end
 
     def check_single_uninstall_zap
       odebug "Auditing single uninstall_* and zap stanzas"
 
-      add_warning "only a single uninstall stanza is allowed" if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::Uninstall) } > 1
+      if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::Uninstall) } > 1
+        add_warning "only a single uninstall stanza is allowed"
+      end
 
-      add_warning "only a single uninstall_preflight stanza is allowed" if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::PreflightBlock) && k.directives.key?(:uninstall_preflight) } > 1
+      if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::PreflightBlock) && k.directives.key?(:uninstall_preflight) } > 1
+        add_warning "only a single uninstall_preflight stanza is allowed"
+      end
 
-      add_warning "only a single uninstall_postflight stanza is allowed" if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::PostflightBlock) && k.directives.key?(:uninstall_postflight) } > 1
+      if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::PostflightBlock) && k.directives.key?(:uninstall_postflight) } > 1
+        add_warning "only a single uninstall_postflight stanza is allowed"
+      end
 
-      add_warning "only a single zap stanza is allowed" if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::Zap) } > 1
+      if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::Zap) } > 1
+        add_warning "only a single zap stanza is allowed"
+      end
     end
 
     def check_required_stanzas
-- 
cgit v1.2.3


From eaae7f3a5b7dcce0d6c4a3238547996e886b7144 Mon Sep 17 00:00:00 2001
From: L. E. Segovia
Date: Thu, 2 Nov 2017 09:56:51 -0300
Subject: Fix last remaining style issues

---
 Library/Homebrew/cask/lib/hbc/audit.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'Library/Homebrew/cask')

diff --git a/Library/Homebrew/cask/lib/hbc/audit.rb b/Library/Homebrew/cask/lib/hbc/audit.rb
index 51316baec..d757b0623 100644
--- a/Library/Homebrew/cask/lib/hbc/audit.rb
+++ b/Library/Homebrew/cask/lib/hbc/audit.rb
@@ -57,9 +57,8 @@ module Hbc
         add_warning "only a single preflight stanza is allowed"
       end
 
-      if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::PostflightBlock) && k.directives.key?(:postflight) } > 1
-        add_warning "only a single postflight stanza is allowed"
-      end
+      return unless cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::PostflightBlock) && k.directives.key?(:postflight) } > 1
+      add_warning "only a single postflight stanza is allowed"
     end
 
     def check_single_uninstall_zap
@@ -77,9 +76,8 @@ module Hbc
         add_warning "only a single uninstall_postflight stanza is allowed"
       end
 
-      if cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::Zap) } > 1
-        add_warning "only a single zap stanza is allowed"
-      end
+      return unless cask.artifacts.count { |k| k.is_a?(Hbc::Artifact::Zap) } > 1
+      add_warning "only a single zap stanza is allowed"
     end
 
     def check_required_stanzas
-- 
cgit v1.2.3