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

bump-cask-pr: add fetch_cask helper method

Browse Source
This commit is contained in:
Seeker 2021-02-23 09:22:35 -08:00
parent 5f92d00244
commit f65f0f9245
No known key found for this signature in database
GPG Key ID: DAC8CD3021038C62
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Library/Homebrew/dev-cmd/bump-cask-pr.rb
View File

@ -134,18 +134,7 @@ module Homebrew
if tmp_contents.include?("Hardware::CPU.intel?") if tmp_contents.include?("Hardware::CPU.intel?")
other_contents = tmp_contents.gsub("Hardware::CPU.intel?", (!Hardware::CPU.intel?).to_s) other_contents = tmp_contents.gsub("Hardware::CPU.intel?", (!Hardware::CPU.intel?).to_s)
other_cask = Cask::CaskLoader.load(other_contents) replacement_pairs << fetch_cask(other_contents, new_version)
other_url = other_cask.url.to_s
other_old_hash = other_cask.sha256.to_s
resource_path = fetch_resource(cask, new_version, other_url)
Utils::Tar.validate_file(resource_path)
other_new_hash = resource_path.sha256
replacement_pairs << [
other_old_hash,
other_new_hash,
]
end end
end end
@ -153,19 +142,7 @@ module Homebrew
next if language == cask.language next if language == cask.language
lang_config = tmp_config.merge(Cask::Config.new(explicit: { languages: [language] })) lang_config = tmp_config.merge(Cask::Config.new(explicit: { languages: [language] }))
lang_cask = Cask::CaskLoader.load(tmp_contents) replacement_pairs << fetch_cask(tmp_contents, new_version, config: lang_config)
lang_cask.config = lang_config
lang_url = lang_cask.url.to_s
lang_old_hash = lang_cask.sha256.to_s
resource_path = fetch_resource(cask, new_version, lang_url)
Utils::Tar.validate_file(resource_path)
lang_new_hash = resource_path.sha256
replacement_pairs << [
lang_old_hash,
lang_new_hash,
]
end end
end end
end end
@ -204,14 +181,27 @@ module Homebrew
GitHub.create_bump_pr(pr_info, args: args) GitHub.create_bump_pr(pr_info, args: args)
end end
def fetch_resource(cask, new_version, url, **specs) def fetch_resource(cask, version, url, **specs)
resource = Resource.new resource = Resource.new
resource.url(url, specs) resource.url(url, specs)
resource.owner = Resource.new(cask.token) resource.owner = Resource.new(cask.token)
resource.version = new_version resource.version = version
resource.fetch resource.fetch
end end
def fetch_cask(contents, version, config: nil)
cask = Cask::CaskLoader.load(contents)
cask.config = config if config.present?
url = cask.url.to_s
old_hash = cask.sha256.to_s
resource_path = fetch_resource(cask, version, url)
Utils::Tar.validate_file(resource_path)
new_hash = resource_path.sha256
[old_hash, new_hash]
end
def check_open_pull_requests(cask, args:) def check_open_pull_requests(cask, args:)
GitHub.check_for_duplicate_pull_requests(cask.token, cask.tap.full_name, GitHub.check_for_duplicate_pull_requests(cask.token, cask.tap.full_name,
state: "open", state: "open",