Remove ARGV.filter_for_dependencies

This commit is contained in:
Jack Nagel 2014-06-19 21:35:47 -05:00
parent 10fda9e9b9
commit 445dd80e44
3 changed files with 32 additions and 64 deletions

View File

@ -161,15 +161,6 @@ module HomebrewArgvExtension
Homebrew.help_s Homebrew.help_s
end end
def filter_for_dependencies
old_args = clone
delete "--devel"
delete "--HEAD"
yield
ensure
replace(old_args)
end
def cc def cc
value 'cc' value 'cc'
end end

View File

@ -255,7 +255,6 @@ class FormulaInstaller
while f = formulae.pop while f = formulae.pop
ARGV.filter_for_dependencies do
f.recursive_requirements do |dependent, req| f.recursive_requirements do |dependent, req|
build = effective_build_options_for(dependent) build = effective_build_options_for(dependent)
@ -277,7 +276,6 @@ class FormulaInstaller
end end
end end
end end
end
return unsatisfied_reqs, deps return unsatisfied_reqs, deps
end end
@ -285,8 +283,7 @@ class FormulaInstaller
def expand_dependencies(deps) def expand_dependencies(deps)
inherited_options = {} inherited_options = {}
expanded_deps = ARGV.filter_for_dependencies do expanded_deps = Dependency.expand(f, deps) do |dependent, dep|
Dependency.expand(f, deps) do |dependent, dep|
options = inherited_options[dep.name] = inherited_options_for(dep) options = inherited_options[dep.name] = inherited_options_for(dep)
build = effective_build_options_for( build = effective_build_options_for(
dependent, dependent,
@ -303,7 +300,6 @@ class FormulaInstaller
Dependency.skip Dependency.skip
end end
end end
end
expanded_deps.map { |dep| [dep, inherited_options[dep.name]] } expanded_deps.map { |dep| [dep, inherited_options[dep.name]] }
end end
@ -333,9 +329,7 @@ class FormulaInstaller
oh1 "Installing dependencies for #{f}: #{Tty.green}#{deps.map(&:first)*", "}#{Tty.reset}" oh1 "Installing dependencies for #{f}: #{Tty.green}#{deps.map(&:first)*", "}#{Tty.reset}"
end end
ARGV.filter_for_dependencies do
deps.each { |dep, options| install_dependency(dep, options) } deps.each { |dep, options| install_dependency(dep, options) }
end
@show_header = true unless deps.empty? @show_header = true unless deps.empty?
end end

View File

@ -47,21 +47,4 @@ class ArgvExtensionTests < Homebrew::TestCase
assert !@argv.flag?("--frotz") assert !@argv.flag?("--frotz")
assert !@argv.flag?("--debug") assert !@argv.flag?("--debug")
end end
def test_filter_for_dependencies_clears_flags
@argv << "--HEAD" << "--devel"
@argv.filter_for_dependencies { assert_empty @argv }
end
def test_filter_for_dependencies_ensures_argv_restored
@argv.expects(:replace).with(@argv.clone)
begin
@argv.filter_for_dependencies { raise Exception }
rescue Exception
end
end
def test_filter_for_dependencies_returns_block_value
assert_equal 1, @argv.filter_for_dependencies { 1 }
end
end end