From 0939c8832d9a12b436bc570240ab29e9f26a0298 Mon Sep 17 00:00:00 2001 From: Julian Mayer Date: Tue, 21 May 2019 12:07:25 +0200 Subject: [PATCH 1/3] Add configuration to new appcast check --- Library/Homebrew/cask/audit.rb | 9 +++++++-- Library/Homebrew/cask/dsl/appcast.rb | 10 ++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cask/audit.rb b/Library/Homebrew/cask/audit.rb index 0c3cf7773b..b1db10e800 100644 --- a/Library/Homebrew/cask/audit.rb +++ b/Library/Homebrew/cask/audit.rb @@ -301,11 +301,16 @@ module Cask def check_appcast_contains_version return unless check_appcast? return if cask.appcast.to_s.empty? + return if cask.appcast.configuration == :no_check 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 - adjusted_version_stanza = version_stanza.split(",")[0].split("-")[0].split("_")[0] + if cask.appcast.configuration.to_s.empty? + 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 add_warning "appcast at URL '#{appcast_stanza}' does not contain"\ diff --git a/Library/Homebrew/cask/dsl/appcast.rb b/Library/Homebrew/cask/dsl/appcast.rb index f2296ad942..b5aa010c20 100644 --- a/Library/Homebrew/cask/dsl/appcast.rb +++ b/Library/Homebrew/cask/dsl/appcast.rb @@ -3,11 +3,21 @@ module Cask class DSL class Appcast + ATTRIBUTES = [ + :configuration, + ].freeze attr_reader :uri, :parameters + attr_reader(*ATTRIBUTES) def initialize(uri, **parameters) @uri = URI(uri) @parameters = parameters + + ATTRIBUTES.each do |attribute| + next unless parameters.key?(attribute) + + instance_variable_set("@#{attribute}", parameters[attribute]) + end end def to_yaml From b6840c56384d1f127e90182c15bb9f56572f3c09 Mon Sep 17 00:00:00 2001 From: CoreCode Date: Tue, 21 May 2019 14:51:06 +0200 Subject: [PATCH 2/3] Update audit.rb --- Library/Homebrew/cask/audit.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cask/audit.rb b/Library/Homebrew/cask/audit.rb index b1db10e800..54599a685d 100644 --- a/Library/Homebrew/cask/audit.rb +++ b/Library/Homebrew/cask/audit.rb @@ -304,9 +304,9 @@ module Cask return if cask.appcast.configuration == :no_check appcast_stanza = cask.appcast.to_s - appcast_contents, = curl_output("-L", "--max-time", "5", appcast_stanza) + appcast_contents, = curl_output("--location", "--max-time", "5", appcast_stanza) version_stanza = cask.version.to_s - if cask.appcast.configuration.to_s.empty? + if cask.appcast.configuration.blank? adjusted_version_stanza = version_stanza.split(",")[0].split("-")[0].split("_")[0] else adjusted_version_stanza = cask.appcast.configuration From b81ead6dbbad8734513346978c189b0601a596c1 Mon Sep 17 00:00:00 2001 From: CoreCode Date: Tue, 21 May 2019 15:10:39 +0200 Subject: [PATCH 3/3] Update appcast.rb --- Library/Homebrew/cask/dsl/appcast.rb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Library/Homebrew/cask/dsl/appcast.rb b/Library/Homebrew/cask/dsl/appcast.rb index b5aa010c20..695152dec3 100644 --- a/Library/Homebrew/cask/dsl/appcast.rb +++ b/Library/Homebrew/cask/dsl/appcast.rb @@ -3,21 +3,12 @@ module Cask class DSL class Appcast - ATTRIBUTES = [ - :configuration, - ].freeze - attr_reader :uri, :parameters - attr_reader(*ATTRIBUTES) + attr_reader :uri, :parameters, :configuration def initialize(uri, **parameters) @uri = URI(uri) @parameters = parameters - - ATTRIBUTES.each do |attribute| - next unless parameters.key?(attribute) - - instance_variable_set("@#{attribute}", parameters[attribute]) - end + @configuration = parameters[:configuration] if parameters.key?(:configuration) end def to_yaml