Merge branch 'release/0.0.3'

README.md

@@ -1,10 +1,10 @@
 # EZDocker
 
-[![license:mit](https://img.shields.io/badge/license-mit-green.svg)]()
-[![Travis](https://img.shields.io/travis/clarkmalmgren/ezdocker.svg)]()
-[![Coveralls](https://img.shields.io/coveralls/clarkmalmgren/ezdocker.svg)]()
-[![npm](https://img.shields.io/npm/dt/ezdocker.svg)]()
-[![npm](https://img.shields.io/npm/v/ezdocker.svg)]()
+[![license:mit](https://img.shields.io/badge/license-mit-green.svg)](./LICENSE)
+[![Build Status](https://travis-ci.org/clarkmalmgren/ezdocker.svg?branch=develop)](https://travis-ci.org/clarkmalmgren/ezdocker)
+[![Coverage Status](https://coveralls.io/repos/github/clarkmalmgren/ezdocker/badge.svg?branch=develop)](https://coveralls.io/github/clarkmalmgren/ezdocker?branch=develop)
+[![npm](https://img.shields.io/npm/dt/ezdocker.svg)](https://www.npmjs.com/package/ezdocker)
+[![npm](https://img.shields.io/npm/v/ezdocker.svg)](https://www.npmjs.com/package/ezdocker)
 
 EZDocker provides an easy and intuitive way to build docker images in JavaScript. This builds upon
 [Dockerode](https://github.com/apocas/dockerode) to provide build patterns and output formatting to improve
@@ -35,7 +35,7 @@ configuration from command line arguments:
 (function() {
 
   var gulp = require('gulp'),
-      ezdocker = require('ezdocker').default; // Note that in ES5, EZDocker is bound to ".default"
+      EZDocker = require('ezdocker').default; // Note that in ES5, EZDocker is bound to ".default"
 
   gulp.task('docker:build-image', function() {
     return EZDocker.createFromArgs().imageBuilder()
@@ -143,4 +143,4 @@ See [Contributing](CONTRIBUTING.md)
 
 ## License
 
-[Licensed under MIT](LICENSE)
+[Licensed under MIT](LICENSE)

gulpfile.js

@@ -5,7 +5,9 @@
     gulp = require('gulp'),
     jspm = require('gulp-jspm'),
     babel = require('gulp-babel'),
+    esdoc = require('gulp-esdoc'),
     mocha = require('gulp-mocha'),
+    plumber = require('gulp-plumber'),
     istanbul = require('gulp-istanbul'),
     coveralls = require('gulp-coveralls'),
     sourcemaps = require('gulp-sourcemaps');
@@ -29,13 +31,17 @@
       .pipe(gulp.dest('dist'));
   });
 
+  gulp.task('esdoc', function() {
+    return gulp.src(['src'])
+      .pipe(esdoc({ destination: './build/esdoc' }));
+  });
+
   gulp.task('test:build', function() {
     return gulp.src(['test/*.js'])
       .pipe(sourcemaps.init())
       .pipe(babel())
       .pipe(sourcemaps.write())
       .pipe(gulp.dest('dist_test'));
-
   });
 
   gulp.task('test:instrument', ['build', 'test:build'], function() {
@@ -55,7 +61,9 @@
 
   gulp.task('ci', [ 'test' ], function() {
     return gulp.src('build/coverage/lcov.info')
-      .pipe(coveralls());
+      .pipe(plumber())
+      .pipe(coveralls())
+      .pipe(plumber.stop());
   });
 
 })();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezdocker",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Makes building docker containers in javascript a breeze",
   "main": "dist/ezdocker.js",
   "scripts": {
@@ -29,17 +29,21 @@
     "babel-preset-es2015": "^6.3.13",
     "babel-register": "^6.4.3",
     "chai": "^3.5.0",
+    "chai-as-promised": "^5.2.0",
     "chai-string": "^1.1.6",
     "del": "^2.2.0",
     "gulp": "^3.9.0",
     "gulp-babel": "^6.1.1",
     "gulp-concat": "^2.6.0",
     "gulp-coveralls": "^0.1.4",
+    "gulp-esdoc": "^0.2.0",
     "gulp-istanbul": "^0.10.3",
     "gulp-jspm": "^0.5.6",
     "gulp-mocha": "^2.2.0",
+    "gulp-plumber": "^1.0.1",
     "gulp-sourcemaps": "^1.6.0",
     "sinon": "^1.17.3",
+    "sinon-as-promised": "^4.0.0",
     "sinon-chai": "^2.8.0"
   },
   "dependencies": {

src/ezdocker.js

@@ -196,10 +196,12 @@ class EZDocker {
   /**
    * Creates a EZDocker using command line arguments.
    *
+   * @param {{}} [args=argv] the arguments that default to those from yargs.argv
+   *
    * @return {EZDocker}
    */
-  static createFromArgs() {
-    return new EZDocker(argv.docker);
+  static createFromArgs(args = argv) {
+    return new EZDocker(args.docker);
   }
 
   /**
@@ -315,6 +317,7 @@ class EZDocker {
         if (error) {
           if (error.statusCode == 404) {
             Log.info('No docker images to remove.');
+            resolve();
           } else {
             Log.error('Removing Docker Image Failed: ' + error.message);
             reject(error);

src/tar-utils.js

@@ -35,7 +35,7 @@ class TarUtils {
   /**
    * Generate a single tar stream that contains multiple inputs that can be mapped to relative paths.
    *
-   * @param {Map<String, String>} mapping a map of source folders to target relative paths
+   * @param {{String, String}} mapping a map of source folders to target relative paths
    * @return {Promise<stream.Readable, Error>} a promise that resolves with the generated combined stream
    */
   all(mapping) {