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

bump-cask-pr: use similar logic to brew fetch

Browse Source
This commit is contained in:
Michael Cho 2021-08-24 18:15:04 -07:00
parent 7d3f073e9d
commit 79cb9e051b
No known key found for this signature in database
GPG Key ID: F0487049DAE15338
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
# frozen_string_literal: true
require "cask"
require "cask/download"
require "cli/parser"
require "utils/tar"
@ -128,16 +129,15 @@ module Homebrew
silent: true)
tmp_cask = Cask::CaskLoader.load(tmp_contents)
tmp_config = cask.config
tmp_url = tmp_cask.url.to_s
tmp_config = tmp_cask.config
if old_hash != :no_check
new_hash = fetch_resource(cask, new_version, tmp_url) if new_hash.nil?
new_hash = fetch_cask(tmp_contents)[1] if new_hash.nil?
if tmp_contents.include?("Hardware::CPU.intel?")
other_intel = !Hardware::CPU.intel?
other_contents = tmp_contents.gsub("Hardware::CPU.intel?", other_intel.to_s)
replacement_pairs << fetch_cask(other_contents, new_version)
replacement_pairs << fetch_cask(other_contents)
end
end
@ -145,7 +145,7 @@ module Homebrew
next if language == cask.language
lang_config = tmp_config.merge(Cask::Config.new(explicit: { languages: [language] }))
replacement_pairs << fetch_cask(tmp_contents, new_version, config: lang_config)
replacement_pairs << fetch_cask(tmp_contents, config: lang_config)
end
end
end
@ -184,23 +184,16 @@ module Homebrew
GitHub.create_bump_pr(pr_info, args: args)
end
def fetch_resource(cask, version, url, **specs)
resource = Resource.new
resource.url(url, specs)
resource.owner = Resource.new(cask.token)
resource.version = version
resource_path = resource.fetch
Utils::Tar.validate_file(resource_path)
resource_path.sha256
end
def fetch_cask(contents, version, config: nil)
def fetch_cask(contents, config: nil)
cask = Cask::CaskLoader.load(contents)
cask.config = config if config.present?
url = cask.url.to_s
old_hash = cask.sha256.to_s
new_hash = fetch_resource(cask, version, url)
cask_download = Cask::Download.new(cask, quarantine: true)
download = cask_download.fetch(verify_download_integrity: false)
Utils::Tar.validate_file(download)
new_hash = download.sha256
[old_hash, new_hash]
end