From ea203c2aaccc466fc782fa7f2b37cec6527b0cf5 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 18 Jun 2014 21:08:09 -0500 Subject: [PATCH] Combine Homebrew module declarations in testing_env --- Library/Homebrew/test/testing_env.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb index 25478de92c..7bc6630b0e 100644 --- a/Library/Homebrew/test/testing_env.rb +++ b/Library/Homebrew/test/testing_env.rb @@ -43,10 +43,6 @@ MACOS_VERSION = ENV.fetch('MACOS_VERSION') { MACOS_FULL_VERSION[/10\.\d+/] } ORIGINAL_PATHS = ENV['PATH'].split(File::PATH_SEPARATOR).map{ |p| Pathname.new(p).expand_path rescue nil }.compact.freeze -module Homebrew extend self - include FileUtils -end - # Test environment setup %w{Library/Formula Library/ENV}.each do |d| HOMEBREW_REPOSITORY.join(d).mkpath @@ -68,6 +64,8 @@ rescue LoadError end module Homebrew + include FileUtils + module VersionAssertions def version v Version.new(v)