Added io.js support

MeltyMooncakes · May 18, 2015 · 1d833f7 · 1d833f7
1 parent 5deca02
commit 1d833f7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,3 +5,4 @@ language: node_js
 node_js:
   - "0.10"
   - "0.12"
+  - "iojs-v2"
diff --git a/History.md b/History.md
@@ -1,6 +1,10 @@
+1.18.1 / 2015-05-18
+
+* changed: Added io.js support [rwky](https://github.com/rwky)
+
 1.18.0 / 2015-05-18
 
-* changed: Removed support for node 0.8 and added support for 0.12
+* changed: Removed support for node 0.8 and added support for 0.12 [rwky](https://github.com/rwky)
 * changed: Listen to stdin error event for spawn errors [kapouer](https://github.com/kapouer)
 * changed: Improved error handling when gm isn't installed [FreshXOpenSource](https://github.com/FreshXOpenSource)
 * changed: Allow append method to use an array of arguments [emohacker](https://github.com/emohacker)

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gm",
   "description": "GraphicsMagick and ImageMagick for node.js",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "author": "Aaron Heckmann <[email protected]>",
   "keywords": [
     "graphics",

diff --git a/test/index.js b/test/index.js
@@ -8,6 +8,9 @@ var assert = require('assert');
 var gleak = require('gleak')();
 var fs = require('fs');
 
+gleak.whitelist.push(clearImmediate);
+gleak.whitelist.push(setImmediate);
+
 var only = process.argv.slice(2);
 gm.integration = !! ~process.argv.indexOf('--integration');
 if (gm.integration) only.shift();
@@ -81,4 +84,4 @@ files.forEach(function (file) {
     imagemagick: true,
     filename: file
   })
-})
+})
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ language: node_js @@
     node_js:
       - "0.10"
       - "0.12"
+      - "iojs-v2"