Merge pull request #62 from dcaravana/master

Tim-B · Tim-B · commit 88d9eedb12fc · 2016-01-24T12:23:37.000-08:00
added package_folder option to lambda_invoke task
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -49,6 +49,13 @@ module.exports = function (grunt) {
                     event: 'test/fixtures/event.json',
                     handler: 'myfunction'
                 }
+            },
+            package_folder_options: {
+                options: {
+                    package_folder: 'test/fixtures/package_folder_option',
+                    file_name: 'index.js',
+                    event: '../../../test/fixtures/event.json'
+                }
             }
         },
         lambda_package: {
diff --git a/tasks/lambda_invoke.js b/tasks/lambda_invoke.js
@@ -13,13 +13,13 @@ module.exports = function (grunt) {
     var path = require('path');
     var fs = require('fs');
 
-
     // Please see the Grunt documentation for more information regarding task
     // creation: http://gruntjs.com/creating-tasks
 
     grunt.registerMultiTask('lambda_invoke', 'Invokes a lambda function for testing purposes', function () {
 
         var options = this.options({
+            'package_folder': './',
             'handler': 'handler',
             'file_name': 'index.js',
             'event': 'event.json',
@@ -82,10 +82,19 @@ module.exports = function (grunt) {
             identity: identity
         };
 
+        var cwd;
+        if(options.package_folder) {
+          cwd = process.cwd();
+          process.chdir(path.resolve(options.package_folder));
+        }
+        
         var lambda = require(path.resolve(options.file_name));
         var event = JSON.parse(fs.readFileSync(path.resolve(options.event), "utf8"));
         lambda[options.handler](event, context);
-
+        
+        if(cwd) {
+          process.chdir(cwd);
+        }
     });
 
 };
diff --git a/test/fixtures/package_folder_option/.test b/test/fixtures/package_folder_option/.test
@@ -0,0 +1 @@
+Hello World
diff --git a/test/fixtures/package_folder_option/index.js b/test/fixtures/package_folder_option/index.js
@@ -0,0 +1,3 @@
+exports.handler = function (event, context) {
+    context.done(null, process.cwd());
+};
diff --git a/test/fixtures/package_folder_option/package.json b/test/fixtures/package_folder_option/package.json
@@ -0,0 +1,12 @@
+{
+    "name": "my-lambda-function",
+    "description": "An Example Lamda Function",
+    "version": "0.0.1",
+    "private": "true",
+    "dependencies": {
+    },
+    "devDependencies": {
+    },
+    "bundledDependencies": [
+    ]
+}
diff --git a/test/lambda_invoke_test.js b/test/lambda_invoke_test.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var grunt = require('grunt');
+var path = require('path');
 
 /*
  ======== A Handy Little Nodeunit Reference ========
@@ -70,6 +71,30 @@ exports.lambda_invoke = {
             var expected = getNormalizedFile('test/expected/failure_options');
             var actual = grunt.util.normalizelf(result.stdout);
             test.equal(actual, expected);
+            test.done();
+        });
+    },
+    package_folder_options: function (test) {
+        test.expect(2);
+
+        grunt.util.spawn({
+            grunt: true,
+            args: ['lambda_invoke:package_folder_options', '--no-color']
+        }, function (err, result, code) {
+
+            var cwd = process.cwd();
+
+            // test cwd inside the function
+            var expected_cwd = 'Running "lambda_invoke:package_folder_options" (lambda_invoke) task\n\n\nSuccess!  Message:\n------------------\n' +
+              path.join(cwd, 'test/fixtures/package_folder_option') +
+              '\n\nDone, without errors.';
+              
+            var actual_cwd = grunt.util.normalizelf(result.stdout);
+            test.equal(actual_cwd, expected_cwd);
+
+            // test back from the function
+            test.equal(process.cwd(), cwd);
+
             test.done();
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,13 @@ module.exports = function (grunt) {`
`49`	`49`	`event: 'test/fixtures/event.json',`
`50`	`50`	`handler: 'myfunction'`
`51`	`51`	`}`
	`52`	`+ },`
	`53`	`+ package_folder_options: {`
	`54`	`+ options: {`
	`55`	`+ package_folder: 'test/fixtures/package_folder_option',`
	`56`	`+ file_name: 'index.js',`
	`57`	`+ event: '../../../test/fixtures/event.json'`
	`58`	`+ }`
`52`	`59`	`}`
`53`	`60`	`},`
`54`	`61`	`lambda_package: {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+exports.handler = function (event, context) {`
	`2`	`+ context.done(null, process.cwd());`
	`3`	`+};`