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

audit: fix --display-failures-only failure messaging

Browse Source
This commit is contained in:
Rylan Polster 2021-03-21 17:11:17 -04:00
parent 83ebc5ef7e
commit b4a36bef64
No known key found for this signature in database
GPG Key ID: 46A744940CFF4D64
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/cask/audit.rb
View File

@ -126,9 +126,10 @@ module Cask
end end
end end
sig { params(include_passed: T::Boolean).returns(String) } sig { params(include_passed: T::Boolean, include_warnings: T::Boolean).returns(String) }
def summary(include_passed: false) def summary(include_passed: false, include_warnings: true)
return if success? && !include_passed return if success? && !include_passed
return if warnings? && !errors? && !include_warnings
summary = ["audit for #{cask}: #{result}"] summary = ["audit for #{cask}: #{result}"]
@ -136,8 +137,10 @@ module Cask
summary << " #{Formatter.error("-")} #{error}" summary << " #{Formatter.error("-")} #{error}"
end end
warnings.each do |warning| if include_warnings
summary << " #{Formatter.warning("-")} #{warning}" warnings.each do |warning|
summary << " #{Formatter.warning("-")} #{warning}"
end
end end
summary.join("\n") summary.join("\n")

11
Library/Homebrew/cask/auditor.rb
View File

@ -75,7 +75,7 @@ module Cask
if !language && language_blocks if !language && language_blocks
language_blocks.each_key do |l| language_blocks.each_key do |l|
audit = audit_languages(l) audit = audit_languages(l)
summary = audit.summary(include_passed: output_passed?) summary = audit.summary(include_passed: output_passed?, include_warnings: output_warnings?)
if summary.present? && output_summary?(audit) if summary.present? && output_summary?(audit)
ohai "Auditing language: #{l.map { |lang| "'#{lang}'" }.to_sentence}" if output_summary? ohai "Auditing language: #{l.map { |lang| "'#{lang}'" }.to_sentence}" if output_summary?
puts summary puts summary
@ -85,7 +85,7 @@ module Cask
end end
else else
audit = audit_cask_instance(cask) audit = audit_cask_instance(cask)
summary = audit.summary(include_passed: output_passed?) summary = audit.summary(include_passed: output_passed?, include_warnings: output_warnings?)
puts summary if summary.present? && output_summary?(audit) puts summary if summary.present? && output_summary?(audit)
warnings += audit.warnings warnings += audit.warnings
errors += audit.errors errors += audit.errors
@ -97,7 +97,6 @@ module Cask
private private
def output_summary?(audit = nil) def output_summary?(audit = nil)
return false if @display_failures_only.present?
return true if @any_named_args.present? return true if @any_named_args.present?
return true if @audit_strict.present? return true if @audit_strict.present?
return false if audit.blank? return false if audit.blank?
@ -112,6 +111,12 @@ module Cask
false false
end end
def output_warnings?
return false if @display_failures_only.present?
true
end
def audit_languages(languages) def audit_languages(languages)
original_config = cask.config original_config = cask.config
localized_config = original_config.merge(Config.new(explicit: { languages: languages })) localized_config = original_config.merge(Config.new(explicit: { languages: languages }))