From 705f03ef9f8576016853bdc34c63a053e9bce986 Mon Sep 17 00:00:00 2001 From: EricFromCanada Date: Sun, 10 Mar 2019 16:11:15 -0400 Subject: [PATCH] info: support analytics for cask-install --- Library/Homebrew/cmd/info.rb | 13 +++++++++---- docs/Manpage.md | 2 +- manpages/brew.1 | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb index 29c65e67aa..c2145919e0 100644 --- a/Library/Homebrew/cmd/info.rb +++ b/Library/Homebrew/cmd/info.rb @@ -26,7 +26,7 @@ module Homebrew flag "--category", depends_on: "--analytics", description: "The value for `category` must be `install`, `install-on-request`, "\ - "`build-error` or `os-version`. The default is `install`." + "`cask-install`, `build-error` or `os-version`. The default is `install`." switch "--github", description: "Open a browser to the GitHub History page for provided . "\ "To view formula history locally: `brew log -p` " @@ -223,7 +223,7 @@ module Homebrew nil end - def analytics_table(category, days, results, os_version: false) + def analytics_table(category, days, results, os_version: false, cask_install: false) oh1 "#{category} (#{days} days)" total_count = results.values.inject("+") formatted_total_count = format_count(total_count) @@ -234,6 +234,8 @@ module Homebrew percent_header = "Percent" name_with_options_header = if os_version "macOS Version" + elsif cask_install + "Token" else "Name (with options)" end @@ -314,7 +316,7 @@ module Homebrew raise UsageError, "days must be one of #{valid_days.join(", ")}" unless valid_days.include?(days) category = args.category || "install" - valid_categories = %w[install install-on-request build-error os-version] + valid_categories = %w[install install-on-request cask-install build-error os-version] unless valid_categories.include?(category) raise UsageError, "category must be one of #{valid_categories.join(", ")}" end @@ -323,10 +325,13 @@ module Homebrew return if json.blank? || json["items"].blank? os_version = category == "os-version" + cask_install = category == "cask-install" results = {} json["items"].each do |item| key = if os_version item["os_version"] + elsif cask_install + item["cask"] else item["formula"] end @@ -341,7 +346,7 @@ module Homebrew return end - analytics_table(category, days, results, os_version: os_version) + analytics_table(category, days, results, os_version: os_version, cask_install: cask_install) end def output_formula_analytics(f) diff --git a/docs/Manpage.md b/docs/Manpage.md index b4ec74f7bf..49e37761e0 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -203,7 +203,7 @@ Display brief statistics for your Homebrew installation. * `--days`: The value for `days` must be `30`, `90` or `365`. The default is `30`. * `--category`: - The value for `category` must be `install`, `install-on-request`, `build-error` or `os-version`. The default is `install`. + The value for `category` must be `install`, `install-on-request`, `cask-install`, `build-error` or `os-version`. The default is `install`. * `--github`: Open a browser to the GitHub History page for provided *`formula`*. To view formula history locally: `brew log -p` *`formula`* * `--json`: diff --git a/manpages/brew.1 b/manpages/brew.1 index e73a4224e4..a0f257f496 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -243,7 +243,7 @@ The value for \fBdays\fR must be \fB30\fR, \fB90\fR or \fB365\fR\. The default i . .TP \fB\-\-category\fR -The value for \fBcategory\fR must be \fBinstall\fR, \fBinstall\-on\-request\fR, \fBbuild\-error\fR or \fBos\-version\fR\. The default is \fBinstall\fR\. +The value for \fBcategory\fR must be \fBinstall\fR, \fBinstall\-on\-request\fR, \fBcask\-install\fR, \fBbuild\-error\fR or \fBos\-version\fR\. The default is \fBinstall\fR\. . .TP \fB\-\-github\fR