Merge pull request #47 from ember-cli-deploy/add-fetch-initial-revisions

add fetchInitialRevisions

Author: LevelbossMike

index.js

@@ -26,8 +26,12 @@ module.exports = {
         s3Client: function(context) {
           return context.s3Client; // if you want to provide your own S3 client to be used instead of one from aws-sdk
         },
+        s3DeployClient: function(/* context */) {
+          return new S3({ plugin: this });
+        },
         allowOverwrite: false
       },
+
       requiredConfig: ['bucket', 'region'],
 
       upload: function(context) {
@@ -52,7 +56,7 @@ module.exports = {
 
         this.log('preparing to upload revision to S3 bucket `' + bucket + '`', { verbose: true });
 
-        var s3 = new S3({ plugin: this });
+        var s3 = this.readConfig('s3DeployClient');
         return s3.upload(options);
       },
 
@@ -73,11 +77,29 @@ module.exports = {
 
         this.log('preparing to activate `' + revisionKey + '`', { verbose: true });
 
-        var s3 = new S3({ plugin: this });
+        var s3 = this.readConfig('s3DeployClient');
         return s3.activate(options);
       },
 
       fetchRevisions: function(context) {
+        return this._list(context)
+          .then(function(revisions) {
+            return {
+              revisions: revisions
+            };
+          });
+      },
+
+      fetchInitialRevisions: function(context) {
+        return this._list(context)
+          .then(function(revisions) {
+            return {
+              initialRevisions: revisions
+            };
+          });
+      },
+
+      _list: function(/* context */) {
         var bucket      = this.readConfig('bucket');
         var prefix      = this.readConfig('prefix');
         var filePattern = this.readConfig('filePattern');
@@ -88,12 +110,9 @@ module.exports = {
           filePattern: filePattern,
         };
 
-        var s3 = new S3({ plugin: this });
-        return s3.fetchRevisions(options)
-          .then(function(revisions) {
-            context.revisions = revisions;
-          });
-      },
+        var s3 = this.readConfig('s3DeployClient');
+        return s3.fetchRevisions(options);
+      }
     });
 
     return new DeployPlugin();

tests/unit/index-nodetest.js

@@ -0,0 +1,139 @@
+'use strict';
+
+var Promise = require('ember-cli/lib/ext/promise');
+var assert  = require('ember-cli/tests/helpers/assert');
+
+var stubProject = {
+  name: function(){
+    return 'my-project';
+  }
+};
+
+describe('s3-index plugin', function() {
+  var subject, mockUi;
+
+  beforeEach(function() {
+    subject = require('../../index');
+    mockUi = {
+      verbose: true,
+      messages: [],
+      write: function() { },
+      writeLine: function(message) {
+        this.messages.push(message);
+      }
+    };
+  });
+
+  it('has a name', function() {
+    var result = subject.createDeployPlugin({
+      name: 'test-plugin'
+    });
+
+    assert.equal(result.name, 'test-plugin');
+  });
+
+  it('implements the correct hooks', function() {
+    var plugin = subject.createDeployPlugin({
+      name: 'test-plugin'
+    });
+    assert.ok(plugin.configure);
+    assert.ok(plugin.upload);
+    assert.ok(plugin.activate);
+    assert.ok(plugin.fetchRevisions);
+    assert.ok(plugin.fetchInitialRevisions);
+  });
+
+
+  describe('fetchInitialRevisions hook', function() {
+    it('fills the initialRevisions variable on context', function() {
+      var plugin;
+      var context;
+
+      plugin = subject.createDeployPlugin({
+        name: 's3-index'
+      });
+
+      context = {
+        ui: mockUi,
+        project: stubProject,
+        config: {
+          's3-index': {
+            prefix: 'test-prefix',
+            filePattern: 'index.html',
+            bucket: 'my-bucket',
+            region: 'my-region',
+            s3DeployClient: function(/* context */) {
+              return {
+                fetchRevisions: function(/* keyPrefix, revisionKey */) {
+                  return Promise.resolve([{
+                    revision: 'a',
+                    active: false
+                  }]);
+                }
+              };
+            }
+          }
+        }
+      };
+      plugin.beforeHook(context);
+      plugin.configure(context);
+
+      return assert.isFulfilled(plugin.fetchInitialRevisions(context))
+        .then(function(result) {
+          assert.deepEqual(result, {
+            initialRevisions: [{
+              "active": false,
+              "revision": "a"
+            }]
+          });
+        });
+    });
+  });
+
+  describe('fetchRevisions hook', function() {
+    it('fills the revisions variable on context', function() {
+      var plugin;
+      var context;
+
+      plugin = subject.createDeployPlugin({
+        name: 's3-index'
+      });
+
+      context = {
+        ui: mockUi,
+        project: stubProject,
+
+        config: {
+          's3-index': {
+            prefix: 'test-prefix',
+            filePattern: 'index.html',
+            bucket: 'my-bucket',
+            region: 'my-region',
+            s3DeployClient: function(/* context */) {
+              return {
+                fetchRevisions: function(/* keyPrefix, revisionKey */) {
+                  return Promise.resolve([{
+                    revision: 'a',
+                    active: false
+                  }]);
+                }
+              };
+            }
+          }
+        }
+      };
+      plugin.beforeHook(context);
+      plugin.configure(context);
+
+      return assert.isFulfilled(plugin.fetchRevisions(context))
+        .then(function(result) {
+          assert.deepEqual(result, {
+              revisions: [{
+                "active": false,
+                "revision": "a"
+              }]
+          });
+        });
+    });
+  });
+});