Skip to content

brew deps: support --full-name in --installed, --all, and --tree modes #1706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apjanke merged 1 commit into from
Dec 28, 2016
Merged

brew deps: support --full-name in --installed, --all, and --tree modes #1706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions Library/Homebrew/cmd/deps.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ def deps
else
all_deps = deps_for_formulae(ARGV.formulae, !ARGV.one?, &(mode.union? ? :| : :&))
all_deps = all_deps.select(&:installed?) if mode.installed?
all_deps = if ARGV.include? "--full-name"
all_deps.map(&:to_formula).map(&:full_name)
else
all_deps.map(&:name)
end.uniq
all_deps = all_deps.map(&method(:dep_display_name)).uniq
all_deps.sort! unless mode.topo_order?
puts all_deps
end
end

def dep_display_name(d)
ARGV.include?("--full-name") ? d.to_formula.full_name : d.name
end

def deps_for_formula(f, recursive = false)
includes = []
ignores = []
Expand Down Expand Up @@ -127,7 +127,10 @@ def deps_for_formulae(formulae, recursive = false, &block)
end

def puts_deps(formulae)
formulae.each { |f| puts "#{f.full_name}: #{deps_for_formula(f).sort_by(&:name) * " "}" }
formulae.each do |f|
deps = deps_for_formula(f).sort_by(&:name).map(&method(:dep_display_name))
puts "#{f.full_name}: #{deps.join(" ")}"
end
end

def puts_deps_tree(formulae)
Expand All @@ -143,14 +146,14 @@ def recursive_deps_tree(f, prefix)
max = reqs.length - 1
reqs.each_with_index do |req, i|
chr = i == max ? "└──" : "├──"
puts prefix + "#{chr} :#{req.to_dependency.name}"
puts prefix + "#{chr} :#{dep_display_name(req.to_dependency)}"
end
deps = f.deps.default
max = deps.length - 1
deps.each_with_index do |dep, i|
chr = i == max ? "└──" : "├──"
prefix_ext = i == max ? " " : "│ "
puts prefix + "#{chr} #{dep.name}"
puts prefix + "#{chr} #{dep_display_name(dep)}"
recursive_deps_tree(Formulary.factory(dep.name), prefix + prefix_ext)
end
end
Expand Down