Merge pull request #31 from alexbuijs/fix-ignored-items

Fix ignored items. Thanks to @alexbuijs .
nordnet · May 4, 2016 · 13bf5fe · 13bf5fe
2 parents 209084a + 9cfb471
commit 13bf5fe
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/dist/context.js b/dist/context.js
@@ -6,7 +6,7 @@
       fs = require('fs-extra'),
       _ = require('lodash'),
       ignoreFilePath = path.join(process.cwd(), '.chcpignore'),
-      DEFAULT_IGNORE_LIST = ['.DS_Store', 'node_modules/*', 'node_modules\\*', 'chcp.json', 'chcp.manifest', '.chcp*', '.gitignore', '.git', 'package.json'];
+      DEFAULT_IGNORE_LIST = ['.DS_Store', 'node_modules/*', 'node_modules\\*', 'chcp.json', 'chcp.manifest', '.chcp*', '.gitignore', '.gitkeep', '.git', 'package.json'];
 
   module.exports = {
     context: context
@@ -46,7 +46,7 @@
     }
 
     if (projectIgnore.length > 0) {
-      _.assign(this.__ignoredFiles, _.trim(projectIgnore).split(/\n/));
+      this.__ignoredFiles = this.__ignoredFiles.concat(_.trim(projectIgnore).split(/\n/));
     }
 
     return this.__ignoredFiles;

diff --git a/dist/deploy.js b/dist/deploy.js
@@ -30,7 +30,8 @@
   function deploy(context) {
     var executeDfd = Q.defer(),
         config,
-        credentials;
+        credentials,
+        ignore = context.ignoredFiles();
 
     try {
       config = fs.readFileSync(context.defaultConfig, 'utf-8');
@@ -55,11 +56,20 @@
       process.exit(0);
     }
 
+    ignore = ignore.filter(function (ignoredFile) {
+      return !ignoredFile.match(/^chcp/);
+    });
+    ignore = ignore.map(function (ignoredFile) {
+      return '!' + ignoredFile;
+    });
+
     // console.log('Credentials: ', credentials);
     // console.log('Config: ', config);
+    // console.log('Ignore: ', ignore);
 
     var files = readdirp({
-      root: context.sourceDirectory
+      root: context.sourceDirectory,
+      fileFilter: ignore
     });
 
     var uploader = s3sync({

diff --git a/src/context.js b/src/context.js
@@ -12,6 +12,7 @@
       'chcp.manifest',
       '.chcp*',
       '.gitignore',
+      '.gitkeep',
       '.git',
       'package.json'
     ];
@@ -54,7 +55,7 @@
     }
 
     if (projectIgnore.length > 0) {
-      _.assign(this.__ignoredFiles, _.trim(projectIgnore).split(/\n/));
+      this.__ignoredFiles = this.__ignoredFiles.concat(_.trim(projectIgnore).split(/\n/));
     }
 
     return this.__ignoredFiles;

diff --git a/src/deploy.js b/src/deploy.js
@@ -28,7 +28,8 @@
   function deploy(context) {
     var executeDfd = Q.defer(),
         config,
-        credentials;
+        credentials,
+        ignore = context.ignoredFiles();
 
     try {
       config = fs.readFileSync(context.defaultConfig, 'utf-8');
@@ -53,11 +54,16 @@
       process.exit(0);
     }
 
+    ignore = ignore.filter( ignoredFile => !ignoredFile.match(/^chcp/) )
+    ignore = ignore.map( ignoredFile => `!${ignoredFile}` )
+
     // console.log('Credentials: ', credentials);
     // console.log('Config: ', config);
+    // console.log('Ignore: ', ignore);
 
     var files = readdirp({
-      root: context.sourceDirectory
+      root: context.sourceDirectory,
+      fileFilter: ignore
     });
 
     var uploader = s3sync({