Merge pull request #18 from dschmidt/read-options-from-configured-name

Read config from configured name path instead of static 'redis' key

Author: Aaron Chambers

index.js

@@ -39,10 +39,10 @@ module.exports = {
           return context.commandOptions.revision || context.revisionKey;
         },
         redisDeployClient: function(context) {
-          var options = context.config.redis;
+          var redisOptions = this.pluginConfig;
           var redisLib = context._redisLib;
 
-          return new Redis(options, redisLib);
+          return new Redis(redisOptions, redisLib);
         }
       },
       configure: function(/* context */) {
@@ -114,6 +114,7 @@ module.exports = {
         return Promise.reject(error);
       }
     });
+
     return new DeployPlugin();
   }
 };

package.json

@@ -44,7 +44,7 @@
   "dependencies": {
     "chalk": "^1.0.0",
     "core-object": "^1.1.0",
-    "ember-cli-deploy-plugin": "0.1.2",
+    "ember-cli-deploy-plugin": "0.1.3",
     "ember-cli-babel": "^5.0.0",
     "redis": "^0.12.1",
     "rsvp": "^3.0.18",

tests/helpers/fake-redis-client.js

@@ -0,0 +1,13 @@
+var CoreObject = require('core-object');
+
+module.exports = CoreObject.extend({
+  init: function (options) {
+    this.options = options;
+  },
+  get: function(key) {
+    return Promise.resolve('some-other-value');
+  },
+  set: function() { },
+  lpush: function() { },
+  ltrim: function() { }
+});

tests/helpers/fake-redis-lib.js

@@ -0,0 +1,15 @@
+var FakeClient = require('./fake-redis-client');
+
+var CoreObject = require('core-object');
+
+module.exports = CoreObject.extend({
+  init: function(clientClass) {
+      this.clientClass = clientClass || FakeClient;
+  },
+
+  createClient: function(options) {
+    this.options = options;
+    this.createdClient = new this.clientClass(options);
+    return this.createdClient;
+  }
+});

tests/unit/index-nodetest.js

@@ -2,28 +2,14 @@
 
 var Promise = require('ember-cli/lib/ext/promise');
 var assert  = require('ember-cli/tests/helpers/assert');
-var CoreObject = require('core-object');
+var FakeRedis = require('../helpers/fake-redis-lib');
 
 var stubProject = {
   name: function(){
     return 'my-project';
   }
 };
 
-var fakeClient = {
-  createClient: function(options) {
-    this.options = options;
-    return {
-      get: function(key) {
-        return Promise.resolve('some-other-value');
-      },
-      set: function() { },
-      lpush: function() { },
-      ltrim: function() { }
-    }
-  }
-};
-
 describe('redis plugin', function() {
   var subject, mockUi;
 
@@ -83,6 +69,8 @@ describe('redis plugin', function() {
         name: 'redis'
       });
 
+      var redisLib = new FakeRedis();
+
       var context = {
         ui: mockUi,
         project: stubProject,
@@ -93,15 +81,15 @@ describe('redis plugin', function() {
             database: 4
           }
         },
-        _redisLib: fakeClient
+        _redisLib: redisLib
       };
       plugin.beforeHook(context);
       plugin.configure(context);
       plugin.readConfig('redisDeployClient');
 
-      assert.equal(fakeClient.options.host, 'somehost');
-      assert.equal(fakeClient.options.port, 1234);
-      assert.equal(fakeClient.options.database, 4);
+      assert.equal(redisLib.createdClient.options.host, 'somehost');
+      assert.equal(redisLib.createdClient.options.port, 1234);
+      assert.equal(redisLib.createdClient.options.database, 4);
     });
 
     describe('resolving revisionKey from the pipeline', function() {
@@ -292,6 +280,34 @@ describe('redis plugin', function() {
         assert.isDefined(config.redis.didDeployMessage);
       });
     });
+
+    describe('with aliases', function () {
+      it('passes config for specified alias to redis', function () {
+        var plugin = subject.createDeployPlugin({
+          name: 'foobar'
+        });
+
+        var redisLib = new FakeRedis();
+
+        var config = {
+          database: 7
+        };
+        var context = {
+          ui: mockUi,
+          project: stubProject,
+          config: {
+            foobar: config
+          },
+          _redisLib: redisLib
+        };
+
+        plugin.beforeHook(context);
+        plugin.configure(context);
+        plugin.readConfig('redisDeployClient');
+
+        assert.equal(redisLib.createdClient.options.database, 7);
+      });
+    });
   });
 
   describe('upload hook', function() {

tests/unit/lib/redis-nodetest.js

@@ -1,5 +1,9 @@
 'use strict';
 
+var FakeRedis = require('../../helpers/fake-redis-lib');
+var FakeClient = require('../../helpers/fake-redis-client');
+
+
 var Promise = require('ember-cli/lib/ext/promise');
 var assert  = require('ember-cli/tests/helpers/assert');
 var CoreObject = require('core-object');
@@ -11,26 +15,6 @@ describe('redis', function() {
     Redis = require('../../../lib/redis');
   });
 
-  var FakeClient = CoreObject.extend({
-    get: function(key) {
-      return Promise.resolve('some-other-value');
-    },
-    set: function() { },
-    lpush: function() { },
-    ltrim: function() { }
-  });
-
-  var FakeRedis = CoreObject.extend({
-    init: function(clientClass) {
-        this.clientClass = clientClass || FakeClient;
-    },
-
-    createClient: function(options) {
-      this.options = options;
-      return new this.clientClass()
-    }
-  });
-
   describe('#upload', function() {
     it('rejects if the key already exists in redis', function() {
       var redis = new Redis({}, new FakeRedis());