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

Run brew style on all the new Sorbet sigs

Browse Source
This commit is contained in:
Issy Long 2024-07-01 19:13:38 +01:00
parent f854a9f3fc
commit 8360218a3e
No known key found for this signature in database
3 changed files with 59 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -434,7 +434,10 @@ module Homebrew
new_url.gsub(%r{/(v?)#{Regexp.escape(partial_old_version)}/}, "/\\1#{partial_new_version}/") new_url.gsub(%r{/(v?)#{Regexp.escape(partial_old_version)}/}, "/\\1#{partial_new_version}/")
end end
sig { params(formula: Formula, new_version: T.nilable(String), url: String, specs: Float).returns(T::Array[T.untyped]) } sig {
params(formula: Formula, new_version: T.nilable(String), url: String,
specs: Float).returns(T::Array[T.untyped])
}
def fetch_resource_and_forced_version(formula, new_version, url, **specs) def fetch_resource_and_forced_version(formula, new_version, url, **specs)
resource = Resource.new resource = Resource.new
resource.url(url, **specs) resource.url(url, **specs)
@ -459,13 +462,18 @@ module Homebrew
sig { params(formula: Formula, tap_remote_repo: String).returns(T.nilable(T::Array[String])) } sig { params(formula: Formula, tap_remote_repo: String).returns(T.nilable(T::Array[String])) }
def check_open_pull_requests(formula, tap_remote_repo) def check_open_pull_requests(formula, tap_remote_repo)
GitHub.check_for_duplicate_pull_requests(formula.name, tap_remote_repo, GitHub.check_for_duplicate_pull_requests(
state: "open", formula.name, tap_remote_repo,
file: formula.path.relative_path_from(T.must(formula.tap).path).to_s, state: "open",
quiet: args.quiet?) file: formula.path.relative_path_from(T.must(formula.tap).path).to_s,
quiet: args.quiet?
)
end end
sig { params(formula: Formula, tap_remote_repo: String, version: T.nilable(String), url: T.nilable(String), tag: T.nilable(String)).void } sig {
params(formula: Formula, tap_remote_repo: String, version: T.nilable(String), url: T.nilable(String),
tag: T.nilable(String)).void
}
def check_new_version(formula, tap_remote_repo, version: nil, url: nil, tag: nil) def check_new_version(formula, tap_remote_repo, version: nil, url: nil, tag: nil)
if version.nil? if version.nil?
specs = {} specs = {}
@ -493,14 +501,19 @@ module Homebrew
odie "#{formula} should only be updated every #{throttled_rate} releases on multiples of #{throttled_rate}" odie "#{formula} should only be updated every #{throttled_rate} releases on multiples of #{throttled_rate}"
end end
sig { params(formula: Formula, tap_remote_repo: String, version: T.nilable(String)).returns(T.nilable(T::Array[String])) } sig {
params(formula: Formula, tap_remote_repo: String,
version: T.nilable(String)).returns(T.nilable(T::Array[String]))
}
def check_closed_pull_requests(formula, tap_remote_repo, version:) def check_closed_pull_requests(formula, tap_remote_repo, version:)
# if we haven't already found open requests, try for an exact match across closed requests # if we haven't already found open requests, try for an exact match across closed requests
GitHub.check_for_duplicate_pull_requests(formula.name, tap_remote_repo, GitHub.check_for_duplicate_pull_requests(
version:, formula.name, tap_remote_repo,
state: "closed", version:,
file: formula.path.relative_path_from(T.must(formula.tap).path).to_s, state: "closed",
quiet: args.quiet?) file: formula.path.relative_path_from(T.must(formula.tap).path).to_s,
quiet: args.quiet?
)
end end
sig { params(formula: Formula, new_formula_version: String).returns(T.nilable(T::Array[String])) } sig { params(formula: Formula, new_formula_version: String).returns(T.nilable(T::Array[String])) }

20
Library/Homebrew/dev-cmd/pr-pull.rb
View File

@ -243,7 +243,10 @@ module Homebrew
end end
end end
sig { params(old_contents: String, new_contents: String, subject_path: T.any(String, Pathname), reason: T.nilable(String)).returns(String) } sig {
params(old_contents: String, new_contents: String, subject_path: T.any(String, Pathname),
reason: T.nilable(String)).returns(String)
}
def determine_bump_subject(old_contents, new_contents, subject_path, reason: nil) def determine_bump_subject(old_contents, new_contents, subject_path, reason: nil)
subject_path = Pathname(subject_path) subject_path = Pathname(subject_path)
tap = Tap.from_path(subject_path) tap = Tap.from_path(subject_path)
@ -272,7 +275,10 @@ module Homebrew
# Cherry picks a single commit that modifies a single file. # Cherry picks a single commit that modifies a single file.
# Potentially rewords this commit using {determine_bump_subject}. # Potentially rewords this commit using {determine_bump_subject}.
sig { params(commit: String, file: String, git_repo: GitRepository, reason: T.nilable(String), verbose: T::Boolean, resolve: T::Boolean).void } sig {
params(commit: String, file: String, git_repo: GitRepository, reason: T.nilable(String), verbose: T::Boolean,
resolve: T::Boolean).void
}
def reword_package_commit(commit, file, git_repo:, reason: "", verbose: false, resolve: false) def reword_package_commit(commit, file, git_repo:, reason: "", verbose: false, resolve: false)
package_file = git_repo.pathname / file package_file = git_repo.pathname / file
package_name = package_file.basename.to_s.chomp(".rb") package_name = package_file.basename.to_s.chomp(".rb")
@ -298,7 +304,10 @@ module Homebrew
# Cherry picks multiple commits that each modify a single file. # Cherry picks multiple commits that each modify a single file.
# Words the commit according to {determine_bump_subject} with the body # Words the commit according to {determine_bump_subject} with the body
# corresponding to all the original commit messages combined. # corresponding to all the original commit messages combined.
sig { params(commits: T::Array[String], file: String, git_repo: GitRepository, reason: T.nilable(String), verbose: T::Boolean, resolve: T::Boolean).void } sig {
params(commits: T::Array[String], file: String, git_repo: GitRepository, reason: T.nilable(String),
verbose: T::Boolean, resolve: T::Boolean).void
}
def squash_package_commits(commits, file, git_repo:, reason: "", verbose: false, resolve: false) def squash_package_commits(commits, file, git_repo:, reason: "", verbose: false, resolve: false)
odebug "Squashing #{file}: #{commits.join " "}" odebug "Squashing #{file}: #{commits.join " "}"
@ -346,7 +355,10 @@ module Homebrew
end end
# TODO: fix test in `test/dev-cmd/pr-pull_spec.rb` and assume `cherry_picked: false`. # TODO: fix test in `test/dev-cmd/pr-pull_spec.rb` and assume `cherry_picked: false`.
sig { params(original_commit: String, tap: Tap, reason: String, verbose: T::Boolean, resolve: T::Boolean, cherry_picked: T::Boolean).void } sig {
params(original_commit: String, tap: Tap, reason: String, verbose: T::Boolean, resolve: T::Boolean,
cherry_picked: T::Boolean).void
}
def autosquash!(original_commit, tap:, reason: "", verbose: false, resolve: false, cherry_picked: true) def autosquash!(original_commit, tap:, reason: "", verbose: false, resolve: false, cherry_picked: true)
git_repo = tap.git_repository git_repo = tap.git_repository
original_head = git_repo.head_ref original_head = git_repo.head_ref

26
Library/Homebrew/dev-cmd/unbottled.rb
View File

@ -34,11 +34,14 @@ module Homebrew
def run def run
Formulary.enable_factory_cache! Formulary.enable_factory_cache!
@bottle_tag = T.let(if (tag = args.tag) @bottle_tag = T.let(
Utils::Bottles::Tag.from_symbol(tag.to_sym) if (tag = args.tag)
else Utils::Bottles::Tag.from_symbol(tag.to_sym)
Utils::Bottles.tag else
end, T.nilable(Utils::Bottles::Tag)) Utils::Bottles.tag
end,
T.nilable(Utils::Bottles::Tag),
)
if args.lost? if args.lost?
if args.named.present? if args.named.present?
@ -104,7 +107,9 @@ module Homebrew
private private
sig { params(all: T::Boolean).returns([T::Array[Formula], T::Array[Formula], T.nilable(T::Hash[Symbol, Integer])]) } sig {
params(all: T::Boolean).returns([T::Array[Formula], T::Array[Formula], T.nilable(T::Hash[Symbol, Integer])])
}
def formulae_all_installs_from_args(all) def formulae_all_installs_from_args(all)
if args.named.present? if args.named.present?
formulae = all_formulae = args.named.to_formulae formulae = all_formulae = args.named.to_formulae
@ -152,7 +157,8 @@ module Homebrew
formulae = Array(formulae).reject(&:deprecated?) if formulae.present? formulae = Array(formulae).reject(&:deprecated?) if formulae.present?
all_formulae = Array(all_formulae).reject(&:deprecated?) if all_formulae.present? all_formulae = Array(all_formulae).reject(&:deprecated?) if all_formulae.present?
[T.let(formulae, T::Array[Formula]), T.let(all_formulae, T::Array[Formula]), T.let(T.must(formula_installs), T.nilable(T::Hash[Symbol, Integer]))] [T.let(formulae, T::Array[Formula]), T.let(all_formulae, T::Array[Formula]),
T.let(T.must(formula_installs), T.nilable(T::Hash[Symbol, Integer]))]
end end
sig { params(all_formulae: T.untyped).returns([T::Hash[String, T.untyped], T::Hash[String, T.untyped]]) } sig { params(all_formulae: T.untyped).returns([T::Hash[String, T.untyped], T::Hash[String, T.untyped]]) }
@ -191,7 +197,11 @@ module Homebrew
puts "#{unbottled_formulae}/#{formulae.length} remaining." puts "#{unbottled_formulae}/#{formulae.length} remaining."
end end
sig { params(formulae: T::Array[Formula], deps_hash: T::Hash[T.any(Symbol, String), T.untyped], noun: T.nilable(String), hash: T::Hash[T.any(Symbol, String), T.untyped], any_named_args: T::Boolean).returns(NilClass) } sig {
params(formulae: T::Array[Formula], deps_hash: T::Hash[T.any(Symbol, String), T.untyped],
noun: T.nilable(String), hash: T::Hash[T.any(Symbol, String), T.untyped],
any_named_args: T::Boolean).returns(NilClass)
}
def output_unbottled(formulae, deps_hash, noun, hash, any_named_args) def output_unbottled(formulae, deps_hash, noun, hash, any_named_args)
ohai ":#{@bottle_tag} bottle status#{@sort}" ohai ":#{@bottle_tag} bottle status#{@sort}"
any_found = T.let(false, T::Boolean) any_found = T.let(false, T::Boolean)