Fix cli options and make the cli better testable with require()

Nothing is directly written to stdout/stderr but is passed in an event
emitter, so when testing we can use that.

This way of testing the cli has the advantage that we don't need to exec
for all tests.

bin/node-sass

 #!/usr/bin/env node
 
-require('../lib/cli')(process.argv.slice(2));
+var cli = require('../lib/cli')(process.argv.slice(2));
+
+cli.on('log', function(msg){
+  console.log(msg);
+});
+
+cli.on('error', function(msg){
+  console.error(msg);
+});
+
+cli.on('warn', function(msg){
+  console.warn(msg);
+});

lib/cli.js

 var watch = require('node-watch'),
     render = require('./render'),
     path = require('path'),
+    Emitter = require('events').EventEmitter,
     cwd = process.cwd();
 
 var optimist = require('optimist')
@@ -40,13 +41,14 @@ var optimist = require('optimist')
 
 // throttle function, used so when multiple files change at the same time
 // (e.g. git pull) the files are only compiled once.
-function throttle(fn, args) {
+function throttle(fn) {
   var timer;
+  var args = Array.prototype.slice.call(arguments, 1);
   return function() {
     var self = this;
     clearTimeout(timer);
     timer = setTimeout(function() {
-      fn.call(self, args);
+      fn.apply(self, args);
     }, 20);
   };
 }
@@ -64,6 +66,10 @@ exports = module.exports = function(args) {
     return;
   }
 
+  var emitter = new Emitter();
+
+  emitter.on('error', function(){});
+
   var options = {
     stdout: argv.stdout
   };
@@ -76,22 +82,22 @@ exports = module.exports = function(args) {
   }
 
   // make sure it's an array
-  if (!Array.isArray(options['include-path'])) {
-    options['include-paths'] = options.includePaths = [options['include-path']];
+  options.includePaths = argv['include-paths'];
+  if (!Array.isArray(options.includePaths)) {
+    options.includePaths = [options.includePaths];
   }
-  options.includePaths = options['include-paths'];
 
   // if it's an array, make it a string
-  if (Array.isArray(options['output-style'])) {
-    options['output-style'] = options['output-style'][0];
+  options.outputStyle = argv['output-style'];
+  if (Array.isArray(options.outputStyle)) {
+    options.outputStyle = options.outputStyle[0];
   }
-  options.outputStyle = options['output-style'];
 
   // if it's an array, make it a string
-  if (Array.isArray(options['source-comments'])) {
-    options['source-comments'] = options['source-comments'][0];
+  options.sourceComments = argv['source-comments'];
+  if (Array.isArray(options.sourceComments)) {
+    options.sourceComments = options.sourceComments[0];
   }
-  options.sourceComments = options['source-comments'];
 
   if (argv.w) {
 
@@ -104,10 +110,10 @@ exports = module.exports = function(args) {
     }
     watchDir.push(inFile)
 
-    var throttledRender = throttle(render, options);
+    var throttledRender = throttle(render, options, emitter);
 
     watch(watchDir, function(file){
-      console.warn('=> changed: '.grey + file.blue);
+      emitter.emit('warn', '=> changed: '.grey + file.blue);
       if (isSassFile(file)) {
         throttledRender();
       }
@@ -116,8 +122,10 @@ exports = module.exports = function(args) {
     throttledRender();
 
   } else {
-    render(options);
+    render(options, emitter);
   }
+
+  return emitter;
 };
 
 exports.optimist = optimist;

lib/render.js

@@ -5,7 +5,7 @@ var sass = require('../sass'),
 
 var cwd = process.cwd();
 
-function render(options) {
+function render(options, emitter) {
 
   sass.render({
     file: options.inFile,
@@ -14,19 +14,21 @@ function render(options) {
     sourceComments: options.sourceComments,
     success: function(css) {
 
-      console.warn('Rendering Complete, saving .css file...'.green);
+      emitter.emit('warn', 'Rendering Complete, saving .css file...'.green);
 
       fs.writeFile(options.outFile, css, function(err) {
-        if (err) return console.error(('Error: ' + err).red);
-        console.warn(('Wrote CSS to ' + options.outFile).green);
+        if (err) return emitter.emit('error', ('Error: ' + err).red);
+        emitter.emit('warn', ('Wrote CSS to ' + options.outFile).green);
       });
 
       if (options.stdout) {
-        console.log(css);
+        emitter.emit('log', css);
       }
+
+      emitter.emit('render', css);
     },
     error: function(error) {
-      console.error(error);
+      emitter.emit('error', error);
     }
   });
 }

test/cli.js

@@ -3,6 +3,7 @@ var path   = require('path'),
     fs     = require('fs'),
     exec   = require('child_process').exec,
     sass   = require(path.join(__dirname, '..', 'sass')),
+    cli    = require(path.join(__dirname, '..', 'lib', 'cli')),
 
     cliPath = path.resolve(__dirname, '..', 'bin', 'node-sass'),
     sampleFilename = path.resolve(__dirname, 'sample.scss');
@@ -44,4 +45,17 @@ describe('cli', function() {
       });
     });
   });
+
+  it('should compile with --include-paths option', function(done){
+    var emitter = cli(['--include-paths', __dirname + '/lib', __dirname + '/include_path.scss']);
+    emitter.on('error', function(err){
+      done(err);
+    });
+    emitter.on('render', function(css){
+      assert.equal(css.trim(), 'body {\n  background: red; }');
+      done();
+    });
+  });
+
+
 });