admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

test-bot: make variable names consistent with other code

Browse Source
This commit is contained in:
Jack Nagel 2014-11-10 20:40:29 -06:00
parent 001c9baa7f
commit ab0368cb34
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Library/Homebrew/cmd/test-bot.rb
View File

@ -298,12 +298,12 @@ module Homebrew
end
end
def skip formula
puts "#{Tty.blue}==>#{Tty.white} SKIPPING: #{formula}#{Tty.reset}"
def skip formula_name
puts "#{Tty.blue}==>#{Tty.white} SKIPPING: #{formula_name}#{Tty.reset}"
end
def satisfied_requirements? formula_object, spec
requirements = formula_object.send(spec).requirements
def satisfied_requirements? formula, spec
requirements = formula.send(spec).requirements
unsatisfied_requirements = requirements.reject do |requirement|
requirement.satisfied? || requirement.default_formula?
@ -312,10 +312,10 @@ module Homebrew
if unsatisfied_requirements.empty?
true
else
formula = formula_object.name
formula += " (#{spec})" unless spec == :stable
skip formula
unsatisfied_requirements.each {|r| puts r.message}
name = formula.name
name += " (#{spec})" unless spec == :stable
skip name
puts unsatisfied_requirements.map(&:message)
false
end
end
@ -328,28 +328,28 @@ module Homebrew
test "brew", "config"
end
def formula formula
@category = __method__.to_s + ".#{formula}"
def formula formula_name
@category = "#{__method__}.#{formula_name}"
test "brew", "uses", formula
dependencies = `brew deps #{formula}`.split("\n")
test "brew", "uses", formula_name
dependencies = `brew deps #{formula_name}`.split("\n")
dependencies -= `brew list`.split("\n")
unchanged_dependencies = dependencies - @formulae
changed_dependences = dependencies - unchanged_dependencies
formula_object = Formulary.factory(formula)
return unless satisfied_requirements?(formula_object, :stable)
formula = Formulary.factory(formula_name)
return unless satisfied_requirements?(formula, :stable)
installed_gcc = false
deps = formula_object.stable.deps.to_a
reqs = formula_object.stable.requirements.to_a
if formula_object.devel && !ARGV.include?('--HEAD')
deps |= formula_object.devel.deps.to_a
reqs |= formula_object.devel.requirements.to_a
deps = formula.stable.deps.to_a
reqs = formula.stable.requirements.to_a
if formula.devel && !ARGV.include?('--HEAD')
deps |= formula.devel.deps.to_a
reqs |= formula.devel.requirements.to_a
end
begin
deps.each { |d| CompilerSelector.select_for(d.to_formula) }
CompilerSelector.select_for(formula_object)
CompilerSelector.select_for(formula)
rescue CompilerSelectionError => e
unless installed_gcc
test "brew", "install", "gcc"
@ -357,7 +357,7 @@ module Homebrew
OS::Mac.clear_version_cache
retry
end
skip formula
skip formula_name
puts e.message
return
end
@ -373,44 +373,44 @@ module Homebrew
formula_fetch_options = []
formula_fetch_options << "--build-bottle" unless ARGV.include? "--no-bottle"
formula_fetch_options << "--force" if ARGV.include? "--cleanup"
formula_fetch_options << formula
formula_fetch_options << formula_name
test "brew", "fetch", "--retry", *formula_fetch_options
test "brew", "uninstall", "--force", formula if formula_object.installed?
test "brew", "uninstall", "--force", formula_name if formula.installed?
install_args = %w[--verbose]
install_args << "--build-bottle" unless ARGV.include? "--no-bottle"
install_args << "--HEAD" if ARGV.include? "--HEAD"
install_args << formula
install_args << formula_name
# Don't care about e.g. bottle failures for dependencies.
ENV["HOMEBREW_DEVELOPER"] = nil
test "brew", "install", "--only-dependencies", *install_args unless dependencies.empty?
ENV["HOMEBREW_DEVELOPER"] = "1"
test "brew", "install", *install_args
install_passed = steps.last.passed?
test "brew", "audit", formula
test "brew", "audit", formula_name
if install_passed
unless ARGV.include? '--no-bottle'
test "brew", "bottle", "--rb", formula, :puts_output_on_success => true
test "brew", "bottle", "--rb", formula_name, :puts_output_on_success => true
bottle_step = steps.last
if bottle_step.passed? and bottle_step.has_output?
bottle_filename =
bottle_step.output.gsub(/.*(\.\/\S+#{bottle_native_regex}).*/m, '\1')
test "brew", "uninstall", "--force", formula
test "brew", "uninstall", "--force", formula_name
test "brew", "install", bottle_filename
end
end
test "brew", "test", "--verbose", formula if formula_object.test_defined?
test "brew", "uninstall", "--force", formula
test "brew", "test", "--verbose", formula_name if formula.test_defined?
test "brew", "uninstall", "--force", formula_name
end
if formula_object.devel && !ARGV.include?('--HEAD') \
&& satisfied_requirements?(formula_object, :devel)
if formula.devel && !ARGV.include?('--HEAD') \
&& satisfied_requirements?(formula, :devel)
test "brew", "fetch", "--retry", "--devel", *formula_fetch_options
test "brew", "install", "--devel", "--verbose", formula
test "brew", "install", "--devel", "--verbose", formula_name
devel_install_passed = steps.last.passed?
test "brew", "audit", "--devel", formula
test "brew", "audit", "--devel", formula_name
if devel_install_passed
test "brew", "test", "--devel", "--verbose", formula if formula_object.test_defined?
test "brew", "uninstall", "--devel", "--force", formula
test "brew", "test", "--devel", "--verbose", formula_name if formula.test_defined?
test "brew", "uninstall", "--devel", "--force", formula_name
end
end
test "brew", "uninstall", "--force", *unchanged_dependencies unless unchanged_dependencies.empty?