From ea2b92f291c695b7a53538b74e00b99071535a98 Mon Sep 17 00:00:00 2001
From: Antonio D'Ettole <antonio@brandwatch.com>
Date: Sun, 31 Aug 2014 12:58:37 +0200
Subject: [PATCH] Add .editorconfig and use it on all project files

---
 .editorconfig    | 12 ++++++++++++
 .travis.yml      |  4 ++--
 lib/job.js       |  8 ++++----
 test/test_job.js | 42 +++++++++++++++++++++---------------------
 4 files changed, 39 insertions(+), 27 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..ac72573
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+; EditorConfig file: http://EditorConfig.org
+; Install the "EditorConfig" plugin into Sublime Text to use
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
diff --git a/.travis.yml b/.travis.yml
index a4b4d0b..62b0b33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,5 +5,5 @@ node_js:
   - '0.8'
   - '0.10'
 
-services: 
-  - redis-server 
+services:
+  - redis-server
diff --git a/lib/job.js b/lib/job.js
index 117b323..ff292f4 100644
--- a/lib/job.js
+++ b/lib/job.js
@@ -95,7 +95,7 @@ Job.prototype.releaseLock = function(token){
     'else',
     'return 0',
     'end'].join('\n');
-    
+
   return this.queue.client.evalAsync(script, 1, this.lockKey(), token).then(function(result){
     return result === 1;
   });
@@ -144,7 +144,7 @@ Job.prototype.remove = function(){
   });
 
   return this.queue.client.evalAsync(
-    script, 
+    script,
     keys.length,
     keys[0],
     keys[1],
@@ -169,9 +169,9 @@ Job.prototype._moveToSet = function(set){
   var queue = this.queue;
   var activeList = queue.toKey('active');
   var destinationSet = queue.toKey(set);
-  
+
   var multi = queue.multi();
-    
+
   return multi
     .lrem(activeList, 0, this.jobId)
     .sadd(destinationSet, this.jobId)
diff --git a/test/test_job.js b/test/test_job.js
index c1dc918..4ce98c4 100644
--- a/test/test_job.js
+++ b/test/test_job.js
@@ -5,7 +5,7 @@ var expect = require('expect.js');
 
 describe('Job', function(){
   var queue;
-  
+
   before(function(done){
     queue = new Queue('test', 6379, '127.0.0.1');
     queue.client.keys(queue.toKey('*'), function(err, keys){
@@ -23,13 +23,13 @@ describe('Job', function(){
     Job.create(queue, 1, {foo: 'bar'}).then(function(job){
       expect(job).to.have.property('jobId');
       expect(job).to.have.property('data');
-    
+
       expect(job.data.foo).to.be.equal('bar');
-      
+
       Job.fromId(queue, job.jobId).then(function(storedJob){
         expect(storedJob).to.have.property('jobId');
         expect(storedJob).to.have.property('data');
-    
+
         expect(storedJob.data.foo).to.be.equal('bar');
         done();
       }, function(err){
@@ -41,14 +41,14 @@ describe('Job', function(){
       done(err);
     });
   });
-  
+
   it('remove', function(done){
     Job.create(queue, 1, {foo: 'bar'}).then(function(job){
       expect(job).to.have.property('jobId');
       expect(job).to.have.property('data');
-    
+
       expect(job.data.foo).to.be.equal('bar');
-      
+
       job.remove().then(function(){
         Job.fromId(queue, job.jobId).then(function(storedJob){
           expect(storedJob).to.be(null);
@@ -63,14 +63,14 @@ describe('Job', function(){
       done(err);
     });
   })
-  
-  
+
+
   describe('Locking', function(){
     it('take a lock', function(done){
       Job.create(queue, 1, {foo: 'bar'}).then(function(job){
         expect(job).to.have.property('jobId');
         expect(job).to.have.property('data');
-        
+
         return job.takeLock('123').then(function(lockTaken){
           expect(lockTaken).to.be(true);
         });
@@ -79,12 +79,12 @@ describe('Job', function(){
         done(err);
       });
     });
-    
+
     it('take an already taken lock', function(done){
       Job.create(queue, 2, {foo: 'bar'}).then(function(job){
         expect(job).to.have.property('jobId');
         expect(job).to.have.property('data');
-        
+
         return job.takeLock('123').then(function(lockTaken){
           expect(lockTaken).to.be(true);
         }).then(function(){
@@ -97,12 +97,12 @@ describe('Job', function(){
         done(err);
       });
     });
-    
+
     it('renew a taken lock', function(done){
       Job.create(queue, 3, {foo: 'bar'}).then(function(job){
         expect(job).to.have.property('jobId');
         expect(job).to.have.property('data');
-        
+
         return job.takeLock('123').then(function(lockTaken){
           expect(lockTaken).to.be(true);
         }).then(function(){
@@ -115,12 +115,12 @@ describe('Job', function(){
         done(err);
       });
     });
-    
+
     it('release a lock', function(done){
       Job.create(queue, 4, {foo: 'bar'}).then(function(job){
         expect(job).to.have.property('jobId');
         expect(job).to.have.property('data');
-        
+
         return job.takeLock('123').then(function(lockTaken){
           expect(lockTaken).to.be(true);
         }).then(function(){
@@ -138,8 +138,8 @@ describe('Job', function(){
       });
     });
   })
-  
-  
+
+
   it('report progress', function(done){
     Job.create(queue, 2, {foo: 'bar'}).then(function(job){
       expect(job).to.have.property('jobId');
@@ -159,7 +159,7 @@ describe('Job', function(){
       done(err);
     });
   });
-  
+
   it('moveToCompleted', function(done){
     Job.create(queue, 3, {foo: 'bar'}).then(function(job){
       return job.isCompleted().then(function(isCompleted){
@@ -176,7 +176,7 @@ describe('Job', function(){
       done(err);
     });
   });
-  
+
   it('moveToFailed', function(done){
     Job.create(queue, 4, {foo: 'bar'}).then(function(job){
       return job.isFailed().then(function(isFailed){
@@ -192,7 +192,7 @@ describe('Job', function(){
     }, function(err){
       done(err);
     });
-    
+
   });
 });