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

Apply suggestions from code review

Browse Source 
Co-authored-by: Sam Ford <1584702+samford@users.noreply.github.com>
This commit is contained in:
nandahkrishna 2021-02-27 22:39:12 +05:30
parent 22cc750c66
commit f11786d63d
No known key found for this signature in database
GPG Key ID: 067E5FCD58ADF3AA
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,18 +161,17 @@ module Homebrew
livecheck_latest = livecheck_result(formula_or_cask)
pull_requests = retrieve_pull_requests(formula_or_cask, name) unless args.no_pull_requests?
print_name = begin
"#{name} (cask)" if formula_or_cask.is_a?(Cask::Cask) && Formula[name] && !args.cask?
name += begin
(" (cask)" if formula_or_cask.is_a?(Cask::Cask) && !args.cask? && Formula[name]).to_s
rescue FormulaUnavailableError
nil
""
end
print_name ||= name
title = if current_version == repology_latest &&
current_version == livecheck_latest
"#{print_name} is up to date!"
"#{name} is up to date!"
else
print_name
name
end
ohai title

27
Library/Homebrew/livecheck/livecheck.rb
View File

@ -125,12 +125,6 @@ module Homebrew
formula = formula_or_cask if formula_or_cask.is_a?(Formula)
cask = formula_or_cask if formula_or_cask.is_a?(Cask::Cask)
name = formula_or_cask_name(formula_or_cask, full_name: full_name)
print_name = begin
"#{name} (cask)" if cask && Formula[name] && handle_name_conflict
rescue FormulaUnavailableError
nil
end
print_name ||= name
if debug && i.positive?
puts <<~EOS
@ -230,8 +224,7 @@ module Homebrew
next info
end
info[:cask] = print_name
print_latest_version(info, verbose: verbose)
print_latest_version(info, verbose: verbose, handle_name_conflict: handle_name_conflict)
nil
rescue => e
Homebrew.failed = true
@ -240,7 +233,14 @@ module Homebrew
progress&.increment
status_hash(formula_or_cask, "error", [e.to_s], full_name: full_name, verbose: verbose)
elsif !quiet
onoe "#{Tty.blue}#{print_name}#{Tty.reset}: #{e}"
name = formula_or_cask_name(formula_or_cask, full_name: full_name)
name += begin
(" (cask)" if cask && handle_name_conflict && Formula[name]).to_s
rescue FormulaUnavailableError
""
end
onoe "#{Tty.blue}#{name}#{Tty.reset}: #{e}"
$stderr.puts e.backtrace if debug && !e.is_a?(Livecheck::Error)
nil
end
@ -317,9 +317,14 @@ module Homebrew
end
# Formats and prints the livecheck result for a formula.
sig { params(info: Hash, verbose: T::Boolean).void }
def print_latest_version(info, verbose:)
sig { params(info: Hash, verbose: T::Boolean, handle_name_conflict: T::Boolean).void }
def print_latest_version(info, verbose:, handle_name_conflict: false)
formula_or_cask_s = "#{Tty.blue}#{info[:formula] || info[:cask]}#{Tty.reset}"
formula_or_cask_s += begin
(" (cask)" if info[:cask] && handle_name_conflict && Formula[info[:cask]]).to_s
rescue FormulaUnavailableError
""
end
formula_or_cask_s += " (guessed)" if !info[:meta][:livecheckable] && verbose
current_s = if info[:version][:newer_than_upstream]