Merge branch 'master' into jordalgo-patch-1

.travis.yml

@@ -1,6 +1,13 @@
 language: node_js
 sudo: false
 node_js:
-- '0.12'
-- '4'
-- '6'
+  - '4'
+  - '6'
+  - '7'
+
+matrix:
+  allow_failures:
+    - node_js: "4"
+
+after_success:
+  - npm run coverage:report

README.md

@@ -1,4 +1,4 @@
-bucket-runner
+bucket-runner [![Build Status](https://travis-ci.org/spotify/bucket-runner.svg?branch=master)](https://travis-ci.org/spotify/bucket-runner) [![Coverage Status](https://coveralls.io/repos/github/spotify/bucket-runner/badge.svg?branch=master)](https://coveralls.io/github/spotify/bucket-runner?branch=master)
 =============
 
 Run a command in parallel, distributing the input files to each process and buffer the output to prevent interleaving. Kind of like xargs but with control over output.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bucket-runner",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Execute a command in parallel, distributing files and buffering output.",
   "main": "index.js",
   "bin": {
@@ -30,7 +30,7 @@
     "lint:fix": "npm run lint -- --fix",
     "coverage:report": "nyc report --reporter=text-lcov | coveralls",
     "coverage:html": "nyc report --reporter=html",
-    "prepublish": "npm run test"
+    "prepublish": "in-publish && npm run test || not-in-publish"
   },
   "keywords": [
     "mocha",
@@ -44,8 +44,12 @@
   "license": "Apache 2.0",
   "devDependencies": {
     "coveralls": "^2.11.9",
-    "eslint": "^3.7.1",
+    "eslint": "^3.8.1",
     "eslint-config-airbnb": "^12.0.0",
+    "eslint-plugin-import": "^1.16.0",
+    "eslint-plugin-jsx-a11y": "^2.2.3",
+    "eslint-plugin-react": "^6.4.1",
+    "in-publish": "^2.0.0",
     "istanbul": "^1.0.0-alpha.2",
     "mocha": "^2.4.5",
     "nyc": "^6.4.0",