Fix bugs related to deps upgrades

package.json

@@ -22,7 +22,7 @@
     "scripts":
     {
         "start": "sudo node server.js",
-        "test": "mocha --compilers coffee:coffee-script --reporter spec tests/*.coffee"
+        "test": "mocha --compilers coffee:coffee-script/register --reporter spec tests/*.coffee"
     },
     "engines":
     {

pushd.coffee

@@ -4,14 +4,18 @@ zlib = require 'zlib'
 url = require 'url'
 Netmask = require('netmask').Netmask
 settings = require './settings'
-redis = require('redis').createClient(settings.server.redis_socket or settings.server.redis_port, settings.server.redis_host)
 Subscriber = require('./lib/subscriber').Subscriber
 EventPublisher = require('./lib/eventpublisher').EventPublisher
 Event = require('./lib/event').Event
 PushServices = require('./lib/pushservices').PushServices
 Payload = require('./lib/payload').Payload
 logger = require 'winston'
 
+if settings.server.redis_socket?
+    redis = require('redis').createClient(settings.server.redis_socket)
+else if settings.server.redis_port? or settings.server.redis_host?
+    redis = require('redis').createClient(settings.server.redis_port, settings.server.redis_host)
+
 if settings.loglevel?
     logger.remove(logger.transports.Console);
     logger.add(logger.transports.Console, { level: settings.loglevel });

server.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-require('coffee-script');
+require('coffee-script/register');
 require('./pushd');

tests/performance/statsserver.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-require('coffee-script');
+require('coffee-script/register');
 require('./pushlistener');