1.0.0

- sub directories would cause deploy to fail, now recursively find the strings and add them manually
- delete should delete the current working directories deployment if not specified
- Deployment.del removes the instance metadata from the database using the correct query params
- refactors CLI to be a class
- moves from easy-table to turtler
- fixes login and logout functionality was mixed on cli
- by default the open command will open the current directory if it is deployed
- by default the log command will open the current directory if it is deployed
- logs no longer have a - preceding each line
- logs trim white space instead of adding an empty line
- delete API actually works now, instead of continuously hanging
- removes; mkdirp, easy-table, async
- adds tryitout for docs page generation
- config is now stored in /.deployrc
- getCredentials and cacheCredentials are no longer blocking calls, they will happen async
- all error responses from the server will contain an error object
- not-found (application not deployed) and page-could-not-load (proxy errors) pages are now moved into a static directory
- main landing page is rendered with tryitout

Author: gabrielcsapo

.eslintrc

@@ -1,14 +1,23 @@
 {
   "extends": "eslint:recommended",
   "env": {
-    "node": true,
-    "es6": true
+    "es6": true,
+    "node": true
+  },
+  "parserOptions": {
+    "ecmaVersion": "2017"
   },
   "rules": {
+    "no-inner-declarations": 0,
     "strict": 0,
     "semi": [
       "error",
       "always"
+    ],
+    "no-octal": 0,
+    "indent": [
+      "error",
+      2
     ]
   }
 }

.tryitout

@@ -0,0 +1,48 @@
+module.exports = {
+    title: 'deploy.sh',
+    nav: {
+      Source: 'https://github.com/gabrielcsapo/deploy.sh',
+      Docs: './code/index.html'
+    },
+    body: `
+      <div>
+        <div class="main">
+          <div>
+            <div id="example-area">
+              <img class="logo" src="./logo.png"/>
+              <br/>
+              <blockquote> an open source continuous deployment service; deploying to the ☁️ shouldn't be 🚀🔬 </blockquote>
+              <pre id="install"></pre>
+            </div>
+
+            <div class="platforms">
+              <div class="platform">
+                <h3 id="docker">Docker</h3>
+                <div class="code"><span>$ my-app/</span> ls<br><b>Dockerfile</b> server.go<br><span>$ my-app/</span> deploy</div>
+              </div>
+              <div class="platform">
+                <h3 id="node">Node.js</h3>
+                <div class="code"><span>$ my-api/</span> ls<br><b>package.json</b> index.js<br><span>$ my-api/</span> deploy</div>
+              </div>
+              <div class="platform">
+                <h3 id="static">Static Websites</h3>
+                <div class="code"><span>$ my-site/</span> ls<br><b>index.html</b> logo.png<br><span>$ my-site/</span> deploy</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    `,
+    template: 'landing',
+    options: {
+      width: '100%'
+    },
+    output: './docs',
+    footer: `
+      <div class="text-black">Made with ☕️ by <a href="https://www.gabrielcsapo.com">@gabrielcsapo</a></div>
+    `,
+    externals: [,
+      "./docs/main.css",
+      "./docs/main.js"
+    ]
+};

CHANGELOG.md

@@ -1,3 +1,24 @@
+# 1.0.0 (01/27/2018)
+
+- sub directories would cause deploy to fail, now recursively find the strings and add them manually
+- delete should delete the current working directories deployment if not specified
+- Deployment.del removes the instance metadata from the database using the correct query params
+- refactors CLI to be a class
+- moves from easy-table to turtler
+- fixes login and logout functionality was mixed on cli
+- by default the open command will open the current directory if it is deployed
+- by default the log command will open the current directory if it is deployed
+- logs no longer have a `-` preceding each line
+- logs trim white space instead of adding an empty line
+- delete API actually works now, instead of continuously hanging
+- removes; mkdirp, easy-table, async
+- adds tryitout for docs page generation
+- config is now stored in `${homedir}/.deployrc`
+- getCredentials and cacheCredentials are no longer blocking calls, they will happen async
+- all error responses from the server will contain an error object
+- not-found (application not deployed) and page-could-not-load (proxy errors) pages are now moved into a static directory
+- main landing page is rendered with tryitout
+
 # 0.2.1 (08/15/2017)
 
 - adds the ability to delete deployment and its assets

README.md

@@ -2,7 +2,6 @@
 
 > ☁️ open source continuous deployment service
 
-![Status](https://img.shields.io/badge/release-beta-orange.svg)
 [![Npm Version](https://img.shields.io/npm/v/deploy.sh.svg)](https://www.npmjs.com/package/deploy.sh)
 [![Coverage Status](https://lcov-server.gabrielcsapo.com/badge/github%2Ecom/gabrielcsapo/deploy.sh.svg)](https://lcov-server.gabrielcsapo.com/coverage/github%2Ecom/gabrielcsapo/deploy.sh)
 [![Dependency Status](https://starbuck.gabrielcsapo.com/badge/github/gabrielcsapo/deploy.sh/status.svg)](https://starbuck.gabrielcsapo.com/github/gabrielcsapo/deploy.sh)
@@ -11,6 +10,6 @@
 ![npm](https://img.shields.io/npm/dt/deploy.sh.svg)
 ![npm](https://img.shields.io/npm/dm/deploy.sh.svg)
 
-![Static Example](https://github.com/gabrielcsapo/deploy.sh/blob/master/docs/example-static.gif?raw=true)
+![Static Example](./docs/example.gif)
 
 To learn more visit [http://www.gabrielcsapo.com/deploy.sh/](http://www.gabrielcsapo.com/deploy.sh/)

TODO.md

@@ -1,39 +1,11 @@
 #!/usr/bin/env node
 
-const Async = require('async');
-const ora = require('ora');
+module.exports = async function(cli, spinner) {
+  spinner.text = `Deleting deployment ${cli.application}`;
 
-const program = require('commander');
-program
-    .option('-u, --url [url]', 'The endpoint of the deploy.sh server', 'http://localhost:5000')
-    .parse(process.argv);
+  const { token, username } = await cli.getCredentials();
 
-const name = program.args[0];
-const { deleteDeployment, getCredentials } = require('../lib/helpers/cli')(program.url);
+  await cli.deleteDeployment({ token, username, name: cli.application });
 
-const spinner = ora(`Deleting deployment instance`).start();
-
-Async.waterfall([
-  function(callback) {
-    spinner.text = 'Getting deploy keys';
-
-    getCredentials()
-      .then((credentials) => callback(null, credentials))
-      .catch((ex) => callback(ex, null));
-  },
-  function(credentials, callback) {
-    spinner.text = 'Calling delete API';
-
-    const { token, username } = credentials;
-
-    deleteDeployment({ token, username, name })
-      .then(() => callback())
-      .catch((error) => callback(error));
-  }
-], (ex) => {
-  if (ex) return spinner.fail(`API call failed 🙈 ${JSON.stringify({
-    ex
-  }, null, 4)}`);
-
-  spinner.succeed('deployment deleted successfully');
-});
+  spinner.succeed(`Deployment deleted, ${cli.application} successfully`);
+};

bin/deploy-delete.js

@@ -1,61 +1,31 @@
 #!/usr/bin/env node
 
-const Async = require('async');
 const fs = require('fs');
 const path = require('path');
-const ora = require('ora');
-
-const program = require('commander');
-program
-    .option('-u, --url [url]', 'The endpoint of the deploy.sh server', 'http://localhost:5000')
-    .parse(process.argv);
-
-const { removeBundle, createBundle, uploadBundle, getCredentials } = require('../lib/helpers/cli')(program.url);
-
-const spinner = ora(`Starting deploy process`).start();
-
-Async.waterfall([
-  function(callback) {
-    spinner.text = 'Creating application bundle';
-
-    createBundle(process.cwd())
-      .then(() => callback(null))
-      .catch((ex) => callback(ex, null));
-  },
-  function(callback) {
-    spinner.text = 'Getting deploy keys';
-
-    getCredentials()
-      .then((credentials) => callback(null, credentials))
-      .catch((ex) => callback(ex, null));
-  },
-  function(credentials, callback) {
-    spinner.start();
-    spinner.text = 'Uploading application bundle';
-
-    const { token, username } = credentials;
-    const bundle = fs.createReadStream(path.resolve(process.cwd(), 'bundle.tgz'));
-
-    uploadBundle({
-      name: path.basename(process.cwd()),
-      bundle,
-      token,
-      username
-    })
-      .then((response) => callback(null, response))
-      .catch((error) => callback(error, null));
-  },
-  function(project, callback) {
-    spinner.text = 'Cleaning up local files';
-
-    removeBundle(process.cwd())
-      .then(() => callback(null, project))
-      .catch((error) => callback(error, null));
-  }
-], (ex, deployment) => {
-  if (ex) return spinner.fail(`Deployment failed 🙈 ${JSON.stringify({
-    ex
-  }, null, 4)}`);
+
+module.exports = async function(cli, spinner) {
+  spinner.text = 'Creating application bundle';
+
+  await cli.createBundle(process.cwd());
+
+  spinner.text = 'Getting deploy keys';
+
+  const { token, username } = await cli.getCredentials();
+
+  spinner.text = 'Uploading application bundle';
+
+  const bundle = fs.createReadStream(path.resolve(process.cwd(), 'bundle.tgz'));
+
+  const { deployment } = await cli.uploadBundle({
+    name: path.basename(process.cwd()),
+    bundle,
+    token,
+    username
+  });
+
+  spinner.text = 'Cleaning up local files';
+
+  await cli.removeBundle(process.cwd());
 
   spinner.succeed(`Upload successfully, http://${deployment.subdomain}.localhost:5000`);
-});
+};

bin/deploy-deploy.js

@@ -1,68 +1,32 @@
 #!/usr/bin/env node
 
-const Async = require('async');
-const ora = require('ora');
 const moment = require('moment');
 const Url = require('url');
-const Table = require('easy-table');
+const Table = require('turtler');
 
-const program = require('commander');
-program
-    .option('-u, --url [url]', 'The endpoint of the deploy.sh server', 'http://localhost:5000')
-    .parse(process.argv);
+module.exports = async function(cli, spinner) {
+  spinner.text = 'Getting deployment list';
 
-const { getDeployments, getCredentials } = require('../lib/helpers/cli')(program.url);
-
-const spinner = ora(`Getting deployment list`).start();
-
-Async.waterfall([
-  function(callback) {
-    spinner.text = 'Getting deploy keys';
-
-    getCredentials()
-      .then((credentials) => callback(null, credentials))
-      .catch((ex) => callback(ex, null));
-  },
-  function(credentials, callback) {
-    spinner.text = 'Calling list API';
-
-    const { token, username } = credentials;
-
-    getDeployments({
-      token,
-      username
-    })
-    .then((response) => callback(null, response))
-    .catch((error) => callback(error, null));
-  }
-], (ex, result) => {
-  if (ex) return spinner.fail(`API call failed 🙈 ${JSON.stringify({
-    ex
-  }, null, 4)}`);
+  const { token, username } = await cli.getCredentials();
+  const { deployments } = await cli.getDeployments({ token, username });
 
   spinner.stop();
 
-  const { deployments } = result;
-
   if(deployments.length > 0) {
-    var table = new Table();
+    let data = [["name", "url", "age", "requests", "status"]];
 
-    deployments.forEach((r) => {
-      const config = Url.parse(program.url);
+    deployments.forEach((r, i) => {
+      const config = Url.parse(cli.url);
       config.host = `${r.subdomain}.${config.host}`;
       const url = Url.format(config);
 
-      table.cell('name', r.name);
-      table.cell('url', url);
-      table.cell('age', moment(r.updated_at).fromNow());
-      table.cell('requests', r.requests);
-      table.cell('status', r.status);
-      table.newRow();
+      data[i + 1] = [r.name, url, moment(r.updated_at).fromNow(), r.requests.toString(), r.status];
     });
-    table.sort('age|asc');
 
-    console.log(table.toString()); // eslint-disable-line
+    let table = new Table(data);
+
+    console.log(table.markdown()); // eslint-disable-line
   } else {
     console.log('0 deployments found'); // eslint-disable-line
   }
-});
+};