Refactor brew missing
The heuristic for determining whether something is installed changes from "f.installed?" to "f.rack.exist? and f.rack.subdirs.length > 0" in order to properly consider outdated formulae. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
parent
166a9ba0ed
commit
d95f467362
@ -764,9 +764,8 @@ end
|
|||||||
def check_missing_deps
|
def check_missing_deps
|
||||||
return unless HOMEBREW_CELLAR.exist?
|
return unless HOMEBREW_CELLAR.exist?
|
||||||
s = Set.new
|
s = Set.new
|
||||||
missing_deps = Homebrew.find_missing_brews(Homebrew.installed_brews)
|
Homebrew.missing_deps(Homebrew.installed_brews).each do |_, deps|
|
||||||
missing_deps.each do |m|
|
s.merge deps
|
||||||
s.merge m[1]
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if s.length > 0 then <<-EOS.undent
|
if s.length > 0 then <<-EOS.undent
|
||||||
|
|||||||
@ -1,47 +1,41 @@
|
|||||||
require 'formula'
|
require 'formula'
|
||||||
require 'cmd/outdated'
|
|
||||||
|
|
||||||
module Homebrew extend self
|
module Homebrew extend self
|
||||||
def installed_brews
|
def installed_brews
|
||||||
formulae = []
|
formulae = []
|
||||||
HOMEBREW_CELLAR.subdirs.each do |rack|
|
HOMEBREW_CELLAR.subdirs.each do |rack|
|
||||||
f = Formula.factory rack.basename.to_s rescue nil
|
f = Formula.factory rack.basename.to_s rescue nil
|
||||||
formulae << f if f and f.installed?
|
formulae << f if f and f.rack.exist? and f.rack.subdirs.length > 0
|
||||||
end
|
end
|
||||||
formulae
|
formulae
|
||||||
end
|
end
|
||||||
|
|
||||||
def find_missing_brews top_level
|
def missing_deps ff
|
||||||
# Names of outdated brews; they count as installed.
|
missing = {}
|
||||||
outdated = Homebrew.outdated_brews.collect{ |b| b.name }
|
ff.each do |f|
|
||||||
|
missing_deps = f.recursive_deps.uniq.reject do |dep|
|
||||||
brews = []
|
dep.rack.exist? and dep.rack.subdirs.length > 0
|
||||||
top_level.each do |f|
|
|
||||||
missing_deps = f.recursive_deps.map{ |g| g.name }.uniq.reject do |dep_name|
|
|
||||||
Formula.factory(dep_name).installed? or outdated.include?(dep_name)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
unless missing_deps.empty?
|
unless missing_deps.empty?
|
||||||
brews << [f.name, missing_deps]
|
yield f.name, missing_deps if block_given?
|
||||||
|
missing[f.name] = missing_deps
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
brews
|
missing
|
||||||
end
|
end
|
||||||
|
|
||||||
def missing
|
def missing
|
||||||
return unless HOMEBREW_CELLAR.exist?
|
return unless HOMEBREW_CELLAR.exist?
|
||||||
|
|
||||||
formulae_to_check = if ARGV.named.empty?
|
ff = if ARGV.named.empty?
|
||||||
installed_brews
|
installed_brews
|
||||||
else
|
else
|
||||||
ARGV.formulae
|
ARGV.formulae
|
||||||
end
|
end
|
||||||
|
|
||||||
missing_deps = find_missing_brews(formulae_to_check)
|
missing_deps(ff) do |name, missing|
|
||||||
missing_deps.each do |d|
|
print "#{name}: " if ff.size > 1
|
||||||
name = d[0]
|
|
||||||
missing = d[1]
|
|
||||||
print "#{name}: " if formulae_to_check.size > 1
|
|
||||||
puts "#{missing * ' '}"
|
puts "#{missing * ' '}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user