Dev

.gitignore

@@ -5,3 +5,4 @@ node_modules
 *.rdb
 test/incomplete
 *.swp
+/.project

Makefile

@@ -4,11 +4,13 @@ all:    build
 
 build:
 	@./node_modules/coffee-script/bin/coffee \
+		--exit \
     -c \
     -o lib src
 
 test-tdd:
 	@./node_modules/.bin/mocha \
+		--exit \
     --reporter $(REPORTER) \
 		--require should \
 		--require sinon \
@@ -17,17 +19,18 @@ test-tdd:
 
 test-bdd:
 	@./node_modules/.bin/mocha \
+		--exit \
     --reporter $(REPORTER) \
     --require should \
     --ui bdd \
     test/*.js
 
 test-bdd-coffee:
 	@./node_modules/.bin/mocha \
-    --compilers coffee:coffee-script \
+		--exit \
     --reporter $(REPORTER) \
-    --require should \
     --require coffee-script/register \
+    --require should \
     --ui bdd \
     test/*.coffee
 

Readme.md

@@ -251,7 +251,7 @@ queue.on('job enqueue', function(id, type){
   console.log( 'Job %s got queued of type %s', id, type );
 
 }).on('job complete', function(id, result){
-  kue.Job.get(id, function(err, job){
+  queue.Job.get(id, function(err, job){
     if (err) return;
     job.remove(function(err){
       if (err) throw err;
@@ -490,14 +490,14 @@ queue.inactive( function( err, ids ) { // others are active, complete, failed, d
 however the second one doesn't scale to large deployments, there you can use more specific `Job` static methods:
 
 ```js
-kue.Job.rangeByState( 'failed', 0, n, 'asc', function( err, jobs ) {
+queue.Job.rangeByState( 'failed', 0, n, 'asc', function( err, jobs ) {
   // you have an array of maximum n Job objects here
 });
 ```
 or
 
 ```js
-kue.Job.rangeByType( 'my-job-type', 'failed', 0, n, 'asc', function( err, jobs ) {
+queue.Job.rangeByType( 'my-job-type', 'failed', 0, n, 'asc', function( err, jobs ) {
   // you have an array of maximum n Job objects here
 });
 ```
@@ -512,7 +512,7 @@ If you did none of above in [Error Handling](#error-handling) section or your pr
 ```js
 queue.active( function( err, ids ) {
   ids.forEach( function( id ) {
-    kue.Job.get( id, function( err, job ) {
+    queue.Job.get( id, function( err, job ) {
       // Your application should check if job is a stuck one
       job.inactive();
     });
@@ -533,7 +533,7 @@ queue.create( ... ).removeOnComplete( true ).save()
 But if you eventually/temporally need completed job data, you can setup an on-demand job removal script like below to remove top `n` completed jobs:
 
 ```js
-kue.Job.rangeByState( 'complete', 0, n, 'asc', function( err, jobs ) {
+queue.Job.rangeByState( 'complete', 0, n, 'asc', function( err, jobs ) {
   jobs.forEach( function( job ) {
     job.remove( function(){
       console.log( 'removed ', job.id );

bin/kue-dashboard

@@ -1,20 +1,20 @@
 #!/usr/bin/env node
 var kue = require('kue');
 var argv = require('yargs')
-	.usage('Usage: $0 [options]')
-	.example('$0 -p 3050 -r redis://10.0.0.4:6379 -q q')
-	.describe('r', 'Redis url')
-	.describe('p', 'Dashboard port')
-	.describe('q', 'Prefix to use')
-	.default('p', 3000)
-	.default('r', 'redis://127.0.0.1:6379')
-	.default('q', 'q')
-	.help('h')
+        .usage('Usage: $0 [options]')
+        .example('$0 -p 3050 -r redis://10.0.0.4:6379 -q q')
+        .describe('r', 'Redis url')
+        .describe('p', 'Dashboard port')
+        .describe('q', 'Prefix to use')
+        .default('p', 3000)
+        .default('r', 'redis://127.0.0.1:6379')
+        .default('q', 'q')
+        .help('h')
     .alias('h', 'help')
     .argv
 ;
 
-kue.createQueue({
+kue.getQueue({
   redis: argv.r,
   prefix: argv.q
 });

examples/stale.js

@@ -4,7 +4,7 @@ var kue     = require( '../' )
 // create our job queue
 
 var jobs = kue.createQueue()
-  , Job  = kue.Job;
+  , Job  = jobs.Job;
 
 // start redis with $ redis-server
 
@@ -62,4 +62,4 @@ jobs.on( 'job complete', function ( id ) {
 var app = express.createServer();
 app.use( kue.app );
 app.listen( 3000 );
-console.log( 'UI started on port 3000' );
+console.log( 'UI started on port 3000' );

lib/http/routes/index.js

@@ -9,8 +9,7 @@
  */
 
 var Queue = require('../../kue')
-  , Job   = require('../../queue/job')
-  , queue = Queue.createQueue();
+  , queue = Queue.getQueue();
 
 /**
  * Serve the index page.

lib/http/routes/json.js

@@ -9,9 +9,9 @@
  */
 
 var Queue  = require('../../kue')
-  , Job    = require('../../queue/job')
   , lodash = require('lodash')
-  , queue  = Queue.createQueue();
+  , queue  = Queue.getQueue()
+  , Job    = queue.Job;
 
 /**
  * Search instance.
@@ -21,7 +21,7 @@ var search;
 function getSearch() {
   if( search ) return search;
   var reds = require('reds');
-  reds.createClient = require('../../redis').createClient;
+  reds.createClient = queue.redis.createClient;
   return search = reds.createSearch(queue.client.getKey('search'));
 }
 
@@ -158,7 +158,7 @@ exports.createJob = function( req, res ) {
   function _create( args, next ) {
     if( !args.type ) return next({ error: 'Must provide job type' }, null, 400);
 
-    var job     = new Job(args.type, args.data || {});
+    var job     = queue.createJob(args.type, args.data || {});
     var options = args.options || {};
     if( options.attempts ) job.attempts(parseInt(options.attempts));
     if( options.priority ) job.priority(options.priority);
@@ -167,7 +167,7 @@ exports.createJob = function( req, res ) {
     if( options.backoff ) job.backoff(options.backoff);
     if( options.removeOnComplete ) job.removeOnComplete(options.removeOnComplete);
     if( options.ttl ) job.ttl(options.ttl);
-    
+
     job.save(function( err ) {
       if( err ) {
         return next({ error: err.message }, null, 500);