diff options
| author | Jack Nagel | 2012-09-27 16:22:01 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-09-27 16:22:01 -0500 |
| commit | 6ebcccdcc58a0bd9b33730d3b7423811126e00ca (patch) | |
| tree | 37e99599b650b54535354e3ebdc817449d39de8e /Library/Homebrew | |
| parent | 8d3ff5691d330364275bf8288ba543ed2f98e6c7 (diff) | |
| download | brew-6ebcccdcc58a0bd9b33730d3b7423811126e00ca.tar.bz2 | |
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>
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/formula.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/global.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/test/testing_env.rb | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 728dbbd40..15acff3cd 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -3,7 +3,6 @@ require 'dependencies' 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 index 12157b0c0..31cd14793 100644 --- 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 @@ HOMEBREW_USER_AGENT = "Homebrew #{HOMEBREW_VERSION} (Ruby #{RUBY_VERSION}-#{RUBY 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 index 1333db5a8..a93fe6872 100644 --- 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 @@ at_exit { HOMEBREW_PREFIX.parent.rmtree } # 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 |