move from supervisor to nodemon (more flexible ignore allows to ignore hmvc/*/client)

Author: iliakan

.gitignore

@@ -30,7 +30,7 @@ out/*
 
 # Generated content
 public/*
-client/styles/sprites/*
+styles/sprites/*
 
 # Bower stuff.
 bower_components/

bin/server

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-'use strict';
 
 const log = require('js-log')();
 const config = require('config');

client/delegate.js

@@ -24,13 +24,13 @@ function delegate(topElement, selector, eventName, handler) {
   topElement.addEventListener(eventName, function(event) {
     var found = findDelegateTarget(event, selector);
 
-    // currentTarget is read only, I can not overwrite it to the "found" element
+    // .currentTarget is read only, I can not overwrite it to the "found" element
     // Object.create wrapper would break event.preventDefault()
     // so, keep in mind:
     // --> event.currentTarget is always the top-level (delegating) element!
     // use "this" to get the found target
 
-    event.delegateTarget = event.currentTarget; // for compat. with jQuery
+    event.delegateTarget = this; // use instead of this in object methods
 
     if (found) {
       handler.call(found, event);

client/modal.js

@@ -0,0 +1,31 @@
+function Modal() {
+
+}
+
+Modal.prototype.getElement = function() {
+  if (!this.elem) this.render();
+  return this.elem;
+};
+
+Modal.prototype.render = function() {
+  var elem = this.elem = document.createElement('div');
+  elem.className = 'modal';
+  this.contentElem = document.createElement('div');
+  this.contentElem.className = 'modal-dialog';
+  elem.appendChild(this.contentElem);
+};
+
+Modal.prototype.setContent = function(html) {
+  this.contentElem.innerHTML = html;
+};
+
+Modal.prototype.show = function() {
+  document.body.appendChild(this.getElement());
+};
+
+Modal.prototype.hide = function() {
+  this.elem.remove();
+};
+
+
+module.exports = Modal;

gulpfile.js

@@ -7,7 +7,6 @@ const gulp = require('gulp');
 const path = require('path');
 const fs = require('fs');
 const assert = require('assert');
-const config = require('config');
 const development = (process.env.NODE_ENV == 'development');
 
 const jsSources = [
@@ -43,7 +42,11 @@ gulp.task('lint', ['lint-once'], wrapWatch(jsSources, 'lint'));
 // usage: gulp loaddb --db fixture/db
 gulp.task('loaddb', lazyRequireTask('./tasks/loadDb'));
 
-gulp.task("supervisor", ['link-modules'], lazyRequireTask('./tasks/supervisor', { cmd: "./bin/server", watch: ["hmvc", "modules"] }));
+gulp.task("nodemon", ['link-modules'], lazyRequireTask('./tasks/nodemon', {
+  script: "./bin/server",
+  ignore: '**/client/', // ignore hmvc apps client code
+  watch:  ["hmvc", "modules"]
+}));
 
 gulp.task("client:livereload", lazyRequireTask("./tasks/livereload", { watch: "public/**/*.*" }));
 
@@ -95,7 +98,7 @@ gulp.task('client:minify', lazyRequireTask('./tasks/minify', {
 }));
 
 
-gulp.task('client:compile-css', ['client:compile-css-once'], wrapWatch(["styles/**/*.styl","styles/**/*.sprite/**"], "client:compile-css-once"));
+gulp.task('client:compile-css', ['client:compile-css-once'], wrapWatch(["styles/**/*.styl", "styles/**/*.sprite/**"], "client:compile-css-once"));
 
 
 gulp.task("client:browserify:clean", lazyRequireTask('./tasks/browserifyClean', { dst: './public/js'}));
@@ -107,10 +110,10 @@ gulp.task("client:browserify", ['client:browserify:clean'], lazyRequireTask('./t
 // compile-css and sprites are independant tasks
 // run both or run *-once separately
 gulp.task('run', [
-  'supervisor', 'client:livereload',
+  'nodemon', 'client:livereload',
   "client:sync-resources", 'client:compile-css', 'client:browserify', 'client:sync-css-images']);
 
 gulp.task('tutorial:import', lazyRequireTask('tutorial/tasks/import', {
-  root:        path.join(config.projectRoot, 'javascript-tutorial'),
+  root:        'javascript-tutorial',
   updateFiles: true // skip same size files
 }));

hmvc/auth/client/login.js

@@ -1,5 +1,6 @@
 var xhr = require('client/xhr');
 var delegate = require('client/delegate');
+var Modal = require('client/modal');
 
 // Run like this:
 // login()
@@ -8,12 +9,11 @@ var delegate = require('client/delegate');
 module.exports = function(options, authCallback) {
   options = options || {};
 
-  var authModal = document.createElement('div');
-  authModal.className = "auth-modal";
-
-  authModal.innerHTML = '<div class="progress large"></div>';
-  document.body.append(authModal);
+  var modal = new Modal();
 
+  modal.setContent('<div class="progress large"></div>');
+  modal.show();
+/*
   var request = xhr({ url: '/auth/login-register-form' });
   request.addEventListener('success',   function(event) {
     authModal.innerHTML = event.result;
@@ -26,7 +26,7 @@ module.exports = function(options, authCallback) {
   });
 
   request.send();
-
+*/
 };
 
 function initAuthModal(authCallback) {
@@ -87,6 +87,7 @@ function initAuthLogin(authCallback) {
 
 }
 
+/*
 document.on('click', '[data-action-verify-email]', function(event) {
   event.preventDefault();
   var request = xhr({method: 'POST', url: '/auth/verify-email'});
@@ -97,6 +98,7 @@ document.on('click', '[data-action-verify-email]', function(event) {
   request.send(JSON.stringify({email: this.dataset.actionVerifyEmail}));
 
 });
+*/
 
 
 function openAuthPopup(url) {

hmvc/tutorial/tasks/import.js

@@ -26,7 +26,7 @@ const gm = require('gm');
  * @returns {Function}
  */
 module.exports = function(options) {
-  const root = options.root;
+  const root =  path.join(config.projectRoot, options.root);
 
   return function(callback) {
 

package.json

@@ -4,10 +4,7 @@
   "private": true,
   "scripts": {
     "prod": "NODE_ENV=production node --harmony ./bin/server",
-    "dev": "NODE_ENV=development supervisor --harmony --debug --ignore node_modules ./bin/server",
-    "debug": "NODE_ENV=development supervisor --harmony --debug-brk --ignore node_modules ./bin/server",
-    "test": "NODE_ENV=test supervisor --harmony --debug --ignore node_modules ./bin/server",
-    "fixperms": "chown -R `id -u` . * ~/.npm ~/.node-gyp"
+    "fixperms": "sudo chown -R `id -u` . * ~/.npm ~/.node-gyp"
   },
   "precommit": "NODE_ENV=development node --harmony `which gulp` pre-commit",
   "dependencies": {
@@ -19,7 +16,7 @@
     "factor-bundle": "*",
     "fs-extra": "*",
     "glob": "*",
-    "gm": "^1.16.0",
+    "gm": "*",
     "gulp-cache": "*",
     "gulp-concat": "*",
     "gulp-debug": "*",
@@ -29,23 +26,24 @@
     "gulp-jshint-cache": "*",
     "gulp-load-plugins": "*",
     "gulp-newer": "*",
+    "gulp-nodemon": "^1.0.4",
     "gulp-notify": "*",
     "gulp-plumber": "*",
     "gulp-rimraf": "*",
     "gulp-stylus": "*",
     "gulp-util": "*",
     "gulp.spritesmith": "*",
-    "humane-js": "^3.1.0",
-    "image-size": "^0.3.2",
+    "humane-js": "*",
+    "image-size": "*",
     "imagemin": "*",
     "imagemin-pngcrush": "*",
     "imagemin-svgo": "*",
-    "inherits": "^2.0.1",
+    "inherits": "*",
     "jade": "*",
     "javascript-parser": "*",
     "jquery": "*",
     "js-log": "*",
-    "juice2": "^1.3.0",
+    "juice2": "*",
     "koa": "*",
     "koa-compose": "*",
     "koa-csrf": "*",
@@ -70,18 +68,19 @@
     "nib": "*",
     "nodemailer": "*",
     "nodemailer-ses-transport": "*",
+    "nodemon": "^1.2.1",
     "passport": "*",
-    "passport-facebook": "^1.0.3",
-    "passport-github": "^0.1.5",
-    "passport-google": "^0.3.0",
-    "passport-google-oauth": "^0.1.5",
-    "passport-google-plus": "^0.2.0",
+    "passport-facebook": "*",
+    "passport-github": "*",
+    "passport-google": "*",
+    "passport-google-oauth": "*",
+    "passport-google-plus": "*",
     "passport-local": "*",
-    "passport-vkontakte": "^0.2.1",
-    "passport-yandex": "0.0.2",
+    "passport-vkontakte": "*",
+    "passport-yandex": "*",
     "path-to-regexp": "*",
     "prismjs": "git://github.com/LeaVerou/prism#gh-pages",
-    "request": "^2.39.0",
+    "request": "*",
     "stylus": "*",
     "svgutils": "*",
     "through2": "*",
@@ -92,7 +91,7 @@
     "yargs": "*"
   },
   "devDependencies": {
-    "better-assert": "^1.0.1",
+    "better-assert": "*",
     "browserify": "*",
     "clarify": "*",
     "co-mocha": "*",
@@ -104,16 +103,14 @@
     "gulp-mocha": "*",
     "gulp-sourcemaps": "*",
     "gulp-stylus-sprite": "*",
-    "gulp-supervisor": "*",
     "lazypipe": "*",
     "mocha": "*",
     "node-notifier": "*",
-    "nodemailer-stub-transport": "^0.1.4",
+    "nodemailer-stub-transport": "*",
     "should": "*",
     "sinon": "*",
     "superagent": "*",
     "supertest": "*",
-    "supervisor": "*",
     "trace": "*",
     "watchify": "*"
   },

tasks/nodemon.js

@@ -0,0 +1,17 @@
+const gp = require('gulp-load-plugins')();
+
+module.exports = function(options) {
+
+  var opts = {
+    ext:    "js",
+    nodeArgs: ['--debug', '--harmony']
+  };
+
+  for (var key in options) {
+    opts[key] = options[key];
+  }
+
+  return function(callback) {
+    gp.nodemon(opts);
+  };
+};