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

show formula livecheck and brew data when repology response is nil

Browse Source
This commit is contained in:
Elizabeth Tackett 2020-08-16 19:22:24 -05:00
parent 9cae9f284c
commit 388b0ae8ba
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/dev-cmd/bump.rb
View File

@ -23,7 +23,7 @@ module Homebrew
def bump def bump
args = bump_args.parse args = bump_args.parse
requested_formula = args.formulae.first.to_s requested_formula = args.formulae.first.to_s if args.formulae.first
requested_limit = args.limit.to_i if args.limit.present? requested_limit = args.limit.to_i if args.limit.present?
raise FormulaUnavailableError, requested_formula if requested_formula && !validate_formula(requested_formula) raise FormulaUnavailableError, requested_formula if requested_formula && !validate_formula(requested_formula)
@ -34,12 +34,13 @@ module Homebrew
Repology.parse_api_response Repology.parse_api_response
end end
if repology_data.blank? validated_formulae = if repology_data.blank?
ohai "No Repology data found." { requested_formula.to_s => Repology.format_package(requested_formula, nil) }
else else
validated_formulae = Repology.validate_and_format_packages(repology_data, requested_limit) Repology.validate_and_format_packages(repology_data, requested_limit)
display(validated_formulae)
end end
display(validated_formulae)
end end
def validate_formula(formula_name) def validate_formula(formula_name)
@ -49,12 +50,12 @@ module Homebrew
end end
def up_to_date?(package) def up_to_date?(package)
package &&
package[:current_formula_version] == package[:repology_latest_version] && package[:current_formula_version] == package[:repology_latest_version] &&
package[:current_formula_version] == package[:livecheck_latest_version] package[:current_formula_version] == package[:livecheck_latest_version]
end end
def display(formulae) def display(formulae)
puts
formulae.each do |formula, package_details| formulae.each do |formula, package_details|
title = (up_to_date?(package_details) ? "#{formula} is up to date!" : formula).to_s title = (up_to_date?(package_details) ? "#{formula} is up to date!" : formula).to_s
ohai title ohai title

1
Library/Homebrew/utils/repology.rb
View File

@ -56,6 +56,7 @@ module Repology
def validate_and_format_packages(outdated_repology_packages, limit) def validate_and_format_packages(outdated_repology_packages, limit)
packages = {} packages = {}
outdated_repology_packages.each do |_name, repositories| outdated_repology_packages.each do |_name, repositories|
# identify homebrew repo # identify homebrew repo
repology_homebrew_repo = repositories.find do |repo| repology_homebrew_repo = repositories.find do |repo|