cmd/update-report: rework
This commit is contained in:
parent
7cec7586ff
commit
c481e71092
@ -869,9 +869,13 @@ class ReporterHub
|
|||||||
return if formulae.blank?
|
return if formulae.blank?
|
||||||
|
|
||||||
ohai "New Formulae"
|
ohai "New Formulae"
|
||||||
should_display_desc = !Homebrew::EnvConfig.no_install_from_api? || formulae.size <= 100
|
should_display_descriptions = if Homebrew::EnvConfig.no_install_from_api?
|
||||||
|
formulae.size <= 100
|
||||||
|
else
|
||||||
|
true
|
||||||
|
end
|
||||||
formulae.each do |formula|
|
formulae.each do |formula|
|
||||||
if should_display_desc && (desc = description(formula))
|
if should_display_descriptions && (desc = description(formula))
|
||||||
puts "#{formula}: #{desc}"
|
puts "#{formula}: #{desc}"
|
||||||
else
|
else
|
||||||
puts formula
|
puts formula
|
||||||
@ -883,18 +887,21 @@ class ReporterHub
|
|||||||
def dump_new_cask_report
|
def dump_new_cask_report
|
||||||
return unless Cask::Caskroom.any_casks_installed?
|
return unless Cask::Caskroom.any_casks_installed?
|
||||||
|
|
||||||
casks = select_formula_or_cask(:AC).sort.filter_map do |name|
|
casks = select_formula_or_cask(:AC).sort.reject { |name| cask_installed?(name) }
|
||||||
name.split("/").last unless cask_installed?(name)
|
|
||||||
end
|
|
||||||
return if casks.blank?
|
return if casks.blank?
|
||||||
|
|
||||||
ohai "New Casks"
|
ohai "New Casks"
|
||||||
should_display_desc = !Homebrew::EnvConfig.no_install_from_api? || casks.size <= 100
|
should_display_descriptions = if Homebrew::EnvConfig.no_install_from_api?
|
||||||
|
casks.size <= 100
|
||||||
|
else
|
||||||
|
true
|
||||||
|
end
|
||||||
casks.each do |cask|
|
casks.each do |cask|
|
||||||
if should_display_desc && (desc = cask_description(cask))
|
cask_token = T.must(cask.split("/").last)
|
||||||
puts "#{cask}: #{desc}"
|
if should_display_descriptions && (desc = cask_description(cask))
|
||||||
|
puts "#{cask_token}: #{desc}"
|
||||||
else
|
else
|
||||||
puts cask
|
puts cask_token
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -960,6 +967,7 @@ class ReporterHub
|
|||||||
sig { params(formula: String).returns(T.nilable(String)) }
|
sig { params(formula: String).returns(T.nilable(String)) }
|
||||||
def description(formula)
|
def description(formula)
|
||||||
if Homebrew::EnvConfig.no_install_from_api?
|
if Homebrew::EnvConfig.no_install_from_api?
|
||||||
|
# Skip non-homebrew/core formulae for security.
|
||||||
return if formula.include?("/")
|
return if formula.include?("/")
|
||||||
|
|
||||||
Formula[formula].desc&.presence
|
Formula[formula].desc&.presence
|
||||||
@ -973,6 +981,7 @@ class ReporterHub
|
|||||||
sig { params(cask: String).returns(T.nilable(String)) }
|
sig { params(cask: String).returns(T.nilable(String)) }
|
||||||
def cask_description(cask)
|
def cask_description(cask)
|
||||||
if Homebrew::EnvConfig.no_install_from_api?
|
if Homebrew::EnvConfig.no_install_from_api?
|
||||||
|
# Skip non-homebrew/cask formulae for security.
|
||||||
return if cask.include?("/")
|
return if cask.include?("/")
|
||||||
|
|
||||||
Cask::CaskLoader.load(cask).desc&.presence
|
Cask::CaskLoader.load(cask).desc&.presence
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user