ARGV: Replace usages of ARGV.resolved_formulae with Homebrew.args

This commit is contained in:
Gautham Goli 2019-12-19 13:56:26 +05:30 committed by Mike McQuaid
parent 5baf68ab6e
commit 959b88266d
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
16 changed files with 21 additions and 21 deletions

View File

@ -25,7 +25,7 @@ module Homebrew
if Homebrew.args.named.blank? if Homebrew.args.named.blank?
puts HOMEBREW_CELLAR puts HOMEBREW_CELLAR
else else
puts ARGV.resolved_formulae.map(&:rack) puts Homebrew.args.resolved_formulae.map(&:rack)
end end
end end
end end

View File

@ -25,7 +25,7 @@ module Homebrew
if Homebrew.args.named.blank? if Homebrew.args.named.blank?
puts HOMEBREW_PREFIX puts HOMEBREW_PREFIX
else else
puts ARGV.resolved_formulae.map { |f| puts Homebrew.args.resolved_formulae.map { |f|
f.opt_prefix.exist? ? f.opt_prefix : f.installed_prefix f.opt_prefix.exist? ? f.opt_prefix : f.installed_prefix
} }
end end

View File

@ -142,10 +142,10 @@ module Homebrew
end end
def gist_logs def gist_logs
raise FormulaUnspecifiedError if ARGV.resolved_formulae.length != 1 raise FormulaUnspecifiedError if Homebrew.args.resolved_formulae.length != 1
Install.perform_preinstall_checks(all_fatal: true) Install.perform_preinstall_checks(all_fatal: true)
Install.perform_build_from_source_checks(all_fatal: true) Install.perform_build_from_source_checks(all_fatal: true)
gistify_logs(ARGV.resolved_formulae.first) gistify_logs(Homebrew.args.resolved_formulae.first)
end end
end end

View File

@ -27,7 +27,7 @@ module Homebrew
raise FormulaUnspecifiedError if Homebrew.args.named.blank? raise FormulaUnspecifiedError if Homebrew.args.named.blank?
ARGV.resolved_formulae.each do |f| Homebrew.args.resolved_formulae.each do |f|
if f.oldname if f.oldname
unless (rack = HOMEBREW_CELLAR/f.oldname).exist? && !rack.subdirs.empty? unless (rack = HOMEBREW_CELLAR/f.oldname).exist? && !rack.subdirs.empty?
raise NoSuchKegError, f.oldname raise NoSuchKegError, f.oldname

View File

@ -33,7 +33,7 @@ module Homebrew
ff = if Homebrew.args.named.blank? ff = if Homebrew.args.named.blank?
Formula.installed.sort Formula.installed.sort
else else
ARGV.resolved_formulae.sort Homebrew.args.resolved_formulae.sort
end end
ff.each do |f| ff.each do |f|

View File

@ -35,10 +35,10 @@ module Homebrew
def outdated def outdated
outdated_args.parse outdated_args.parse
formulae = if ARGV.resolved_formulae.empty? formulae = if Homebrew.args.resolved_formulae.blank?
Formula.installed Formula.installed
else else
ARGV.resolved_formulae Homebrew.args.resolved_formulae
end end
if args.json if args.json
raise UsageError, "Invalid JSON version: #{args.json}" unless ["v1", true].include? args.json raise UsageError, "Invalid JSON version: #{args.json}" unless ["v1", true].include? args.json
@ -47,7 +47,7 @@ module Homebrew
else else
outdated = print_outdated(formulae) outdated = print_outdated(formulae)
end end
Homebrew.failed = !ARGV.resolved_formulae.empty? && !outdated.empty? Homebrew.failed = Homebrew.args.resolved_formulae.present? && !outdated.empty?
end end
def print_outdated(formulae) def print_outdated(formulae)

View File

@ -23,7 +23,7 @@ module Homebrew
raise FormulaUnspecifiedError if args.remaining.empty? raise FormulaUnspecifiedError if args.remaining.empty?
ARGV.resolved_formulae.each do |f| Homebrew.args.resolved_formulae.each do |f|
if f.pinned? if f.pinned?
opoo "#{f.name} already pinned" opoo "#{f.name} already pinned"
elsif !f.pinnable? elsif !f.pinnable?

View File

@ -25,7 +25,7 @@ module Homebrew
raise KegUnspecifiedError if args.remaining.empty? raise KegUnspecifiedError if args.remaining.empty?
ARGV.resolved_formulae.each do |f| Homebrew.args.resolved_formulae.each do |f|
ohai "Postinstalling #{f}" ohai "Postinstalling #{f}"
fi = FormulaInstaller.new(f) fi = FormulaInstaller.new(f)
fi.post_install fi.post_install

View File

@ -53,7 +53,7 @@ module Homebrew
Install.perform_preinstall_checks Install.perform_preinstall_checks
ARGV.resolved_formulae.each do |f| Homebrew.args.resolved_formulae.each do |f|
if f.pinned? if f.pinned?
onoe "#{f.full_name} is pinned. You must unpin it to reinstall." onoe "#{f.full_name} is pinned. You must unpin it to reinstall."
next next

View File

@ -24,7 +24,7 @@ module Homebrew
raise FormulaUnspecifiedError if args.remaining.empty? raise FormulaUnspecifiedError if args.remaining.empty?
ARGV.resolved_formulae.each do |f| Homebrew.args.resolved_formulae.each do |f|
if f.pinned? if f.pinned?
f.unpin f.unpin
elsif !f.pinnable? elsif !f.pinnable?

View File

@ -68,11 +68,11 @@ module Homebrew
exit 0 if outdated.empty? exit 0 if outdated.empty?
else else
outdated = ARGV.resolved_formulae.select do |f| outdated = Homebrew.args.resolved_formulae.select do |f|
f.outdated?(fetch_head: args.fetch_HEAD?) f.outdated?(fetch_head: args.fetch_HEAD?)
end end
(ARGV.resolved_formulae - outdated).each do |f| (Homebrew.args.resolved_formulae - outdated).each do |f|
versions = f.installed_kegs.map(&:version) versions = f.installed_kegs.map(&:version)
if versions.empty? if versions.empty?
ofail "#{f.full_specified_name} not installed" ofail "#{f.full_specified_name} not installed"

View File

@ -83,8 +83,8 @@ module Homebrew
ff = Formula ff = Formula
files = Tap.map(&:formula_dir) files = Tap.map(&:formula_dir)
else else
ff = ARGV.resolved_formulae ff = Homebrew.args.resolved_formulae
files = ARGV.resolved_formulae.map(&:path) files = Homebrew.args.resolved_formulae.map(&:path)
end end
only_cops = args.only_cops only_cops = args.only_cops

View File

@ -89,7 +89,7 @@ module Homebrew
raise KegUnspecifiedError if args.remaining.empty? raise KegUnspecifiedError if args.remaining.empty?
ensure_relocation_formulae_installed! unless args.skip_relocation? ensure_relocation_formulae_installed! unless args.skip_relocation?
ARGV.resolved_formulae.each do |f| Homebrew.args.resolved_formulae.each do |f|
bottle_formula f bottle_formula f
end end
end end

View File

@ -23,6 +23,6 @@ module Homebrew
raise FormulaUnspecifiedError if Homebrew.args.named.blank? raise FormulaUnspecifiedError if Homebrew.args.named.blank?
ARGV.resolved_formulae.each { |f| puts f.path } Homebrew.args.resolved_formulae.each { |f| puts f.path }
end end
end end

View File

@ -38,7 +38,7 @@ module Homebrew
require "formula_assertions" require "formula_assertions"
ARGV.resolved_formulae.each do |f| Homebrew.args.resolved_formulae.each do |f|
# Cannot test uninstalled formulae # Cannot test uninstalled formulae
unless f.latest_version_installed? unless f.latest_version_installed?
ofail "Testing requires the latest version of #{f.full_name}" ofail "Testing requires the latest version of #{f.full_name}"

View File

@ -21,7 +21,7 @@ begin
trap("INT", old_trap) trap("INT", old_trap)
formula = ARGV.resolved_formulae.first formula = Homebrew.args.resolved_formulae.first
formula.extend(Homebrew::Assertions) formula.extend(Homebrew::Assertions)
formula.extend(Debrew::Formula) if ARGV.debug? formula.extend(Debrew::Formula) if ARGV.debug?