
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`.
111 lines
3.8 KiB
Ruby
111 lines
3.8 KiB
Ruby
# typed: strict
|
|
# frozen_string_literal: true
|
|
|
|
module Homebrew
|
|
module Livecheck
|
|
module Strategy
|
|
# The {Pypi} strategy identifies the newest version of a PyPI package by
|
|
# checking the JSON API endpoint for the project and using the
|
|
# `info.version` field from the response.
|
|
#
|
|
# PyPI URLs have a standard format:
|
|
# `https://files.pythonhosted.org/packages/<hex>/<hex>/<long_hex>/example-1.2.3.tar.gz`
|
|
#
|
|
# Upstream documentation for the PyPI JSON API can be found at:
|
|
# https://docs.pypi.org/api/json/#get-a-project
|
|
#
|
|
# @api public
|
|
class Pypi
|
|
NICE_NAME = "PyPI"
|
|
|
|
# The default `strategy` block used to extract version information when
|
|
# a `strategy` block isn't provided.
|
|
DEFAULT_BLOCK = T.let(proc do |json, regex|
|
|
version = json.dig("info", "version")
|
|
next if version.blank?
|
|
|
|
regex ? version[regex, 1] : version
|
|
end.freeze, T.proc.params(
|
|
json: T::Hash[String, T.untyped],
|
|
regex: T.nilable(Regexp),
|
|
).returns(T.nilable(String)))
|
|
|
|
# The `Regexp` used to extract the package name and suffix (e.g. file
|
|
# extension) from the URL basename.
|
|
FILENAME_REGEX = /
|
|
(?<package_name>.+)- # The package name followed by a hyphen
|
|
.*? # The version string
|
|
(?<suffix>\.tar\.[a-z0-9]+|\.[a-z0-9]+)$ # Filename extension
|
|
/ix
|
|
|
|
# The `Regexp` used to determine if the strategy applies to the URL.
|
|
URL_MATCH_REGEX = %r{
|
|
^https?://files\.pythonhosted\.org
|
|
/packages
|
|
(?:/[^/]+)+ # The hexadecimal paths before the filename
|
|
/#{FILENAME_REGEX.source.strip} # The filename
|
|
}ix
|
|
|
|
# Whether the strategy can be applied to the provided URL.
|
|
#
|
|
# @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
|
|
|
|
# Extracts the package name from the provided URL and uses it to
|
|
# generate the PyPI JSON API URL for the project.
|
|
#
|
|
# @param url [String] the URL used to generate values
|
|
# @return [Hash]
|
|
sig { params(url: String).returns(T::Hash[Symbol, T.untyped]) }
|
|
def self.generate_input_values(url)
|
|
values = {}
|
|
|
|
match = File.basename(url).match(FILENAME_REGEX)
|
|
return values if match.blank?
|
|
|
|
values[:url] = "https://pypi.org/pypi/#{T.must(match[:package_name]).gsub(/%20|_/, "-")}/json"
|
|
|
|
values
|
|
end
|
|
|
|
# Generates a PyPI JSON API URL for the project and identifies new
|
|
# versions using {Json#find_versions} with a block.
|
|
#
|
|
# @param url [String] the URL of the content to check
|
|
# @param regex [Regexp] a regex used for matching versions in content
|
|
# @param provided_content [String, nil] content to check instead of
|
|
# fetching
|
|
# @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)
|
|
match_data = { matches: {}, regex:, url: }
|
|
|
|
generated = generate_input_values(url)
|
|
return match_data if generated.blank?
|
|
|
|
Json.find_versions(
|
|
url: generated[:url],
|
|
regex:,
|
|
provided_content:,
|
|
options:,
|
|
&block || DEFAULT_BLOCK
|
|
)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|