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

Add error handling to formula current version finding function

Browse Source
This commit is contained in:
Baffour Adu Boampong 2020-07-03 01:51:38 +00:00
parent aa4134a830
commit 15da87704c
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
require "cli/parser" require "cli/parser"
require "utils/popen"
require "utils/repology"
module Homebrew module Homebrew
module_function module_function

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

@ -2,6 +2,7 @@
require "utils/curl" require "utils/curl"
require "utils/versions" require "utils/versions"
require "formula_info" require "formula_info"
module RepologyParser module RepologyParser
@ -45,7 +46,7 @@ module RepologyParser
end end
def validate_and_format_packages(outdated_repology_packages) 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 = {} packages = {}
outdated_repology_packages.each do |_name, repositories| 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) packages[repology_homebrew_repo["srcname"]] = format_package(repology_homebrew_repo["srcname"], latest_version)
end end
# hash of hashes {"aacgain"=>{"repology_latest_version"=>"1.9", "current_formula_version"=>"1.8"}, ...}
packages packages
end end
@ -75,7 +75,7 @@ module RepologyParser
pull_requests = Versions.check_for_duplicate_pull_requests(package_name, latest_version) 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, current_formula_version: current_version.to_s,
livecheck_latest_version: livecheck_response[:livecheck_version], livecheck_latest_version: livecheck_response[:livecheck_version],
open_pull_requests: pull_requests, open_pull_requests: pull_requests,

7
Library/Homebrew/utils/versions.rb
View File

@ -5,11 +5,8 @@ module Versions
def current_formula_version(formula_name) def current_formula_version(formula_name)
Formula[formula_name].version.to_s.to_f Formula[formula_name].version.to_s.to_f
end rescue
nil
def bump_formula_pr(formula_name, url)
Utils.popen_read("brew", "bump-formula-pr", "--no-browse", "--dry-run",
formula_name, "--url=#{url}").chomp
end end
def livecheck_formula(formula) def livecheck_formula(formula)