Merge branch dev into master

Author: zodern

.eslintrc.yml

@@ -7,33 +7,34 @@ env:
   es6: true
   node: true
   mocha: true
-ecmaVersion: 2017
-ecmaFeatures:
-  accessor-pairs: 2
-  arrowFunctions: true
-  binaryLiterals: true
-  blockBindings: true
-  classes: true
-  defaultParams: true
-  destructuring: true
-  experimentalObjectRestSpread: true
-  forOf: true
-  generators: true
-  globalReturn: true
-  jsx: true
-  modules: true
-  objectLiteralComputedProperties: true
-  objectLiteralDuplicateProperties: true
-  objectLiteralShorthandMethods: true
-  objectLiteralShorthandProperties: true
-  octalLiterals: true
-  regexUFlag: true
-  regexYFlag: true
-  restParams: true
-  spread: true
-  superInFunctions: true
-  templateStrings: true
-  unicodeCodePointEscapes: true
+parserOptions:
+  ecmaVersion: 2017
+  ecmaFeatures:
+    accessor-pairs: 2
+    arrowFunctions: true
+    binaryLiterals: true
+    blockBindings: true
+    classes: true
+    defaultParams: true
+    destructuring: true
+    experimentalObjectRestSpread: true
+    forOf: true
+    generators: true
+    globalReturn: true
+    jsx: true
+    modules: true
+    objectLiteralComputedProperties: true
+    objectLiteralDuplicateProperties: true
+    objectLiteralShorthandMethods: true
+    objectLiteralShorthandProperties: true
+    octalLiterals: true
+    regexUFlag: true
+    regexYFlag: true
+    restParams: true
+    spread: true
+    superInFunctions: true
+    templateStrings: true
+    unicodeCodePointEscapes: true
 rules:
   arrow-parens:
   - 2

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.3.1 - August 23, 2017
+- Add `mup ssh <server>` command
+- Exit code when task list fails is now 1 instead of 0
+- Fix deploying when server's default shell is zsh @thsowers
+- All docker commands are run with `sudo`
+- `mup proxy stop` doesn't require the `proxy` object to be in the config
+- Add option `app.docker.prepareBundle` to enable or disable prepare bundle
+
 ## 1.3.0 - August 22, 2017
 
 **Hooks**

docs/docs.md

@@ -126,7 +126,7 @@ module.exports = {
       ]
     },
 
-     // list of servers to deploy to, from the 'servers' list
+    // list of servers to deploy to, from the 'servers' list
     servers: {
       one: {},
       two: {},
@@ -157,7 +157,7 @@ module.exports = {
       // your app url for mobile app access
       server: 'http://app.com',
 
-       // adds --allow-incompatible-updates arg to build command
+      // adds --allow-incompatible-updates arg to build command
       allowIncompatibleUpdates: true,
 
       // Executable used to build the meteor project
@@ -914,7 +914,7 @@ module.exports = {
           alias: 'f',
           description: 'Follow log output'
         })
-        .strict(false);
+          .strict(false);
       },
 
       // This is called when the command is run.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mup",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Production Quality Meteor Deployments",
   "main": "lib/index.js",
   "repository": {
@@ -37,47 +37,47 @@
     "docs": "cd docs && bundle exec jekyll serve"
   },
   "devDependencies": {
-    "babel-cli": "^6.23.0",
+    "babel-cli": "^6.26.0",
     "babel-eslint": "^7.1.1",
     "babel-plugin-istanbul": "^4.1.4",
     "babel-preset-es2015": "^6.22.0",
     "babel-preset-es2016": "^6.22.0",
     "babel-preset-es2017": "^6.22.0",
     "babel-preset-stage-2": "^6.24.1",
     "babel-preset-stage-3": "^6.22.0",
-    "babel-register": "^6.24.1",
-    "chai": "^3.5.0",
+    "babel-register": "^6.26.0",
+    "chai": "^4.1.1",
     "chai-string": "^1.4.0",
     "cross-env": "^5.0.1",
-    "eslint": "^3.19.0",
+    "eslint": "^4.5.0",
     "eslint-plugin-babel": "^4.1.0",
     "eslint-plugin-markdown": "^1.0.0-beta.4",
     "keypair": "^1.0.1",
     "mocha": "^3.2.0",
     "node-forge": "^0.7.1",
     "nyc": "^11.0.3",
-    "sinon": "^2.3.6"
+    "sinon": "^3.2.1"
   },
   "dependencies": {
-    "archiver": "~1.3.0",
+    "archiver": "^2.0.0",
     "async": "~2.5.0",
-    "babel-polyfill": "6.6.1",
+    "babel-polyfill": "^6.26.0",
     "bluebird": "~3.5.0",
     "boxen": "~1.1.0",
-    "chalk": "~2.0.1",
-    "debug": "~2.6.8",
+    "chalk": "^2.1.0",
+    "debug": "^3.0.0",
     "expand-tilde": "~2.0.2",
     "global-modules": "^1.0.0",
     "joi": "~10.6.0",
     "lodash": "^4.17.4",
     "nodemiral": "~1.1.1",
-    "parse-json": "~2.2.0",
+    "parse-json": "^3.0.0",
     "random-seed": "~0.3.0",
     "resolve-from": "^3.0.0",
     "shelljs": "~0.5.0",
-    "silent-npm-registry-client": "2.x.x",
+    "silent-npm-registry-client": "^3.0.1",
     "ssh2": "0.4.x",
-    "uuid": "2.x.x",
+    "uuid": "^3.1.0",
     "yargs": "~8.0.2"
   },
   "nyc": {

src/__tests__/utils.unit.js

@@ -34,7 +34,7 @@ describe('utils', function() {
       };
 
       utils.runTaskList(list, {}, {verbose: true})
-      .then(() => { cb(); });
+        .then(() => { cb(); });
     });
 
     it('should reject if a task failed', cb => {

src/index.js

@@ -104,7 +104,7 @@ let program = yargs
   .strict(true)
   .alias('help', 'h')
   .epilogue(
-  'For more information, read the docs at https://github.com/zodern/meteor-up'
+    'For more information, read the docs at http://zodern.github.io/meteor-up/docs.html'
   )
   .help('help');
 

src/plugin-api.js

@@ -31,6 +31,7 @@ export default class PluginAPI {
     this.runTaskList = utils.runTaskList;
     this.getDockerLogs = utils.getDockerLogs;
     this.runSSHCommand = utils.runSSHCommand;
+    this._createSSHOptions = utils.createSSHOptions;
   }
 
   getArgs() {
@@ -226,14 +227,15 @@ export default class PluginAPI {
     return;
   };
   _commandErrorHandler(e) {
+    process.exitCode = 1;
+
     if (e.nodemiralHistory instanceof Array) {
       // Error is from nodemiral when running a task list.
       // Nodemiral should have already displayed the error
       return;
     }
 
     console.error(e);
-    process.exitCode = 1;
   }
   runCommand = async function(name) {
     if (!name) {
@@ -302,9 +304,9 @@ export default class PluginAPI {
       }
 
       if (
-          this._enabledSessions.length > 0 &&
+        this._enabledSessions.length > 0 &&
           this._enabledSessions.indexOf(name) === -1
-        ) {
+      ) {
         continue;
       }
 

src/plugins/default/command-handlers.js

@@ -1,6 +1,7 @@
 import debug from 'debug';
 import fs from 'fs';
 import sh from 'shelljs';
+import { Client } from 'ssh2';
 
 const log = debug('mup:module:default');
 
@@ -95,3 +96,40 @@ export function stop(api) {
   log('exec => mup stop');
   return api.runCommand('meteor.stop');
 }
+
+export function ssh(api) {
+  const servers = api.getConfig().servers;
+  const serverOption = api.getArgs()[1];
+
+  if (!(serverOption in servers)) {
+    console.log('mup ssh <server>');
+    console.log('Available servers are:\n', Object.keys(servers).join('\n'));
+    process.exitCode = 1;
+    return;
+  }
+
+  const server = servers[serverOption];
+  const sshOptions = api._createSSHOptions(server);
+
+  var conn = new Client();
+  conn.on('ready', function() {
+    conn.shell(function(err, stream) {
+      if (err) { throw err; }
+      stream.on('close', function() {
+        conn.end();
+        process.exit();
+      });
+
+      process.stdin.setRawMode(true);
+      process.stdin.pipe(stream);
+
+      stream.pipe(process.stdout);
+      stream.stderr.pipe(process.stderr);
+      stream.setWindow(process.stdout.rows, process.stdout.columns);
+
+      process.stdout.on('resize', () => {
+        stream.setWindow(process.stdout.rows, process.stdout.columns);
+      });
+    });
+  }).connect(sshOptions);
+}

src/plugins/default/commands.js

@@ -58,3 +58,9 @@ export let stop = {
   description: 'Stop app',
   handler: commandHandlers.stop
 };
+
+export let ssh = {
+  name: 'ssh [server]',
+  description: 'SSH into server',
+  handler: commandHandlers.ssh
+};

src/plugins/docker/assets/docker-setup.sh

@@ -26,8 +26,8 @@ minimumMinor=13
 
 # Is docker already installed?
 set +e
-hasDocker=$(docker version | grep "version")
-serverVersion=$(docker version --format '{{.Server.Version}}')
+hasDocker=$(sudo docker version | grep "version")
+serverVersion=$(sudo docker version --format '{{.Server.Version}}')
 parsedVersion=( ${serverVersion//./ })
 majorVersion="${parsedVersion[0]}"
 minorVersion="${parsedVersion[1]}"