Merge 0cf3d8c into 02e7473

.eslintignore

@@ -0,0 +1,2 @@
+/backup/
+/coverage/

.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "wcl-backend"
+}

.gitignore

@@ -2,7 +2,8 @@
 !.gitkeep
 !.gitignore
 !.npmignore
-!.jscsrc
+!.eslintignore
+!.eslintrc
 !.travis.yml
 !.coveralls.yml
 !.istanbul.yml

.travis.yml

@@ -9,13 +9,8 @@ branches:
     - master
 node_js:
   - "8"
-  - "6"
-  - "4"
 services:
   - docker
-install:
-  - npm install
-  - npm prune
 before_script:
   - make fixture-build
   - make fixture-up

Makefile

@@ -5,7 +5,7 @@ MOCHA_OPTS = -b --timeout 10000 --reporter spec
 
 lint:
 	@echo "Linting..."
-	@$(BIN)/jscs index.js bin lib test
+	@$(BIN)/eslint .
 test: lint
 	@echo "Testing..."
 	@$(ENV) $(BIN)/_mocha $(MOCHA_OPTS) $(TESTS)

README.md

@@ -9,7 +9,7 @@ Mock multiple (micro-)services with Docker boxes and gateway with Kong.
 - _Always shutdown the docker boxes before you change anything_
 - Download and install Docker
 - `npm install -g micro-mockers`
-- `cd` to your work directory (see `example` as an example)
+- `cd` to your work directory (see `test/fixture` as an example)
 - `mm build`
 - `mm up`
 - `mm down`

bin/mm-down.js

@@ -11,7 +11,8 @@ lib.command
   .parse(process.argv);
 
 const config = new Config(lib.command.context);
-
-const child = spawn('docker-compose', ['-f', config.compose, 'down']);
-child.stdout.pipe(process.stdout);
-child.stderr.pipe(process.stderr);
+config.load().then(() => {
+  const child = spawn('docker-compose', ['-f', config.compose, 'down']);
+  child.stdout.pipe(process.stdout);
+  child.stderr.pipe(process.stderr);
+});

bin/mm-up.js

@@ -5,6 +5,9 @@
 const debug = require('debug')('mm:bin:up');
 const spawn = require('child_process').spawn;
 
+const pEvent = require('p-event');
+const Promise = require('bluebird');
+
 const lib = require('../lib');
 const Config = lib.classes.Config;
 const adminApi = lib.kong.adminApi;
@@ -13,26 +16,24 @@ lib.command
   .parse(process.argv);
 
 const config = new Config(lib.command.context);
-const host = config.adminApi;
-const status = new adminApi.Status(host);
-const plugins = new adminApi.Plugins(host);
-const apis = new adminApi.Apis(host);
-
-debug('running docker-compose up');
-const child = spawn('docker-compose', ['-f', config.compose, 'up', '-d', '--build']);
-child.stdout.pipe(process.stdout);
-child.stderr.pipe(process.stderr);
-
-child.on('close', (code) => {
-  // TODO: error handling when code > 0.
-  debug('docker-compose up finished with code %s', code);
-  status.ping().then(syncPlugins).then(syncApis).catch(debug);
+config.load().then(() => {
+  const host = config.adminApi;
+  const status = new adminApi.Status(host);
+  const plugins = new adminApi.Plugins(host);
+  const apis = new adminApi.Apis(host);
+
+  debug('running docker-compose up');
+  const child = spawn('docker-compose', ['-f', config.compose, 'up', '-d', '--build']);
+  child.stdout.pipe(process.stdout);
+  child.stderr.pipe(process.stderr);
+
+  return Promise.resolve(pEvent(child, 'close')).then(Promise.coroutine(function*(code) {
+    debug('docker-compose up finished with code %s', code);
+    if (code > 0) {
+      throw new Error('docker-compose up failed');
+    }
+    yield status.ping();
+    yield plugins.syncAll(config.plugins || []);
+    yield apis.syncAll(config.apis || []);
+  }));
 });
-
-function syncPlugins() {
-  return plugins.syncAll(config.plugins || []);
-}
-
-function syncApis() {
-  return apis.syncAll(config.apis || []);
-}