From 6b995ad111c6dcc808de054c07666ac0bd32e9ee Mon Sep 17 00:00:00 2001 From: Issy Long Date: Sun, 30 Jun 2024 20:58:10 +0100 Subject: [PATCH] dev-cmd/pr-upload: Bump to Sorbet `typed: strict` --- Library/Homebrew/dev-cmd/pr-upload.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/dev-cmd/pr-upload.rb b/Library/Homebrew/dev-cmd/pr-upload.rb index 672086f3ef..4217f27e08 100644 --- a/Library/Homebrew/dev-cmd/pr-upload.rb +++ b/Library/Homebrew/dev-cmd/pr-upload.rb @@ -1,4 +1,4 @@ -# typed: true +# typed: strict # frozen_string_literal: true require "abstract_command" @@ -120,6 +120,7 @@ module Homebrew private + sig { params(bottles_hash: T::Hash[String, T.untyped]).void } def check_bottled_formulae!(bottles_hash) bottles_hash.each do |name, bottle_hash| formula_path = HOMEBREW_REPOSITORY/bottle_hash["formula"]["path"] @@ -131,22 +132,25 @@ module Homebrew end end + sig { params(bottles_hash: T::Hash[String, T.untyped]).returns(T::Boolean) } def github_releases?(bottles_hash) - @github_releases ||= bottles_hash.values.all? do |bottle_hash| + @github_releases ||= T.let(bottles_hash.values.all? do |bottle_hash| root_url = bottle_hash["bottle"]["root_url"] url_match = root_url.match GitHubReleases::URL_REGEX _, _, _, tag = *url_match tag - end + end, T.nilable(T::Boolean)) end + sig { params(bottles_hash: T::Hash[String, T.untyped]).returns(T::Boolean) } def github_packages?(bottles_hash) - @github_packages ||= bottles_hash.values.all? do |bottle_hash| + @github_packages ||= T.let(bottles_hash.values.all? do |bottle_hash| bottle_hash["bottle"]["root_url"].match? GitHubPackages::URL_REGEX - end + end, T.nilable(T::Boolean)) end + sig { params(json_files: T::Array[String], args: T.untyped).returns(T::Hash[String, T.untyped]) } def bottles_hash_from_json_files(json_files, args) puts "Reading JSON files: #{json_files.join(", ")}" if args.verbose?