Updates module to support nan. 0.12/io.js

.gitignore

@@ -0,0 +1,6 @@
+build
+examples/*.jpeg
+examples/*.jpg
+node_modules
+bindings
+

.travis.yml

@@ -0,0 +1,16 @@
+before_install: []
+env:
+  global: []
+install:
+  - 'a() { set -e; }'
+  - "z() { E=$?; test $E -eq 0 && return 0; printf \"\\n\\033[1;31mThe command failed with exit code $?.\\033[0m\"; set -e; return $E; }"
+  - (a; npm install );z
+script:
+  - (a; npm test );z
+git:
+  depth: 10
+language: objective-c
+notifications:
+  email: false
+matrix:
+  fast_finish: true

appveyor.yml

@@ -0,0 +1,11 @@
+environment:
+  global: {}
+init: []
+install:
+  - cmd: 'setlocal & npm install & endlocal'
+build_script:
+  - cmd: 'setlocal & npm test & endlocal'
+clone_depth: 10
+cache:
+  - '%CYG_CACHE%'
+test: 'off'

binding.gyp

@@ -10,6 +10,9 @@
                 "src/dynamic_jpeg_stack.cpp",
                 "src/module.cpp",
             ],
+            "include_dirs" : [
+                "<!(node -e \"require('nan')\")"
+            ],
             "conditions" : [
                 [
                     'OS=="linux"', {
@@ -39,6 +42,17 @@
                     }
                 ]
             ]
-        }
+        },
+        {
+          "target_name": "action_after_build",
+          "type": "none",
+          "dependencies": [ "<(module_name)" ],
+          "copies": [
+            {
+              "files": [ "<(PRODUCT_DIR)/<(module_name).node" ],
+              "destination": "<(module_path)"
+            }
+          ]
+        },
     ]
 }

circle.yml

@@ -0,0 +1,15 @@
+machine:
+  environment:
+    A: 1
+dependencies:
+  override:
+    - npm test:
+        environment: {}
+  pre:
+    - npm install:
+        environment: {}
+test:
+  override:
+    - 'true'
+general:
+  build_dir: .

examples/dynamic-jpeg-stack-async.js

@@ -1,11 +1,11 @@
-var JpegLib = require('jpeg');
+var JpegLib = require('../');
 var fs = require('fs');
 var sys = require('sys');
 var Buffer = require('buffer').Buffer;
 
 // --------
 
-var terminal = fs.readFileSync('./rgba-terminal.dat');
+var terminal = fs.readFileSync(__dirname + '/rgba-terminal.dat');
 
 var jpegStack = new JpegLib.DynamicJpegStack('rgba');
 jpegStack.setBackground(terminal, 720, 400);
@@ -18,16 +18,16 @@ function rectDim(fileName) {
     return { x: dim[0], y: dim[1], w: dim[2], h: dim[3] }
 }
 
-var files = fs.readdirSync('./push-data');
+var files = fs.readdirSync(__dirname + '/push-data');
 
 files.forEach(function(file) {
     var dim = rectDim(file);
-    var rgba = fs.readFileSync('./push-data/' + file);
+    var rgba = fs.readFileSync(__dirname + '/push-data/' + file);
     jpegStack.push(rgba, dim.x, dim.y, dim.w, dim.h);
 });
 
 jpegStack.encode(function (image, dims) {
-    fs.writeFileSync('dynamic-async.jpg', image.toString('binary'), 'binary');
-    sys.puts("x: " + dims.x + ", y: " + dims.y + ", w: " + dims.width + ", h: " + dims.height);
+    fs.writeFileSync(__dirname + '/dynamic-async.jpg', image.toString('binary'), 'binary');
+    console.log("x: " + dims.x + ", y: " + dims.y + ", w: " + dims.width + ", h: " + dims.height);
 });
 

examples/dynamic-jpeg-stack.js

@@ -1,11 +1,11 @@
-var JpegLib = require('jpeg');
+var JpegLib = require('../');
 var fs = require('fs');
 var sys = require('sys');
 var Buffer = require('buffer').Buffer;
 
 // --------
 
-var terminal = fs.readFileSync('./rgba-terminal.dat');
+var terminal = fs.readFileSync(__dirname + '/rgba-terminal.dat');
 
 var jpegStack = new JpegLib.DynamicJpegStack('rgba');
 jpegStack.setBackground(terminal, 720, 400);
@@ -18,16 +18,16 @@ function rectDim(fileName) {
     return { x: dim[0], y: dim[1], w: dim[2], h: dim[3] }
 }
 
-var files = fs.readdirSync('./push-data');
+var files = fs.readdirSync(__dirname + '/push-data');
 
 files.forEach(function(file) {
     var dim = rectDim(file);
-    var rgba = fs.readFileSync('./push-data/' + file);
+    var rgba = fs.readFileSync(__dirname + '/push-data/' + file);
     jpegStack.push(rgba, dim.x, dim.y, dim.w, dim.h);
 });
 
-fs.writeFileSync('dynamic.jpg', jpegStack.encodeSync().toString('binary'), 'binary');
+fs.writeFileSync(__dirname + '/dynamic.jpg', jpegStack.encodeSync().toString('binary'), 'binary');
 
 var dims = jpegStack.dimensions();
 
-sys.puts("x: " + dims.x + ", y: " + dims.y + ", w: " + dims.width + ", h: " + dims.height);
+console.log("x: " + dims.x + ", y: " + dims.y + ", w: " + dims.width + ", h: " + dims.height);

examples/fixed-jpeg-stack-async.js

@@ -1,4 +1,4 @@
-var JpegLib = require('jpeg');
+var JpegLib = require('../');
 var fs = require('fs');
 var sys = require('sys');
 var Buffer = require('buffer').Buffer;
@@ -13,15 +13,15 @@ function rectDim(fileName) {
     return { x: dim[0], y: dim[1], w: dim[2], h: dim[3] }
 }
 
-var files = fs.readdirSync('./push-data');
+var files = fs.readdirSync(__dirname + '/push-data');
 
 files.forEach(function(file) {
     var dim = rectDim(file);
-    var rgba = fs.readFileSync('./push-data/' + file);
+    var rgba = fs.readFileSync(__dirname + '/push-data/' + file);
     jpegStack.push(rgba, dim.x, dim.y, dim.w, dim.h);
 });
 
 jpegStack.encode(function (image) {
-    fs.writeFileSync('fixed-async.jpg', image.toString('binary'), 'binary');
+    fs.writeFileSync(__dirname + '/fixed-async.jpg', image.toString('binary'), 'binary');
 });
 

examples/fixed-jpeg-stack.js

@@ -1,4 +1,4 @@
-var JpegLib = require('jpeg');
+var JpegLib = require('../');
 var fs = require('fs');
 var sys = require('sys');
 var Buffer = require('buffer').Buffer;
@@ -13,13 +13,13 @@ function rectDim(fileName) {
     return { x: dim[0], y: dim[1], w: dim[2], h: dim[3] }
 }
 
-var files = fs.readdirSync('./push-data');
+var files = fs.readdirSync(__dirname + '/push-data');
 
 files.forEach(function(file) {
     var dim = rectDim(file);
-    var rgba = fs.readFileSync('./push-data/' + file);
+    var rgba = fs.readFileSync(__dirname + '/push-data/' + file);
     jpegStack.push(rgba, dim.x, dim.y, dim.w, dim.h);
 });
 
-fs.writeFileSync('fixed.jpg', jpegStack.encodeSync().toString('binary'), 'binary');
+fs.writeFileSync(__dirname + '/fixed.jpg', jpegStack.encodeSync().toString('binary'), 'binary');
 

examples/jpeg-example-async.js

@@ -1,12 +1,12 @@
 var fs  = require('fs');
 var sys = require('sys');
-var Jpeg = require('../jpeg').Jpeg;
+var Jpeg = require('../').Jpeg;
 var Buffer = require('buffer').Buffer;
 
-var rgba = fs.readFileSync('./rgba-terminal.dat');
+var rgba = fs.readFileSync(__dirname + '/rgba-terminal.dat');
 
 var jpeg = new Jpeg(rgba, 720, 400, 'rgba');
 jpeg.encode(function (image) {
-    fs.writeFileSync('./jpeg-async.jpeg', image.toString('binary'), 'binary');
+    fs.writeFileSync(__dirname + '/jpeg-async.jpeg', image.toString('binary'), 'binary');
 })
 

examples/jpeg-example.js

@@ -1,12 +1,11 @@
 var fs  = require('fs');
 var sys = require('sys');
-var Jpeg = require('../jpeg').Jpeg;
+var Jpeg = require('../').Jpeg;
 var Buffer = require('buffer').Buffer;
 
-var rgba = fs.readFileSync('./rgba-terminal.dat');
+var rgba = fs.readFileSync(__dirname + '/rgba-terminal.dat');
 
 var jpeg = new Jpeg(rgba, 720, 400, 'rgba');
 var jpeg_img = jpeg.encodeSync().toString('binary');
 
-fs.writeFileSync('./jpeg.jpeg', jpeg_img, 'binary');
-
+fs.writeFileSync(__dirname + '/jpeg.jpeg', jpeg_img, 'binary');

examples/jpeg-example2-async.js

@@ -1,6 +1,6 @@
 var fs  = require('fs');
 var sys = require('sys');
-var Jpeg = require('../jpeg').Jpeg;
+var Jpeg = require('../').Jpeg;
 var Buffer = require('buffer').Buffer;
 
 var WIDTH = 400, HEIGHT = 300;
@@ -17,6 +17,5 @@ for (var i=0; i<HEIGHT; i++) {
 
 var jpeg = new Jpeg(rgba, WIDTH, HEIGHT, 'rgb');
 jpeg.encode(function (jpeg_img) {
-    fs.writeFileSync('./jpeg-gradient-async.jpeg', jpeg_img.toString('binary'), 'binary');
+    fs.writeFileSync(__dirname + '/jpeg-gradient-async.jpeg', jpeg_img.toString('binary'), 'binary');
 });
-

examples/jpeg-example2.js

@@ -1,6 +1,6 @@
 var fs  = require('fs');
 var sys = require('sys');
-var Jpeg = require('../jpeg').Jpeg;
+var Jpeg = require('../').Jpeg;
 var Buffer = require('buffer').Buffer;
 
 var WIDTH = 400, HEIGHT = 300;
@@ -18,5 +18,5 @@ for (var i=0; i<HEIGHT; i++) {
 var jpeg = new Jpeg(rgba, WIDTH, HEIGHT, 'rgb');
 var jpeg_img = jpeg.encodeSync().toString('binary');
 
-fs.writeFileSync('./jpeg-gradient.jpeg', jpeg_img, 'binary');
+fs.writeFileSync(__dirname + '/jpeg-gradient.jpeg', jpeg_img, 'binary');
 

examples/test.js

@@ -0,0 +1,8 @@
+require('./dynamic-jpeg-stack-async')
+require('./dynamic-jpeg-stack')
+require('./fixed-jpeg-stack-async')
+require('./fixed-jpeg-stack')
+require('./jpeg-example-async')
+require('./jpeg-example')
+require('./jpeg-example2-async')
+require('./jpeg-example2')

incisor.yml

@@ -0,0 +1,21 @@
+builds:
+  - os: windows
+    stages:
+      setup:
+        - npm install
+      build:
+        - npm test
+
+  - os: linux
+    stages:
+      setup:
+        - npm install
+      build:
+        - npm test
+
+  - os: osx
+    stages:
+      setup:
+        - npm install
+      build:
+        - npm test

package.json

@@ -1,35 +1,53 @@
 {
-   "name": "jpeg",
-   "version": "2.0.0",
-   "main": "build/Release/jpeg",
-   "description": "A C++ module for node-js that converts RGB and RGBA buffers to a JPEG images (in memory).",
-   "keywords": [
-       "jpg",
-       "rgba",
-       "rgb",
-       "image",
-       "picture"
-   ],
-   "author": {
-       "name": "Peteris Krumins",
-       "email": "peteris.krumins@gmail.com",
-       "web": "http://www.catonmat.net",
-       "twitter": "pkrumins"
-   },
-   "license": "MIT",
-   "repository": {
-       "type": "git",
-       "url": "http://github.com/pkrumins/node-jpeg.git" 
-   },
-   "directories": {
-       "examples": "examples",
-       "src": "src"
-   },
-   "engines": {
-       "node": ">=0.1.93"
-   },
-   "scripts": {
-       "install": "node-gyp configure build"
-   }
+  "name": "jpeg",
+  "version": "2.0.0",
+  "main": "bindings/jpeg",
+  "description": "A C++ module for node-js that converts RGB and RGBA buffers to a JPEG images (in memory).",
+  "keywords": [
+    "jpg",
+    "rgba",
+    "rgb",
+    "image",
+    "picture"
+  ],
+  "author": {
+    "name": "Peteris Krumins",
+    "email": "peteris.krumins@gmail.com",
+    "web": "http://www.catonmat.net",
+    "twitter": "pkrumins"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/pkrumins/node-jpeg.git"
+  },
+  "directories": {
+    "examples": "examples",
+    "src": "src"
+  },
+  "engines": {
+    "node": ">=0.1.93"
+  },
+  "scripts": {
+    "install": "node-gyp configure build"
+  },
+  "dependencies": {
+    "nan": "^1.7.0",
+    "node-pre-gyp": "0.6.x"
+  },
+  "devDependencies": {
+    "aws-sdk": "~2.0.0-rc.15"
+  },
+  "bundledDependencies": [
+    "node-pre-gyp"
+  ],
+  "scripts": {
+    "install": "node-pre-gyp install --fallback-to-build"
+  },
+  "binary": {
+    "module_name": "jpeg",
+    "module_path": "./bindings",
+    "host": "https://tessel-builds.s3-us-west-2.amazonaws.com",
+    "remote_path": "./pre-gyp/{name}/v{version}"
+  }
 }
-