Merge pull request #8 from hapinessjs/next

v1.0.0-rc.4
hapinessjs · Jul 10, 2017 · 3370783 · 3370783
2 parents 580edf5 + d4f1f68
commit 3370783
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 59 deletions.
diff --git a/README.md b/README.md
@@ -59,8 +59,8 @@ $ yarn add @hapiness/logger
 
 ```javascript
 "dependencies": {
-    "@hapiness/core": "^1.0.0-rc.3",
-    "@hapiness/logger": "^1.0.0-rc.3",
+    "@hapiness/core": "^1.0.0-rc.4",
+    "@hapiness/logger": "^1.0.0-rc.4",
     //...
 }
 //...
@@ -73,7 +73,7 @@ import { Hapiness, HapinessModule, HttpServer, OnGet } from '@hapiness/core';
 import { LoggerModule } from '@hapiness/logger';
 
 @HapinessModule({
-    version: '1.0.0'
+    version: '1.0.0',
     imports: [
         LoggerModule
     ]
@@ -121,6 +121,9 @@ To set up your development environment:
 
 ## Change History
 
+* v1.0.0-rc.4 (2017-07-10)
+    * Latest packages' versions.
+    * Module version related to core version.
 * v1.0.0-rc.3 (2017-07-04)
     * Logger extension
     * Logger provider

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@hapiness/logger",
-    "version": "1.0.0-rc.3",
+    "version": "1.0.0-rc.4",
     "description": "Hapiness module for logging",
     "main": "index.js",
     "types": "index.d.ts",
@@ -19,8 +19,8 @@
         "url": "git+ssh://git@github.com/hapinessjs/logger-module.git"
     },
     "keywords": [
-        "HapiJS",
-        "Hapi",
+        "Logger",
+        "Log",
         "Hapiness",
         "Framework",
         "NodeJS",
@@ -67,7 +67,7 @@
     },
     "homepage": "https://github.com/hapinessjs/logger-module#readme",
     "dependencies": {
-        "@hapiness/core": "^1.0.0-rc.3"
+        "@hapiness/core": "^1.0.0-rc.4"
     },
     "devDependencies": {
         "@types/fs-extra": "^3.0.3",
@@ -78,8 +78,8 @@
         "mocha": "^3.4.2",
         "mocha-typescript": "^1.1.7",
         "rimraf": "^2.6.1",
-        "ts-node": "^3.1.0",
-        "tslint": "^5.4.3",
+        "ts-node": "^3.2.0",
+        "tslint": "^5.5.0",
         "typescript": "^2.4.1",
         "unit.js": "^2.0.0"
     },

diff --git a/src/module/logger.module.ts b/src/module/logger.module.ts
@@ -2,7 +2,7 @@ import { HapinessModule } from '@hapiness/core';
 import { LoggerService } from './logger.service';
 
 @HapinessModule({
-    version: '1.0.0-rc.3',
+    version: '1.0.0-rc.4',
     exports: [ LoggerService ]
 })
 export class LoggerModule {}
diff --git a/test/integration/logger.module.test.ts b/test/integration/logger.module.test.ts
@@ -1,18 +1,14 @@
 /**
  * @see https://github.com/pana-cc/mocha-typescript
  */
-import { test, suite, only } from 'mocha-typescript';
+import { test, suite } from 'mocha-typescript';
 
 /**
  * @see http://unitjs.com/
  */
 import * as unit from 'unit.js';
-import { Hapiness, HapinessModule, Lib, OnStart } from '@hapiness/core';
-import { LoggerExt } from '../../src/module/logger.extension';
-import { LoggerModule } from '../../src/module/logger.module';
-import { LoggerService } from '../../src/module/logger.service';
-
-import { HttpServerExt } from '@hapiness/core/extensions/http-server';
+import { Hapiness, HapinessModule, OnStart } from '@hapiness/core';
+import { LoggerExt, LoggerModule, LoggerService } from '../../src/';
 
 @suite('Integration - LoggerModuleTest')
 class LoggerModuleTest {
@@ -53,7 +49,7 @@ class LoggerModuleTest {
             version: '1.0.0',
             imports: [ LoggerModule ]
         })
-        class LoggerModuleTest implements OnStart {
+        class LMTest implements OnStart {
             constructor(private logger: LoggerService) {}
 
             onStart(): void {
@@ -64,7 +60,7 @@ class LoggerModuleTest {
             }
         }
 
-        Hapiness.bootstrap(LoggerModuleTest);
+        Hapiness.bootstrap(LMTest);
     }
 
     @test('- Test logger with extension')
@@ -78,7 +74,7 @@ class LoggerModuleTest {
             version: '1.0.0',
             imports: [ LoggerModule ]
         })
-        class LoggerModuleTest implements OnStart {
+        class LMTest implements OnStart {
             constructor(private logger: LoggerService) {}
 
             onStart(): void {
@@ -89,7 +85,7 @@ class LoggerModuleTest {
             }
         }
 
-        Hapiness.bootstrap(LoggerModuleTest,
+        Hapiness.bootstrap(LMTest,
             [
                 LoggerExt.setConfig({ logger: console })
             ]

diff --git a/test/unit/logger.service.unit.ts b/test/unit/logger.service.unit.ts
@@ -1,8 +1,6 @@
 import { test, suite } from 'mocha-typescript';
 import * as unit from 'unit.js';
-import { Hapiness, HapinessModule, Lib, OnStart } from '@hapiness/core';
-import { LoggerModule } from '../../src/module/logger.module';
-import { LoggerService } from '../../src/module/logger.service';
+import { LoggerService } from '../../src';
 
 @suite('Unit - LoggerServiceTest')
 class LoggerServiceTest {
@@ -13,7 +11,7 @@ class LoggerServiceTest {
         const data = ['test', {val: true}];
         const logger = {
             trace: (...args) => unit.array(args).is(data)
-        }
+        };
         const service = new LoggerService(logger);
         service.trace(...data);
 
@@ -25,7 +23,7 @@ class LoggerServiceTest {
         const data = ['test', {val: true}];
         const logger = {
             debug: (...args) => unit.array(args).is(data)
-        }
+        };
         const service = new LoggerService(logger);
         service.debug(...data);
 
@@ -37,7 +35,7 @@ class LoggerServiceTest {
         const data = ['test', {val: true}];
         const logger = {
             info: (...args) => unit.array(args).is(data)
-        }
+        };
         const service = new LoggerService(logger);
         service.info(...data);
 
@@ -49,7 +47,7 @@ class LoggerServiceTest {
         const data = ['test', {val: true}];
         const logger = {
             warn: (...args) => unit.array(args).is(data)
-        }
+        };
         const service = new LoggerService(logger);
         service.warn(...data);
 
@@ -61,7 +59,7 @@ class LoggerServiceTest {
         const data = ['test', {val: true}];
         const logger = {
             error: (...args) => unit.array(args).is(data)
-        }
+        };
         const service = new LoggerService(logger);
         service.error(...data);
 
@@ -73,7 +71,7 @@ class LoggerServiceTest {
         const data = ['test', {val: true}];
         const logger = {
             fatal: (...args) => unit.array(args).is(data)
-        }
+        };
         const service = new LoggerService(logger);
         service.fatal(...data);
 
@@ -85,7 +83,7 @@ class LoggerServiceTest {
         const data = ['test', {val: true}];
         const logger = {
             error: (...args) => unit.array(args).is(data)
-        }
+        };
         const service = new LoggerService(logger);
         service.fatal(...data);