Dependency Upgrades (#84)

* update deps

* update some dev deps.
fix tests that were mixing done and returning a promise

* stick to core-object@2 for node 0.12 support

* use same core-object semver as ember-cli-deploy

Author: kturney

lib/s3.js

@@ -10,48 +10,48 @@ var _          = require('lodash');
 
 module.exports = CoreObject.extend({
   init: function(options) {
-    this._plugin = options.plugin;
+    this._super(options);
     var AWS = require('aws-sdk');
     var s3Options = {
-      region: this._plugin.readConfig('region')
+      region: this.plugin.readConfig('region')
     };
 
-    const proxy = this._plugin.readConfig('proxy');
+    const proxy = this.plugin.readConfig('proxy');
     if (proxy) {
-      this._proxyAgent = this._plugin.readConfig('proxyAgent') || require('proxy-agent');
+      this._proxyAgent = this.plugin.readConfig('proxyAgent') || require('proxy-agent');
       s3Options.httpOptions = {
         agent: this._proxyAgent(proxy)
       };
     }
 
-    const accessKeyId = this._plugin.readConfig('accessKeyId');
-    const secretAccessKey = this._plugin.readConfig('secretAccessKey');
-    const sessionToken = this._plugin.readConfig('sessionToken');
-    const profile = this._plugin.readConfig('profile');
-    const signatureVersion = this._plugin.readConfig('signatureVersion');
+    const accessKeyId = this.plugin.readConfig('accessKeyId');
+    const secretAccessKey = this.plugin.readConfig('secretAccessKey');
+    const sessionToken = this.plugin.readConfig('sessionToken');
+    const profile = this.plugin.readConfig('profile');
+    const signatureVersion = this.plugin.readConfig('signatureVersion');
 
     if (accessKeyId && secretAccessKey) {
-      this._plugin.log('Using AWS access key id and secret access key from config', { verbose: true });
+      this.plugin.log('Using AWS access key id and secret access key from config', { verbose: true });
       s3Options.accessKeyId = accessKeyId;
       s3Options.secretAccessKey = secretAccessKey;
     }
 
     if (signatureVersion) {
-      this._plugin.log('Using signature version from config', { verbose: true });
+      this.plugin.log('Using signature version from config', { verbose: true });
       s3Options.signatureVersion = signatureVersion;
     }
 
     if (sessionToken) {
-      this._plugin.log('Using AWS session token from config', { verbose: true });
+      this.plugin.log('Using AWS session token from config', { verbose: true });
       s3Options.sessionToken = sessionToken;
     }
 
-    if (profile && !this._plugin.readConfig('s3Client')) {
-      this._plugin.log('Using AWS profile from config', { verbose: true });
+    if (profile && !this.plugin.readConfig('s3Client')) {
+      this.plugin.log('Using AWS profile from config', { verbose: true });
       AWS.config.credentials = new AWS.SharedIniFileCredentials({ profile: profile });
     }
 
-    this._client = this._plugin.readConfig('s3Client') || new AWS.S3(s3Options);
+    this._client = this.plugin.readConfig('s3Client') || new AWS.S3(s3Options);
   },
 
   upload: function(options) {
@@ -73,7 +73,7 @@ module.exports = CoreObject.extend({
   },
 
   _determineFilePaths: function(options) {
-    var plugin = this._plugin;
+    var plugin = this.plugin;
     var filePaths = options.filePaths || [];
     if (typeof filePaths === 'string') {
       filePaths = [filePaths];
@@ -105,7 +105,7 @@ module.exports = CoreObject.extend({
   },
 
   _putObject: function(filePath, options, filePaths) {
-    var plugin               = this._plugin;
+    var plugin               = this.plugin;
     var cwd                  = options.cwd;
     var bucket               = options.bucket;
     var prefix               = options.prefix;

package.json

@@ -21,19 +21,19 @@
   "dependencies": {
     "aws-sdk": "^2.6.12",
     "chalk": "^1.0.0",
-    "core-object": "^1.1.0",
+    "core-object": "^2.0.0",
     "ember-cli-babel": "^5.1.7",
     "ember-cli-deploy-plugin": "^0.2.2",
-    "lodash": "^3.9.3",
+    "lodash": "^4.17.4",
     "mime": "^1.3.4",
     "minimatch": "^3.0.3",
     "proxy-agent": "^2.0.0"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
+    "chai": "^3.5.0",
+    "chai-as-promised": "^6.0.0",
     "ember-ajax": "^2.4.1",
-    "chai": "^2.2.0",
-    "chai-as-promised": "^5.0.0",
     "ember-cli": "2.10.0",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-dependency-checker": "^1.3.0",
@@ -52,9 +52,9 @@
     "ember-load-initializers": "^0.5.1",
     "ember-resolver": "^2.0.3",
     "github": "^0.2.4",
-    "glob": "^5.0.5",
+    "glob": "^7.1.1",
     "loader.js": "^4.0.10",
-    "mocha": "^2.2.4",
+    "mocha": "^3.2.0",
     "multiline": "^1.0.2"
   },
   "engines": {

tests/unit/index-nodetest.js

@@ -253,7 +253,7 @@ describe('s3 plugin', function() {
         });
     });
 
-    it('calls proxy agent if a proxy is specified', function(done) {
+    it('calls proxy agent if a proxy is specified', function() {
       var plugin = subject.createDeployPlugin({
         name: 's3'
       });
@@ -266,15 +266,12 @@ describe('s3 plugin', function() {
       plugin.beforeHook(context);
       plugin.configure(context);
 
-      return assert.isFulfilled(plugin.upload(context)).then(function(){
+      assert.isFulfilled(plugin.upload(context)).then(function(){
         assert.equal(assertionCount, 1);
-        done();
-      }).catch(function(reason){
-        done(reason.actual.stack);
       });
     });
 
-    it('sets the appropriate header if the file is inclued in gzippedFiles list', function(done) {
+    it('sets the appropriate header if the file is inclued in gzippedFiles list', function() {
       var plugin = subject.createDeployPlugin({
         name: 's3'
       });
@@ -301,9 +298,6 @@ describe('s3 plugin', function() {
       plugin.beforeHook(context);
       return assert.isFulfilled(plugin.upload(context)).then(function(){
         assert.equal(assertionCount, 2);
-        done();
-      }).catch(function(reason){
-        done(reason.actual.stack);
       });
     });
   });

tests/unit/lib/s3-nodetest.js

@@ -241,7 +241,7 @@ describe('s3', function() {
     });
 
     describe('with a manifestPath specified', function () {
-      it('uploads all files when manifest is missing from server', function (done) {
+      it('uploads all files when manifest is missing from server', function () {
         var options = {
           filePaths: ['app.js', 'app.css'],
           cwd: process.cwd() + '/tests/fixtures/dist',
@@ -260,13 +260,10 @@ describe('s3', function() {
             assert.match(mockUi.messages[3], /- ✔  js-app\/app\.css/);
             assert.match(mockUi.messages[4], /- ✔  js-app\/manifest\.txt/);
             assert.deepEqual(filesUploaded, ['app.js', 'app.css', 'manifest.txt']);
-            done();
-          }).catch(function(reason) {
-            done(reason);
           });
       });
 
-      it('only uploads missing files when manifest is present on server', function (done) {
+      it('only uploads missing files when manifest is present on server', function () {
         s3Client.getObject = function(params, cb) {
           cb(undefined, {
             Body: "app.js"
@@ -290,13 +287,10 @@ describe('s3', function() {
             assert.match(mockUi.messages[2], /- ✔  js-app\/app\.css/);
             assert.match(mockUi.messages[3], /- ✔  js-app\/manifest\.txt/);
             assert.deepEqual(filesUploaded, ['app.css', 'manifest.txt']);
-            done();
-          }).catch(function(reason) {
-            done(reason);
           });
       });
 
-      it('does not upload manifest.txt when one of the files does not succeed uploading', function(done) {
+      it('does not upload manifest.txt when one of the files does not succeed uploading', function() {
         s3Client.putObject = function(params, cb) {
           if (params.Key === 'js-app/app.css') {
             cb('error uploading');
@@ -320,9 +314,6 @@ describe('s3', function() {
             assert.match(mockUi.messages[0], /- Downloading manifest for differential deploy.../);
             assert.match(mockUi.messages[1], /- Manifest not found. Disabling differential deploy\./);
             assert.match(mockUi.messages[2], /- ✔  js-app\/app\.js/);
-            done();
-          }).catch(function(reason) {
-            done(reason);
           });
       });
     });
@@ -376,7 +367,7 @@ describe('s3', function() {
           });
       });
 
-      it('uploads the correct number of batches', function (done) {
+      it('uploads the correct number of batches', function () {
         var s3Params;
         var requests = 0;
 
@@ -412,14 +403,10 @@ describe('s3', function() {
         return subject.upload(options)
           .then(function () {
             assert.equal(requests, 4);
-            done();
-          })
-          .catch(function (reason) {
-            done(reason);
           });
       });
 
-      it('rejects if an upload fails', function (done) {
+      it('rejects if an upload fails', function () {
         s3Client.putObject = function(params, cb) {
           cb('error uploading');
         };
@@ -433,7 +420,7 @@ describe('s3', function() {
 
         var promises = subject.upload(options);
 
-        return assert.isRejected(promises).then(function () { done(); });
+        return assert.isRejected(promises);
       });
     });
   });