Merge branch 'master' of github.com:OptimalBits/bull

README.md

@@ -33,6 +33,9 @@
     <a href="http://badge.fury.io/js/bull">
       <img src="https://badge.fury.io/js/bull.svg"/>
     </a>
+    <a href="https://coveralls.io/github/OptimalBits/bull?branch=master">
+      <img src="https://coveralls.io/repos/github/OptimalBits/bull/badge.svg?branch=master"/>
+    </a>
     <a href="http://isitmaintained.com/project/OptimalBits/bull">
       <img src="http://isitmaintained.com/badge/open/optimalbits/bull.svg"/>
     </a>

lib/commands/index.js

@@ -37,8 +37,7 @@ module.exports = (function (){
 function loadScripts(dir) {
   return fs.readdirAsync(dir).filter(function (file){
     return path.extname(file) === '.lua';
-  })
-  .map(function (file) {
+  }).map(function (file) {
     var longName = path.basename(file, '.lua');
     var name = longName.split('-')[0];
     var numberOfKeys = parseInt(longName.split('-')[1]);
@@ -50,4 +49,4 @@ function loadScripts(dir) {
       };
     });
   });
-}
\ No newline at end of file
+}

lib/job.js

@@ -239,11 +239,12 @@ Job.prototype.promote = function(){
     keys.length,
     keys[0],
     keys[1],
-    jobId).then(function(result){
-      if(result === -1){
-        throw new Error('Job ' + jobId + ' is not in a delayed state');
-      }
-    });
+    jobId
+  ).then(function(result){
+    if(result === -1){
+      throw new Error('Job ' + jobId + ' is not in a delayed state');
+    }
+  });
 };
 
 /**

lib/queue.js

@@ -209,8 +209,8 @@ var Queue = function Queue(name, url, opts){
 
 function redisClientGetter(queue, options, initCallback) {
   var createClient = _.isFunction(options.createClient)
-      ? options.createClient
-      : function(type, config) { return new redis(config); };
+    ? options.createClient
+    : function(type, config) { return new redis(config); };
 
   var connections = {};
 

lib/repeatable.js

@@ -61,21 +61,22 @@ module.exports = function(Queue){
     end = end || -1;
     return (asc ?
       this.client.zrange(key, start, end, 'WITHSCORES') :
-      this.client.zrevrange(key, start, end, 'WITHSCORES')).then(function(result){
-        var jobs = [];
-        for(var i=0; i<result.length; i+=2){
-          var data = result[i].split(':');
-          jobs.push({
-            name: data[0],
-            id: data[1] || null,
-            endDate: parseInt(data[2]) || null,
-            tz: data[3] || null,
-            cron: data[4],
-            next: parseInt(result[i+1])
-          });
-        }
-        return jobs;
-      });
+      this.client.zrevrange(key, start, end, 'WITHSCORES')
+    ).then(function(result){
+      var jobs = [];
+      for(var i=0; i<result.length; i+=2){
+        var data = result[i].split(':');
+        jobs.push({
+          name: data[0],
+          id: data[1] || null,
+          endDate: parseInt(data[2]) || null,
+          tz: data[3] || null,
+          cron: data[4],
+          next: parseInt(result[i+1])
+        });
+      }
+      return jobs;
+    });
   };
 
   Queue.prototype.getRepeatableCount = function(){

test/cluster_worker.js

@@ -22,7 +22,7 @@ queue.process(1, function(job, jobDone) {
 
 process.on('disconnect', function () {
   queue.close().then(function () {
-//    process.exit(0);
+  //  process.exit(0);
   }).catch(function (err) {
     console.error(err);
   //  process.exit(-1);

test/test_queue.js

@@ -1528,24 +1528,25 @@ describe('Queue', function () {
         queue.add({ order: 2 }, { delay: 300 }),
         queue.add({ order: 4 }, { delay: 500 }),
         queue.add({ order: 1 }, { delay: 200 }),
-        queue.add({ order: 3 }, { delay: 400 })).then(function () {
-          //
-          // Start processing so that jobs get into the delay set.
-          //
-          queue.process(fn);
-        }).delay(20).then(function () {
-          /*
-          //We simulate a restart
-          console.log('RESTART');
-          return queue.close().then(function () {
-            console.log('CLOSED');
-            return Promise.delay(100).then(function () {
-              queue = new Queue(QUEUE_NAME);
-              queue.process(fn);
-            });
+        queue.add({ order: 3 }, { delay: 400 })
+      ).then(function () {
+        //
+        // Start processing so that jobs get into the delay set.
+        //
+        queue.process(fn);
+      }).delay(20).then(function () {
+        /*
+        //We simulate a restart
+        console.log('RESTART');
+        return queue.close().then(function () {
+          console.log('CLOSED');
+          return Promise.delay(100).then(function () {
+            queue = new Queue(QUEUE_NAME);
+            queue.process(fn);
           });
-          */
         });
+        */
+      });
     });
 
     it('should process delayed jobs with exact same timestamps in correct order (FIFO)', function (done) {
@@ -2458,4 +2459,4 @@ describe('Queue', function () {
       });
     });
   });
-});
\ No newline at end of file
+});