Merge pull request #57 from ashiina/develop

release 1.3.0

Author: ashiina

CHANGELOG.md

@@ -1,5 +1,8 @@
 # ChangeLog
 
+## 1.3.0 (2016/11/26)
+ * Fixed critical bug (logger)
+
 ## 1.2.0 (2016/11/23)
  * Added mock functionality
  * Dropped Node.js v0.1, v0.12 suport

REQUIRE_SAMPLES.md

@@ -72,13 +72,13 @@ Then you will be able to use in your test.js mocha file, something like:
                 cb();
             }
         });
-        describe("Your first test", function () {
-            it("should return mocked value", function () {
-                assert.equal(done, "MockedData");
-            });
+    });
+    describe("Your first test", function () {
+        it("should return mocked value", function () {
+            assert.equal(done, "MockedData");
         });
-        ... Other tests
     });
+    ... Other tests
 ```
 
 [1]: https://mochajs.org/

bin/lambda-local

@@ -7,17 +7,17 @@
  */
 (function() {
 
-	var winston = require('winston');
-	var logger = new winston.Logger({
-		level: 'info',
-		transports: [
-			new (winston.transports.Console)({handleExceptions: true, json: false, colorize: true})
-		]
-	});
+    var logger = require('winston');
+    logger.level = 'info';
+    logger.configure({
+        transports: [
+            new (logger.transports.Console)({handleExceptions: true, json: false, colorize: true})
+        ]
+    });
 
     var lambdaLocal = require('../lib/lambdalocal.js'),
         utils = require('../lib/utils.js');
-	lambdaLocal.setLogger(logger);
+    lambdaLocal.setLogger(logger);
 
     // process opts
     var program = require('commander');

lib/lambdalocal.js

@@ -16,10 +16,14 @@ var _setLogger = function(_logger){
     if(_logger != null && typeof _logger.loggers != 'undefined'){
         logger = _logger;
     } else {
-        throw new TypeError("The object must be a winston logger !");
+        console.warn("Invalid logger object ! Using default logger");
     }
 }
-    
+ 
+var _getLogger = function() {
+    return logger;
+}
+   
 var _execute = function(opts) {
     var event = opts.event,
         lambdaFunc = opts.lambdaFunc,
@@ -88,5 +92,6 @@ var _execute = function(opts) {
 module.exports = {
     context: _context,
     execute: _execute, 
-    setLogger: _setLogger
+    setLogger: _setLogger,
+    getLogger: _getLogger
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambda-local",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Commandline tool to run Lambda functions on your local machine.",
   "keywords": [
     "lambda",

test/test.js

@@ -28,6 +28,32 @@ describe("- Testing utils.js", function () {
         });
     });
 });
+describe("- Testing lambdalocal.js Logger", function () {
+    var lambdalocal = require("../lib/lambdalocal.js");
+    var defaultLogger = lambdalocal.getLogger();
+    describe("* Use winston logger", function () {
+        it("should correctly load Logger", function () {
+            lambdalocal.setLogger(winston);
+            var logger = lambdalocal.getLogger();
+            assert.equal(winston, logger);
+        });
+    });
+    describe("* Use invalid logger (object)", function () {
+        it("should load default Logger", function () {
+            lambdalocal.setLogger(Object);
+            var logger = lambdalocal.getLogger();
+            assert.equal(logger, defaultLogger);
+        });
+    });
+    describe("* Use null logger", function () {
+        it("should load default Logger", function () {
+            lambdalocal.setLogger(null);
+            var logger = lambdalocal.getLogger();
+            assert.equal(logger, defaultLogger);
+        });
+    });
+});
+
 describe("- Testing lambdalocal.js", function () {
     describe("* Basic Run", function () {
         var done, err;
@@ -127,4 +153,4 @@ describe("- Testing lambdalocal.js", function () {
             });
         });
     });
-});
+});