From bf60e2da3ddc49de569fd01726e0ad8a5f794fdb Mon Sep 17 00:00:00 2001 From: nandahkrishna Date: Wed, 17 Feb 2021 02:04:13 +0530 Subject: [PATCH] utils/repology: add constants for repository names --- Library/Homebrew/dev-cmd/bump.rb | 20 +++++++++++++------- Library/Homebrew/utils/repology.rb | 7 +++++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump.rb b/Library/Homebrew/dev-cmd/bump.rb index b6e4979e4c..801c771aba 100644 --- a/Library/Homebrew/dev-cmd/bump.rb +++ b/Library/Homebrew/dev-cmd/bump.rb @@ -62,9 +62,9 @@ module Homebrew next end - "homebrew" + Repology::HOMEBREW_CORE else - "homebrew_casks" + Repology::HOMEBREW_CASK end package_data = Repology.single_package_query(name, repository: repository) @@ -72,14 +72,20 @@ module Homebrew end else api_response = {} - api_response[:formulae] = Repology.parse_api_response(limit, repository: "homebrew") unless args.cask? - api_response[:casks] = Repology.parse_api_response(limit, repository: "homebrew_casks") unless args.formula? + unless args.cask? + api_response[:formulae] = + Repology.parse_api_response(limit, repository: Repology::HOMEBREW_CORE) + end + unless args.formula? + api_response[:casks] = + Repology.parse_api_response(limit, repository: Repology::HOMEBREW_CASK) + end api_response.each do |package_type, outdated_packages| repository = if package_type == :formulae - "homebrew" + Repology::HOMEBREW_CORE else - "homebrew_casks" + Repology::HOMEBREW_CASK end outdated_packages.each_with_index do |(_name, repositories), i| @@ -90,7 +96,7 @@ module Homebrew next if homebrew_repo.blank? formula_or_cask = begin - if repository == "homebrew" + if repository == Repology::HOMEBREW_CORE Formula[homebrew_repo["srcname"]] else Cask::CaskLoader.load(homebrew_repo["srcname"]) diff --git a/Library/Homebrew/utils/repology.rb b/Library/Homebrew/utils/repology.rb index fa63c922ca..e4517c2cff 100644 --- a/Library/Homebrew/utils/repology.rb +++ b/Library/Homebrew/utils/repology.rb @@ -7,6 +7,9 @@ require "utils/curl" # # @api private module Repology + HOMEBREW_CORE = "homebrew" + HOMEBREW_CASK = "homebrew_casks" + module_function MAX_PAGINATION = 15 @@ -36,9 +39,9 @@ module Repology def parse_api_response(limit = nil, repository:) package_term = case repository - when "homebrew" + when HOMEBREW_CORE "formula" - when "homebrew_casks" + when HOMEBREW_CASK "cask" else "package"