diff --git a/Library/Homebrew/dev-cmd/bump.rb b/Library/Homebrew/dev-cmd/bump.rb index 3e4b761686..604657e2a0 100644 --- a/Library/Homebrew/dev-cmd/bump.rb +++ b/Library/Homebrew/dev-cmd/bump.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true require "cli/parser" -require "utils/popen" -require "utils/repology" module Homebrew module_function diff --git a/Library/Homebrew/utils/repology.rb b/Library/Homebrew/utils/repology.rb index 48c8b53044..824f6a788b 100644 --- a/Library/Homebrew/utils/repology.rb +++ b/Library/Homebrew/utils/repology.rb @@ -2,6 +2,7 @@ require "utils/curl" require "utils/versions" + require "formula_info" module RepologyParser @@ -45,7 +46,7 @@ module RepologyParser end def validate_and_format_packages(outdated_repology_packages) - ohai "Verifying outdated Repology packages as Homebrew Formulae" + ohai "Verifying outdated repology packages as Homebrew Formulae" packages = {} outdated_repology_packages.each do |_name, repositories| @@ -65,7 +66,6 @@ module RepologyParser packages[repology_homebrew_repo["srcname"]] = format_package(repology_homebrew_repo["srcname"], latest_version) end - # hash of hashes {"aacgain"=>{"repology_latest_version"=>"1.9", "current_formula_version"=>"1.8"}, ...} packages end @@ -75,7 +75,7 @@ module RepologyParser pull_requests = Versions.check_for_duplicate_pull_requests(package_name, latest_version) { - repoology_latest_version: latest_version, + repology_latest_version: latest_version, current_formula_version: current_version.to_s, livecheck_latest_version: livecheck_response[:livecheck_version], open_pull_requests: pull_requests, diff --git a/Library/Homebrew/utils/versions.rb b/Library/Homebrew/utils/versions.rb index 6895d41084..45e1715eb1 100644 --- a/Library/Homebrew/utils/versions.rb +++ b/Library/Homebrew/utils/versions.rb @@ -5,11 +5,8 @@ module Versions def current_formula_version(formula_name) Formula[formula_name].version.to_s.to_f - end - - def bump_formula_pr(formula_name, url) - Utils.popen_read("brew", "bump-formula-pr", "--no-browse", "--dry-run", - formula_name, "--url=#{url}").chomp + rescue + nil end def livecheck_formula(formula)