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

cmd/uses: fix Rubocop warnings.

Browse Source
This commit is contained in:
Mike McQuaid 2016-09-10 10:24:57 +01:00
parent 2c5beb0eff
commit 1174264d47
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Library/Homebrew/cmd/uses.rb
View File

@ -27,7 +27,7 @@ module Homebrew
raise FormulaUnspecifiedError if ARGV.named.empty? raise FormulaUnspecifiedError if ARGV.named.empty?
used_formulae = ARGV.formulae used_formulae = ARGV.formulae
formulae = (ARGV.include? "--installed") ? Formula.installed : Formula formulae = ARGV.include?("--installed") ? Formula.installed : Formula
recursive = ARGV.flag? "--recursive" recursive = ARGV.flag? "--recursive"
includes = [] includes = []
ignores = [] ignores = []
@ -65,8 +65,6 @@ module Homebrew
Requirement.prune unless includes.include?("build?") Requirement.prune unless includes.include?("build?")
end end
end end
deps.any? { |dep| dep.to_formula.full_name == ff.full_name rescue dep.name == ff.name } ||
reqs.any? { |req| req.name == ff.name || [ff.name, ff.full_name].include?(req.default_formula) }
else else
deps = f.deps.reject do |dep| deps = f.deps.reject do |dep|
ignores.any? { |ignore| dep.send(ignore) } && !includes.any? { |include| dep.send(include) } ignores.any? { |ignore| dep.send(ignore) } && !includes.any? { |include| dep.send(include) }
@ -74,8 +72,17 @@ module Homebrew
reqs = f.requirements.reject do |req| reqs = f.requirements.reject do |req|
ignores.any? { |ignore| req.send(ignore) } && !includes.any? { |include| req.send(include) } ignores.any? { |ignore| req.send(ignore) } && !includes.any? { |include| req.send(include) }
end end
deps.any? { |dep| dep.to_formula.full_name == ff.full_name rescue dep.name == ff.name } || end
reqs.any? { |req| req.name == ff.name || [ff.name, ff.full_name].include?(req.default_formula) } next true if deps.any? do |dep|
begin
dep.to_formula.full_name == ff.full_name
rescue
dep.name == ff.name
end
end
reqs.any? do |req|
req.name == ff.name || [ff.name, ff.full_name].include?(req.default_formula)
end end
rescue FormulaUnavailableError rescue FormulaUnavailableError
# Silently ignore this case as we don't care about things used in # Silently ignore this case as we don't care about things used in