Allow for closing of a watch

The previous version had no return value.  Now the function returns its underlying listener so that it can be closed and future changes to the watched file will not trigger events.

lib/watch.js

@@ -166,7 +166,8 @@ var catchException = function() {};
  */
 var handleOptions = function(origin, defaultOptions) {
   return function() {
-    var args = [].slice.call(arguments);
+    var args = [].slice.call(arguments),
+     retrs=[];
     if (Object.prototype.toString.call(args[1]) === '[object Function]') {
       args[2] = args[1];
     }
@@ -177,8 +178,9 @@ var handleOptions = function(origin, defaultOptions) {
     args[1] = mixin(defaultOptions, args[1]);           
     //handle multiple files.
     args[0].forEach(function(path) {
-      origin.apply(null, [path].concat(args.slice(1))); 
-    });  
+      retrs.push(origin.apply(null, [path].concat(args.slice(1)))); 
+    });
+    return retrs.length==1 ? retrs[0] : retrs; 
   }
 };
 
@@ -207,18 +209,18 @@ function watch(fpath, options, cb) {
       && options.maxSymLevel--)) {
     return;
   }
-  // Due to the unstable fs.watch(), if the `fpath` is a file then 
+  // Due to the unstalbe fs.watch(), if the `fpath` is a file then 
   // switch to watch its parent directory instead of watch it directly. 
   // Once the logged filename matches it then triggers the callback function.
   if (is.file(fpath)) {
     var parent = path.resolve(fpath, '..');
-    fs.watch(parent, options, function(evt, fname) {
+    return fs.watch(parent, options, function(evt, fname) {
       if (path.basename(fpath) === fname) {
         normalizeCall(fpath, options, cb);
       }
     }).on('error', catchException);                         
   } else if (is.dir(fpath)) {
-    fs.watch(fpath, options, function(evt, fname) {
+    var retr = fs.watch(fpath, options, function(evt, fname) {
       if (fname) {
         normalizeCall(path.join(fpath, fname), options, cb);
       }
@@ -230,6 +232,7 @@ function watch(fpath, options, cb) {
         watch(dir, options, cb);
       });    
     }
+    return retr;
   }
 }; 
 
@@ -242,4 +245,3 @@ module.exports = handleOptions(watch, {
   , followSymLinks: false
   , maxSymLevel: 1
 });
-