From 43cec1000088d885504d05d7bbbcaa514b6e008a Mon Sep 17 00:00:00 2001
From: Gautham Goli
Date: Sun, 30 Jul 2017 16:02:06 +0530
Subject: audit: Port patches audit code to a rubocop

---
 Library/Homebrew/rubocops/extend/formula_cop.rb | 34 +++++++++++++++++++++
 Library/Homebrew/rubocops/legacy_patches_cop.rb | 39 +++++--------------------
 2 files changed, 42 insertions(+), 31 deletions(-)

(limited to 'Library/Homebrew/rubocops')

diff --git a/Library/Homebrew/rubocops/extend/formula_cop.rb b/Library/Homebrew/rubocops/extend/formula_cop.rb
index 4be0c0fe3..e4a9a5b45 100644
--- a/Library/Homebrew/rubocops/extend/formula_cop.rb
+++ b/Library/Homebrew/rubocops/extend/formula_cop.rb
@@ -380,6 +380,40 @@ module RuboCop
         add_offense(@offensive_node, @offense_source_range, msg)
       end
 
+      def patch_problems(patch)
+        patch_url = string_content(patch)
+        gh_patch_patterns = Regexp.union([%r{/raw\.github\.com/},
+                                          %r{gist\.github\.com/raw},
+                                          %r{gist\.github\.com/.+/raw},
+                                          %r{gist\.githubusercontent\.com/.+/raw}])
+        if regex_match_group(patch, gh_patch_patterns)
+          unless patch_url =~ /[a-fA-F0-9]{40}/
+            problem "GitHub/Gist patches should specify a revision:\n#{patch_url}"
+          end
+        end
+
+        gh_patch_diff_pattern = %r{https?://patch-diff\.githubusercontent\.com/raw/(.+)/(.+)/pull/(.+)\.(?:diff|patch)}
+        if match_obj = regex_match_group(patch, gh_patch_diff_pattern)
+          problem <<-EOS.undent
+              use GitHub pull request URLs:
+                https://github.com/#{match_obj[1]}/#{match_obj[2]}/pull/#{match_ojb[3]}.patch
+              Rather than patch-diff:
+                #{patch_url}
+          EOS
+        end
+
+        if regex_match_group(patch, %r{macports/trunk})
+          problem "MacPorts patches should specify a revision instead of trunk:\n#{patch_url}"
+        end
+
+        if regex_match_group(patch, %r{^http://trac\.macports\.org})
+          problem "Patches from MacPorts Trac should be https://, not http:\n#{patch_url}"
+        end
+
+        return unless regex_match_group(patch, %r{^http://bugs\.debian\.org})
+        problem "Patches from Debian should be https://, not http:\n#{patch_url}"
+      end
+
       private
 
       def formula_class?(node)
diff --git a/Library/Homebrew/rubocops/legacy_patches_cop.rb b/Library/Homebrew/rubocops/legacy_patches_cop.rb
index e569f650e..25a580b12 100644
--- a/Library/Homebrew/rubocops/legacy_patches_cop.rb
+++ b/Library/Homebrew/rubocops/legacy_patches_cop.rb
@@ -13,39 +13,16 @@ module RuboCop
           problem "Use the patch DSL instead of defining a 'patches' method"
           legacy_patches.each { |p| patch_problems(p) }
         end
+      end
 
-        def patch_problems(patch)
-          patch_url = string_content(patch)
-          gh_patch_patterns = Regexp.union([%r{/raw\.github\.com/},
-                                            %r{gist\.github\.com/raw},
-                                            %r{gist\.github\.com/.+/raw},
-                                            %r{gist\.githubusercontent\.com/.+/raw}])
-          if regex_match_group(patch, gh_patch_patterns)
-            unless patch_url =~ /[a-fA-F0-9]{40}/
-              problem "GitHub/Gist patches should specify a revision:\n#{patch_url}"
-            end
-          end
-
-          gh_patch_diff_pattern = %r{https?://patch-diff\.githubusercontent\.com/raw/(.+)/(.+)/pull/(.+)\.(?:diff|patch)}
-          if match_obj = regex_match_group(patch, gh_patch_diff_pattern)
-            problem <<-EOS.undent
-              use GitHub pull request URLs:
-                https://github.com/#{match_obj[1]}/#{match_obj[2]}/pull/#{match_ojb[3]}.patch
-              Rather than patch-diff:
-                #{patch_url}
-            EOS
-          end
-
-          if regex_match_group(patch, %r{macports/trunk})
-            problem "MacPorts patches should specify a revision instead of trunk:\n#{patch_url}"
-          end
-
-          if regex_match_group(patch, %r{^http://trac\.macports\.org})
-            problem "Patches from MacPorts Trac should be https://, not http:\n#{patch_url}"
+      class ExternalPatches < FormulaCop
+        def audit_formula(_node, _class_node, _parent_class_node, body)
+          patches = find_all_blocks(body, :patch)
+          patches.each do |patch_block|
+            url_node = find_node_method_by_name(patch_block, :url)
+            url_string = parameters(url_node).first
+            patch_problems(url_string)
           end
-
-          return unless regex_match_group(patch, %r{^http://bugs\.debian\.org})
-          problem "Patches from Debian should be https://, not http:\n#{patch_url}"
         end
       end
     end
-- 
cgit v1.2.3