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

Merge pull request #6155 from core-code/master

Browse Source 
Add configuration to new appcast check
This commit is contained in:
Mike McQuaid 2019-05-23 08:28:56 +01:00 committed by GitHub
commit c82496cf5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/cask/audit.rb
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("--location", "--max-time", "5", appcast_stanza)
version_stanza = cask.version.to_s version_stanza = cask.version.to_s
if cask.appcast.configuration.blank?
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"\

3
Library/Homebrew/cask/dsl/appcast.rb
View File

@ -3,11 +3,12 @@
module Cask module Cask
class DSL class DSL
class Appcast class Appcast
attr_reader :uri, :parameters attr_reader :uri, :parameters, :configuration
def initialize(uri, **parameters) def initialize(uri, **parameters)
@uri = URI(uri) @uri = URI(uri)
@parameters = parameters @parameters = parameters
@configuration = parameters[:configuration] if parameters.key?(:configuration)
end end
def to_yaml def to_yaml