diff --git a/Library/Homebrew/dev-cmd/bump.rb b/Library/Homebrew/dev-cmd/bump.rb index f53879603f..18f9fb2d18 100644 --- a/Library/Homebrew/dev-cmd/bump.rb +++ b/Library/Homebrew/dev-cmd/bump.rb @@ -3,7 +3,6 @@ require "cli/parser" require "livecheck/livecheck" -require "livecheck/skip_conditions" module Homebrew extend T::Sig @@ -28,7 +27,6 @@ module Homebrew args = bump_args.parse requested_formulae = args.named.to_formulae.presence - requested_limit = args.limit.to_i if args.limit.present? if requested_formulae @@ -96,7 +94,7 @@ module Homebrew ) latest = version_info[:latest] if version_info.present? - return "not found" if latest.blank? + return "unable to get versions" if latest.blank? latest.to_s end @@ -118,7 +116,8 @@ module Homebrew end def display(formula, current_version, repology_latest, livecheck_latest, pull_requests) - title = if up_to_date?(current_version, repology_latest, livecheck_latest) + title = if current_version == repology_latest && + current_version == livecheck_latest "#{formula} is up to date!" else formula.name diff --git a/Library/Homebrew/livecheck/livecheck.rb b/Library/Homebrew/livecheck/livecheck.rb index 05bb1b6307..d69719b7e0 100644 --- a/Library/Homebrew/livecheck/livecheck.rb +++ b/Library/Homebrew/livecheck/livecheck.rb @@ -60,12 +60,9 @@ module Homebrew @livecheck_strategy_names.freeze end - # Identify taps other than homebrew/core and homebrew/cask in use - # for current formulae and casks and load additional Strategy - # files them. - sig do - params(formulae_and_casks_to_check: T::Enumerable[T.any(Formula, Cask::Cask)]).void - end + # Uses `formulae_and_casks_to_check` to identify taps in use other than + # homebrew/core and homebrew/cask and loads strategies from them. + sig { params(formulae_and_casks_to_check: T::Enumerable[T.any(Formula, Cask::Cask)]).void } def load_other_tap_strategies(formulae_and_casks_to_check) other_taps = {} formulae_and_casks_to_check.each do |formula_or_cask| diff --git a/Library/Homebrew/utils/repology.rb b/Library/Homebrew/utils/repology.rb index 455a54a449..9e80e455cc 100644 --- a/Library/Homebrew/utils/repology.rb +++ b/Library/Homebrew/utils/repology.rb @@ -21,10 +21,8 @@ module Repology end def single_package_query(name) - url = %W[ - https://repology.org/tools/project-by?repo=homebrew& - name_type=srcname&target_page=api_v1_project&name=#{name} - ].join + url = "https://repology.org/tools/project-by?repo=homebrew&" \ + "name_type=srcname&target_page=api_v1_project&name=#{name}" output, _errors, _status = curl_output("--location", url.to_s) @@ -62,8 +60,8 @@ module Repology end def latest_version(repositories) - # The status is "unique" when the package is present only in Homebrew, so Repology - # has no way of knowing if the package is up-to-date. + # The status is "unique" when the package is present only in Homebrew, so + # Repology has no way of knowing if the package is up-to-date. is_unique = repositories.find do |repo| repo["status"] == "unique" end.present? @@ -74,7 +72,8 @@ module Repology repo["status"] == "newest" end - # Repology cannot identify "newest" versions for packages without a version scheme + # Repology cannot identify "newest" versions for packages without a version + # scheme return "no latest version" if latest_version.blank? latest_version["version"]