Now filePattern is relative to the dist dir which is stored in

`context.distDir`

Author: achambers

index.js

@@ -5,6 +5,7 @@ var Promise = require('ember-cli/lib/ext/promise');
 
 var chalk = require('chalk');
 var blue  = chalk.blue;
+var red   = chalk.red;
 
 var validateConfig = require('./lib/utilities/validate-config');
 
@@ -15,19 +16,26 @@ module.exports = {
     var tags = require('./lib/tags');
 
     function _beginMessage(ui, type) {
-      ui.write(blue('|      '));
+      ui.write(blue('|    '));
       ui.writeLine(blue('- creating tag using `' + type + '`'));
 
       return Promise.resolve();
     }
 
     function _successMessage(ui, tag) {
-      ui.write(blue('|      '));
+      ui.write(blue('|    '));
       ui.writeLine(blue('- generated tag: `' + tag + '`'));
 
       return Promise.resolve(tag);
     }
 
+    function _errorMessage(ui, error) {
+      ui.write(blue('|    '));
+      ui.write(red('- ' + error + '`\n'));
+
+      return Promise.reject(error);
+    }
+
     return {
       name: options.name,
 
@@ -56,13 +64,12 @@ module.exports = {
         });
 
         return _beginMessage(ui, type)
-          .then(function() {
-            return Promise.resolve(tag.generate());
-          })
+        .then(tag.generate.bind(tag))
           .then(_successMessage.bind(this, ui))
           .then(function(value) {
             return { tag: value };
-          });
+          })
+          .catch(_errorMessage.bind(this, ui));
       }
     };
   }

lib/tags/index-hash.js

@@ -1,7 +1,12 @@
 var CoreObject  = require('core-object');
 var fs          = require('fs');
+var path        = require('path');
+var minimatch   = require('minimatch');
 var Fingerprint = require('broccoli-asset-rev/lib/fingerprint');
 
+var denodeify   = require('rsvp').denodeify;
+var readFile    = denodeify(fs.readFile);
+
 module.exports = CoreObject.extend({
   init: function(options) {
     this._context = options.context || {};
@@ -10,25 +15,22 @@ module.exports = CoreObject.extend({
 
   generate: function() {
     var filePattern = this._config.filePattern;
+    var distDir     = this._context.distDir;
     var distFiles   = this._context.distFiles;
-    var index       = distFiles.indexOf(filePattern);
-    var indexPath;
-    var contents;
     var fingerprint;
 
-    if (index === -1) {
-      return '';
-    }
-
-    indexPath = distFiles[index];
+    var filePaths = distFiles.filter(minimatch.filter(filePattern, { matchBase: true }));
 
-    if (!fs.existsSync(indexPath)) {
-      return '';
+    if (!filePaths.length) {
+      return Promise.reject('`' + filePattern + '` does not exist in distDir');
     }
 
-    contents    = fs.readFileSync(indexPath);
-    fingerprint = new Fingerprint();
+    var filePath = path.join(distDir, filePaths[0]);
 
-    return fingerprint.hashFn(contents);
+    return readFile(filePath)
+      .then(function(contents) {
+        fingerprint = new Fingerprint();
+        return fingerprint.hashFn(contents.toString());
+      })
   }
 });

lib/utilities/validate-config.js

@@ -10,7 +10,7 @@ module.exports = function(ui, config) {
 
   var defaultConfig = {
     type: 'index-hash',
-    filePattern: 'dist/index.html'
+    filePattern: 'index.html'
   };
 
   ['type', 'filePattern'].forEach(function(prop) {

package.json

@@ -44,7 +44,9 @@
   "dependencies": {
     "chalk": "^1.0.0",
     "core-object": "^1.1.0",
-    "ember-cli-babel": "^5.0.0"
+    "ember-cli-babel": "^5.0.0",
+    "minimatch": "^2.0.4",
+    "rsvp": "^3.0.18"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",

tests/unit/index-nodetest.js

@@ -57,6 +57,8 @@ describe('the index', function() {
       });
 
       var context = {
+        distDir: process.cwd() + '/tests/fixtures',
+        distFiles: ['index.html'],
         deployment: {
           ui: {
             write: function() {},
@@ -65,11 +67,10 @@ describe('the index', function() {
           config: {
             tag: {
               type: 'index-hash',
-              filePattern: process.cwd() + '/tests/fixtures/index.html'
+              filePattern: 'index.html'
             },
           }
-        },
-        distFiles: [process.cwd() + '/tests/fixtures/index.html']
+        }
       };
 
       return assert.isFulfilled(plugin.didBuild.call(plugin, context))

tests/unit/lib/tags/index-hash-nodetest.js

@@ -13,31 +13,49 @@ describe('the index-hash tag', function() {
     it ('generates a hash of the supplied index file', function() {
       var subject = new Tag({
         context: {
-          distFiles: [process.cwd() + '/tests/fixtures/index.html'],
+          distDir: process.cwd() + '/tests/fixtures',
+          distFiles: ['index.html'],
         },
         config: {
-          filePattern: process.cwd() + '/tests/fixtures/index.html'
+          filePattern: 'index.html'
         }
       });
 
-      var hash = subject.generate();
-
-      assert.equal(hash, 'ae1569f72495012cd5e8588e0f2f5d49');
+      return assert.isFulfilled(subject.generate())
+        .then(function(hash) {
+          assert.equal(hash, 'ae1569f72495012cd5e8588e0f2f5d49');
+        });
     });
 
-    it('returns an empty string when the file doesn\'t exist', function() {
+    it('rejects when the filePattern doesn\'t exist in distFiles', function() {
       var subject = new Tag({
         context: {
-          distFiles: [process.cwd() + '/tests/fixtures/index.html'],
+          distDir: process.cwd() + '/tests/fixtures',
+          distFiles: ['index.html']
         },
         config: {
           filePattern: 'some-file-that-does-not-exist'
         }
       });
 
-      var hash = subject.generate();
+      return assert.isRejected(subject.generate())
+        .then(function(error) {
+          assert.equal(error, '`some-file-that-does-not-exist` does not exist in distDir');
+        });
+    });
+
+    it('rejects when the file doesn\'t exist', function() {
+      var subject = new Tag({
+        context: {
+          distDir: process.cwd() + '/tests/fixtures',
+          distFiles: ['index.xxx']
+        },
+        config: {
+          filePattern: 'index.xxx'
+        }
+      });
 
-      assert.equal(hash, '');
+      return assert.isRejected(subject.generate());
     });
   });
 });