Fix code style.
This commit is contained in:
parent
90067ea8ed
commit
3b366d05b9
@ -278,7 +278,7 @@ module Cask
|
|||||||
|
|
||||||
def livecheck(&block)
|
def livecheck(&block)
|
||||||
@livecheck ||= Livecheck.new(self)
|
@livecheck ||= Livecheck.new(self)
|
||||||
return @livecheck unless block_given?
|
return @livecheck unless block
|
||||||
|
|
||||||
raise CaskInvalidError.new(cask, "'livecheck' stanza may only appear once.") if @livecheckable
|
raise CaskInvalidError.new(cask, "'livecheck' stanza may only appear once.") if @livecheckable
|
||||||
|
|
||||||
|
|||||||
@ -61,16 +61,16 @@ module Homebrew
|
|||||||
|
|
||||||
formulae_and_casks_to_check = if args.tap
|
formulae_and_casks_to_check = if args.tap
|
||||||
tap = Tap.fetch(args.tap)
|
tap = Tap.fetch(args.tap)
|
||||||
formulae = !args.cask? ? tap.formula_names.map { |name| Formula[name] } : []
|
formulae = args.cask? ? [] : tap.formula_names.map { |name| Formula[name] }
|
||||||
casks = !args.formula? ? tap.cask_tokens.map { |token| Cask::CaskLoader.load(token) } : []
|
casks = args.formula? ? [] : tap.cask_tokens.map { |token| Cask::CaskLoader.load(token) }
|
||||||
formulae + casks
|
formulae + casks
|
||||||
elsif args.installed?
|
elsif args.installed?
|
||||||
formulae = !args.cask? ? Formula.installed : []
|
formulae = args.cask? ? [] : Formula.installed
|
||||||
casks = !args.formula? ? Cask::Caskroom.casks : []
|
casks = args.formula? ? [] : Cask::Caskroom.casks
|
||||||
formulae + casks
|
formulae + casks
|
||||||
elsif args.all?
|
elsif args.all?
|
||||||
formulae = !args.cask? ? Formula.to_a : []
|
formulae = args.cask? ? [] : Formula.to_a
|
||||||
casks = !args.formula? ? Cask::Cask.to_a : []
|
casks = args.formula? ? [] : Cask::Cask.to_a
|
||||||
formulae + casks
|
formulae + casks
|
||||||
elsif args.named.present?
|
elsif args.named.present?
|
||||||
if args.formula?
|
if args.formula?
|
||||||
|
|||||||
@ -120,15 +120,15 @@ module Homebrew
|
|||||||
separator, method = livecheck_version
|
separator, method = livecheck_version
|
||||||
Version.new(formula_or_cask.version.to_s.split(separator, 2).try(method))
|
Version.new(formula_or_cask.version.to_s.split(separator, 2).try(method))
|
||||||
elsif formula
|
elsif formula
|
||||||
if formula.head_only?
|
if formula.head_only?
|
||||||
formula.any_installed_version.version.commit
|
formula.any_installed_version.version.commit
|
||||||
else
|
else
|
||||||
formula.stable.version
|
formula.stable.version
|
||||||
end
|
end
|
||||||
elsif livecheck_version.is_a?(Symbol)
|
elsif livecheck_version.is_a?(Symbol)
|
||||||
Version.new(Cask::DSL::Version.new(formula_or_cask.version).try(livecheck_version))
|
Version.new(Cask::DSL::Version.new(formula_or_cask.version).try(livecheck_version))
|
||||||
else
|
else
|
||||||
Version.new(formula_or_cask.version)
|
Version.new(formula_or_cask.version)
|
||||||
end
|
end
|
||||||
|
|
||||||
latest = if formula&.stable? || cask
|
latest = if formula&.stable? || cask
|
||||||
@ -269,9 +269,9 @@ module Homebrew
|
|||||||
if formula&.deprecated? && !formula.livecheckable?
|
if formula&.deprecated? && !formula.livecheckable?
|
||||||
return status_hash(formula, "deprecated", args: args) if args.json?
|
return status_hash(formula, "deprecated", args: args) if args.json?
|
||||||
|
|
||||||
puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : deprecated" unless args.quiet?
|
puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : deprecated" unless args.quiet?
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if formula&.disabled? && !formula.livecheckable?
|
if formula&.disabled? && !formula.livecheckable?
|
||||||
return status_hash(formula, "disabled", args: args) if args.json?
|
return status_hash(formula, "disabled", args: args) if args.json?
|
||||||
@ -283,17 +283,17 @@ module Homebrew
|
|||||||
if formula&.versioned_formula? && !formula.livecheckable?
|
if formula&.versioned_formula? && !formula.livecheckable?
|
||||||
return status_hash(formula, "versioned", args: args) if args.json?
|
return status_hash(formula, "versioned", args: args) if args.json?
|
||||||
|
|
||||||
puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : versioned" unless args.quiet?
|
puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : versioned" unless args.quiet?
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if formula&.head_only? && !formula.any_version_installed?
|
if formula&.head_only? && !formula.any_version_installed?
|
||||||
head_only_msg = "HEAD only formula must be installed to be livecheckable"
|
head_only_msg = "HEAD only formula must be installed to be livecheckable"
|
||||||
return status_hash(formula, "error", [head_only_msg], args: args) if args.json?
|
return status_hash(formula, "error", [head_only_msg], args: args) if args.json?
|
||||||
|
|
||||||
puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : #{head_only_msg}" unless args.quiet?
|
puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : #{head_only_msg}" unless args.quiet?
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
is_gist = formula&.stable&.url&.include?("gist.github.com")
|
is_gist = formula&.stable&.url&.include?("gist.github.com")
|
||||||
if formula_or_cask.livecheck.skip? || is_gist
|
if formula_or_cask.livecheck.skip? || is_gist
|
||||||
@ -312,7 +312,7 @@ module Homebrew
|
|||||||
puts "#{Tty.red}#{formula_or_cask_name(formula_or_cask, args: args)}#{Tty.reset} : skipped" \
|
puts "#{Tty.red}#{formula_or_cask_name(formula_or_cask, args: args)}#{Tty.reset} : skipped" \
|
||||||
"#{" - #{skip_msg}" if skip_msg.present?}"
|
"#{" - #{skip_msg}" if skip_msg.present?}"
|
||||||
end
|
end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
false
|
false
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user