From 2822a7b0c3276fcab8335374bc305d048c10feba Mon Sep 17 00:00:00 2001 From: Elizabeth Tackett Date: Tue, 28 Jul 2020 12:56:19 -0500 Subject: [PATCH] adapt output to adjust for single-formula queries --- Library/Homebrew/dev-cmd/bump.rb | 11 +++++++++-- Library/Homebrew/utils/repology.rb | 8 +++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump.rb b/Library/Homebrew/dev-cmd/bump.rb index 97b2fd7c5a..2840c513a9 100644 --- a/Library/Homebrew/dev-cmd/bump.rb +++ b/Library/Homebrew/dev-cmd/bump.rb @@ -39,12 +39,19 @@ module Homebrew Repology.parse_api_response end + if requested_formula && outdated_repology_packages.nil? + ohai "The requested formula, #{requested_formula}, is up-to-date." + puts "Current version: #{get_formula_details(requested_formula).version}" + return + end + outdated_packages = validate_and_format_packages(outdated_repology_packages) display(outdated_packages) end def validate_and_format_packages(outdated_repology_packages) - ohai "Verifying outdated repology packages as Homebrew formulae" + ohai "Verifying outdated repology #{"package".pluralize(outdated_repology_packages.size)} " \ + "as Homebrew #{"formula".pluralize(outdated_repology_packages.size)}" packages = {} outdated_repology_packages.each do |_name, repositories| @@ -118,7 +125,7 @@ module Homebrew end def display(outdated_packages) - ohai "Outdated formulae" + ohai "Outdated #{"formula".pluralize(outdated_packages.size)}" puts outdated_packages.each do |formula, package_details| ohai formula diff --git a/Library/Homebrew/utils/repology.rb b/Library/Homebrew/utils/repology.rb index ce90e518b2..c687a43f83 100644 --- a/Library/Homebrew/utils/repology.rb +++ b/Library/Homebrew/utils/repology.rb @@ -19,7 +19,13 @@ module Repology url = "https://repology.org/api/v1/project/#{name}" output, _errors, _status = curl_output(url.to_s) - { name: JSON.parse(output) } + data = JSON.parse(output) + + outdated_homebrew = data.select do |repo| + repo["repo"] == "homebrew" && repo["status"] == "outdated" + end + + outdated_homebrew.empty? ? nil : { name: data } end def parse_api_response