Merge branch 'develop', prepare 0.18.0

Author: yamalight

.travis.yml

@@ -5,4 +5,13 @@ node_js: node
 cache: yarn
 
 after_success:
-  - yarn coveralls
+- yarn coveralls
+
+deploy:
+  provider: npm
+  email: [email protected]
+  api_key:
+    secure: E0jdvpJugRD1upHJI0S+g0xvDkGvGGJv0plyZaY/zHqKf5oNspok74Ew8cqkP4IRdB/G/57eXoiyCCOkQM/P44a2xt7TEiBvn4PBhxRD1Dfw+u5ukreQPAn4QCXvC9pRF2KuRSswnkZk+QYRiYUVcsv7S7C6p7xDyCw5Po0ywiHzUR75c56B657sCOG4w+wTFcawIjpb369DqPoefUK1C837YYfu0DJXX6NBrV1BN6kOUiSHITbUcwPFg5VfZLRMOZIqQzb3ud0IDfvy5KdcOiKOCes7bi179NMWG8evPr7l6NikA882xqdDjmxvUPY0x6H1tzXTKca8pzX2l5Pkh0qPXipkjgKAjrg4qrQmoH4lW3sr+6zan6Nk3RwwE7QdhuvXHuyNQ/YJHxGHr1uI5SV7AQyUCM0AtdkXnIJ97LoEm8zm/48YzeMQel53iw01quOubmRP3qv6PNJU8Nlbfy02caXhIftkEBxanXAQl8OSnYUaZYN2XmvAqlzMdyygBWhg/f7NbZLkjWY6JdzFzBnSAkghKt//CfsylYvQt7xNk7sjGvoUjuKx+hWfrCb7fnjIjWwalchyjHRRokUROx0QdRltUbZDGPL0JG3vYTlDV1/k0tkw9C3faq2ckoXccEHXItZrspAk1EYVL6FvlHPu6YqZtQupMIxszI4BvXQ=
+  on:
+    tags: true
+    repo: exoframejs/exoframe

src/commands/deploy.js

@@ -18,23 +18,28 @@ const ignores = ['.git', 'node_modules'];
 
 const streamToResponse = ({tarStream, remoteUrl, options}) =>
   new Promise((resolve, reject) => {
-    // pipe stream to remote
+    // store error and result
+    let error;
     let result = '';
+    // pipe stream to remote
     const stream = tarStream.pipe(got.stream.post(remoteUrl, options));
-    // log output if in verbose mode
+    // store output
     stream.on('data', str => (result += str.toString()));
     // listen for read stream end
     stream.on('end', () => {
       const res = JSON.parse(result);
-      // ignore errored out results
-      if (res.status !== 'success') {
+      // if stream had error - reject
+      if (error) {
+        // add response to allow access to body
+        error.response = res;
+        reject(error);
         return;
       }
-      // resolve on end
+      // otherwise resolve
       resolve(res);
     });
     // listen for stream errors
-    stream.on('error', e => reject(e));
+    stream.on('error', e => (error = e));
   });
 
 exports.command = ['*', 'deploy'];
@@ -148,14 +153,21 @@ exports.handler = async (args = {}) => {
       opn(`http://${formattedServices[0].domain.split(',')[0].trim()}`);
     }
   } catch (e) {
-    spinner.fail('Upload failed!');
+    spinner.fail('Deployment failed!');
     // if authorization is expired/broken/etc
     if (e.statusCode === 401) {
       logout(userConfig);
       console.log(chalk.red('Error: authorization expired!'), 'Please, relogin and try again.');
       return;
     }
 
-    console.log(chalk.red('Error deploying project:'), e.toString());
+    const reason = e.response.result ? e.response.result.error : e.toString();
+    console.log(chalk.red('Error deploying project:'), 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));
   }
 };

test/deploy.js

@@ -219,6 +219,51 @@ module.exports = () => {
     });
   });
 
+  // test
+  tap.test('Should display error log', 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, [
+        400,
+        {
+          status: 'error',
+          result: {
+            error: 'Build failed! See build log for details.',
+            log: ['Error log', 'here'],
+            image: 'test:latest',
+          },
+        },
+      ]);
+    });
+
+    // 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:', 'Build failed! See build log for details.'],
+          ['Build log:\n'],
+          ['Error log'],
+          ['here'],
+        ],
+        '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