Merge 8b5f492 into 666fd5d

.eslintrc

@@ -0,0 +1 @@
+{"extends": ["standard"]}

.gitignore

@@ -1,2 +1,4 @@
 node_modules
 /coverage
+npm-debug.log
+.DS_Store

.travis.yml

@@ -1,5 +1,20 @@
-#
-# .travis.yml
-#
-
 language: node_js
+node_js:
+  - "0.10"
+  - "0.12"
+  - "5"
+  - "4.4"
+  - "4.3"
+  - "4.2"
+  - "4.1"
+  - "4.0"
+sudo: false
+
+script:
+  - npm run lint
+  - npm run test-coverage
+  - npm run coveralls
+
+cache:
+  directories:
+    - node_modules

README.md

@@ -1,5 +1,7 @@
 # LCOV Result Merger
 [![Build Status](https://travis-ci.org/mweibel/lcov-result-merger.png)](https://travis-ci.org/mweibel/lcov-result-merger)
+[![Coverage Status](https://coveralls.io/repos/github/mweibel/lcov-result-merger/badge.svg?branch=master)](https://coveralls.io/github/mweibel/lcov-result-merger?branch=master)
+[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
 When you have multiple test suites for the same application you still want to
 have the code coverage across all testsuites.

bin/lcov-result-merger.js

@@ -1,29 +1,29 @@
 #!/usr/bin/env node
 
-var vfs = require('vinyl-fs'),
-	through = require('through2'),
-	fs = require('fs'),
-	lcovResultMerger = require('../index');
+var vfs = require('vinyl-fs')
+var through = require('through2')
+var fs = require('fs')
+var lcovResultMerger = require('../index')
 
 if (process.argv.length < 3) {
-	console.error("");
-	console.error("Usage: node lcov-result-merger 'pattern'" +
-		" ['output file']");
-	console.error("EX: node lcov-result-merger 'target/**/lcov.out'" +
-		" 'target/lcov-merged.out'");
-	console.error("");
-	process.exit(1);
+  console.error('')
+  console.error("Usage: node lcov-result-merger 'pattern'" +
+    " ['output file']")
+  console.error("EX: node lcov-result-merger 'target/**/lcov.out'" +
+    " 'target/lcov-merged.out'")
+  console.error('')
+  process.exit(1)
 }
 
-var files = process.argv[2];
-var outputFile = process.argv[3];
+var files = process.argv[2]
+var outputFile = process.argv[3]
 
 vfs.src(files)
-	.pipe(lcovResultMerger())
-	.pipe(through.obj(function (file) {
-		if ( outputFile ) {
-			fs.writeFileSync(outputFile, file.contents);
-		} else {
-			process.stdout.write(file.contents);
-		}
-	}));
+  .pipe(lcovResultMerger())
+  .pipe(through.obj(function (file) {
+    if (outputFile) {
+      fs.writeFileSync(outputFile, file.contents)
+    } else {
+      process.stdout.write(file.contents)
+    }
+  }))