Merge pull request arunoda#407 from SamuelBolduc/master

Added an uploadProgressBar option to disable it
andy4545 · May 5, 2015 · ccff8a4 · ccff8a4
2 parents 8251d7a + 4d35a82
commit ccff8a4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -101,6 +101,10 @@ This will create two files in your Meteor Up project directory:
   // Install PhantomJS on the server
   "setupPhantom": true,
 
+  // Show a progress bar during the upload of the bundle to the server. 
+  // Might cause an error in some rare cases if set to true, for instance in Shippable CI
+  "enableUploadProgressBar": true,
+
   // Application name (no spaces).
   "appName": "meteor",
 

diff --git a/example/mup.json b/example/mup.json
@@ -22,6 +22,10 @@
   // Install PhantomJS in the server
   "setupPhantom": true,
 
+  // Show a progress bar during the upload of the bundle to the server. 
+  // Might cause an error in some rare cases if set to true, for instance in Shippable CI
+  "enableUploadProgressBar": true,
+
   // Application name (No spaces)
   "appName": "meteor",
 

diff --git a/lib/actions.js b/lib/actions.js
@@ -73,7 +73,7 @@ Actions.prototype._showKadiraLink = function() {
       );
     }
   }
-}
+};
 
 Actions.prototype._executePararell = function(actionName, args) {
   var self = this;
@@ -110,6 +110,7 @@ Actions.prototype.deploy = function() {
   var deployCheckWaitTime = this.config.deployCheckWaitTime;
   var appName = this.config.appName;
   var appPath = this.config.app;
+  var enableUploadProgressBar = this.config.enableUploadProgressBar;
 
   console.log('Building Started: ' + this.config.app);
   buildApp(appPath, buildLocation, function(err) {
@@ -131,17 +132,17 @@ Actions.prototype.deploy = function() {
         sessionsData,
         function (sessionData, callback) {
           var session = sessionData.session;
-          var taskListsBuilder = sessionData.taskListsBuilder
+          var taskListsBuilder = sessionData.taskListsBuilder;
           var env = _.extend({}, self.config.env, session._serverConfig.env);
           var taskList = taskListsBuilder.deploy(
             bundlePath, env,
-            deployCheckWaitTime, appName);
+            deployCheckWaitTime, appName, enableUploadProgressBar);
           taskList.run(session, function (summaryMap) {
             callback(null, summaryMap);
           });
         },
         whenAfterDeployed(buildLocation)
-      )
+      );
     }
   });
 };
@@ -243,7 +244,7 @@ function storeLastNChars(vars, field, limit, color) {
     if(vars[field].length > 1000) {
       vars[field] = vars[field].substring(vars[field].length - 1000);
     }
-  }
+  };
 }
 
 function whenAfterDeployed(buildLocation) {
@@ -265,5 +266,5 @@ function haveSummaryMapsErrors(summaryMaps) {
 function hasSummaryMapErrors(summaryMap) {
   return _.some(summaryMap, function (summary) {
     return summary.error;
-  })
+  });
 }
diff --git a/lib/config.js b/lib/config.js
@@ -24,6 +24,9 @@ exports.read = function() {
     if(typeof mupJson.appName === "undefined") {
       mupJson.appName = "meteor";
     }
+    if(typeof mupJson.enableUploadProgressBar === "undefined") {
+      mupJson.enableUploadProgressBar = true;
+    }
 
     //validating servers
     if(!mupJson.servers || mupJson.servers.length == 0) {

diff --git a/lib/taskLists/linux.js b/lib/taskLists/linux.js
@@ -60,13 +60,13 @@ exports.setup = function(config) {
   return taskList;
 };
 
-exports.deploy = function(bundlePath, env, deployCheckWaitTime, appName) {
+exports.deploy = function(bundlePath, env, deployCheckWaitTime, appName, enableUploadProgressBar) {
   var taskList = nodemiral.taskList("Deploy app '" + appName + "' (linux)");
 
   taskList.copy('Uploading bundle', {
     src: bundlePath,
     dest: '/opt/' + appName + '/tmp/bundle.tar.gz',
-    progressBar: true
+    progressBar: enableUploadProgressBar
   });
 
   taskList.copy('Setting up Environment Variables', {