Expose bottle details on the formula object

Fixes Homebrew/homebrew#36032.
This commit is contained in:
Jack Nagel 2015-01-20 22:25:24 -05:00
parent 8b793c6ab3
commit af1e9a9610
3 changed files with 13 additions and 3 deletions

View File

@ -365,7 +365,7 @@ module Homebrew
dependents -= @formulae dependents -= @formulae
dependents = dependents.map {|d| Formulary.factory(d)} dependents = dependents.map {|d| Formulary.factory(d)}
testable_dependents = dependents.select {|d| d.test_defined? && d.stable.bottled? } testable_dependents = dependents.select { |d| d.test_defined? && d.bottled? }
formula = Formulary.factory(formula_name) formula = Formulary.factory(formula_name)
installed_gcc = false installed_gcc = false

View File

@ -147,10 +147,20 @@ class Formula
active_spec == head active_spec == head
end end
# @private
def bottled?
active_spec.bottled?
end
# @private
def bottle_specification
active_spec.bottle_specification
end
# The Bottle object for the currently active {SoftwareSpec}. # The Bottle object for the currently active {SoftwareSpec}.
# @private # @private
def bottle def bottle
Bottle.new(self, active_spec.bottle_specification) if active_spec.bottled? Bottle.new(self, bottle_specification) if bottled?
end end
# The homepage for the software. # The homepage for the software.

View File

@ -78,7 +78,7 @@ class FormulaVersions
map = Hash.new { |h, k| h[k] = [] } map = Hash.new { |h, k| h[k] = [] }
rev_list(branch) do |rev| rev_list(branch) do |rev|
formula_at_revision(rev) do |f| formula_at_revision(rev) do |f|
bottle = f.stable.bottle_specification bottle = f.bottle_specification
unless bottle.checksums.empty? unless bottle.checksums.empty?
map[f.pkg_version] << bottle.revision map[f.pkg_version] << bottle.revision
end end