Show uploading process

Author: MikeBild

bin/dropstack-deploy

@@ -63,11 +63,11 @@ function deploy({folder, token, variables, instances, alias, https, type, url, e
     .then(settings => {
       console.log(`Deploying ${chalk.green.underline(settings.alias || settings.name || '-')} for ${chalk.green.underline(settings.username || '-')} on ${chalk.green.underline(settings.url || '-')}`);
       if(verbose) {
-        console.log(chalk.gray(`${settings.name || '--------'} packing ... please wait!`));
+        console.log(chalk.gray(`${settings.name || '--------'} packing ...`));
       } else {
         process.stdout.cursorTo(0);
         process.stdout.clearLine();
-        process.stdout.write(chalk.gray(' Packing ... please wait!'));
+        process.stdout.write(chalk.gray(' Packing ...'));
       }
       fstream.Reader({ path: args, type: 'Directory', follow: false, filter: x => tarFileFilter(x, settings.excludes)})
         .on('error', err => console.error(chalk.red(`\nAn unexpected error occurred!\nMessage: ${chalk.gray(err.message)}`)))
@@ -125,11 +125,11 @@ function deployment(settings, verbose) {
   const startDate = new Date();
 
   if(verbose) {
-    console.log(chalk.gray(`${settings.name || '--------'} uploading ... please wait!`))
+    console.log(chalk.gray(`${settings.name || '--------'} uploading`))
   } else {
     process.stdout.cursorTo(0);
     process.stdout.clearLine();
-    process.stdout.write(chalk.gray(`  Uploading ... please wait!`))
+    process.stdout.write(chalk.gray(`  Uploading`))
   };
 
   if(settings.name) form.append('serviceName', settings.name);
@@ -139,7 +139,20 @@ function deployment(settings, verbose) {
   if(settings.instances) form.append('serviceInstances', settings.instances);
   if(settings.aliveEndpoint) form.append('serviceAliveEndpoint', settings.aliveEndpoint);
   if(settings.variables) form.append('serviceVariables', settings.variables);
-  form.append(pathObj.name, fs.createReadStream(settings.tarPath));
+  const tarStream = fs.createReadStream(settings.tarPath);
+  const stat = fs.statSync(settings.tarPath);
+  let uploadedSize = 0;
+  tarStream.on('data', buffer => {
+    uploadedSize += buffer.length;
+    if(verbose) {
+      console.log(chalk.gray(`${settings.name || '--------'} ${(uploadedSize/stat.size*100).toFixed(2)}% uploaded`));
+    } else {
+      process.stdout.cursorTo(0);
+      process.stdout.clearLine();
+      process.stdout.write(chalk.gray(`  ${(uploadedSize/stat.size*100).toFixed(2)}% uploaded`));
+    }
+  });
+  form.append(pathObj.name, tarStream);
 
   return new Promise((resolve, reject) => {
     const spin = ' ⢹⢺⢼⣸⣇⡧⡗⡏'.split('');

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dropstack-cli",
-  "version": "2.3.10",
+  "version": "2.3.11",
   "description": "A CLI to simplify continuous deployments into hybrid clouds.",
   "author": "Mike Bild <mike@codecommission.com>",
   "homepage": "https://github.com/codecommission/dropstack-cli#readme",

yarn.lock

@@ -21,10 +21,10 @@ ansi-styles@^2.2.1:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
 ansi-styles@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750"
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
   dependencies:
-    color-convert "^1.0.0"
+    color-convert "^1.9.0"
 
 any-promise@^1.0.0, any-promise@^1.3.0:
   version "1.3.0"
@@ -53,8 +53,8 @@ block-stream@*:
     inherits "~2.0.0"
 
 boxen@^1.0.0, boxen@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.2.0.tgz#03478d84be7fe02189b80904d81d6a80384368f1"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.2.1.tgz#0f11e7fe344edb9397977fc13ede7f64d956481d"
   dependencies:
     ansi-align "^2.0.0"
     camelcase "^4.0.0"
@@ -105,7 +105,7 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-color-convert@^1.0.0:
+color-convert@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
   dependencies:
@@ -138,8 +138,8 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
 configstore@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.0.tgz#45df907073e26dfa1cf4b2d52f5b60545eaa11d1"
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90"
   dependencies:
     dot-prop "^4.1.0"
     graceful-fs "^4.1.2"
@@ -211,8 +211,8 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
 eventsource@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.4.tgz#029450d04ebd34e4cf061788c595faa5f4c10843"
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.5.tgz#1f012c9df0bd8832fd6b1744fea00ccdd479f046"
   dependencies:
     original "^1.0.0"
 
@@ -608,8 +608,8 @@ semver-diff@^2.0.0:
     semver "^5.0.3"
 
 semver@^5.0.3, semver@^5.1.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
 shebang-command@^1.2.0:
   version "1.2.0"
@@ -642,8 +642,8 @@ string-width@^1.0.1:
     strip-ansi "^3.0.0"
 
 string-width@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.0.tgz#030664561fc146c9423ec7d978fe2457437fe6d0"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
@@ -673,8 +673,8 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
 supports-color@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.0.tgz#ad986dc7eb2315d009b4d77c8169c2231a684037"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836"
   dependencies:
     has-flag "^2.0.0"