From bb7cbf39bf58bfb6627e103be0e1d61f9c70ce94 Mon Sep 17 00:00:00 2001
From: Daniel Stockman <daniel.stockman@gmail.com>
Date: Mon, 1 May 2017 10:27:44 -0700
Subject: [PATCH] Disable progress bars when running in CI or non-interactive
 shell (#798)

Fixes #447
---
 package.json                    |  1 +
 src/UpdatedPackagesCollector.js |  9 +--------
 src/cli.js                      | 10 +++++++---
 yarn.lock                       |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index b6fe79fa79..835a4674c2 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "globby": "^6.1.0",
     "graceful-fs": "^4.1.11",
     "inquirer": "^3.0.6",
+    "is-ci": "^1.0.10",
     "load-json-file": "^2.0.0",
     "lodash": "^4.17.4",
     "minimatch": "^3.0.0",
diff --git a/src/UpdatedPackagesCollector.js b/src/UpdatedPackagesCollector.js
index 64bbf75e30..e59f6bd809 100644
--- a/src/UpdatedPackagesCollector.js
+++ b/src/UpdatedPackagesCollector.js
@@ -82,10 +82,9 @@ export default class UpdatedPackagesCollector {
     }
 
     const updatedPackages = {};
-    const tracker = this.logger.newItem("find updated packages");
 
     const registerUpdated = (pkg) => {
-      this.logger.verbose("has update", pkg.name);
+      this.logger.verbose("updated", pkg.name);
       updatedPackages[pkg.name] = pkg;
     };
 
@@ -94,11 +93,7 @@ export default class UpdatedPackagesCollector {
     if (!hasTags || forced.has("*")) {
       this.packages.forEach(registerUpdated);
     } else {
-      tracker.addWork(this.packages.length);
-
       this.packages.filter((pkg) => {
-        tracker.completeWork(1);
-
         if (forced.has(pkg.name)) {
           return true;
         } else {
@@ -107,8 +102,6 @@ export default class UpdatedPackagesCollector {
       }).forEach(registerUpdated);
     }
 
-    tracker.finish();
-
     return updatedPackages;
   }
 
diff --git a/src/cli.js b/src/cli.js
index 785be86ba7..8d60c40af1 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -1,4 +1,5 @@
 import dedent from "dedent";
+import isCI from "is-ci";
 import log from "npmlog";
 import yargs from "yargs/yargs";
 
@@ -21,9 +22,12 @@ export default function CLI(argv, cwd) {
     "version",
   ]);
 
-  if (process.stdout.isTTY) {
-    // log.enableColor();
-    // log.enableUnicode();
+  if (isCI || !process.stderr.isTTY) {
+    log.disableColor();
+    log.disableProgress();
+  } else if (process.stderr.isTTY) {
+    log.enableColor();
+    log.enableUnicode();
     log.enableProgress();
   }
 
diff --git a/yarn.lock b/yarn.lock
index aed02ca00d..4dcecdac68 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2045,7 +2045,7 @@ is-builtin-module@^1.0.0:
   dependencies:
     builtin-modules "^1.0.0"
 
-is-ci@^1.0.9:
+is-ci@^1.0.10, is-ci@^1.0.9:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
   dependencies: