Merge pull request #1 from nightshiftjs/promises

Promises
nightshiftjs · May 8, 2016 · d29c9a0 · d29c9a0
2 parents 74da66d + 07127c2
commit d29c9a0
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,11 @@
+language: node_js
+node_js:
+    - "5"
+    - "5.1"
+    - "4"
+    - "4.2"
+    - "4.1"
+    - "4.0"
+    - "0.12"
+script:
+    - grunt ci
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http.semver.org).
 
+## 0.3.0 - 2016-05-08
+### Added
+- Set up Travis CI, Coveralls and David for continuous integration
+
 ## 0.2.0 - 2016-04-28
 ### Changed
 - Bumped version number

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -70,7 +70,7 @@ module.exports = function (grunt) {
         makeReport: {
             src: '<%= coverage_tmp %>/coverage.json',
             options: {
-                type: 'html',
+                type: 'lcov',
                 dir: '<%= coverage %>',
                 print: 'detail'
             }
@@ -86,6 +86,12 @@ module.exports = function (grunt) {
                     }
                 ]
             }
+        },
+
+        coveralls: {
+            istanbul: {
+                src: '<%= coverage %>/lcov.info'
+            }
         }
     });
 
@@ -101,6 +107,9 @@ module.exports = function (grunt) {
     // plugin for computing test coverage (see https://github.com/taichi/grunt-istanbul)
     grunt.loadNpmTasks('grunt-istanbul');
 
+    // plugin for reporting test coverage to coveralls.io (see https://github.com/pimterry/grunt-coveralls)
+    grunt.loadNpmTasks('grunt-coveralls');
+
     // plugin for copying files (see https://github.com/gruntjs/grunt-contrib-copy)
     grunt.loadNpmTasks('grunt-contrib-copy');
 
@@ -131,6 +140,10 @@ module.exports = function (grunt) {
         'jshint',
         'build-coverage']);
 
+    grunt.task.registerTask('ci', [
+        'build',
+        'coveralls']);
+
     grunt.task.registerTask('build-coverage', [
         'clean:coverage',
         'instrument',

diff --git a/README.md b/README.md
@@ -1,4 +1,15 @@
 # nightshift-error-handling
+
+[![Build Status][build]](https://travis-ci.org/nightshiftjs/nightshift-error-handling) 
+
+[![Coverage Status][coverage]](https://coveralls.io/github/nightshiftjs/nightshift-error-handling)
+
+[![Dependencies Status][deps]](https://david-dm.org/nightshiftjs/nightshift-error-handling)
+
+[build]: https://travis-ci.org/nightshiftjs/nightshift-error-handling.svg?branch=master
+[coverage]: https://coveralls.io/repos/github/nightshiftjs/nightshift-error-handling/badge.svg?branch=master
+[deps]: https://david-dm.org/nightshiftjs/nightshift-error-handling.svg
+
 This [NightShift](https://github.com/nightshiftjs) plugin helps you writing robust code by providing an extendable, consistent and test-friendly way of handling errors.
 
 ## About Error Handling

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nightshift-error-handling",
   "description": "NightShift plugin for error handling",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "main": "src/index.js",
   "keywords": ["error handling", "plugin", "framework", "nightshift"],
   "repository": {
@@ -20,10 +20,11 @@
     "grunt-contrib-clean": "1.0.0",
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-jshint": "1.0.0",
+    "grunt-coveralls": "1.0.1",
     "grunt-istanbul": "0.7.0",
     "grunt-jasmine-nodejs": "1.5.2",
-    "lodash": "4.9.0",
-    "nightshift-core": "0.2.0",
+    "lodash": "4.11.2",
+    "nightshift-core": "0.3.0",
     "pretty-error": "2.0.0"
   }
 }