Fix nested directories in blobs

Resolves: #24

Author: kevlened

src/index.js

@@ -56,14 +56,13 @@ export default (patterns = [], options = {}) => {
             Promise.each(patterns, (pattern) => {
                 let relDest;
                 let globOpts;
-                let context;
-                const ignoreList = webpackIgnore.concat(pattern.ignore || []);
 
                 if (pattern.context && !path.isAbsolute(pattern.context)) {
                     pattern.context = path.resolve(webpackContext, pattern.context);
                 }
-                
-                context = pattern.context || webpackContext;
+
+                const context = pattern.context || webpackContext;
+                const ignoreList = webpackIgnore.concat(pattern.ignore || []);
 
                 globOpts = {
                     cwd: context
@@ -112,8 +111,11 @@ export default (patterns = [], options = {}) => {
                         }
 
                         return globAsync(relSrc, globOpts)
-                            .each((relFileSrc) => {
+                            .each((relFileSrcParam) => {
                                 let relFileDest;
+                                let relFileSrc;
+
+                                relFileSrc = relFileSrcParam;
 
                                 // Skip if it matches any of our ignore list
                                 if (shouldIgnore(relFileSrc, ignoreList)) {

src/writeFileToAssets.js

@@ -20,7 +20,7 @@ export default (opts) => {
     return fs
     .statAsync(absFileSrc)
     .then((stat) => {
-        if (!copyUnmodified && stat.mtime.getTime() < lastGlobalUpdate) {
+        if (stat.isDirectory() || !copyUnmodified && stat.mtime.getTime() < lastGlobalUpdate) {
             return null;
         }
 

tests/index.js

@@ -281,9 +281,9 @@ describe('apply function', () => {
                 ],
                 patterns: [{
                     context: 'directory',
+                    flatten: true,
                     from: '**/*.txt',
-                    to: 'nested',
-                    flatten: true
+                    to: 'nested'
                 }]
             })
             .then(done)
@@ -665,9 +665,9 @@ describe('apply function', () => {
                     'newdirectory/nestedfile.txt'
                 ],
                 patterns: [{
+                    flatten: true,
                     from: 'directory',
-                    to: 'newdirectory',
-                    flatten: true
+                    to: 'newdirectory'
                 }]
             })
             .then(done)