Merge branch 'develop', prepare 6.2.0

Author: yamalight

.github/workflows/prerelease.yml

@@ -62,6 +62,19 @@ jobs:
       - name: package
         run: yarn package
 
+      # bump version & commit it
+      - run: npm version prerelease --preid=dev --no-git-tag-version
+      - name: setup git
+        run: |
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+          git config user.name "$GITHUB_ACTOR"
+      - name: commit new version to develop
+        run: |
+          git add -A
+          git commit -m "Bump version for @next release"
+          git push "https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # deploy to npm
       - run: npm publish --access public --tag next
         env:

README.md

@@ -2,7 +2,7 @@
 
 > Simple Docker deployment tool
 
-[![Build Status](https://travis-ci.org/exoframejs/exoframe.svg?branch=master)](https://travis-ci.org/exoframejs/exoframe)
+[![Test Status](https://github.com/exoframejs/exoframe/workflows/Test/badge.svg)](https://github.com/exoframejs/exoframe/actions?query=workflow%3ATest)
 [![Coverage Status](https://coveralls.io/repos/github/exoframejs/exoframe/badge.svg?branch=master)](https://coveralls.io/github/exoframejs/exoframe?branch=master)
 [![npm](https://img.shields.io/npm/v/exoframe.svg)](https://www.npmjs.com/package/exoframe)
 [![license](https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000)](https://opensource.org/licenses/MIT)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "exoframe",
-  "version": "6.1.4",
+  "version": "6.1.5-dev.3",
   "description": "Exoframe is a self-hosted tool that allows simple one-command deployments using Docker",
   "main": "dist/index.js",
   "repository": "git@github.com:exoframejs/exoframe.git",
@@ -51,6 +51,7 @@
     "ora": "^4.0.2",
     "pkg": "^4.4.0",
     "prettier": "^2.0.4",
+    "pretty-bytes": "^5.3.0",
     "semver-diff": "^3.1.1",
     "sinon": "^9.0.2",
     "tar-fs": "^2.0.0",

src/commands/system.js

@@ -0,0 +1,62 @@
+// npm packages
+const got = require('got');
+const chalk = require('chalk');
+const prettyBytes = require('pretty-bytes');
+
+// our packages
+const {userConfig, isLoggedIn, logout} = require('../config');
+
+exports.command = ['system [cmd]'];
+exports.describe = 'execute system commands (prune to remove unused data)';
+exports.builder = {
+  cmd: {
+    default: '',
+    description: 'command to execute [prune]',
+  },
+};
+exports.handler = async args => {
+  if (!isLoggedIn()) {
+    return;
+  }
+
+  // get command
+  const {cmd} = args;
+
+  if (cmd !== 'prune') {
+    console.log('Only "prune" command is currently supported!');
+    return;
+  }
+
+  // services request url
+  const remoteUrl = `${userConfig.endpoint}/system/prune`;
+
+  // construct shared request params
+  const options = {
+    method: 'POST',
+    headers: {
+      Authorization: `Bearer ${userConfig.token}`,
+    },
+    responseType: 'json',
+    json: {},
+  };
+  // try sending request
+  try {
+    const {body} = await got(remoteUrl, options);
+    console.log(chalk.bold('Data prune successful!'));
+    console.log('');
+    console.log(
+      chalk.bold('Reclaimed:'),
+      prettyBytes(body.data.map(item => item.SpaceReclaimed).reduce((acc, val) => acc + val, 0))
+    );
+  } catch (e) {
+    // if authorization is expired/broken/etc
+    if (e.response.statusCode === 401) {
+      logout(userConfig);
+      console.log(chalk.red('Error: authorization expired!'), 'Please, relogin and try again.');
+      return;
+    }
+
+    console.log(chalk.red(`Error executing ${cmd} command:`), e.toString());
+    console.error(e);
+  }
+};

src/index.js

@@ -26,6 +26,7 @@ const template = require('./commands/template');
 const setup = require('./commands/setup');
 const secrets = require('./commands/secrets');
 const completion = require('./commands/completion');
+const system = require('./commands/system');
 
 // init program
 yargs
@@ -45,4 +46,5 @@ yargs
   .command(template)
   .command(setup)
   .command(secrets)
+  .command(system)
   .command(completion(yargs)).argv;

test/__snapshots__/prune.test.js.snap

@@ -0,0 +1,16 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Should execute prune 1`] = `
+Array [
+  Array [
+    "Data prune successful!",
+  ],
+  Array [
+    "",
+  ],
+  Array [
+    "Reclaimed:",
+    "1.02 kB",
+  ],
+]
+`;

test/prune.test.js

@@ -0,0 +1,32 @@
+/* eslint-env jest */
+// mock config for testing
+jest.mock('../src/config', () => require('./__mocks__/config'));
+
+// npm packages
+const nock = require('nock');
+const sinon = require('sinon');
+
+// our packages
+const {handler: system} = require('../src/commands/system');
+
+// test update
+test('Should execute prune', done => {
+  // handle correct request
+  const pruneServer = nock('http://localhost:8080')
+    .post('/system/prune')
+    .reply(200, {pruned: true, data: [{SpaceReclaimed: 1024}]});
+  // spy on console
+  const consoleSpy = sinon.spy(console, 'log');
+  // execute login
+  system({cmd: 'prune'}).then(() => {
+    // make sure log in was successful
+    // check that server was called
+    expect(pruneServer.isDone()).toBeTruthy();
+    // first check console output
+    expect(consoleSpy.args).toMatchSnapshot();
+    // restore console
+    console.log.restore();
+    pruneServer.done();
+    done();
+  });
+});