Merge pull request #15 from strange-studios/split-file-pattern

Make filePattern config relative to distDir

Author: Aaron Chambers

index.js

@@ -2,6 +2,7 @@
 'use strict';
 
 var Promise   = require('ember-cli/lib/ext/promise');
+var path      = require('path');
 var fs        = require('fs');
 
 var denodeify = require('rsvp').denodeify;
@@ -20,8 +21,9 @@ module.exports = {
       defaultConfig: {
         host: 'localhost',
         port: 6379,
-        filePattern: function(context) {
-          return context.distDir + '/index.html';
+        filePattern: 'index.html',
+        distDir: function(context) {
+          return context.distDir;
         },
         keyPrefix: function(context){
           return context.project.name() + ':index';
@@ -30,7 +32,7 @@ module.exports = {
           if (context.revisionKey && !context.activatedRevisionKey) {
             return "Deployed but did not activate revision " + context.revisionKey + ". "
                  + "To activate, run: "
-                 + "ember activate " + context.revisionKey + " --environment=" + context.deployEnvironment + "\n";
+                 + "ember deploy:activate " + context.revisionKey + " --environment=" + context.deployEnvironment + "\n";
           }
         },
         revisionKey: function(context) {
@@ -46,19 +48,21 @@ module.exports = {
         if (!this.pluginConfig.url) {
           ['host', 'port'].forEach(this.applyDefaultConfigProperty.bind(this));
         }
-        ['filePattern', 'keyPrefix', 'revisionKey', 'didDeployMessage', 'redisDeployClient'].forEach(this.applyDefaultConfigProperty.bind(this));
+        ['filePattern', 'distDir', 'keyPrefix', 'revisionKey', 'didDeployMessage', 'redisDeployClient'].forEach(this.applyDefaultConfigProperty.bind(this));
 
         this.log('config ok');
       },
 
       upload: function(/* context */) {
         var redisDeployClient = this.readConfig('redisDeployClient');
         var revisionKey       = this.readConfig('revisionKey');
+        var distDir           = this.readConfig('distDir');
         var filePattern       = this.readConfig('filePattern');
         var keyPrefix         = this.readConfig('keyPrefix');
+        var filePath          = path.join(distDir, filePattern);
 
-        this.log('Uploading `' + filePattern + '`');
-        return this._readFileContents(filePattern)
+        this.log('Uploading `' + filePath + '`');
+        return this._readFileContents(filePath)
           .then(redisDeployClient.upload.bind(redisDeployClient, keyPrefix, revisionKey))
           .then(this._uploadSuccessMessage.bind(this))
           .then(function(key) {

tests/unit/index-nodetest.js

@@ -162,7 +162,7 @@ describe('redis plugin', function() {
 
           return previous;
         }, []);
-        assert.equal(messages.length, 7);
+        assert.equal(messages.length, 8);
       });
       it('adds default config to the config object', function() {
         plugin.configure(context);
@@ -191,7 +191,7 @@ describe('redis plugin', function() {
         };
         plugin.beforeHook(context);
       });
-      it('warns about missing optional filePattern, revisionKey, didDeployMessage, and connection info', function() {
+      it('warns about missing optional filePattern, distDir, revisionKey, didDeployMessage, and connection info', function() {
         plugin.configure(context);
         var messages = mockUi.messages.reduce(function(previous, current) {
           if (/- Missing config:\s.*, using default:\s/.test(current)) {
@@ -200,7 +200,7 @@ describe('redis plugin', function() {
 
           return previous;
         }, []);
-        assert.equal(messages.length, 6);
+        assert.equal(messages.length, 7);
       });
       it('does not add default config to the config object', function() {
         plugin.configure(context);
@@ -230,7 +230,7 @@ describe('redis plugin', function() {
         };
         plugin.beforeHook(context);
       });
-      it('warns about missing optional filePattern, keyPrefix, revisionKey and didDeployMessage only', function() {
+      it('warns about missing optional filePattern, distDir, keyPrefix, revisionKey and didDeployMessage only', function() {
         plugin.configure(context);
         var messages = mockUi.messages.reduce(function(previous, current) {
           if (/- Missing config:\s.*, using default:\s/.test(current)) {
@@ -239,7 +239,7 @@ describe('redis plugin', function() {
 
           return previous;
         }, []);
-        assert.equal(messages.length, 5);
+        assert.equal(messages.length, 6);
       });
 
       it('does not add default config to the config object', function() {
@@ -272,7 +272,8 @@ describe('redis plugin', function() {
         config: {
           redis: {
             keyPrefix: 'test-prefix',
-            filePattern: 'tests/index.html',
+            filePattern: 'index.html',
+            distDir: 'tests',
             revisionKey: '123abc',
             redisDeployClient: function(context) {
               return context.redisClient || new Redis(context.config.redis);
@@ -309,7 +310,8 @@ describe('redis plugin', function() {
         config: {
           redis: {
             keyPrefix: 'test-prefix',
-            filePattern: 'tests/index.html',
+            filePattern: 'index.html',
+            distDir: 'tests',
             revisionKey: '123abc',
             redisDeployClient: function(context){ return context.redisClient; }
           }
@@ -340,7 +342,8 @@ describe('redis plugin', function() {
         config: {
           redis: {
             keyPrefix: 'test-prefix',
-            filePattern: 'tests/index.html',
+            filePattern: 'index.html',
+            distDir: 'tests',
             revisionKey: '123abc',
             redisDeployClient: function(context) {
               return context.redisClient || new Redis(context.config.redis);
@@ -391,7 +394,7 @@ describe('redis plugin', function() {
       plugin.didDeploy(context);
       assert.match(messageOutput, /Deployed but did not activate revision 123abc./);
       assert.match(messageOutput, /To activate, run/);
-      assert.match(messageOutput, /ember activate 123abc --environment=qa/);
+      assert.match(messageOutput, /ember deploy:activate 123abc --environment=qa/);
     });
   });
 });