Combine Homebrew module declarations in testing_env

This commit is contained in:
Jack Nagel 2014-06-18 21:08:09 -05:00
parent 480e3ec855
commit ea203c2aac

View File

@ -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 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 # Test environment setup
%w{Library/Formula Library/ENV}.each do |d| %w{Library/Formula Library/ENV}.each do |d|
HOMEBREW_REPOSITORY.join(d).mkpath HOMEBREW_REPOSITORY.join(d).mkpath
@ -68,6 +64,8 @@ rescue LoadError
end end
module Homebrew module Homebrew
include FileUtils
module VersionAssertions module VersionAssertions
def version v def version v
Version.new(v) Version.new(v)