Eliminate FORMULA_META_FILES constant

4 files changed, 8 insertions, 7 deletions

diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb
index 8952f4873..4ca2d8531 100644
--- a/Library/Homebrew/cmd/list.rb
+++ b/Library/Homebrew/cmd/list.rb
@@ -1,3 +1,5 @@
+require "metafiles"
+
 module Homebrew extend self
   def list
 
@@ -100,7 +102,7 @@ class PrettyListing
           else
             print_dir pn
           end
-        elsif FORMULA_META_FILES.should_list? pn.basename.to_s
+        elsif Metafiles.list?(pn.basename.to_s)
           puts pn
         end
       end
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index b9730a89f..91dd6d5a1 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -1,6 +1,7 @@
 require 'pathname'
 require 'mach'
 require 'resource'
+require 'metafiles'
 
 # we enhance pathname to make our code more readable
 class Pathname
@@ -381,7 +382,7 @@ class Pathname
 
     from.children.each do |p|
       next if p.directory?
-      next unless FORMULA_META_FILES.should_copy? p
+      next unless Metafiles.copy?(p)
       # Some software symlinks these files (see help2man.rb)
       filename = p.resolved_path
       # Some software links metafiles together, so by the time we iterate to one of them
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb
index 5c1155f33..6fd01d149 100644
--- a/Library/Homebrew/global.rb
+++ b/Library/Homebrew/global.rb
@@ -94,8 +94,6 @@ module Homebrew extend self
   alias_method :failed?, :failed
 end
 
-require 'metafiles'
-FORMULA_META_FILES = Metafiles.new
 ISSUES_URL = "https://github.com/Homebrew/homebrew/wiki/troubleshooting"
 HOMEBREW_PULL_OR_COMMIT_URL_REGEX = 'https:\/\/github.com\/(\w+)\/homebrew(-\w+)?\/(pull\/(\d+)|commit\/\w{4,40})'
 
diff --git a/Library/Homebrew/metafiles.rb b/Library/Homebrew/metafiles.rb
index 37e646bb5..a6a265292 100644
--- a/Library/Homebrew/metafiles.rb
+++ b/Library/Homebrew/metafiles.rb
@@ -5,12 +5,12 @@ class Metafiles
     news notes notice readme todo
   ]
 
-  def should_list? file
-    return false if %w[.DS_Store INSTALL_RECEIPT.json].include? file
+  def self.list?(file)
+    return false if %w[.DS_Store INSTALL_RECEIPT.json].include?(file)
     !copy?(file)
   end
 
-  def should_copy?(path)
+  def self.copy?(path)
     path = path.to_s.downcase
     ext  = File.extname(path)