Merge branch 'develop', prepare v6.0.1

Author: yamalight

.gitignore

@@ -7,6 +7,7 @@ exoframe-macos
 exoframe-win.exe
 .idea/
 .DS_Store
+dist/
 
 package-lock.json
 exoframe.json

.travis.yml

@@ -10,6 +10,7 @@ script:
 
 after_success:
   - yarn coveralls
+  - yarn build
   - yarn package
 
 deploy:
@@ -26,13 +27,15 @@ deploy:
       repo: exoframejs/exoframe
   - provider: npm
     email: yamalight@gmail.com
+    skip_cleanup: true
     api_key:
       secure: qAIUnXMdpq7+rEch+hhWehdEpDMd1ZxjMwvlr3QuNkYH3SAgmB9aDeAgcjcOR/gZysH5dXU5s/7paMAur/CnHD7fqapkk01QWjusi4Z+xzznnX0srvysaYg2Eaev6SM666aWtrzxVSZw8aX1BH5k8wjzoNLQ5ARGSKpMRtjXsWkz9RczglgY6vSyz8vuJ+Bw5qlFfiIHt3tI7Ns5NgqkdSTSexX6YaKzZqdv0SNvZu8bCFhUPrE4VmgLVtKGno4ML7sodFEOEs65fPRrznjQW0M5mO9hYGmfU36W4VwXoDr8miBb/dXSjb9Hm/nX3vtf90HtuIb2noxCPLGWku7/NQj76JSzp9PS1X17w7glj/+b5tJsG5V2VRwO0Ta+MnO/0mH2Wbk9K57ZprTVnNirrRX4hYMfn1QPAJEpdSsNpOgTr/LyXbDf1sG84F6337tbJWr3bq1v9go3W3c87Ara32c006NzfXtqC+79+chJi9YqEG6kla6PLj2pdYR9yr2QsYRJo61DG5+xUeHQXQDCLy/f9kpaS24DRlziilqfIzgET+l+TeRtNN18aZAjKFNCKPdtAfPlIWA03LLwG+2KGAP4UfzRIrdIROPDZ9k6Y9/bFKNM3UNF7GBHP9p3rFAQ6yhuOL7BzA/U27E57sU+ZtJQP0iVT9EmjNzQyg/vkzU=
     on:
       tags: true
       repo: exoframejs/exoframe
   - provider: npm
     email: yamalight@gmail.com
+    skip_cleanup: true
     tag: next
     api_key:
       secure: qAIUnXMdpq7+rEch+hhWehdEpDMd1ZxjMwvlr3QuNkYH3SAgmB9aDeAgcjcOR/gZysH5dXU5s/7paMAur/CnHD7fqapkk01QWjusi4Z+xzznnX0srvysaYg2Eaev6SM666aWtrzxVSZw8aX1BH5k8wjzoNLQ5ARGSKpMRtjXsWkz9RczglgY6vSyz8vuJ+Bw5qlFfiIHt3tI7Ns5NgqkdSTSexX6YaKzZqdv0SNvZu8bCFhUPrE4VmgLVtKGno4ML7sodFEOEs65fPRrznjQW0M5mO9hYGmfU36W4VwXoDr8miBb/dXSjb9Hm/nX3vtf90HtuIb2noxCPLGWku7/NQj76JSzp9PS1X17w7glj/+b5tJsG5V2VRwO0Ta+MnO/0mH2Wbk9K57ZprTVnNirrRX4hYMfn1QPAJEpdSsNpOgTr/LyXbDf1sG84F6337tbJWr3bq1v9go3W3c87Ara32c006NzfXtqC+79+chJi9YqEG6kla6PLj2pdYR9yr2QsYRJo61DG5+xUeHQXQDCLy/f9kpaS24DRlziilqfIzgET+l+TeRtNN18aZAjKFNCKPdtAfPlIWA03LLwG+2KGAP4UfzRIrdIROPDZ9k6Y9/bFKNM3UNF7GBHP9p3rFAQ6yhuOL7BzA/U27E57sU+ZtJQP0iVT9EmjNzQyg/vkzU=

package.json

@@ -1,40 +1,33 @@
 {
   "name": "exoframe",
-  "version": "6.0.0",
+  "version": "6.0.4-dev",
   "description": "Exoframe is a self-hosted tool that allows simple one-command deployments using Docker",
-  "main": "index.js",
+  "main": "dist/index.js",
   "repository": "git@github.com:exoframejs/exoframe.git",
   "author": "Tim Ermilov <yamalight@gmail.com>",
   "license": "MIT",
   "bin": {
-    "exoframe": "bin/index.js"
+    "exoframe": "dist/index.js"
   },
+  "files": [
+    "dist/locales/*",
+    "dist/index.js",
+    "dist/xdg-open"
+  ],
   "scripts": {
     "lint": "eslint src/ test/",
     "test": "TZ=Greenland NODE_ENV=testing jest --coverage --silent --maxWorkers=2 --ci",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
-    "package": "pkg --targets node12.2.0-linux-x64,node12.2.0-win-x64,node12.2.0-macos-x64 -o exoframe index.js"
+    "build": "ncc build bin/index.js -o dist",
+    "package": "pkg --targets node12.2.0-linux-x64,node12.2.0-win-x64,node12.2.0-macos-x64 -o exoframe dist/index.js"
   },
-  "dependencies": {
+  "dependencies": {},
+  "devDependencies": {
+    "@zeit/ncc": "^0.20.5",
     "apache-md5": "^1.1.2",
-    "boxen": "^4.1.0",
+    "babel-eslint": "^10.0.3",
     "chalk": "^2.4.2",
     "cli-table3": "^0.5.1",
-    "got": "^9.6.0",
-    "highland": "^2.13.5",
-    "inquirer": "^7.0.0",
-    "js-yaml": "^3.13.1",
-    "jsonwebtoken": "^8.5.1",
-    "lodash": "^4.17.15",
-    "multimatch": "^4.0.0",
-    "open": "^7.0.0",
-    "ora": "^4.0.2",
-    "tar-fs": "^2.0.0",
-    "update-notifier": "^3.0.1",
-    "yargs": "^14.2.0"
-  },
-  "devDependencies": {
-    "babel-eslint": "^10.0.3",
     "coveralls": "^3.0.7",
     "eslint": "^6.6.0",
     "eslint-config-prettier": "^6.5.0",
@@ -44,11 +37,24 @@
     "eslint-plugin-prettier": "^3.1.1",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
+    "got": "^9.6.0",
+    "highland": "^2.13.5",
+    "inquirer": "^7.0.0",
     "jest": "^24.9.0",
+    "js-yaml": "^3.13.1",
+    "jsonwebtoken": "^8.5.1",
+    "latest-version": "^5.1.0",
+    "lodash": "^4.17.15",
+    "multimatch": "^4.0.0",
     "nock": "^11.7.0",
+    "open": "^7.0.0",
+    "ora": "^4.0.2",
     "pkg": "^4.4.0",
     "prettier": "^1.18.2",
-    "sinon": "^7.5.0"
+    "semver-diff": "^3.1.1",
+    "sinon": "^7.5.0",
+    "tar-fs": "^2.0.0",
+    "yargs": "^14.2.0"
   },
   "jest": {
     "testEnvironment": "node"

src/commands/completion.js

@@ -0,0 +1,9 @@
+// custom completion target
+// fixes completion not working with catch-all command
+// see https://github.com/yargs/yargs/issues/1261
+module.exports = yargs => ({
+  command: ['completion'],
+  describe: 'generate completion script',
+  builder: {},
+  handler: () => yargs.showCompletionScript(),
+});

src/index.js

@@ -25,11 +25,11 @@ const update = require('./commands/update');
 const template = require('./commands/template');
 const setup = require('./commands/setup');
 const secrets = require('./commands/secrets');
+const completion = require('./commands/completion');
 
 // init program
 yargs
   .version(pkg.version)
-  .completion('completion')
   .demand(1)
   .help()
   .command(deploy)
@@ -44,4 +44,5 @@ yargs
   .command(update)
   .command(template)
   .command(setup)
-  .command(secrets).argv;
+  .command(secrets)
+  .command(completion(yargs)).argv;

src/util/checkUpdate.js

@@ -1,36 +1,30 @@
 // npm packages
 const chalk = require('chalk');
-const boxen = require('boxen');
-const updateNotifier = require('update-notifier');
+const latestVersion = require('latest-version');
+const semverDiff = require('semver-diff');
 
-// boxen options
-const boxenOpts = {
-  padding: 1,
-  margin: 1,
-  align: 'center',
-  borderColor: 'yellow',
-  borderStyle: 'round',
-};
 // packaged script path
 const pkgPath = '/snapshot/exoframe-cli/src/util';
 
 // check function
-module.exports = pkg => {
+module.exports = async pkg => {
+  const current = pkg.version;
   // Checks for available update and returns an instance
-  const notifier = updateNotifier({
-    pkg,
-    updateCheckInterval: 1000,
-  });
+  const latest = await latestVersion('exoframe').then(r => r.trim());
   // show message if update is available
-  if (notifier.update) {
-    const {update} = notifier;
+  if (semverDiff(current, latest)) {
     const isPackaged = __dirname === pkgPath;
     const upNpmMsg = `Run ${chalk.cyan('npm i -g exoframe')} to update`;
     const upPkgMsg = `Download from ${chalk.cyan('https://github.com/exoframejs/exoframe/releases')}`;
     const upmsg = isPackaged ? upPkgMsg : upNpmMsg;
-    const message = `Update available ${chalk.dim(update.current)} ${chalk.reset(' → ')} ${chalk.green(
-      update.latest
-    )}\n${upmsg}`;
-    console.log(`\n${boxen(message, boxenOpts)}`);
+    const message = `Update available ${chalk.dim(current)} ${chalk.reset('→')} ${chalk.green(latest)}`;
+    console.log(`
+  ┌───────────────────────────────────────┐
+  │                                       │
+  │     ${message}    │
+  │    ${upmsg}    │
+  │                                       │
+  └───────────────────────────────────────┘
+  `);
   }
 };