Merge pull request #109 from Cropster/allow-file-cache

Add fileIgnorePattern option

Author: ghedamat

README.md

@@ -122,6 +122,12 @@ Files that match this pattern will be uploaded to S3. The file pattern must be r
 
 *Default:* '\*\*/\*.{js,css,png,gif,ico,jpg,map,xml,txt,svg,swf,eot,ttf,woff,woff2,otf,wasm}'
 
+### fileIgnorePattern
+
+Files matching this pattern will _not_ be uploaded even if they match filePattern.
+
+*Default:* `null`
+
 ### distDir
 
 The root directory where the files matching `filePattern` will be searched for. By default, this option will use the `distDir` property of the deployment context, provided by [ember-cli-deploy-build][2].

index.js

@@ -17,6 +17,7 @@ module.exports = {
       name: options.name,
       defaultConfig: {
         filePattern: '**/*.{js,css,png,gif,ico,jpg,map,xml,txt,svg,swf,eot,ttf,woff,woff2,otf,wasm}',
+        fileIgnorePattern: null,
         prefix: '',
         profile: '',
         acl: 'public-read',
@@ -53,6 +54,7 @@ module.exports = {
         var self                  = this;
 
         var filePattern           = this.readConfig('filePattern');
+        var fileIgnorePattern     = this.readConfig('fileIgnorePattern');
         var distDir               = this.readConfig('distDir');
         var distFiles             = this.readConfig('distFiles');
         var gzippedFiles          = this.readConfig('gzippedFiles');
@@ -69,6 +71,17 @@ module.exports = {
         var defaultMimeType       = this.readConfig('defaultMimeType');
 
         var filesToUpload = distFiles.filter(minimatch.filter(filePattern, { matchBase: true, dot: dotFolders }));
+        if (fileIgnorePattern) {
+          filesToUpload = filesToUpload.filter(function(path) {
+            return !minimatch(path, fileIgnorePattern, { matchBase: true });
+          });
+          gzippedFiles = gzippedFiles.filter(function(path) {
+            return !minimatch(path, fileIgnorePattern, { matchBase: true });
+          });
+          brotliCompressedFiles = brotliCompressedFiles.filter(function(path) {
+            return !minimatch(path, fileIgnorePattern, { matchBase: true });
+          });
+        }
 
         var s3 = this.readConfig('uploadClient') || new S3({
           plugin: this

tests/index-test.js

@@ -57,6 +57,9 @@ describe('s3 plugin', function() {
           gzippedFiles: function(context) {
             return context.gzippedFiles || []; // e.g. from ember-cli-deploy-gzip
           },
+          brotliCompressedFiles: function(context) {
+            return context.brotliCompressedFiles || []; // e.g. from ember-cli-deploy-gzip
+          },
           manifestPath: function(context) {
             return context.manifestPath; // e.g. from ember-cli-deploy-manifest
           },
@@ -235,6 +238,39 @@ describe('s3 plugin', function() {
         });
     });
 
+    it('filters out ignored files via fileIgnorePattern', function() {
+      var plugin = subject.createDeployPlugin({
+        name: 's3'
+      });
+
+      context.config.s3.fileIgnorePattern = '*.css';
+      context.gzippedFiles = ['app.css', 'app.js'];
+      context.brotliCompressedFiles = ['app.css', 'app.js'];
+      context.config.s3.fileIgnorePattern = '*.css';
+      context.uploadClient.upload = function(options) {
+        assert.equal(options.filePaths.length, 1, 'file paths are filtered');
+        assert.equal(options.gzippedFilePaths.length, 1, 'gzipped file paths are filtered');
+        assert.equal(options.brotliCompressedFilePaths.length, 1, 'brotli compressed file paths are filtered');
+        return RSVP.resolve(options.filePaths);
+      };
+      plugin.beforeHook(context);
+
+      return assert.isFulfilled(plugin.upload(context))
+        .then(function() {
+          assert.equal(mockUi.messages.length, 2);
+
+          var messages = mockUi.messages.reduce(function(previous, current) {
+            if (/- uploaded 1 files ok/.test(current)) {
+              previous.push(current);
+            }
+
+            return previous;
+          }, []);
+
+          assert.equal(messages.length, 1);
+        });
+    });
+
     it('prints an error message if the upload errors', function() {
       var plugin = subject.createDeployPlugin({
         name: 's3'
@@ -259,7 +295,7 @@ describe('s3 plugin', function() {
         name: 's3'
       });
 
-      var assertionCount = 0
+      var assertionCount = 0;
       context.proxyAgent = function(/* proxy */) {
         assertionCount++;
       };
@@ -272,7 +308,7 @@ describe('s3 plugin', function() {
       });
     });
 
-    it('sets the appropriate header if the file is inclued in gzippedFiles list', function(done) {
+    it('sets the appropriate header if the file is included in gzippedFiles list', function(done) {
       var plugin = subject.createDeployPlugin({
         name: 's3'
       });

tests/lib/s3-test.js

@@ -1,4 +1,5 @@
 /*eslint-env node*/
+var os = require('os');
 var chai  = require('chai');
 var chaiAsPromised = require("chai-as-promised");
 chai.use(chaiAsPromised);
@@ -112,7 +113,7 @@ describe('s3', function() {
           .then(function() {
             assert.equal(s3Params.Bucket, 'some-bucket');
             assert.equal(s3Params.ACL, 'public-read');
-            assert.equal(s3Params.Body.toString(), 'body: {}\n');
+            assert.equal(s3Params.Body.toString(), 'body: {}' + os.EOL);
             assert.equal(s3Params.ContentType, 'text/css; charset=utf-8');
             assert.equal(s3Params.Key, 'js-app/app.css');
             assert.equal(s3Params.CacheControl, 'max-age=1234, public');