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

livecheck: assume type of formula_or_cask less

Browse Source
This commit is contained in:
Sam Ford 2020-12-12 11:36:43 -05:00
parent 704ec8abf0
commit 9d08f09714
No known key found for this signature in database
GPG Key ID: 95209E46C7FFDEFE
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/livecheck/livecheck.rb
View File

@ -209,9 +209,10 @@ module Homebrew
end end
def formula_or_cask_name(formula_or_cask, args:) def formula_or_cask_name(formula_or_cask, args:)
if formula_or_cask.is_a?(Formula) case formula_or_cask
when Formula
formula_name(formula_or_cask, args: args) formula_name(formula_or_cask, args: args)
else when Cask::Cask
cask_name(formula_or_cask, args: args) cask_name(formula_or_cask, args: args)
end end
end end
@ -229,11 +230,12 @@ module Homebrew
def status_hash(formula_or_cask, status_str, messages = nil, args:) def status_hash(formula_or_cask, status_str, messages = nil, args:)
formula = formula_or_cask if formula_or_cask.is_a?(Formula) formula = formula_or_cask if formula_or_cask.is_a?(Formula)
cask = formula_or_cask if formula_or_cask.is_a?(Cask::Cask)
status_hash = {} status_hash = {}
if formula if formula
status_hash[:formula] = formula_name(formula, args: args) status_hash[:formula] = formula_name(formula, args: args)
else elsif cask
status_hash[:cask] = cask_name(formula_or_cask, args: args) status_hash[:cask] = cask_name(formula_or_cask, args: args)
end end
status_hash[:status] = status_str status_hash[:status] = status_str
@ -393,6 +395,7 @@ module Homebrew
# @return [Hash, nil] # @return [Hash, nil]
def latest_version(formula_or_cask, args:) def latest_version(formula_or_cask, args:)
formula = formula_or_cask if formula_or_cask.is_a?(Formula) formula = formula_or_cask if formula_or_cask.is_a?(Formula)
cask = formula_or_cask if formula_or_cask.is_a?(Cask::Cask)
has_livecheckable = formula_or_cask.livecheckable? has_livecheckable = formula_or_cask.livecheckable?
livecheck = formula_or_cask.livecheck livecheck = formula_or_cask.livecheck
@ -408,7 +411,7 @@ module Homebrew
if formula if formula
puts "Formula: #{formula_name(formula, args: args)}" puts "Formula: #{formula_name(formula, args: args)}"
puts "Head only?: true" if formula.head_only? puts "Head only?: true" if formula.head_only?
else elsif cask
puts "Cask: #{cask_name(formula_or_cask, args: args)}" puts "Cask: #{cask_name(formula_or_cask, args: args)}"
end end
puts "Livecheckable?: #{has_livecheckable ? "Yes" : "No"}" puts "Livecheckable?: #{has_livecheckable ? "Yes" : "No"}"