fix: Replace jade references by pug

close remy#1595

README.md

@@ -178,10 +178,10 @@ Don't use unix globbing to pass multiple directories, e.g `--watch ./lib/*`, it
 By default, nodemon looks for files with the `.js`, `.mjs`, `.coffee`, `.litcoffee`, and `.json` extensions. If you use the `--exec` option and monitor `app.py` nodemon will monitor files with the extension of `.py`. However, you can specify your own list with the `-e` (or `--ext`) switch like so:
 
 ```bash
-nodemon -e js,jade
+nodemon -e js,pug
 ```
 
-Now nodemon will restart on any changes to files in the directory (or subdirectories) with the extensions `.js`, `.jade`.
+Now nodemon will restart on any changes to files in the directory (or subdirectories) with the extensions `.js`, `.pug`.
 
 ## Ignoring files
 

doc/cli/help.txt

@@ -3,7 +3,7 @@
   Options:
 
   --config file ............ alternate nodemon.json config file to use
-  -e, --ext ................ extensions to look for, ie. js,jade,hbs.
+  -e, --ext ................ extensions to look for, ie. js,pug,hbs.
   -x, --exec app ........... execute script with "app", ie. -x "python -v".
   -w, --watch path.......... watch directory "path" or files. use once for
                              each directory or file to watch.

doc/cli/options.txt

@@ -12,7 +12,7 @@ Configuration
 Execution
   -C, --on-change-only ..... execute script on change only, not startup
   --cwd <dir> .............. change into <dir> before running the script
-  -e, --ext ................ extensions to look for, ie. "js,jade,hbs"
+  -e, --ext ................ extensions to look for, ie. "js,pug,hbs"
   -I, --no-stdin ........... nodemon passes stdin directly to child process
   --spawn .................. force nodemon to use spawn (over fork) [node only]
   -x, --exec app ........... execute script with "app", ie. -x "python -v"

lib/config/exec.js

@@ -198,7 +198,7 @@ function exec(nodemonOptions, execMap) {
   }
 
   // allow users to make a mistake on the extension to monitor
-  // converts .js, jade => js,jade
+  // converts .js, pug => js,pug
   // BIG NOTE: user can't do this: nodemon -e *.js
   // because the terminal will automatically expand the glob against
   // the file system :(

test/cli/exec.test.js

@@ -83,14 +83,14 @@ describe('nodemon exec', function () {
   });
 
   it('should support multiple extensions', function () {
-    var options = exec({ script: 'app.js', ext: 'js, jade, hbs' });
+    var options = exec({ script: 'app.js', ext: 'js, pug, hbs' });
     var cmd = toCmd(options);
     assert(cmd.string === 'node app.js', cmd.string);
-    assert(options.ext.indexOf('jade') !== -1, 'comma separated string');
+    assert(options.ext.indexOf('pug') !== -1, 'comma separated string');
 
-    options = exec({ script: 'app.js', ext: 'js|jade|hbs' });
+    options = exec({ script: 'app.js', ext: 'js|pug|hbs' });
     assert(options.exec === 'node');
-    assert(options.ext.indexOf('jade') !== -1, 'pipe separated string');
+    assert(options.ext.indexOf('pug') !== -1, 'pipe separated string');
   });
 
   it('should support watching all extensions', function () {
@@ -123,14 +123,14 @@ describe('nodemon exec', function () {
   });
 
   it('should support extension maps', function () {
-    var options = exec({ script: 'template.jade' }, { 'jade': 'jade {{filename}} --out /tmp' });
+    var options = exec({ script: 'template.pug' }, { 'pug': 'pug {{filename}} --out /tmp' });
     var cmd = toCmd(options);
-    assert(cmd.string === 'jade template.jade --out /tmp', cmd.string);
+    assert(cmd.string === 'pug template.pug --out /tmp', cmd.string);
   });
 
   it('should support input from argv#parse', function () {
     var parse = require('../../lib/cli/parse');
-    parse('node /usr/local/bin/nodemon.js --debug -e js,jade,hbs app.js'.split(' '));
+    parse('node /usr/local/bin/nodemon.js --debug -e js,pug,hbs app.js'.split(' '));
   });
 
   it('should use coffeescript on .coffee', function () {
@@ -186,10 +186,10 @@ describe('nodemon exec', function () {
   });
 
   it('should support single-level file extensions', function () {
-    var options = exec({ ext: '.js, jade' });
+    var options = exec({ ext: '.js, pug' });
 
     assert(options.ext.indexOf('js') !== -1);
-    assert(options.ext.indexOf('jade') !== -1);
+    assert(options.ext.indexOf('pug') !== -1);
   });
 
   it('should expand app to app.js', function () {

test/cli/parse.test.js

@@ -229,7 +229,7 @@ describe('nodemon argument parser', function () {
   });
 
   it('should support short versions of flags', function () {
-    var settings = cli.parse('node nodemon -v -x java -I -V -q -w fixtures -i fixtures -d 5 -L -C -e jade -s SIGHUP');
+    var settings = cli.parse('node nodemon -v -x java -I -V -q -w fixtures -i fixtures -d 5 -L -C -e pug -s SIGHUP');
     assert(settings.version, 'version');
     assert(settings.verbose, 'verbose');
     assert(settings.exec === 'java', 'exec');
@@ -239,13 +239,13 @@ describe('nodemon argument parser', function () {
     assert(settings.ignore[0] === 'fixtures', 'ignore');
     assert(settings.delay === 5000, 'delay 5 seconds');
     assert(settings.runOnChangeOnly, 'run on change only');
-    assert(settings.ext === 'jade', 'extension is jade');
+    assert(settings.ext === 'pug', 'extension is pug');
     assert(settings.signal === 'SIGHUP', 'signal is SIGHUP');
   });
 
 
   it('should support long versions of flags', function () {
-    var settings = cli.parse('node nodemon --version --exec java --verbose --quiet --watch fixtures --ignore fixtures --no-stdin --delay 5 --legacy-watch --exitcrash --on-change-only --ext jade --config my/.nodemon.json --signal SIGHUP');
+    var settings = cli.parse('node nodemon --version --exec java --verbose --quiet --watch fixtures --ignore fixtures --no-stdin --delay 5 --legacy-watch --exitcrash --on-change-only --ext pug --config my/.nodemon.json --signal SIGHUP');
     assert(settings.version, 'version');
     assert(settings.verbose, 'verbose');
     assert(settings.exec === 'java', 'exec');
@@ -256,7 +256,7 @@ describe('nodemon argument parser', function () {
     assert(settings.ignore[0] === 'fixtures', 'ignore');
     assert(settings.delay === 5000, 'delay 5 seconds');
     assert(settings.runOnChangeOnly, 'run on change only');
-    assert(settings.ext === 'jade', 'extension is jade');
+    assert(settings.ext === 'pug', 'extension is pug');
     assert(settings.configFile === 'my/.nodemon.json', 'custom config file name is my/.nodemon.json');
     assert(settings.signal === 'SIGHUP', 'signal is SIGHUP');
   });

test/config/load.test.js

@@ -97,8 +97,8 @@ describe('config load', function () {
       assert(config.verbose, 'we are verbose');
 
       // ensure global mapping works too
-      var options = exec({ script: 'template.jade' }, config.execMap);
-      assert(options.exec === 'bin/jade template.jade --out /tmp', 'exec used, should be "bin/jade": ' + options.exec);
+      var options = exec({ script: 'template.pug' }, config.execMap);
+      assert(options.exec === 'bin/pug template.pug --out /tmp', 'exec used, should be "bin/pug": ' + options.exec);
 
       done();
 

test/fixtures/global/nodemon.json

@@ -2,6 +2,6 @@
   "verbose": true,
   "ignore": ["one", "two"],
   "execMap": {
-    "jade": "bin/jade {{filename}} --out /tmp"
+    "pug": "bin/pug {{filename}} --out /tmp"
   }
-}
+}

test/fixtures/packages/express4/package.json

@@ -12,6 +12,7 @@
     "cookie-parser": "~1.0.1",
     "body-parser": "~1.0.0",
     "debug": "~0.7.4",
-    "jade": "~1.3.0"
+    "pug": "~2.0.4",
+    "pug-cli": "~1.0.0"
   }
 }

test/monitor/match.test.js

@@ -222,7 +222,7 @@ describe('match', function() {
   it('should be specific about directories', function(done) {
     config.load(
       {
-        ext: 'js md jade',
+        ext: 'js md pug',
         watch: ['lib'],
       },
       function(config) {