
This adds a `Livecheck::Options` class, which is intended to house various configuration options that are set in `livecheck` blocks, conditionally set by livecheck at runtime, etc. The general idea is that when we add features involving configurations options (e.g., for livecheck, strategies, curl, etc.), we can make changes to `Options` without needing to modify parameters for strategy `find_versions` methods, `Strategy` methods like `page_headers` and `page_content`, etc. This is something that I've been trying to improve over the years and `Options` should help to reduce maintenance overhead in this area while also strengthening type signatures. `Options` replaces the existing `homebrew_curl` option (which related strategies pass to `Strategy` methods and on to `curl_args`) and the new `url_options` (which contains `post_form` or `post_json` values that are used to make `POST` requests). I recently added `url_options` as a temporary way of enabling `POST` support without `Options` but this restores the original `Options`-based implementation. Along the way, I added a `homebrew_curl` parameter to the `url` DSL method, allowing us to set an explicit value in `livecheck` blocks. This is something that we've needed in some cases but I also intend to replace implicit/inferred `homebrew_curl` usage with explicit values in `livecheck` blocks once this is available for use. My intention is to eventually remove the implicit behavior and only rely on explicit values. That will align with how `homebrew_curl` options work for other URLs and makes the behavior clear just from looking at the `livecheck` block. Lastly, this removes the `unused` rest parameter from `find_versions` methods. I originally added `unused` as a way of handling parameters that some `find_versions` methods have but others don't (e.g., `cask` in `ExtractPlist`), as this allowed us to pass various arguments to `find_versions` methods without worrying about whether a particular parameter is available. This isn't an ideal solution and I originally wanted to handle this situation by only passing expected arguments to `find_versions` methods but there was a technical issue standing in the way. I recently found an answer to the issue, so this also replaces the existing `ExtractPlist` special case with generic logic that checks the parameters for a strategy's `find_versions` method and only passes expected arguments. Replacing the aforementioned `find_versions` parameters with `Options` ensures that the remaining parameters are fairly consistent across strategies and any differences are handled by the aforementioned logic. Outside of `ExtractPlist`, the only other difference is that some `find_versions` methods have a `provided_content` parameter but that's currently only used by tests (though it's intended for caching support in the future). I will be renaming that parameter to `content` in an upcoming PR and expanding it to the other strategies, which should make them all consistent outside of `ExtractPlist`.
133 lines
4.9 KiB
Ruby
133 lines
4.9 KiB
Ruby
# typed: strict
|
|
# frozen_string_literal: true
|
|
|
|
module Homebrew
|
|
module Livecheck
|
|
module Strategy
|
|
# The {Json} strategy fetches content at a URL, parses it as JSON and
|
|
# provides the parsed data to a `strategy` block. If a regex is present
|
|
# in the `livecheck` block, it should be passed as the second argument to
|
|
# the `strategy` block.
|
|
#
|
|
# This is a generic strategy that doesn't contain any logic for finding
|
|
# versions, as the structure of JSON data varies. Instead, a `strategy`
|
|
# block must be used to extract version information from the JSON data.
|
|
#
|
|
# This strategy is not applied automatically and it is necessary to use
|
|
# `strategy :json` in a `livecheck` block (in conjunction with a
|
|
# `strategy` block) to use it.
|
|
#
|
|
# This strategy's {find_versions} method can be used in other strategies
|
|
# that work with JSON content, so it should only be necessary to write
|
|
# the version-finding logic that works with the parsed JSON data.
|
|
#
|
|
# @api public
|
|
class Json
|
|
NICE_NAME = "JSON"
|
|
|
|
# A priority of zero causes livecheck to skip the strategy. We do this
|
|
# for {Json} so we can selectively apply it only when a strategy block
|
|
# is provided in a `livecheck` block.
|
|
PRIORITY = 0
|
|
|
|
# The `Regexp` used to determine if the strategy applies to the URL.
|
|
URL_MATCH_REGEX = %r{^https?://}i
|
|
|
|
# Whether the strategy can be applied to the provided URL.
|
|
# {Json} will technically match any HTTP URL but is only usable with
|
|
# a `livecheck` block containing a `strategy` block.
|
|
#
|
|
# @param url [String] the URL to match against
|
|
# @return [Boolean]
|
|
sig { params(url: String).returns(T::Boolean) }
|
|
def self.match?(url)
|
|
URL_MATCH_REGEX.match?(url)
|
|
end
|
|
|
|
# Parses JSON text and returns the parsed data.
|
|
# @param content [String] the JSON text to parse
|
|
sig { params(content: String).returns(T.untyped) }
|
|
def self.parse_json(content)
|
|
require "json"
|
|
|
|
begin
|
|
JSON.parse(content)
|
|
rescue JSON::ParserError
|
|
raise "Content could not be parsed as JSON."
|
|
end
|
|
end
|
|
|
|
# Parses JSON text and identifies versions using a `strategy` block.
|
|
# If the block has two parameters, the parsed JSON data will be used as
|
|
# the first argument and the regex (if any) will be the second.
|
|
# Otherwise, only the parsed JSON data will be passed to the block.
|
|
#
|
|
# @param content [String] the JSON text to parse and check
|
|
# @param regex [Regexp, nil] a regex used for matching versions in the
|
|
# content
|
|
# @return [Array]
|
|
sig {
|
|
params(
|
|
content: String,
|
|
regex: T.nilable(Regexp),
|
|
block: T.nilable(Proc),
|
|
).returns(T::Array[String])
|
|
}
|
|
def self.versions_from_content(content, regex = nil, &block)
|
|
return [] if content.blank? || block.blank?
|
|
|
|
json = parse_json(content)
|
|
return [] if json.blank?
|
|
|
|
block_return_value = if block.arity == 2
|
|
yield(json, regex)
|
|
else
|
|
yield(json)
|
|
end
|
|
Strategy.handle_block_return(block_return_value)
|
|
end
|
|
|
|
# Checks the JSON content at the URL for versions, using the provided
|
|
# `strategy` block to extract version information.
|
|
#
|
|
# @param url [String] the URL of the content to check
|
|
# @param regex [Regexp, nil] a regex used for matching versions
|
|
# @param provided_content [String, nil] page content to use in place of
|
|
# fetching via `Strategy#page_content`
|
|
# @param options [Options] options to modify behavior
|
|
# @return [Hash]
|
|
sig {
|
|
params(
|
|
url: String,
|
|
regex: T.nilable(Regexp),
|
|
provided_content: T.nilable(String),
|
|
options: Options,
|
|
block: T.nilable(Proc),
|
|
).returns(T::Hash[Symbol, T.untyped])
|
|
}
|
|
def self.find_versions(url:, regex: nil, provided_content: nil, options: Options.new, &block)
|
|
raise ArgumentError, "#{Utils.demodulize(name)} requires a `strategy` block" if block.blank?
|
|
|
|
match_data = { matches: {}, regex:, url: }
|
|
return match_data if url.blank? || block.blank?
|
|
|
|
content = if provided_content.is_a?(String)
|
|
match_data[:cached] = true
|
|
provided_content
|
|
else
|
|
match_data.merge!(Strategy.page_content(url, options:))
|
|
match_data[:content]
|
|
end
|
|
return match_data if content.blank?
|
|
|
|
versions_from_content(content, regex, &block).each do |match_text|
|
|
match_data[:matches][match_text] = Version.new(match_text)
|
|
end
|
|
|
|
match_data
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|