fix: disable interactivity for non-tty terminals

imhoffd · imhoffd · commit aa5ee25b3ef2 · 2018-03-29T10:17:08.000-05:00
fixes ionic-team#3047
diff --git a/packages/@ionic/cli-framework/src/definitions.ts b/packages/@ionic/cli-framework/src/definitions.ts
@@ -20,6 +20,11 @@ export interface Colors {
   input: Chalk;
 }
 
+export interface TerminalInfo {
+  tty: boolean;
+  ci: boolean;
+}
+
 export type ParsedArg = string | boolean | null | undefined | string[];
 export type Validator = (input?: string, key?: string) => true | string;
 
diff --git a/packages/@ionic/cli-framework/src/utils/terminal.ts b/packages/@ionic/cli-framework/src/utils/terminal.ts
@@ -0,0 +1,25 @@
+import * as Debug from 'debug';
+
+import { TerminalInfo } from '../definitions';
+
+const debug = Debug('ionic:cli-framework:utils:terminal');
+
+/**
+ * These environment variables work for: Travis CI, CircleCI, Gitlab CI,
+ * AppVeyor, CodeShip, Jenkins, TeamCity, Bitbucket Pipelines, AWS CodeBuild
+ */
+export const CI_ENVIRONMENT_VARIABLES = ['CI', 'BUILD_ID', 'BUILD_NUMBER', 'BITBUCKET_COMMIT', 'CODEBUILD_BUILD_ARN'];
+
+export function getTerminalInfo(): TerminalInfo {
+  const vars = CI_ENVIRONMENT_VARIABLES.filter(v => !!process.env[v]);
+  const detectedCI = vars.length > 0;
+
+  if (detectedCI) {
+    debug(`Environment variables for CI detected: ${vars.join(', ')}`);
+  }
+
+  return {
+    tty: process.stdout.isTTY ? true : false,
+    ci: detectedCI,
+  };
+}
diff --git a/packages/@ionic/cli-utils/package.json b/packages/@ionic/cli-utils/package.json
@@ -40,7 +40,6 @@
     "@ionic/cli-framework": "1.0.0-rc.1",
     "@ionic/discover": "1.0.0-rc.1",
     "chalk": "^2.3.0",
-    "ci-info": "^1.1.2",
     "cross-spawn": "^6.0.3",
     "debug": "^3.1.0",
     "diff": "^3.4.0",
diff --git a/packages/@ionic/cli-utils/src/index.ts b/packages/@ionic/cli-utils/src/index.ts
@@ -3,11 +3,11 @@ import * as path from 'path';
 
 import chalk from 'chalk';
 import * as Debug from 'debug';
-import { isCI } from 'ci-info';
 
 import { PackageJson, parseArgs } from '@ionic/cli-framework';
 import { findBaseDirectory } from '@ionic/cli-framework/utils/fs';
 import { readPackageJsonFile } from '@ionic/cli-framework/utils/npm';
+import { getTerminalInfo } from '@ionic/cli-framework/utils/terminal';
 
 import * as inquirerType from 'inquirer';
 
@@ -73,8 +73,10 @@ export async function generateIonicEnvironment(ctx: IonicContext, pargv: string[
   let prefix: LogPrefix = '';
 
   const configData = await config.load();
+  const terminalInfo = getTerminalInfo();
+  debug('Terminal info: %o', terminalInfo);
 
-  if (isCI || configData.interactive === false) {
+  if (configData.interactive === false || !terminalInfo.tty || terminalInfo.ci) {
     flags.interactive = false;
   }
 
diff --git a/packages/@ionic/cli-utils/src/lib/command.ts b/packages/@ionic/cli-utils/src/lib/command.ts
@@ -32,7 +32,7 @@ export abstract class Command extends BaseCommand<ICommand, INamespace, CommandM
       await this.validate(inputs);
     } catch (e) {
       if (!this.env.flags.interactive) {
-        this.env.log.warn(`Command ran non-interactively due to ${chalk.green('--no-interactive')} flag, CI being detected, or a config setting.`);
+        this.env.log.warn(`Command ran non-interactively due to ${chalk.green('--no-interactive')} flag, CI being detected, non-TTY, or a config setting.`);
       }
 
       throw e;
diff --git a/packages/@ionic/cli-utils/tsconfig.json b/packages/@ionic/cli-utils/tsconfig.json
@@ -4,7 +4,6 @@
     "outDir": "./"
   },
   "include": [
-    "../../../types/ci-info.d.ts",
     "../../../types/cross-spawn.d.ts",
     "../../../types/elementtree.d.ts",
     "../../../types/leek.d.ts",
diff --git a/types/ci-info.d.ts b/types/ci-info.d.ts

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export abstract class Command extends BaseCommand<ICommand, INamespace, CommandM`
`32`	`32`	`await this.validate(inputs);`
`33`	`33`	`} catch (e) {`
`34`	`34`	`if (!this.env.flags.interactive) {`
`35`		- this.env.log.warn(`Command ran non-interactively due to ${chalk.green('--no-interactive')} flag, CI being detected, or a config setting.`);
	`35`	+ this.env.log.warn(`Command ran non-interactively due to ${chalk.green('--no-interactive')} flag, CI being detected, non-TTY, or a config setting.`);
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`throw e;`