Merge branch 'topic/capturing-stderr'

Author: ethul

Fixture1.purs

@@ -0,0 +1,3 @@
+module Fixture1 where
+
+fixture = "fixture"

Fixture.purs.hs renamed to Fixture2.purs

@@ -1,3 +1,3 @@
-module Fixture where
+module Fixture2 w
 
 fixture = "fixture"

index.js

@@ -83,19 +83,18 @@ function psc(opts) {
   return acc(function(files, cb){
     var args = files.concat(options(OPTIONS.psc, opts$prime))
       , cmd = cp.spawn('psc', args)
-      , buffer = new Buffer(0)
+      , buffero = new Buffer(0)
+      , buffere = new Buffer(0)
       , that = this
     ;
-    cmd.stdout.on('data', function(stdout){buffer = Buffer.concat([buffer, new Buffer(stdout)]);});
-    cmd.stderr.on('data', function(stderr){
-      gutil.log('Stderr from \'' + gutil.colors.cyan('psc') + '\'\n' + gutil.colors.magenta(stderr));
-    });
+    cmd.stdout.on('data', function(stdout){buffero = Buffer.concat([buffero, new Buffer(stdout)]);});
+    cmd.stderr.on('data', function(stderr){buffere = Buffer.concat([buffere, new Buffer(stderr)]);});
     cmd.on('close', function(code){
-      if (!!code) that.emit('error', new gutil.PluginError(PLUGIN, buffer.toString()));
+      if (!!code) that.emit('error', new gutil.PluginError(PLUGIN, buffere.toString()));
       else {
         that.push(new gutil.File({
           path: output,
-          contents: buffer
+          contents: buffero
         }));
       }
       cb();
@@ -126,21 +125,18 @@ function docgen(opts) {
   return acc(function(files, cb){
     var args = options(OPTIONS.docgen, opts).concat(files)
       , cmd = cp.spawn('docgen', args)
-      , buffer = new Buffer(0)
+      , buffero = new Buffer(0)
+      , buffere = new Buffer(0)
       , that = this
     ;
-    cmd.stdout.on('data', function(stdout){
-      buffer = Buffer.concat([buffer, new Buffer(stdout)]);
-    });
-    cmd.stderr.on('data', function(stderr){
-      gutil.log('Stderr from \'' + gutil.colors.cyan('docgen') + '\'\n' + gutil.colors.magenta(stderr));
-    });
+    cmd.stdout.on('data', function(stdout){buffero = Buffer.concat([buffero, new Buffer(stdout)]);});
+    cmd.stderr.on('data', function(stderr){buffere = Buffer.concat([buffere, new Buffer(stderr)]);});
     cmd.on('close', function(code){
-      if (!!code) that.emit('error', new gutil.PluginError(PLUGIN, buffer.toString()));
+      if (!!code) that.emit('error', new gutil.PluginError(PLUGIN, buffere.toString()));
       else {
         that.push(new gutil.File({
           path: '.',
-          contents: buffer
+          contents: buffero
         }));
       }
       cb();

test.js

@@ -8,7 +8,7 @@ var gutil = require('gulp-util')
 
 it('should compile purescript', function(cb){
   var stream = purescript.psc({noPrelude: true})
-    , fixture = 'Fixture.purs.hs'
+    , fixture = 'Fixture1.purs'
   ;
 
   stream.on('data', function(file){
@@ -33,7 +33,7 @@ it('should compile purescript', function(cb){
 });
 
 it('should compile purescript to specified output, without creating file', function(cb){
-  var fixture = 'Fixture.purs.hs'
+  var fixture = 'Fixture1.purs'
     , output  = 'output.js'
     , stream  = purescript.psc({noPrelude: true, output: output})
   ;
@@ -58,3 +58,29 @@ it('should compile purescript to specified output, without creating file', funct
     }
   });
 });
+
+it('should fail to compile with an error message', function(cb){
+  var stream = purescript.psc({noPrelude: true})
+    , fixture = 'Fixture2.purs'
+  ;
+
+  stream.on('error', function(e){
+    assert("Error" === e.name);
+    assert(/expecting "where"/.test(e.message));
+    cb();
+  });
+
+  fs.readFile(fixture, function(e, buffer){
+    if (e) cb(assert(false));
+    else {
+      stream.write(new gutil.File({
+        cwd: __dirname,
+        base: __dirname,
+        path: __dirname + '/' + fixture,
+        contents: buffer,
+        stat: {mtime: new Date()}
+      }));
+      stream.end();
+    }
+  });
+});