Teach audit about new patches implementation

2 files changed, 14 insertions, 13 deletions

diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
index 8b8489acc..624e223e7 100644
--- a/Library/Homebrew/cmd/audit.rb
+++ b/Library/Homebrew/cmd/audit.rb
@@ -292,19 +292,24 @@ class FormulaAuditor
           "#{name} resource #{resource.name.inspect}: #{problem}"
         }
       end
+
+      spec.patches.select(&:external?).each { |p| audit_patch(p) }
     end
   end
 
   def audit_patches
-    Patches.new(f.patches).select(&:external?).each do |p|
-      case p.url
-      when %r[raw\.github\.com], %r[gist\.github\.com/raw], %r[gist\.github\.com/.+/raw$]
-        unless p.url =~ /[a-fA-F0-9]{40}/
-          problem "GitHub/Gist patches should specify a revision:\n#{p.url}"
-        end
-      when %r[macports/trunk]
-        problem "MacPorts patches should specify a revision instead of trunk:\n#{p.url}"
+    patches = Patch.normalize_legacy_patches(f.patches)
+    patches.grep(LegacyPatch).each { |p| audit_patch(p) }
+  end
+
+  def audit_patch(patch)
+    case patch.url
+    when %r[raw\.github\.com], %r[gist\.github\.com/raw], %r[gist\.github\.com/.+/raw$]
+      unless patch.url =~ /[a-fA-F0-9]{40}/
+        problem "GitHub/Gist patches should specify a revision:\n#{patch.url}"
       end
+    when %r[macports/trunk]
+      problem "MacPorts patches should specify a revision instead of trunk:\n#{patch.url}"
     end
   end
 
diff --git a/Library/Homebrew/patch.rb b/Library/Homebrew/patch.rb
index 27ce2d9c3..1a6f36c5d 100644
--- a/Library/Homebrew/patch.rb
+++ b/Library/Homebrew/patch.rb
@@ -86,7 +86,7 @@ class ExternalPatch < Patch
   attr_reader :resource, :strip
 
   def_delegators :@resource, :fetch, :verify_download_integrity,
-    :cached_download, :clear_cache
+    :cached_download, :clear_cache, :url
 
   def initialize(strip, &block)
     @strip    = strip
@@ -94,10 +94,6 @@ class ExternalPatch < Patch
     @whence   = :resource
   end
 
-  def url
-    resource.url
-  end
-
   def owner= owner
     resource.owner   = owner
     resource.name    = "patch-#{resource.checksum}"