mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add unversioned? method to Cask::URL.

Browse Source
This commit is contained in:
Markus Reiter 2020-12-07 18:46:35 +01:00
parent ff28d7c69b
commit 76a3c0338b
2 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/cask/dsl.rb
View File

@ -173,12 +173,14 @@ module Cask
@language_blocks.keys.flatten @language_blocks.keys.flatten
end end
def url(*args) def url(*args, **options)
set_unique_stanza(:url, args.empty? && !block_given?) do caller_location = caller_locations[0]
set_unique_stanza(:url, args.empty? && options.empty? && !block_given?) do
if block_given? if block_given?
LazyObject.new { URL.new(*yield) } LazyObject.new { URL.new(*yield, caller_location: caller_location) }
else else
URL.new(*args) URL.new(*args, **options, caller_location: caller_location)
end end
end end
end end

55
Library/Homebrew/cask/url.rb
View File

@ -18,19 +18,20 @@ class URL
sig do sig do
params( params(
uri: T.any(URI::Generic, String), uri: T.any(URI::Generic, String),
verified: T.nilable(String), verified: T.nilable(String),
using: T.nilable(Symbol), using: T.nilable(Symbol),
tag: T.nilable(String), tag: T.nilable(String),
branch: T.nilable(String), branch: T.nilable(String),
revisions: T.nilable(T::Array[String]), revisions: T.nilable(T::Array[String]),
revision: T.nilable(String), revision: T.nilable(String),
trust_cert: T.nilable(T::Boolean), trust_cert: T.nilable(T::Boolean),
cookies: T.nilable(T::Hash[String, String]), cookies: T.nilable(T::Hash[String, String]),
referer: T.nilable(T.any(URI::Generic, String)), referer: T.nilable(T.any(URI::Generic, String)),
header: T.nilable(String), header: T.nilable(String),
user_agent: T.nilable(T.any(Symbol, String)), user_agent: T.nilable(T.any(Symbol, String)),
data: T.nilable(T::Hash[String, String]), data: T.nilable(T::Hash[String, String]),
caller_location: Thread::Backtrace::Location,
).returns(T.untyped) ).returns(T.untyped)
end end
def initialize( def initialize(
@ -46,8 +47,10 @@ class URL
referer: nil, referer: nil,
header: nil, header: nil,
user_agent: nil, user_agent: nil,
data: nil data: nil,
caller_location: T.must(caller_locations).fetch(0)
) )
@uri = URI(uri) @uri = URI(uri)
specs = {} specs = {}
@ -65,5 +68,29 @@ class URL
specs[:data] = @data = data specs[:data] = @data = data
@specs = specs.compact @specs = specs.compact
@caller_location = caller_location
end
sig { returns(T.nilable(String)) }
def raw_interpolated_url
return @raw_interpolated_url if defined?(@raw_interpolated_url)
@raw_interpolated_url =
Pathname(@caller_location.absolute_path)
.each_line.drop(@caller_location.lineno - 1)
.first&.yield_self { |line| line[/url\s+"([^"]+)"/, 1] }
end
private :raw_interpolated_url
sig { params(ignore_major_version: T::Boolean).returns(T::Boolean) }
def unversioned?(ignore_major_version: false)
interpolated_url = raw_interpolated_url
return false unless interpolated_url
interpolated_url = interpolated_url.gsub(/\#{\s*version\s*\.major\s*}/, "") if ignore_major_version
interpolated_url.exclude?('#{')
end end
end end