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

Merge pull request #7606 from vitorgalvao/appcast-configuration-match

Browse Source 
Cask: rename appcast configuration to must_contain
This commit is contained in:
Vítor Galvão 2020-06-06 03:49:22 +01:00 committed by GitHub
commit aff92b3af3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cask/audit.rb
View File

@ -307,7 +307,7 @@ module Cask
def check_appcast_contains_version
return unless appcast?
return if cask.appcast.to_s.empty?
return if cask.appcast.configuration == :no_check
return if cask.appcast.must_contain == :no_check
appcast_stanza = cask.appcast.to_s
appcast_contents, = curl_output("--compressed", "--user-agent", HOMEBREW_USER_AGENT_FAKE_SAFARI, "--location",
@ -316,7 +316,7 @@ module Cask
adjusted_version_stanza = if cask.appcast.configuration.blank?
version_stanza.match(/^[[:alnum:].]+/)[0]
else
cask.appcast.configuration
cask.appcast.must_contain
end
return if appcast_contents.include? adjusted_version_stanza

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

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