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

deps: keep "--all" output sorted

Browse Source
This commit is contained in:
Jack Nagel 2014-02-27 12:56:42 -06:00
parent 50b94ada1b
commit 87cbe716d9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/cmd/deps.rb
View File

@ -22,7 +22,7 @@ module Homebrew extend self
else else
raise FormulaUnspecifiedError if ARGV.named.empty? raise FormulaUnspecifiedError if ARGV.named.empty?
all_deps = deps_for_formulae(ARGV.formulae, !ARGV.one?) all_deps = deps_for_formulae(ARGV.formulae, !ARGV.one?)
all_deps.sort! unless mode.topo_order? all_deps = all_deps.sort_by(&:name) unless mode.topo_order?
puts all_deps puts all_deps
end end
end end
@ -35,9 +35,8 @@ module Homebrew extend self
deps = f.deps.default deps = f.deps.default
reqs = f.requirements reqs = f.requirements
end end
deps.map(&:name) + reqs.to_a.map do |r|
r.class.default_formula if r.default_formula? deps + reqs.select(&:default_formula?).map(&:to_dependency)
end.compact
end end
def deps_for_formulae(formulae, recursive=false) def deps_for_formulae(formulae, recursive=false)
@ -45,7 +44,7 @@ module Homebrew extend self
end end
def puts_deps(formulae) def puts_deps(formulae)
formulae.each { |f| puts "#{f.name}: #{deps_for_formula(f)*' '}" } formulae.each { |f| puts "#{f.name}: #{deps_for_formula(f).sort_by(&:name) * " "}" }
end end
def puts_deps_tree(formulae) def puts_deps_tree(formulae)