Fix #112 (#146)

Author: DeviaVir

lib/main.js

@@ -2,13 +2,12 @@
 
 var aws = require('aws-sdk');
 var exec = require('child_process').exec;
-var fs = require('fs');
+var fs = require('fs-extra');
 var os = require('os');
 var packageJson = require('./../package.json');
 var path = require('path');
 var async = require('async');
 var zip = new require('node-zip')();
-var wrench = require('wrench');
 var dotenv = require('dotenv');
 
 var Lambda = function () {
@@ -214,19 +213,18 @@ Lambda.prototype._zip = function (program, codeDirectory, callback) {
   };
 
   console.log('=> Zipping repo. This might take up to 30 seconds');
-  var files = wrench.readdirSyncRecursive(codeDirectory);
-  files.forEach(function (file) {
-    var filePath = [codeDirectory, file].join('/');
-    var isFile = fs.lstatSync(filePath).isFile();
-    if (isFile) {
-      var content = fs.readFileSync(filePath);
-      zip.file(file, content);
-    }
-  });
-
-  var data = zip.generate(options);
-
-  return callback(null, data);
+  fs.walk(codeDirectory)
+    .on('data', function (file) {
+      if (!file.stats.isDirectory()) {
+        var content = fs.readFileSync(file.path);
+        var filePath = file.path.replace(codeDirectory + '/', '');
+        zip.file(filePath, content);
+      }
+    })
+    .on('end', function () {
+      var data = zip.generate(options);
+      return callback(null, data);
+    });
 };
 
 Lambda.prototype._nativeZip = function (program, codeDirectory, callback) {

package.json

@@ -41,9 +41,9 @@
     "aws-sdk": "^2.1.24",
     "commander": "^2.5.0",
     "dotenv": "^0.4.0",
+    "fs-extra": "^0.30.0",
     "node-uuid": "^1.4.2",
     "node-zip": "^1.1.0",
-    "rimraf": "^2.2.8",
-    "wrench": "^1.5.8"
+    "rimraf": "^2.2.8"
   }
 }

test/main.js

@@ -92,7 +92,6 @@ describe('node-lambda', function () {
       lambda._rsync(program, '.', codeDirectory, true, function (err, result) {
         var contents = fs.readdirSync(codeDirectory);
 
-        console.log('contents: ', contents);
         result = _.includes(contents, 'index.js') &&
                  _.includes(contents, 'package.json') &&
                  !_.includes(contents, 'node_modules');
@@ -102,9 +101,9 @@ describe('node-lambda', function () {
       });
     });
 
-    describe("when there are excluded files", function (done) {
+    describe("when there are excluded files", function () {
       beforeEach(function (done) {
-        program.excludeGlobs="*.png test"
+        program.excludeGlobs="*.png test";
         done();
       });
 
@@ -216,7 +215,7 @@ describe('node-lambda', function () {
         result = _.includes(contents, 'node_modules/async/lib/async.js');
         assert.equal(result, true);
         done();
-      })
+      });
     });
 
     it('packages a prebuilt module without installing', function (done) {
@@ -238,14 +237,13 @@ describe('node-lambda', function () {
         var contents = _.map(archive.files, function (f) {
           return f.name.toString();
         });
-        console.log('contents: ', contents);
         var result = _.includes(contents, 'testa') &&
                      _.includes(contents, 'd/testb') &&
                      _.includes(contents, 'node_modules/a');
         assert.equal(result, true);
         done();
 
-      })
+      });
     });
   });