fixed watch

Author: wesleytodd

bin/node-sass

@@ -139,7 +139,7 @@ function getEmitter() {
  */
 
 function getOptions(args, options) {
-  options.src = options.watch ? options.watch : args[0];
+  options.src = args[0] || options.watch;
 
   if (args[1]) {
     options.dest = path.resolve(process.cwd(), args[1]);
@@ -161,25 +161,30 @@ function getOptions(args, options) {
  */
 
 function watch(options, emitter) {
-  var dir = options.watch;
-  var gaze = new Gaze();
+  var watchDir = isSassFile(options.watch) ? path.dirname(path.resolve(options.watch)) : options.watch,
+      glob = options.recursive ? '**/*.{sass,scss}' : '*.{sass,scss}',
+      gaze = new Gaze(),
+      dir;
 
-  if (dir === true) {
+  if (watchDir === true) {
     dir = [];
-  } else if (!Array.isArray(dir)) {
-    dir = [dir];
+  } else if (!Array.isArray(watchDir)) {
+    dir = [watchDir];
   }
 
-  dir.push(options.src);
+  // only add the src file if it is not already
+  // in the array as the watch path
+  if (options.watch !== options.src) {
+	  dir.push(options.src);
+  }
   dir = dir.map(function(d) {
-    var glob = options.recursive ? '**/*.{sass,scss}' : '*.{sass,scss}';
     return isSassFile(d) ? d : path.join(d, glob);
   });
 
   gaze.add(dir);
   gaze.on('error', emitter.emit.bind(emitter, 'error'));
 
-  var graph = grapher.parseDir(options.src, { loadPaths: options.includePath });
+  var graph = grapher.parseDir(watchDir, { loadPaths: options.includePath });
 
   gaze.on('changed', function(file) {
     var files = [file];

test/cli.js

@@ -207,6 +207,29 @@ describe('cli', function() {
         fs.appendFileSync(src, 'body{background:white}');
       }, 500);
     });
+
+    it('should watch the full sass dep tree for a single file', function(done) {
+      var src = fixture('watching/index.scss');
+      var foo = fixture('watching/foo.scss');
+
+      fs.writeFileSync(foo, '');
+
+      var bin = spawn(cli, [
+        '--output-style', 'compressed',
+        '--watch', src
+      ]);
+
+      bin.stdout.setEncoding('utf8');
+      bin.stdout.once('data', function(data) {
+        assert(data.trim() === 'body{background:white}');
+		fs.unlinkSync(fixtures('watching/index.css'));
+        done();
+      });
+
+      setTimeout(function() {
+        fs.appendFileSync(foo, 'body{background:white}');
+      }, 500);
+    });
   });
 
   describe('node-sass in.scss --output out.css', function() {

test/fixtures/watching/foo.scss

@@ -0,0 +1 @@
+body{background:white}

test/fixtures/watching/index.scss

@@ -0,0 +1 @@
+@import './foo';