chore: fix spinner and logs collection

Author: gabrielcsapo

bin/deploy-delete.js

@@ -1,6 +1,9 @@
 #!/usr/bin/env node
+import ora from 'ora';
+
+export default async function(cli) {
+  const spinner = ora().start();
 
-export default async function(cli, spinner) {
   spinner.text = `Deleting deployment ${cli.application}`;
 
   const { token, username } = await cli.getCredentials();

bin/deploy-deploy.js

@@ -2,8 +2,11 @@
 
 import fs from 'fs';
 import path from 'path';
+import ora from 'ora';
+
+export default async function(cli) {
+  const spinner = ora().start();
 
-export default async function(cli, spinner) {
   spinner.text = 'Creating application bundle';
 
   await cli.createBundle(process.cwd());

bin/deploy-list.js

@@ -2,8 +2,11 @@
 import moment from 'moment';
 import Url from 'url';
 import Table from 'turtler';
+import ora from 'ora';
+
+export default async function(cli) {
+  const spinner = ora().start();
 
-export default async function(cli, spinner) {
   spinner.text = 'Getting deployment list';
 
   const { token, username } = await cli.getCredentials();

bin/deploy-login.js

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
 import inquirer from 'inquirer';
+import ora from 'ora';
 
-export default async function(cli, spinner) {
-  spinner.stop();
+export default async function(cli) {
+  const spinner = ora().start();
 
   const { username, password } = await inquirer.prompt([
     {
@@ -34,5 +35,5 @@ export default async function(cli, spinner) {
   const credentials = await cli.login({ username, password});
   await cli.cacheCredentials(credentials);
 
-  console.log(`Successfully logged in as ${credentials.username}`); // eslint-disable-line
+  spinner.succeed(`Logged in as ${credentials.username}`); // eslint-disable-line
 };

bin/deploy-logout.js

@@ -1,12 +1,16 @@
 #!/usr/bin/env node
 
-export default async function(cli, spinner) {
+import ora from 'ora';
+
+export default async function(cli) {
+  const spinner = ora().start();
+
   const { token, username } = await cli.getCredentials();
 
   spinner.text = `Logging out of current session for ${username}`;
 
   await cli.logout({ token, username });
   await cli.cacheCredentials({ username: '', token: '' });
 
-  spinner.succeed(`Logged out of session for ${username} successfully`);
+  spinner.succeed(`Logged out as ${username}`);
 };

bin/deploy-logs.js

@@ -1,19 +1,22 @@
 #!/usr/bin/env node
 
-export default async function(cli, spinner) {
-  spinner.text = `Getting logs for ${cli.application}`;
+import ora from 'ora';
+
+export default async function(cli) {
+  const spinner = ora().start();
+
+  spinner.text = `Getting logs for application: "${cli.application}"`;
 
   const { token, username } = await cli.getCredentials();
   const { logs } = await cli.getLogs({ token, username, name: cli.application });
 
-  spinner.stop();
-
   if(logs) {
-    console.log('' + // eslint-disable-line
-    `==========
-      ${logs.join('').trim()}
-    ==========`);
+    spinner.info(`
+==========
+${logs.join('').trim()}
+==========
+    `);
   } else {
-    console.log('No logs available 🙈'); // eslint-disable-line
+    spinner.info('No logs available 🙈'); // eslint-disable-line
   }
 };

bin/deploy-open.js

@@ -2,8 +2,11 @@
 
 import Url from 'url';
 import opn from 'opn';
+import ora from 'ora';
+
+export default async function(cli) {
+  const spinner = ora().start();
 
-export default async function(cli, spinner) {
   spinner.text = 'Opening up url to deployment instance';
 
   const { token, username } = await cli.getCredentials();

bin/deploy-register.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 
 import inquirer from 'inquirer';
+import ora from 'ora';
 
-export default async function(cli, spinner) {
-  spinner.stop();
+export default async function(cli) {
+  const spinner = ora().start();
 
   const { username, password } = await inquirer.prompt([
     {
@@ -36,5 +37,5 @@ export default async function(cli, spinner) {
   const credentials = await cli.register({ username, password });
   await cli.cacheCredentials(credentials);
 
-  console.log(`registered as ${credentials.username}`); // eslint-disable-line
+  spinner.succeed(`registered as ${credentials.username}`); // eslint-disable-line
 };

bin/deploy-server.js

@@ -1,6 +1,10 @@
 #!/usr/bin/env node
 
-export default async function(cli, spinner) {
+import ora from 'ora';
+
+export default async function(cli) {
+  const spinner = ora().start();
+
   const { default: importCommand } = await import('../index.js');
 
   importCommand(cli, spinner);

bin/deploy-whoami.js

@@ -1,12 +1,14 @@
 #!/usr/bin/env node
 
-export default async function(cli, spinner) {
+import ora from 'ora';
+
+export default async function(cli) {
+  const spinner = ora().start();
+
   spinner.text = 'Figuring out who you are';
 
   const { token, username } = await cli.getCredentials();
   const { user } = await cli.getUserDetails({ token, username });
 
-  spinner.stop();
-  
-  console.log(`currently logged in as ${user.username}`); // eslint-disable-line
+  spinner.info(`currently logged in as ${user.username}`); // eslint-disable-line
 };

bin/deploy.js

@@ -92,7 +92,6 @@ let program = woof(`
 
 (async function() {
   const cli = new CLI(program);
-  const spinner = ora('').start();
 
   let found = false;
   let commands = ['deploy','list','register','whoami','login','logout','open','logs','delete','server'];
@@ -104,12 +103,10 @@ let program = woof(`
         found = true;
 
         const { default: commandImported } = await import(`./deploy-${command}.js`);
-        commandImported(cli, spinner);
+        commandImported(cli);
       } catch(ex) {
-        spinner.stop();
         if(ex === 'credentials not found') return console.log('Please login for this action'); // eslint-disable-line
-        console.log(ex.stack);
-        console.log(`something happened when running ${command} \n ${ex}`); // eslint-disable-line
+        console.log(`something happened when running ${command} \n ${ex.stack}`); // eslint-disable-line
       }
     }
   }
@@ -120,13 +117,11 @@ let program = woof(`
     try {
       found = true;
       const { default: commandImported } = await import(`./deploy-deploy.js`);
-      commandImported(cli, spinner);
+      commandImported(cli);
     } catch(ex) {
-      spinner.stop();
-      console.log(`something happened when running deploy \n ${ex}`); // eslint-disable-line
+      console.log(`something happened when running deploy \n ${ex.stack}`); // eslint-disable-line
     }
   }
 
-  spinner.stop();
   updateNotifier({pkg}).notify();
 }());

lib/models/deployment.js

@@ -408,6 +408,8 @@ class Deployment {
 
         setTimeout(function() {
           cStream.destroy();
+
+          return resolve(logs);
         }, 2000);
       } catch(ex) {
         return reject(ex);