Merge pull request #113 from synthmeat/master

replace 'package' keyword with 'pkg'
actionhero · Jan 10, 2016 · eb0c99a · eb0c99a
2 parents b11dd1f + cabcf8b
commit eb0c99a
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ var NR = require("node-resque");
 ///////////////////////////
 
 var connectionDetails = {
-  package:   'ioredis',
+  pkg:       'ioredis',
   host:      '127.0.0.1',
   password:  null,
   port:      6379,
@@ -131,7 +131,7 @@ The configuration hash passed to `new worker`, `new scheduler` or `new queue` ca
 
 ```javascript
 var connectionDetails = {
-  package:   "ioredis",
+  pkg:       "ioredis",
   host:      "127.0.0.1",
   password:  "",
   port:      6379,
@@ -387,7 +387,7 @@ node-resque provides a wrapper around the `worker` object which will auto-scale
 var NR = require(__dirname + "/../index.js");
 
 var connectionDetails = {
-  package:   "ioredis",
+  pkg:       "ioredis",
   host:      "127.0.0.1",
   password:  ""
 }

diff --git a/examples/customPluginExample.js b/examples/customPluginExample.js
@@ -10,7 +10,7 @@ var NR = require(__dirname + "/../index.js");
 ///////////////////////////
 
 var connectionDetails = {
-  package:   'ioredis',
+  pkg:       'ioredis',
   host:      '127.0.0.1',
   password:  null,
   port:      6379,

diff --git a/examples/errorExample.js b/examples/errorExample.js
@@ -10,7 +10,7 @@ var NR = require(__dirname + "/../index.js");
 ///////////////////////////
 
 var connectionDetails = {
-  package:   'ioredis',
+  pkg:       'ioredis',
   host:      '127.0.0.1',
   password:  null,
   port:      6379,

diff --git a/examples/example.js b/examples/example.js
@@ -10,7 +10,7 @@ var NR = require(__dirname + "/../index.js");
 ///////////////////////////
 
 var connectionDetails = {
-  package:   'ioredis',
+  pkg:       'ioredis',
   host:      '127.0.0.1',
   password:  null,
   port:      6379,

diff --git a/examples/multiWorker.js b/examples/multiWorker.js
@@ -3,7 +3,7 @@
 var NR = require(__dirname + "/../index.js");
 
 var connectionDetails = {
-  package:   'ioredis',
+  pkg:       'ioredis',
   host:      '127.0.0.1',
   password:  null,
   port:      6379,

diff --git a/examples/scheduledJobs.js b/examples/scheduledJobs.js
@@ -14,7 +14,7 @@ var schedule = require('node-schedule');
 ///////////////////////////
 
 var connectionDetails = {
-  package:   'ioredis',
+  pkg:   'ioredis',
   host:      '127.0.0.1',
   password:  null,
   port:      6379,

diff --git a/lib/connection.js b/lib/connection.js
@@ -19,7 +19,7 @@ util.inherits(connection, EventEmitter);
 
 connection.prototype.defaults = function(){
   return {
-    package:   'ioredis',
+    pkg:       'ioredis',
     host:      '127.0.0.1',
     port:      6379,
     database:  0,
@@ -47,8 +47,8 @@ connection.prototype.connect = function(callback){
 
   }else{
 
-    var package = require(self.options.package);
-    self.redis = package.createClient(self.options.port, self.options.host, self.options.options);
+    var pkg = require(self.options.pkg);
+    self.redis = pkg.createClient(self.options.port, self.options.host, self.options.options);
 
     var handleConnection = function(){
       if(self.connected === true){
@@ -67,7 +67,7 @@ connection.prototype.connect = function(callback){
     };
 
     self.redis.on('connect', handleConnection);
-    if(self.options.package === 'fakeredis'){ process.nextTick(handleConnection); }
+    if(self.options.pkg === 'fakeredis'){ process.nextTick(handleConnection); }
   }
 
   self.redis.on('error', function(err){
@@ -83,7 +83,7 @@ connection.prototype.end = function(){
   var self = this;
   self.connected = false;
   // Only disconnect if we established the redis connection on our own.
-  if (!self.options.redis && self.options.package !== 'fakeredis'){
+  if (!self.options.redis && self.options.pkg !== 'fakeredis'){
     if(typeof self.redis.disconnect === 'function'){ self.redis.disconnect(); }
     else{ self.redis.quit(); }
   }

diff --git a/test/_specHelper.js b/test/_specHelper.js
@@ -3,19 +3,19 @@ var fakeredis = require('fakeredis');
 var namespace = "resque_test";
 var queue = "test_queue";
 
-var package = 'ioredis';
-if(process.env.FAKEREDIS === 'true'){ package = 'fakeredis';  }
+var pkg = 'ioredis';
+if(process.env.FAKEREDIS === 'true'){ pkg = 'fakeredis';  }
 
-console.log("Using " + package);
+console.log("Using " + pkg);
 
 exports.specHelper = {
-  package: package,
+  pkg: pkg,
   NR: require(__dirname + "/../index.js"),
   namespace: namespace,
   queue: queue,
   timeout: 500,
   connectionDetails: {
-    package:   package, 
+    pkg:       pkg, 
     host:      "127.0.0.1",
     password:  "",
     port:      6379,
@@ -25,7 +25,7 @@ exports.specHelper = {
   },
   connect: function(callback){
     var self = this;
-    if(package != 'fakeredis'){
+    if(pkg != 'fakeredis'){
       self.redis = redis.createClient(self.connectionDetails.port, self.connectionDetails.host, self.connectionDetails.options);
       self.redis.setMaxListeners(0);
       if(self.connectionDetails.password != null && self.connectionDetails.password != ""){
@@ -93,7 +93,7 @@ exports.specHelper = {
   cleanConnectionDetails: function(){
     var self = this;
     var out = {};
-    if(self.package === 'fakeredis'){
+    if(self.pkg === 'fakeredis'){
       return self.connectionDetails;
     }
     for(var i in self.connectionDetails){
@@ -104,4 +104,4 @@ exports.specHelper = {
 
     return out;
   }
-}
+}
diff --git a/test/core/connection.js b/test/core/connection.js
@@ -24,7 +24,7 @@ describe('connection', function(){
     }
 
     var connectionDetails = {
-      package:   specHelper.connectionDetails.package,
+      pkg:       specHelper.connectionDetails.pkg,
       host:      "wronghostname",
       password:  specHelper.connectionDetails.password,
       port:      specHelper.connectionDetails.port,
@@ -58,4 +58,4 @@ describe('connection', function(){
     });    
   });
 
-});
+});
diff --git a/test/core/multiWorker.js b/test/core/multiWorker.js
@@ -1,7 +1,7 @@
 var specHelper = require(__dirname + "/../_specHelper.js").specHelper;
 var should = require('should');
 
-if(specHelper.package === 'fakeredis'){
+if(specHelper.pkg === 'fakeredis'){
   console.log("multiWorker does not work with fakeredis for now...");
 }else{
 
@@ -139,4 +139,4 @@ if(specHelper.package === 'fakeredis'){
     });
 
   });
-}
+}
diff --git a/test/core/queue.js b/test/core/queue.js
@@ -21,7 +21,7 @@ describe('queue', function(){
     }
 
     var connectionDetails = {
-      package:   specHelper.connectionDetails.package,
+      pkg:       specHelper.connectionDetails.pkg,
       host:      "wronghostname",
       password:  specHelper.connectionDetails.password,
       port:      specHelper.connectionDetails.port,

diff --git a/test/core/scheduler.js b/test/core/scheduler.js
@@ -16,7 +16,7 @@ describe('scheduler', function(){
 
   it("can provide an error if connection does not establish for a long period", function(done) {
     var connectionDetails = {
-      package:   specHelper.connectionDetails.package,
+      pkg:       specHelper.connectionDetails.pkg,
       host:      "wronghostname",
       password:  specHelper.connectionDetails.password,
       port:      specHelper.connectionDetails.port,
@@ -54,7 +54,7 @@ describe('scheduler', function(){
     }
 
     var connectionDetails = {
-      package:   specHelper.connectionDetails.package,
+      pkg:       specHelper.connectionDetails.pkg,
       host:      "wronghostname",
       password:  specHelper.connectionDetails.password,
       port:      specHelper.connectionDetails.port,

diff --git a/test/core/worker.js b/test/core/worker.js
@@ -53,7 +53,7 @@ describe('worker', function(){
     }
 
     var connectionDetails = {
-      package:   specHelper.connectionDetails.package,
+      pkg:       specHelper.connectionDetails.pkg,
       host:      "wronghostname",
       password:  specHelper.connectionDetails.password,
       port:      specHelper.connectionDetails.port,