Fix doctor's use of missing.

`brew doctor` shelled to `brew missing` and parsed the results.
When VERBOSE was true, this caused an error as extra, unexpected
output is generated.

Make missing an internal command, and give it a programmatic interface.
This commit is contained in:
Adam Vandenberg 2012-06-11 12:57:51 -07:00
parent 644af3696b
commit ec4b34aa08
3 changed files with 57 additions and 44 deletions

View File

@ -1,37 +0,0 @@
require "formula"
require "cmd/outdated"
def installed_brews
formulae = []
HOMEBREW_CELLAR.subdirs.each do |rack|
f = Formula.factory rack.basename.to_s rescue nil
formulae << f if f and f.installed?
end
formulae
end
def main
return unless HOMEBREW_CELLAR.exist?
# Names of outdated brews; they count as installed.
outdated = Homebrew.outdated_brews.collect{ |b| b.name }
formulae_to_check = if ARGV.named.empty?
installed_brews
else
ARGV.formulae
end
formulae_to_check.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
unless missing_deps.empty?
print "#{f.name}: " if formulae_to_check.size > 1
puts "#{missing_deps * ' '}"
end
end
end
main()

View File

@ -1,3 +1,6 @@
require 'set'
require 'cmd/missing'
class Volumes class Volumes
def initialize def initialize
@volumes = [] @volumes = []
@ -752,18 +755,17 @@ def check_tmpdir
end end
def check_missing_deps def check_missing_deps
s = [] s = Set.new
`brew missing`.each_line do |line| missing_deps = Homebrew.find_missing_brews(Homebrew.installed_brews)
line =~ /(.*): (.*)/ missing_deps.each do |m|
$2.split.each do |dep| s.merge m[1]
s << dep unless s.include? dep
end
end end
if s.length > 0 then <<-EOS.undent if s.length > 0 then <<-EOS.undent
Some installed formula are missing dependencies. Some installed formula are missing dependencies.
You should `brew install` the missing dependencies: You should `brew install` the missing dependencies:
brew install #{s * " "} brew install #{s.to_a.sort * " "}
Run `brew missing` for more details. Run `brew missing` for more details.
EOS EOS

View File

@ -0,0 +1,48 @@
require 'formula'
require 'cmd/outdated'
module Homebrew extend self
def installed_brews
formulae = []
HOMEBREW_CELLAR.subdirs.each do |rack|
f = Formula.factory rack.basename.to_s rescue nil
formulae << f if f and f.installed?
end
formulae
end
def find_missing_brews top_level
# Names of outdated brews; they count as installed.
outdated = Homebrew.outdated_brews.collect{ |b| b.name }
brews = []
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
unless missing_deps.empty?
brews << [f.name, missing_deps]
end
end
brews
end
def missing
return unless HOMEBREW_CELLAR.exist?
formulae_to_check = if ARGV.named.empty?
installed_brews
else
ARGV.formulae
end
missing_deps = find_missing_brews(formulae_to_check)
missing_deps.each do |d|
name = d[0]
missing = d[1]
print "#{name}: " if formulae_to_check.size > 1
puts "#{missing * ' '}"
end
end
end