Add configuration to new appcast check

This commit is contained in:
Julian Mayer 2019-05-21 12:07:25 +02:00
parent b3c0997c0a
commit 0939c8832d
2 changed files with 17 additions and 2 deletions

View File

@ -301,11 +301,16 @@ module Cask
def check_appcast_contains_version def check_appcast_contains_version
return unless check_appcast? return unless check_appcast?
return if cask.appcast.to_s.empty? return if cask.appcast.to_s.empty?
return if cask.appcast.configuration == :no_check
appcast_stanza = cask.appcast.to_s appcast_stanza = cask.appcast.to_s
appcast_contents, = curl_output("--max-time", "5", appcast_stanza) appcast_contents, = curl_output("-L", "--max-time", "5", appcast_stanza)
version_stanza = cask.version.to_s version_stanza = cask.version.to_s
if cask.appcast.configuration.to_s.empty?
adjusted_version_stanza = version_stanza.split(",")[0].split("-")[0].split("_")[0] adjusted_version_stanza = version_stanza.split(",")[0].split("-")[0].split("_")[0]
else
adjusted_version_stanza = cask.appcast.configuration
end
return if appcast_contents.include? adjusted_version_stanza return if appcast_contents.include? adjusted_version_stanza
add_warning "appcast at URL '#{appcast_stanza}' does not contain"\ add_warning "appcast at URL '#{appcast_stanza}' does not contain"\

View File

@ -3,11 +3,21 @@
module Cask module Cask
class DSL class DSL
class Appcast class Appcast
ATTRIBUTES = [
:configuration,
].freeze
attr_reader :uri, :parameters attr_reader :uri, :parameters
attr_reader(*ATTRIBUTES)
def initialize(uri, **parameters) def initialize(uri, **parameters)
@uri = URI(uri) @uri = URI(uri)
@parameters = parameters @parameters = parameters
ATTRIBUTES.each do |attribute|
next unless parameters.key?(attribute)
instance_variable_set("@#{attribute}", parameters[attribute])
end
end end
def to_yaml def to_yaml