Merge branch 'NodeClusterCompatibility' of https://github.com/penartu…

…r/node-compute-cluster

lib/compute-cluster.js

@@ -66,6 +66,18 @@ ComputeCluster.prototype._onWorkerExit = function(pid) {
   }
 };
 
+ComputeCluster.prototype._getEnvForWorker = function() {
+  var env = {};
+  for (var i in process.env) {
+    env[i] = process.env[i];
+  }
+
+  delete env.NODE_WORKER_ID; //Node.js cluster worker marker for v0.6
+  delete env.NODE_UNIQUE_ID; //Node.js cluster worker marker for v0.7
+
+  return env;
+};
+
 ComputeCluster.prototype._getFreeWorker = function() {
   var self = this;
 
@@ -79,7 +91,7 @@ ComputeCluster.prototype._getFreeWorker = function() {
       worker: child_process.fork(
         this._module,
         [],
-        { env: process.env }
+        { env: this._getEnvForWorker() }
       ) };
     k.worker.on('exit', this._onWorkerExit(k.worker.pid));
     this._kids[k.worker.pid] = k;

test/inside-nodecluster-test.js

@@ -0,0 +1,55 @@
+#!/usr/bin/env node
+
+const
+vows = require('vows'),
+assert = require('assert'),
+nodeCluster = require('cluster'),
+computeCluster = require('../lib/compute-cluster'),
+path = require('path');
+
+if(nodeCluster.isMaster) {
+  nodeCluster.fork();
+  return;
+}
+
+var suite = vows.describe('basic tests');
+
+// disable vows (often flakey?) async error behavior
+suite.options.error = false;
+
+suite.addBatch({
+  "allocation of a compute cluster": {
+    topic: function() {
+      return new computeCluster({
+        module: path.join(__dirname, 'workers', 'echo.js')
+      });
+    },
+    "runs without issue": function (cc) {
+      assert.isObject(cc);
+    },
+    "and invocation against this cluster": {
+      topic: function(cc) {
+        var cb = this.callback;
+        cc.enqueue("hello", function(e, r) {
+          cb.call(self, { cc: cc, r: r });
+        });
+
+      },
+      "succeeds": function (r) {
+        assert.equal(r.r, 'hello');
+      },
+      "finally, exit": {
+        topic: function(r) {
+          r.cc.exit(this.callback);
+        },
+        "also succeeds": function(err) {
+          assert.isNull(err);
+        }
+      }
+    }
+  }
+});
+
+// run or export the suite.
+if (process.argv[1] === __filename) suite.run();
+else suite.export(module);