Merge branch 'develop', prepare 5.2.0

Author: yamalight

.prettierrc

@@ -0,0 +1,6 @@
+{
+  "trailingComma": "es5",
+  "singleQuote": true,
+  "bracketSpacing": false,
+  "printWidth": 120
+}

docs/ServerInstallation.md

@@ -30,6 +30,7 @@ docker run -d \
 -v /home/user/.ssh/authorized_keys:/root/.ssh/authorized_keys:ro
 
 # this is your private key used for JWT encryption
+# you can set this to any string you want (a long random string generated by your password manager is recommended)
 -e EXO_PRIVATE_KEY=your_jwt_encryption_key
 
 # this is used to tell traefik to which deployment current docker service belongs

package.json

@@ -1,6 +1,6 @@
 {
   "name": "exoframe",
-  "version": "5.1.0",
+  "version": "5.1.1-dev",
   "description": "Exoframe is a self-hosted tool that allows simple one-command deployments using Docker",
   "main": "index.js",
   "repository": "[email protected]:exoframejs/exoframe.git",

src/commands/deploy.js

@@ -96,6 +96,10 @@ exports.builder = {
     description: 'Verbose mode; will output more information',
     count: true,
   },
+  endpoint: {
+    alias: 'e',
+    description: 'Exoframe server endpoint to use (will override config value)',
+  },
 };
 exports.handler = async (args = {}) => {
   const deployToken = args.token;
@@ -108,16 +112,14 @@ exports.handler = async (args = {}) => {
 
   const folder = args._ ? args._.filter(arg => arg !== 'deploy').shift() : undefined;
   const update = args.update;
+  const endpoint = args.endpoint || userConfig.endpoint;
 
-  console.log(
-    chalk.bold(`${update ? 'Updating' : 'Deploying'} ${folder || 'current project'} to endpoint:`),
-    userConfig.endpoint
-  );
+  console.log(chalk.bold(`${update ? 'Updating' : 'Deploying'} ${folder || 'current project'} to endpoint:`), endpoint);
 
   // create config vars
   const workdir = folder ? path.join(process.cwd(), folder) : process.cwd();
   const folderName = path.basename(workdir);
-  const remoteUrl = `${userConfig.endpoint}/${update ? 'update' : 'deploy'}`;
+  const remoteUrl = `${endpoint}/${update ? 'update' : 'deploy'}`;
 
   // make sure workdir exists
   if (!fs.existsSync(workdir)) {

test/__snapshots__/deploy.test.js.snap

@@ -47,6 +47,23 @@ Array [
 ]
 `;
 
+exports[`Should deploy with endpoint flag 1`] = `
+Array [
+  Array [
+    "Deploying test/fixtures/test_html_project to endpoint:",
+    "http://localhost:3000",
+  ],
+  Array [
+    "Your project is now deployed as:
+",
+  ],
+  Array [
+    "   ID         URL             Hostname       Type        
+   test       localhost       test           Container   ",
+  ],
+]
+`;
+
 exports[`Should deploy without auth but with token 1`] = `
 Array [
   Array [

test/deploy.test.js

@@ -92,6 +92,38 @@ test('Should deploy', done => {
   });
 });
 
+// test
+test('Should deploy with endpoint flag', done => {
+  // spy on console
+  const consoleSpy = sinon.spy(console, 'log');
+
+  // handle correct request
+  const deployServer = nock('http://localhost:3000')
+    .post('/deploy')
+    .reply((uri, requestBody) => {
+      const excgf = fs.readFileSync(path.join(testFolder, 'exoframe.json'));
+      const index = fs.readFileSync(path.join(testFolder, 'index.html'));
+      expect(requestBody).toContain(excgf);
+      expect(requestBody).toContain(index);
+
+      return replyWithStream([{message: 'Deployment success!', deployments, level: 'info'}]);
+    });
+
+  // execute login
+  deploy({_: [folderPath], endpoint: 'http://localhost:3000'}).then(() => {
+    // make sure log in was successful
+    // check that server was called
+    expect(deployServer.isDone()).toBeTruthy();
+    // first check console output
+    expect(consoleSpy.args).toMatchSnapshot();
+    // restore console
+    console.log.restore();
+    // tear down nock
+    deployServer.done();
+    done();
+  });
+});
+
 // test
 test('Should deploy without path', done => {
   // spy on console