Merge branch 'develop', prepare 0.19.2

Author: yamalight

src/commands/deploy.js

@@ -64,9 +64,14 @@ exports.builder = {
     alias: 'o',
     description: 'Open deployed project in browser after upload',
   },
+  verbose: {
+    alias: 'v',
+    description: 'Verbose mode; will output more information',
+  },
 };
 exports.handler = async (args = {}) => {
   const deployToken = args.token;
+  const {verbose} = args;
 
   // exit if not logged in and no token provided
   if (!deployToken && !isLoggedIn()) {
@@ -100,6 +105,8 @@ exports.handler = async (args = {}) => {
   } catch (e) {
     const defaultConfig = JSON.stringify({name: folderName});
     fs.writeFileSync(configPath, defaultConfig, 'utf-8');
+    // if in verbose mode - log config creation
+    verbose && console.log('Create new default config:', defaultConfig);
   }
 
   // show loader
@@ -119,6 +126,8 @@ exports.handler = async (args = {}) => {
   const tarStream = tar.pack(workdir, {
     ignore: name => ig.ignores(name),
   });
+  // if in verbose mode - log ignores
+  verbose && console.log('\nIgnoring following paths:', ignores);
 
   let token = userConfig.token;
   if (deployToken) {
@@ -133,7 +142,10 @@ exports.handler = async (args = {}) => {
 
   // pipe stream to remote
   try {
-    const res = await streamToResponse({tarStream, remoteUrl, options});
+    const res = await streamToResponse({tarStream, remoteUrl, options, verbose});
+    // if in verbose mode - log response
+    verbose && console.log('\nGot response from server:', res);
+    // check deployments
     if (!res.deployments || !res.deployments.length) {
       throw new Error('Something went wrong!');
     }
@@ -168,13 +180,21 @@ exports.handler = async (args = {}) => {
       return;
     }
 
-    const reason = e.response.result ? e.response.result.error : e.toString();
-    console.log(chalk.red('Error deploying project:'), reason);
+    const response = e.response || {};
+    const reason = response.result ? response.result.error : e.toString();
+    console.log(chalk.red('Error deploying project:'), reason || 'Unknown reason');
     console.log('Build log:\n');
-    e.response.result.log
-      .filter(l => l !== undefined)
-      .map(l => l.trim())
-      .filter(l => l && l.length > 0)
-      .forEach(line => console.log(line));
+    response.result
+      ? (response.result.log || ['No log available'])
+          .filter(l => l !== undefined)
+          .map(l => l.trim())
+          .filter(l => l && l.length > 0)
+          .forEach(line => console.log(line))
+      : console.log('No log available');
+
+    // if in verbose mode - log original error and response
+    verbose && console.log('');
+    verbose && console.log('Original error:', e);
+    verbose && console.log('Original response:', e.response);
   }
 };

test/deploy.js

@@ -312,6 +312,100 @@ module.exports = () => {
     });
   });
 
+  // test
+  tap.test('Should display verbose output', t => {
+    // spy on console
+    const consoleSpy = sinon.spy(console, 'log');
+
+    // handle correct request
+    const deployServer = nock('http://localhost:8080')
+      .post('/deploy')
+      .reply((uri, requestBody, cb) => {
+        cb(null, [200, 'Bad Gateway']);
+      });
+
+    // execute
+    deploy({verbose: true}).then(() => {
+      // make sure log in was successful
+      // check that server was called
+      t.ok(deployServer.isDone());
+      // first check console output
+      t.deepEqual(
+        consoleSpy.args,
+        [
+          ['Deploying current project to endpoint:', 'http://localhost:8080'],
+          ['\nIgnoring following paths:', ['.git', 'node_modules']],
+          ['Error deploying project:', 'Bad Gateway'],
+          ['Build log:\n'],
+          ['No log available'],
+          [''],
+          [
+            'Original error:',
+            {
+              response: {
+                result: {
+                  error: 'Bad Gateway',
+                  log: ['No log available'],
+                },
+              },
+            },
+          ],
+          [
+            'Original response:',
+            {
+              result: {
+                error: 'Bad Gateway',
+                log: ['No log available'],
+              },
+            },
+          ],
+        ],
+        'Correct log output'
+      );
+      // restore console
+      console.log.restore();
+      // tear down nock
+      deployServer.done();
+      t.end();
+    });
+  });
+
+  // test
+  tap.test('Should display error on zero deployments', t => {
+    // spy on console
+    const consoleSpy = sinon.spy(console, 'log');
+
+    // handle correct request
+    const deployServer = nock('http://localhost:8080')
+      .post('/deploy')
+      .reply((uri, requestBody, cb) => {
+        cb(null, [200, {}]);
+      });
+
+    // execute
+    deploy().then(() => {
+      // make sure log in was successful
+      // check that server was called
+      t.ok(deployServer.isDone());
+      // first check console output
+      t.deepEqual(
+        consoleSpy.args,
+        [
+          ['Deploying current project to endpoint:', 'http://localhost:8080'],
+          ['Error deploying project:', 'Error: Something went wrong!'],
+          ['Build log:\n'],
+          ['No log available'],
+        ],
+        'Correct log output'
+      );
+      // restore console
+      console.log.restore();
+      // tear down nock
+      deployServer.done();
+      t.end();
+    });
+  });
+
   // test
   tap.test('Should not deploy with broken config', t => {
     // spy on console