Make FileUtils extension available globally

Now that we are monkeypatching copy_metadata, we should load our extension up front for consistency. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
orn688 · Sep 27, 2012 · 6ebcccd · 6ebcccd
1 parent 8d3ff56
commit 6ebcccd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
@@ -3,7 +3,6 @@
 require 'formula_support'
 require 'hardware'
 require 'bottles'
-require 'extend/fileutils'
 require 'patches'
 require 'compilers'
 require 'build_environment'

diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb
@@ -1,3 +1,4 @@
+require 'extend/fileutils'
 require 'extend/pathname'
 require 'extend/ARGV'
 require 'extend/string'
@@ -75,7 +76,6 @@ def mkpath
 
 HOMEBREW_CURL_ARGS = '-qf#LA'
 
-require 'fileutils'
 module Homebrew extend self
   include FileUtils
 

diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
@@ -7,6 +7,7 @@
 ABS__FILE__=File.expand_path(__FILE__)
 
 $:.push(File.expand_path(__FILE__+'/../..'))
+require 'extend/fileutils'
 require 'extend/pathname'
 require 'extend/string'
 require 'exceptions'
@@ -31,7 +32,6 @@
 # Test fixtures and files can be found relative to this path
 TEST_FOLDER = Pathname.new(ABS__FILE__).parent.realpath
 
-require 'fileutils'
 module Homebrew extend self
   include FileUtils
 end