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

deps: refactor weird OpenStruct usage.

Browse Source
This commit is contained in:
Mike McQuaid 2019-11-06 10:20:20 +00:00
parent 918224ce1a
commit 1224f56511
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,53 +61,45 @@ module Homebrew
Formulary.enable_factory_cache! Formulary.enable_factory_cache!
mode = OpenStruct.new( recursive = !args.send("1?")
installed?: args.installed?,
tree?: args.tree?,
all?: args.all?,
topo_order?: args.n?,
union?: args.union?,
for_each?: args.for_each?,
recursive?: !args.send("1?"),
)
if mode.tree? if args.tree?
if mode.installed? if args.installed?
puts_deps_tree Formula.installed.sort, mode.recursive? puts_deps_tree Formula.installed.sort, recursive
else else
raise FormulaUnspecifiedError if args.remaining.empty? raise FormulaUnspecifiedError if args.remaining.empty?
puts_deps_tree ARGV.formulae, mode.recursive? puts_deps_tree ARGV.formulae, recursive
end end
return return
elsif mode.all? elsif args.all?
puts_deps Formula.sort, mode.recursive? puts_deps Formula.sort, recursive
return return
elsif !args.remaining.empty? && mode.for_each? elsif !args.remaining.empty? && args.for_each?
puts_deps ARGV.formulae, mode.recursive? puts_deps ARGV.formulae, recursive
return return
end end
@only_installed_arg = mode.installed? && @only_installed_arg = args.installed? &&
mode.recursive? && recursive &&
!args.include_build? && !args.include_build? &&
!args.include_test? && !args.include_test? &&
!args.include_optional? && !args.include_optional? &&
!args.skip_recommended? !args.skip_recommended?
if args.remaining.empty? if args.remaining.empty?
raise FormulaUnspecifiedError unless mode.installed? raise FormulaUnspecifiedError unless args.installed?
puts_deps Formula.installed.sort, mode.recursive? puts_deps Formula.installed.sort, recursive
return return
end end
all_deps = deps_for_formulae(ARGV.formulae, mode.recursive?, &(mode.union? ? :| : :&)) all_deps = deps_for_formulae(ARGV.formulae, recursive, &(args.union? ? :| : :&))
all_deps = condense_requirements(all_deps) all_deps = condense_requirements(all_deps)
all_deps.select!(&:installed?) if mode.installed? all_deps.select!(&:installed?) if args.installed?
all_deps.map!(&method(:dep_display_name)) all_deps.map!(&method(:dep_display_name))
all_deps.uniq! all_deps.uniq!
all_deps.sort! unless mode.topo_order? all_deps.sort! unless args.n?
puts all_deps puts all_deps
end end