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

Merge pull request #6714 from hyuraku/repair_info_analysis

Browse Source 
work correctly info analysis args
This commit is contained in:
Mike McQuaid 2019-11-14 14:44:45 -08:00 committed by GitHub
commit de6dc05f84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/cmd/info.rb
View File

@ -231,6 +231,18 @@ module Homebrew
end end
def analytics_table(category, days, results, os_version: false, cask_install: false) def analytics_table(category, days, results, os_version: false, cask_install: false)
valid_days = %w[30 90 365]
if days.present?
raise UsageError, "day must be one of #{valid_days.join(", ")}" unless valid_days.include?(days.to_s)
end
valid_categories = %w[install install-on-request cask-install build-error os-version]
if category.present?
unless valid_categories.include?(category.tr("_", "-"))
raise UsageError, "category must be one of #{valid_categories.join(", ")}"
end
end
oh1 "#{category} (#{days} days)" oh1 "#{category} (#{days} days)"
total_count = results.values.inject("+") total_count = results.values.inject("+")
formatted_total_count = format_count(total_count) formatted_total_count = format_count(total_count)
@ -369,6 +381,14 @@ module Homebrew
value.each do |days, results| value.each do |days, results|
days = days.to_i days = days.to_i
if full_analytics if full_analytics
if args.days.present?
next if args.days&.to_i != days
end
if args.category.present?
next if args.category.tr("-", "_") != category
end
analytics_table(category, days, results) analytics_table(category, days, results)
else else
total_count = results.values.inject("+") total_count = results.values.inject("+")