Merge 40639fa into 14185f6

.flowconfig

@@ -14,7 +14,7 @@ log.file=./artifacts/flow.log
 # dependencies. Ignoring these speeds up the standalone flow command by 2x.
 #
 # DO NOT EDIT: ignored-dependencies: this list is auto-generated by a grunt task
-# 840ddd0acc1670a8955035353a296deb9834be672d3ea0656d1ce2647befec28
+# dddc627ecfbc57d2f3ba9b6a47417ce98d1ba7b05fef08fe8f7dd5a192868584
 .*/node_modules/.bin.*
 .*/node_modules/Base64.*
 .*/node_modules/JSV.*
@@ -53,6 +53,7 @@ log.file=./artifacts/flow.log
 .*/node_modules/async-each.*
 .*/node_modules/aws-sign2.*
 .*/node_modules/aws4.*
+.*/node_modules/babel.*
 .*/node_modules/babel-code-frame.*
 .*/node_modules/babel-core.*
 .*/node_modules/babel-eslint.*
@@ -69,6 +70,8 @@ log.file=./artifacts/flow.log
 .*/node_modules/babel-helper-remap-async-to-generator.*
 .*/node_modules/babel-helper-replace-supers.*
 .*/node_modules/babel-helpers.*
+.*/node_modules/babel-istanbul.*
+.*/node_modules/babel-istanbul-loader.*
 .*/node_modules/babel-jscs.*
 .*/node_modules/babel-loader.*
 .*/node_modules/babel-messages.*
@@ -190,6 +193,7 @@ log.file=./artifacts/flow.log
 .*/node_modules/cookie-signature.*
 .*/node_modules/core-js.*
 .*/node_modules/core-util-is.*
+.*/node_modules/coveralls.*
 .*/node_modules/crc32-stream.*
 .*/node_modules/cryptiles.*
 .*/node_modules/crypto-browserify.*
@@ -246,6 +250,7 @@ log.file=./artifacts/flow.log
 .*/node_modules/es6-weak-map.*
 .*/node_modules/escape-html.*
 .*/node_modules/escape-string-regexp.*
+.*/node_modules/escodegen.*
 .*/node_modules/escope.*
 .*/node_modules/eslint.*
 .*/node_modules/espree.*
@@ -277,6 +282,7 @@ log.file=./artifacts/flow.log
 .*/node_modules/file-entry-cache.*
 .*/node_modules/file-sync-cmp.*
 .*/node_modules/filename-regex.*
+.*/node_modules/fileset.*
 .*/node_modules/fill-range.*
 .*/node_modules/finalhandler.*
 .*/node_modules/find-index.*
@@ -294,8 +300,8 @@ log.file=./artifacts/flow.log
 .*/node_modules/forwarded.*
 .*/node_modules/fresh.*
 .*/node_modules/fs-extra.*
+.*/node_modules/fs-promise.*
 .*/node_modules/fs-readdir-recursive.*
-.*/node_modules/fsevents.*
 .*/node_modules/gaze.*
 .*/node_modules/generate-function.*
 .*/node_modules/generate-object-property.*
@@ -327,6 +333,7 @@ log.file=./artifacts/flow.log
 .*/node_modules/grunt-newer.*
 .*/node_modules/grunt-webpack.*
 .*/node_modules/gulp-rename.*
+.*/node_modules/handlebars.*
 .*/node_modules/har-validator.*
 .*/node_modules/has-ansi.*
 .*/node_modules/has-color.*
@@ -415,10 +422,10 @@ log.file=./artifacts/flow.log
 .*/node_modules/jsprim.*
 .*/node_modules/jszip.*
 .*/node_modules/kind-of.*
-.*/node_modules/klaw.*
 .*/node_modules/lazy-cache.*
 .*/node_modules/lazystream.*
 .*/node_modules/lcid.*
+.*/node_modules/lcov-parse.*
 .*/node_modules/left-pad.*
 .*/node_modules/leven.*
 .*/node_modules/levn.*
@@ -447,6 +454,7 @@ log.file=./artifacts/flow.log
 .*/node_modules/lodash.pick.*
 .*/node_modules/lodash.rest.*
 .*/node_modules/lodash.restparam.*
+.*/node_modules/log-driver.*
 .*/node_modules/logalot.*
 .*/node_modules/lolex.*
 .*/node_modules/longest.*
@@ -472,7 +480,6 @@ log.file=./artifacts/flow.log
 .*/node_modules/ms.*
 .*/node_modules/multimatch.*
 .*/node_modules/mute-stream.*
-.*/node_modules/nan.*
 .*/node_modules/native-or-bluebird.*
 .*/node_modules/natural-compare.*
 .*/node_modules/ncp.*
@@ -536,6 +543,7 @@ log.file=./artifacts/flow.log
 .*/node_modules/prompt.*
 .*/node_modules/proxy-addr.*
 .*/node_modules/prr.*
+.*/node_modules/pseudomap.*
 .*/node_modules/punycode.*
 .*/node_modules/q.*
 .*/node_modules/qs.*
@@ -708,6 +716,7 @@ log.file=./artifacts/flow.log
 .*/node_modules/xregexp.*
 .*/node_modules/xtend.*
 .*/node_modules/y18n.*
+.*/node_modules/yallist.*
 .*/node_modules/yargs-parser.*
 .*/node_modules/yauzl.*
 .*/node_modules/zip-stream.*

.gitignore

@@ -10,3 +10,4 @@ npm-debug.log
 node_modules
 dist/*
 artifacts/*
+coverage/*

.travis.yml

@@ -5,7 +5,8 @@ node_js:
 - '4'
 before_install:
 - npm install -g npm
-script: npm test
+script: COVERAGE=y npm test
+after_script: "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls"
 notifications:
   irc:
     channels:

README.md

@@ -87,6 +87,20 @@ to regenerate the ignore rules. Do so like this:
 
 After that, commit and push the new `.flowconfig`.
 
+### Code Coverage
+
+You can generate Code Coverage reports every time you run the test suite run
+by settings `$CODE_COVERAGE` in the environment. Here is an example of running
+the test suite on the instrumented source code:
+
+    CODE_COVERAGE=y npm test
+
+or even when the test suite re-runs automatically as you edit files:
+
+    CODE_COVERAGE=y npm develop
+
+Once the report has been generated, it can be found in the `./coverage` directory.
+
 ## Some Questions and Answers
 
 ### Why do we need a command line tool?

package.json

@@ -48,13 +48,16 @@
   "devDependencies": {
     "babel-core": "6.6.0",
     "babel-eslint": "5.0.0",
+    "babel-istanbul": "0.6.0",
+    "babel-istanbul-loader": "0.0.3",
     "babel-loader": "6.2.4",
     "babel-plugin-transform-class-properties": "6.6.0",
     "babel-plugin-transform-es2015-modules-commonjs": "6.6.3",
     "babel-plugin-transform-flow-strip-types": "6.5.0",
     "babel-preset-es2015": "6.6.0",
     "babel-preset-stage-2": "6.5.0",
     "chai": "3.5.0",
+    "coveralls": "2.11.8",
     "deepcopy": "0.6.1",
     "eslint": "2.2.0",
     "flow-bin": "0.22.1",

tests/runner.js

@@ -3,5 +3,22 @@
 
 import 'babel-polyfill';
 
+if (process.env.COVERAGE === 'y') {
+  // generate the coverage reports
+  after(() => {
+    let istanbul = require('babel-istanbul');
+    let collector = new istanbul.Collector();
+    let reporter = new istanbul.Reporter();
+    let sync = true;
+
+    collector.add(global.__coverage__);
+
+    reporter.addAll([ 'text', 'text-summary', 'lcov' ]);
+    reporter.write(collector, sync, function() {
+      console.log('All reports generated');
+    });
+  });
+}
+
 var context = require.context('.', true, /.*?test\..*?.js$/);
 context.keys().forEach(context);

webpack.config.js

@@ -16,6 +16,17 @@ fs.readdirSync('node_modules')
     // jscs:enable requireTemplateStrings
   });
 
+var preLoaders = [];
+
+if (process.env.COVERAGE === 'y') {
+  preLoaders.push([
+    {
+      test: /\.js$/,
+      exclude: /(node_modules|bower_components|test)/,
+      loader: 'babel-istanbul',
+    },
+  ]);
+}
 
 module.exports = {
   entry: './src/main.js',
@@ -30,6 +41,7 @@ module.exports = {
     libraryTarget: 'commonjs2',
   },
   module: {
+    preLoaders: preLoaders,
     loaders: [
       {
         exclude: /(node_modules|bower_components)/,