Merge pull request #17740 from Moisan/brew_bump_all

`brew bump`: do not call repology by default
This commit is contained in:
Nanda H Krishna 2024-07-14 16:48:47 -04:00 committed by GitHub
commit 9f3c404b0b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 73 deletions

View File

@ -34,6 +34,10 @@ module Homebrew
description: "Check only formulae." description: "Check only formulae."
switch "--cask", "--casks", switch "--cask", "--casks",
description: "Check only casks." description: "Check only casks."
switch "--eval-all",
description: "Evaluate all formulae and casks."
switch "--repology",
description: "Use Repology to check for outdated packages."
flag "--tap=", flag "--tap=",
description: "Check formulae and casks within the given tap, specified as <user>`/`<repo>." description: "Check formulae and casks within the given tap, specified as <user>`/`<repo>."
switch "--installed", switch "--installed",
@ -76,6 +80,10 @@ module Homebrew
formulae + casks formulae + casks
elsif args.named.present? elsif args.named.present?
args.named.to_formulae_and_casks_with_taps args.named.to_formulae_and_casks_with_taps
else
formulae = args.cask? ? [] : Formula.all(eval_all: args.eval_all?)
casks = args.formula? ? [] : Cask::Cask.all(eval_all: args.eval_all?)
formulae + casks
end end
formulae_and_casks = formulae_and_casks&.sort_by do |formula_or_cask| formulae_and_casks = formulae_and_casks&.sort_by do |formula_or_cask|
@ -90,24 +98,18 @@ module Homebrew
end end
end end
if formulae_and_casks.present? handle_formula_and_casks(formulae_and_casks)
handle_formula_and_casks(formulae_and_casks)
else
handle_api_response
end
end end
end end
private private
sig { params(_formula_or_cask: T.any(Formula, Cask::Cask)).returns(T::Boolean) } sig { params(formula_or_cask: T.any(Formula, Cask::Cask)).returns(T::Boolean) }
def skip_repology?(_formula_or_cask) def skip_repology?(formula_or_cask)
# (ENV["CI"].present? && args.open_pr? && formula_or_cask.livecheckable?) || return true unless args.repology?
# (formula_or_cask.is_a?(Formula) && formula_or_cask.versioned_formula?)
# Unconditionally skip Repology queries for now because we've been blocked. (ENV["CI"].present? && args.open_pr? && formula_or_cask.livecheckable?) ||
# TODO: get unblocked and make this conditional on e.g. args.repology? (formula_or_cask.is_a?(Formula) && formula_or_cask.versioned_formula?)
true
end end
sig { params(formulae_and_casks: T::Array[T.any(Formula, Cask::Cask)]).void } sig { params(formulae_and_casks: T::Array[T.any(Formula, Cask::Cask)]).void }
@ -156,67 +158,6 @@ module Homebrew
end end
end end
sig { void }
def handle_api_response
limit = args.limit.to_i if args.limit.present?
api_response = {}
unless args.cask?
api_response[:formulae] =
Repology.parse_api_response(limit, args.start_with, repository: Repology::HOMEBREW_CORE)
end
unless args.formula?
api_response[:casks] =
Repology.parse_api_response(limit, args.start_with, repository: Repology::HOMEBREW_CASK)
end
api_response.each_with_index do |(package_type, outdated_packages), idx|
repository = if package_type == :formulae
Repology::HOMEBREW_CORE
else
Repology::HOMEBREW_CASK
end
puts if idx.positive?
oh1 package_type.capitalize if api_response.size > 1
outdated_packages.each_with_index do |(_name, repositories), i|
break if limit && i >= limit
homebrew_repo = repositories.find do |repo|
repo["repo"] == repository
end
next if homebrew_repo.blank?
formula_or_cask = begin
if repository == Repology::HOMEBREW_CORE
Formula[homebrew_repo["srcname"]]
else
Cask::CaskLoader.load(homebrew_repo["srcname"])
end
rescue
next
end
name = Livecheck.package_or_resource_name(formula_or_cask)
ambiguous_cask = begin
formula_or_cask.is_a?(Cask::Cask) && !args.cask? && Formula[name]
rescue FormulaUnavailableError
false
end
puts if i.positive?
next if skip_ineligible_formulae(formula_or_cask)
retrieve_and_display_info_and_open_pr(
formula_or_cask,
name,
repositories,
ambiguous_cask:,
)
end
end
end
sig { sig {
params(formula_or_cask: T.any(Formula, Cask::Cask)).returns(T::Boolean) params(formula_or_cask: T.any(Formula, Cask::Cask)).returns(T::Boolean)
} }

View File

@ -20,6 +20,12 @@ class Homebrew::DevCmd::Bump::Args < Homebrew::CLI::Args
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
def formula?; end def formula?; end
sig { returns(T::Boolean) }
def eval_all?; end
sig { returns(T::Boolean) }
def repology?; end
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
def formulae?; end def formulae?; end