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

move methods to analytics_table function

Browse Source
This commit is contained in:
hyuraku 2019-11-15 01:25:54 +09:00
parent af59951c0e
commit 1ab86acb0f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
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)
@ -357,8 +369,6 @@ module Homebrew
end end
def output_formula_analytics(f) def output_formula_analytics(f)
valid_days = %w[30 90 365]
valid_categories = %w[install install-on-request build-error]
json = formulae_api_json("formula/#{f}.json") json = formulae_api_json("formula/#{f}.json")
return if json.blank? || json["analytics"].blank? return if json.blank? || json["analytics"].blank?
@ -372,14 +382,10 @@ module Homebrew
days = days.to_i days = days.to_i
if full_analytics if full_analytics
if args.days.present? if args.days.present?
raise UsageError, "day must be one of #{valid_days.join(", ")}" unless valid_days.include?(args.days)
next if args.days&.to_i != days next if args.days&.to_i != days
end end
if args.category.present? if args.category.present?
unless valid_categories.include?(args.category)
raise UsageError, "category must be one of #{valid_categories.join(", ")}"
end
next if args.category.tr("-", "_") != category next if args.category.tr("-", "_") != category
end end