Merge branch 'develop', prepare 0.17.1

Author: yamalight

.eslintrc

@@ -34,6 +34,9 @@
       "bracketSpacing": false,
       "printWidth": 120
     }],
-    "no-console": "off"
+    "no-console": "off",
+    "no-unused-expressions": "off",
+    "no-param-reassign": "off",
+    "no-return-assign": "off"
   }
 }

docs/Links.md

@@ -0,0 +1,12 @@
+# Articles, video and related links
+
+### Articles
+
+- [Introducing Exoframe (beta) — self-hosted alternative to Now.sh](https://hackernoon.com/introducing-exoframe-beta-self-hosted-alternative-to-now-sh-80643f96b84b)
+- [Continuous deployment for your Node.js projects in 10 minutes with Exoframe](https://hackernoon.com/continuous-deployment-for-your-node-js-projects-in-10-minutes-with-exoframe-bdf48340c1be)
+- [Simplifying Docker management with Exoframe](https://hackernoon.com/simplifying-docker-management-with-exoframe-9275e92c7406)
+
+### Videos
+
+- [Introducing Exoframe - self-hosted Now.sh alternative](https://www.youtube.com/watch?v=VZnYKIoh5oA)
+- [Continuous Deployment for Node.js projects in 10 mins using Exoframe](https://www.youtube.com/watch?v=AEwLt5hmKYo)

docs/README.md

@@ -2,4 +2,5 @@
 
 * [Basics](Basics.md)
 * [FAQ](FAQ.md)
+* [Articles, video and related links](Links.md)
 * [Change Log](../CHANGELOG.md)

package.json

@@ -14,23 +14,24 @@
     "coveralls": "cat ./coverage/lcov.info | coveralls"
   },
   "dependencies": {
-    "chalk": "^2.0.1",
+    "chalk": "^2.1.0",
     "cli-table": "^0.3.1",
     "got": "^7.1.0",
-    "ignore": "^3.3.0",
-    "inquirer": "^3.2.1",
+    "ignore": "^3.3.3",
+    "inquirer": "^3.2.2",
     "js-yaml": "^3.9.1",
-    "jsonwebtoken": "^7.4.1",
+    "jsonwebtoken": "^7.4.3",
     "lodash": "^4.17.4",
-    "open": "0.0.5",
-    "ora": "^1.2.0",
-    "tar-fs": "^1.15.2",
-    "yargs": "^8.0.1"
+    "opn": "^5.1.0",
+    "ora": "^1.3.0",
+    "tar-fs": "^1.15.3",
+    "yargs": "^8.0.2"
   },
   "devDependencies": {
     "coveralls": "^2.13.1",
     "nock": "^9.0.14",
-    "sinon": "^2.4.1",
-    "tap": "^10.7.1"
+    "proxyquire": "^1.8.0",
+    "sinon": "^3.2.1",
+    "tap": "^10.7.2"
   }
 }

src/commands/deploy.js

@@ -7,7 +7,7 @@ const path = require('path');
 const fs = require('fs');
 const ora = require('ora');
 const Table = require('cli-table');
-const open = require('open');
+const opn = require('opn');
 
 // my modules
 const {userConfig, isLoggedIn, logout} = require('../config');
@@ -50,8 +50,8 @@ exports.builder = {
   },
   open: {
     alias: 'o',
-    description: 'Open deployed project in browser after upload'
-  }
+    description: 'Open deployed project in browser after upload',
+  },
 };
 exports.handler = async (args = {}) => {
   const deployToken = args.token;
@@ -138,13 +138,15 @@ exports.handler = async (args = {}) => {
     const formattedServices = formatServices(res.deployments);
     formattedServices.forEach(({name, domain, host}) => {
       resultTable.push([name, domain, host]);
-      if(args.open){
-        open('http://' + domain);
-      }
     });
 
     // draw table
     console.log(resultTable.toString());
+
+    // open in browser
+    if (args.open && formattedServices[0].domain && formattedServices[0].domain !== 'not set') {
+      opn(`http://${formattedServices[0].domain.split(',')[0].trim()}`);
+    }
   } catch (e) {
     spinner.fail('Upload failed!');
     // if authorization is expired/broken/etc

test/deploy.js

@@ -4,11 +4,17 @@ const fs = require('fs');
 const path = require('path');
 const nock = require('nock');
 const sinon = require('sinon');
+const proxyquire = require('proxyquire');
 
 // our packages
-const {handler: deploy} = require('../src/commands/deploy');
 const {userConfig, updateConfig} = require('../src/config');
 
+// opn stub
+const opnStub = sinon.spy();
+
+// require deploy with stub for opn
+const {handler: deploy} = proxyquire('../src/commands/deploy', {opn: opnStub});
+
 module.exports = () => {
   const folder = 'test_html_project';
   const folderPath = path.join('test', 'fixtures', folder);
@@ -178,6 +184,41 @@ module.exports = () => {
     });
   });
 
+  // test
+  tap.test('Should open webpage after deploy', 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, {status: 'success', deployments}]);
+    });
+
+    // execute
+    deploy({open: true}).then(() => {
+      // make sure log in was successful
+      // check that server was called
+      t.ok(deployServer.isDone());
+      // make sure opn was called once
+      t.ok(opnStub.calledOnce);
+      // first check console output
+      t.deepEqual(
+        consoleSpy.args,
+        [
+          ['Deploying current project to endpoint:', 'http://localhost:8080'],
+          ['Your project is now deployed as:\n'],
+          ['   ID         URL             Hostname   \n   test       localhost       test       '],
+        ],
+        '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