Merge pull request #101 from fgnass/release-2.7.0

2.7.0

Author: gasi

CHANGELOG.md

@@ -0,0 +1,20 @@
+# node-dev
+
+## 2.7.0 / 2015-08-17
+
+- [#88]: Support ignoring file paths, e.g. for universal (isomorphic) apps. See
+  [`README`][README-ignore-paths] for more details.
+- Use [`commander`][npm-commander] for CLI argument parsing instead of custom code.
+- Extract [`LICENSE`][LICENSE] file.
+- Upgrade [`tap`][npm-tap] module to 1.3.2.
+- Use [`touch`][npm-touch] module instead of custom code.
+
+
+[LICENSE]: LICENSE
+[npm-commander]: https://www.npmjs.com/package/commander
+[npm-tap]: https://www.npmjs.com/package/tap
+[npm-touch]: https://www.npmjs.com/package/touch
+[README]: README.md
+[README-ignore-paths]: README.md#ignore-paths
+
+[#88]: https://github.com/fgnass/node-dev/issues/88

LICENSE

@@ -0,0 +1,22 @@
+(The MIT License)
+
+Copyright (c) 2014–2015 Felix Gnass
+Copyright (c) 2015 Daniel Gasienica
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -145,28 +145,7 @@ server restart when changed, since it introduces an unnecessary delay.
 
 ## License
 
-### The MIT License (MIT)
-
-Copyright (c) 2014–2015 Felix Gnass
-Copyright (c) 2015 Daniel Gasienica
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+MIT
 
 
 [react]: http://facebook.github.io/react/

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-dev",
-  "version": "2.6.2",
+  "version": "2.7.0",
   "description": "Restarts your app when files are modified",
   "keywords": [
     "restart",
@@ -39,6 +39,7 @@
   },
   "devDependencies": {
     "coffee-script": "^1.8.0",
-    "tap": "^0.4.13"
+    "tap": "^1.3.2",
+    "touch": "^1.0.0"
   }
 }

test/fixture/.node-dev.json

@@ -1,3 +1,6 @@
 {
-  "notify": false
-}
+  "notify": false,
+  "ignore": [
+    "./ignoredModule.js"
+  ]
+}

test/fixture/ignoredModule.js

@@ -0,0 +1 @@
+module.exports = "Ignored file — `touch`ing it should not restart server."

test/fixture/server.js

@@ -1,5 +1,7 @@
 var http = require('http')
   , message = require('./message')
+  // Changes to this module should not cause a server restart:
+  , ignoredModule = require('./ignoredModule')
 
 var server = http.createServer(function (req, res) {
   res.writeHead(200, {'Content-Type': 'text/plain'})

test/index.js

@@ -1,14 +1,22 @@
 var fs = require('fs')
   , child = require('child_process')
   , test = require('tap').test
+  , touch = require('touch')
 
 var dir = __dirname +  '/fixture'
   , bin = __dirname + '/../bin/node-dev'
   , msgFile = dir + '/message.js'
-  , msg = 'module.exports = "Please touch message.js now"\n'
+  , ignoredFile = dir + '/ignoredModule.js'
 
-function touch() {
-  fs.writeFileSync(msgFile, msg)
+
+// Constants
+var MESSAGE = fs.readFileSync(msgFile).toString()
+
+// Helpers
+function touchFile(file) {
+  return function() {
+    touch.sync(file ? file : msgFile)
+  }
 }
 
 function spawn(cmd, cb) {
@@ -31,7 +39,7 @@ function spawn(cmd, cb) {
 function run(cmd, done) {
   spawn(cmd, function(out) {
     if (out.match(/touch message.js/)) {
-      setTimeout(touch, 500)
+      setTimeout(touchFile(), 500)
       return function(out) {
         if (out.match(/Restarting/)) {
           return { exit: done }
@@ -41,18 +49,18 @@ function run(cmd, done) {
   })
 }
 
-
+// Tests
 test('should restart the server', function(t) {
   run('server.js', t.end.bind(t))
 })
 
 test('should restart the server twice', function(t) {
   spawn('server.js', function(out) {
     if (out.match(/touch message.js/)) {
-      setTimeout(touch, 500)
+      setTimeout(touchFile(), 500)
       return function(out) {
         if (out.match(/Restarting/)) {
-          setTimeout(touch, 500)
+          setTimeout(touchFile(), 500)
           return function(out) {
             if (out.match(/Restarting/)) {
               return { exit: t.end.bind(t) }
@@ -64,6 +72,28 @@ test('should restart the server twice', function(t) {
   })
 })
 
+test('should not restart the server for ignored modules', function(t) {
+  ps = spawn('server.js', function(out) {
+    if (out.match(/touch message.js/)) {
+      setTimeout(touchFile(ignoredFile), 500)
+
+      var successTimeoutId = setTimeout(function () {
+        ps.removeAllListeners('exit')
+        ps.kill()
+
+        t.end()
+      }, 1000);
+
+      return function(out) {
+        clearTimeout(successTimeoutId)
+        t.fail('server restarted unexpectedly')
+
+        return { exit: t.end.bind(t) }
+      }
+    }
+  })
+})
+
 test('should restart the cluster', function(t) {
   run('cluster.js', t.end.bind(t))
 })
@@ -78,7 +108,7 @@ test('should support coffee-script', function(t) {
 
 test('should restart when a file is renamed', function(t) {
   var tmp = dir + '/message.tmp'
-  fs.writeFileSync(tmp, msg)
+  fs.writeFileSync(tmp, MESSAGE)
   spawn('log.js', function(out) {
     if (out.match(/touch message.js/)) {
       fs.renameSync(tmp, msgFile)
@@ -94,7 +124,7 @@ test('should restart when a file is renamed', function(t) {
 test('should handle errors', function(t) {
   spawn('error.js', function(out) {
     if (out.match(/ERROR/)) {
-      setTimeout(touch, 500)
+      setTimeout(touchFile(), 500)
       return function(out) {
         if (out.match(/Restarting/)) {
           return { exit: t.end.bind(t) }
@@ -135,7 +165,7 @@ test('should pass through the exit code', function(t) {
   })
 })
 
-test('should conceil the wrapper', function(t) {
+test('should conceal the wrapper', function(t) {
   // require.main should be main.js not wrap.js!
   spawn('main.js').on('exit', function(code) {
     t.is(code, 0)
@@ -177,7 +207,7 @@ test('should set NODE_ENV', function(t) {
 test('should allow graceful shutdowns', function(t) {
   spawn('server.js', function(out) {
     if (out.match(/touch message.js/)) {
-      setTimeout(touch, 500)
+      setTimeout(touchFile(), 500)
       return function(out) {
         if (out.match(/exit/)) {
           return { exit: t.end.bind(t) }