Merge pull request #15 from jonniespratley/fix/misc

Fix/misc

.gitignore

@@ -9,7 +9,11 @@ docs
 .tmp
 .c9
 *-db
+./db-*
+!./src/db-plugin
 npm-debug.log
 db
+db-*.json
 data
-test-db
+test-db
+out

gulpfile.js

@@ -72,8 +72,6 @@ gulp.task('watch', function() {
   gulp.watch(config.specs, ['watch-coverage']);
 });
 
-
-
 gulp.task('clean', function() {
   return gulp.src([
       'data',
@@ -91,10 +89,8 @@ gulp.task('clean', function() {
 
 
 gulp.task('default', gulpSequence('compile', 'test'));
-try {
-  require('require-dir')('tasks');
-} catch (e) {
 
-} finally {
 
-}
+try {
+  require('require-dir')('./tasks');
+} catch (e) {}

package.json

@@ -2,7 +2,7 @@
   "name": "nodejs-sandbox",
   "version": "0.0.1",
   "description": "A sandbox for nodejs",
-  "main": "index.js",
+  "main": "release/js/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/jonniespratley/nodejs-sandbox.git"
@@ -46,6 +46,7 @@
     "leveldown": "^1.4.4",
     "levelup": "^1.3.1",
     "lodash": "^4.5.1",
+    "npmlog": "^4.0.0",
     "serve-static": "^1.10.2"
   },
   "devDependencies": {
@@ -57,6 +58,7 @@
     "gulp-debug": "^2.1.2",
     "gulp-inject": "^3.0.0",
     "gulp-istanbul": "^0.10.3",
+    "gulp-jsdoc3": "^0.3.0",
     "gulp-load-plugins": "^1.2.0",
     "gulp-mocha": "^2.2.0",
     "gulp-rimraf": "^0.2.0",

plop-templates/nodejs-plugin-controller.ts

@@ -23,7 +23,7 @@ export default class {{pascalCase name}}Controller {
      * @param options
      */
     constructor(options:any) {
-        log('Constructor');
+        log.info('Constructor');
         service = new {{pascalCase name}}Service();
     }
 
@@ -34,7 +34,7 @@ export default class {{pascalCase name}}Controller {
      * @param next
      */
     use(req, res, next) {
-        log('use', req.method, req.url, req.params);
+        log.info('use', req.method, req.url, req.params);
         next();
     }
 
@@ -47,9 +47,9 @@ export default class {{pascalCase name}}Controller {
     all(req, res, next) {
         if (req.params.id) {
             req.id = req.params.id;
-            console.log('Got id', req.id);
+            log.info('Got id', req.id);
         }
-        log('all', req.method, req.url);
+        log.info('all', req.method, req.url);
         next();
     }
 
@@ -88,7 +88,7 @@ export default class {{pascalCase name}}Controller {
      */
     post_route(req, res, next) {
         let m = new Model(req.body);
-        log('creating', m);
+        log.info('creating', m);
 
         service.save(m).then((resp) => {
             res.status(201).send(resp);
@@ -108,7 +108,7 @@ export default class {{pascalCase name}}Controller {
             req.body.id = req.params.id;
         }
         let model = new Model(req.body);
-        log('updating', req.params.id);
+        log.info('updating', req.params.id);
         service.get(model.id).then((resp) => {
             service.save(model).then((resp) => {
                 res.status(200).send(resp);
@@ -128,7 +128,7 @@ export default class {{pascalCase name}}Controller {
      */
     delete_route(req, res, next) {
         assert(req.params.id, 'has id');
-        log('removing', req.params.id);
+        log.info('removing', req.params.id);
 
         service.remove(req.params.id).then((resp) => {
             res.status(200).send(resp);

plop-templates/nodejs-plugin-index.ts

@@ -19,7 +19,7 @@ export default class {{pascalCase name}} {
 
 	constructor(app:any) {
 		this.Router = new Router(app);
-		console.log('{{pascalCase name}} Plugin Constructor');
+
 
 	}
 

plop-templates/nodejs-plugin-service.ts

@@ -26,6 +26,9 @@ export default class Service {
             });
         }
         console.log('Service Constructor');
+        log = new Logger('blockchain-plugin').getLogger('service');
+        this.log = log;
+        log.info('created');
     }
 
     get(id:any) {