fix(progress): Correctly avoid progress where we don't want it

lerna · Dec 31, 2018 · 0de3df9 · 0de3df9
1 parent 8957648
commit 0de3df9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/commands/bootstrap/index.js b/commands/bootstrap/index.js
@@ -119,6 +119,8 @@ class BootstrapCommand extends Command {
     const filteredLength = this.filteredPackages.length;
     const packageCountLabel = `${filteredLength} package${filteredLength > 1 ? "s" : ""}`;
 
+    // root install does not need progress bar
+    this.enableProgressBar();
     this.logger.info("", `Bootstrapping ${packageCountLabel}`);
 
     const tasks = [

diff --git a/commands/clean/index.js b/commands/clean/index.js
@@ -44,6 +44,8 @@ class CleanCommand extends Command {
   }
 
   execute() {
+    this.enableProgressBar();
+
     const tracker = this.logger.newItem("clean");
     const mapper = dirPath => {
       tracker.info("clean", "removing", dirPath);

diff --git a/commands/import/index.js b/commands/import/index.js
@@ -186,6 +186,8 @@ class ImportCommand extends Command {
   }
 
   execute() {
+    this.enableProgressBar();
+
     const tracker = this.logger.newItem("execute");
     const mapper = sha => {
       tracker.info(sha);

diff --git a/commands/publish/index.js b/commands/publish/index.js
@@ -164,6 +164,7 @@ class PublishCommand extends Command {
   }
 
   execute() {
+    this.enableProgressBar();
     this.logger.info("publish", "Publishing packages to npm...");
 
     let chain = Promise.resolve();

diff --git a/core/command/index.js b/core/command/index.js
@@ -183,7 +183,7 @@ class Command {
   }
 
   configureLogging() {
-    const { loglevel, progress = true } = this.options;
+    const { loglevel } = this.options;
 
     if (loglevel) {
       log.level = loglevel;
@@ -192,11 +192,6 @@ class Command {
     // handle log.success()
     log.addLevel("success", 3001, { fg: "green", bold: true });
 
-    /* istanbul ignore next */
-    if (progress) {
-      log.enableProgress();
-    }
-
     // create logger that subclasses use
     Object.defineProperty(this, "logger", {
       value: log.newGroup(this.name),
@@ -206,6 +201,13 @@ class Command {
     log.resume();
   }
 
+  enableProgressBar() {
+    /* istanbul ignore next */
+    if (this.options.progress !== false) {
+      log.enableProgress();
+    }
+  }
+
   gitInitialized() {
     const opts = {
       cwd: this.project.rootPath,