refactor(@angular/cli): clean up analytics methods

Re-use methods were possible.

Author: alan-agius4

docs/design/analytics.md

@@ -115,14 +115,5 @@ There are 2 ways of disabling usage analytics:
    as answering "No" to the prompt.
 1. There is an `NG_CLI_ANALYTICS` environment variable that overrides the global configuration.
    That flag is a string that represents the User ID. If the string `"false"` is used it will
-   disable analytics for this run. If the string `"ci"` is used it will show up as a CI run (see
-   below).
+   disable analytics for this run.
 
-# CI
-
-A special user named `ci` is used for analytics for tracking CI information. This is a convention
-and is in no way enforced.
-
-Running on CI by default will disable analytics (because of a lack of TTY on STDIN/OUT). It can be
-manually enabled using either a global configuration with a value of `ci`, or using the
-`NG_CLI_ANALYTICS=ci` environment variable.

packages/angular/cli/bin/postinstall/analytics-prompt.js

@@ -17,10 +17,10 @@ try {
   var analytics = require('../../src/analytics/analytics');
 
   analytics
-    .hasGlobalAnalyticsConfiguration()
+    .hasAnalyticsConfig('global')
     .then((hasGlobalConfig) => {
       if (!hasGlobalConfig) {
-        return analytics.promptGlobalAnalytics();
+        return analytics.promptAnalytics(true /** global */);
       }
     })
     .catch(() => {});

packages/angular/cli/src/analytics/analytics-environment-options.ts

@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+function isDisabled(variable: string): boolean {
+  return variable === '0' || variable.toLowerCase() === 'false';
+}
+
+function isPresent(variable: string | undefined): variable is string {
+  return typeof variable === 'string' && variable !== '';
+}
+
+const analyticsVariable = process.env['NG_CLI_ANALYTICS'];
+export const analyticsDisabled = isPresent(analyticsVariable) && isDisabled(analyticsVariable);
+
+const analyticsShareVariable = process.env['NG_CLI_ANALYTICS_SHARE'];
+export const analyticsShareDisabled =
+  isPresent(analyticsShareVariable) && isDisabled(analyticsShareVariable);