Merge branch 'fujimura-create-output-file-by-gulp-not-psc-command'

Author: ethul

README.md

@@ -46,7 +46,7 @@ Invokes the `psc` command.
  - externs: String value that sets `--externs=<string>`
  - modules: String or array value that sets one or more `--module=<string>`
  - codegen: String or array value that sets one or more `--codegen=<string>`
- - output: String value that sets `--output=<string>`
+ - output: String value that specifies the output file(this won't set'`--output=<string>`)
 
 ### purescript.pscMake(options)
 

index.js

@@ -2,6 +2,7 @@
 
 var gutil = require('gulp-util')
   , through = require('through2')
+  , lodash = require('lodash')
   , cp = require('child_process')
   , PLUGIN = 'gulp-purescript'
   , OPTIONS = {
@@ -66,8 +67,14 @@ function acc(f) {
 }
 
 function psc(opts) {
+  var output = opts && opts.output ? opts.output : 'psc.js'
+    , opts$prime = lodash.omit(opts || {}, 'output')
+  ;
+  // The `output` given there will be passed to gulp, not `psc` command.
+  // If it was passed to `psc` command, the file will be created and gulp
+  // won't receive any input stream from this function.
   return acc(function(files, cb){
-    var args = files.concat(options(OPTIONS.psc, opts))
+    var args = files.concat(options(OPTIONS.psc, opts$prime))
       , cmd = cp.spawn('psc', args)
       , buffer = new Buffer(0)
       , that = this
@@ -80,7 +87,7 @@ function psc(opts) {
       if (!!code) that.emit('error', new gutil.PluginError(PLUGIN, buffer.toString()));
       else {
         that.push(new gutil.File({
-          path: (opts.output || 'psc.js'),
+          path: output,
           contents: buffer
         }));
       }

package.json

@@ -9,16 +9,23 @@
     "email": "[email protected]"
   },
   "engineStrict": true,
-  "engines": {"node": ">=0.10"},
-  "files": ["index.js"],
-  "scripts": {"test": "mocha"},
+  "engines": {
+    "node": ">=0.10"
+  },
+  "files": [
+    "index.js"
+  ],
+  "scripts": {
+    "test": "mocha"
+  },
   "keywords": [
     "gulpplugin",
     "purescript"
   ],
   "dependencies": {
-    "through2": "^0.4.1",
-    "gulp-util": "^2.2.14"
+    "gulp-util": "^2.2.14",
+    "lodash": "^2.4.1",
+    "through2": "^0.4.1"
   },
   "devDependencies": {
     "mocha": "*"

test.js

@@ -4,7 +4,6 @@ var gutil = require('gulp-util')
   , assert = require('assert')
   , fs = require('fs')
   , purescript = require('./')
-  , os = require('os')
 ;
 
 it('should compile purescript', function(cb){
@@ -14,6 +13,7 @@ it('should compile purescript', function(cb){
 
   stream.on('data', function(file){
     assert(/Fixture/.test(file.contents.toString()));
+    assert.equal('psc.js', file.path);
     cb();
   });
 
@@ -32,13 +32,14 @@ it('should compile purescript', function(cb){
   });
 });
 
-it('should compile purescript to specified output', function(cb){
+it('should compile purescript to specified output, without creating file', function(cb){
   var fixture = 'Fixture.purs.hs'
-    , output  = os.tmpdir() + '/output.js'
+    , output  = 'output.js'
     , stream  = purescript.psc({noPrelude: true, output: output})
   ;
 
   stream.on('data', function(file){
+    assert(!fs.existsSync(__dirname + "/" + output));
     assert.equal(output, file.path);
     cb();
   });