add isPipe

Author: wenli.lw

bin/vm.js

@@ -1,6 +1,6 @@
 const stdin = process.stdin
 
-const isPipe = !stdin.isTTY
+const isPipe = process.env.isPipe == null ? !stdin.isTTY : process.env.isPipe === 'true'
 
 const check = function () {
  return new Promise(function (resolve) {

examples.md

@@ -21,7 +21,7 @@
 
 ## Known support list
 
-| node modules | example |
+| node_modules | example |
 | --- | --- |
 | [shelljs](https://github.com/shelljs/shelljs) | fire shelljs ls stdout |
 | [mathjs](https://github.com/josdejong/mathjs) | fire mathjs add 2.1 3.2 |
@@ -32,5 +32,6 @@
 | md5 | fire md5 test |
 | sha1 | fire sha1 test |
 | uuid | fire uuid |
-
+| colors | fire colors |
+| chalk | fire chalk |
 

package.json

@@ -1,6 +1,6 @@
 {
  "name": "node-fire",
- "version": "0.2.5",
+ "version": "0.2.6",
  "description": "Run a js object or a function by command line directly.",
  "bin": {
  "fire": "./bin/index.js"

test/_exec.js

@@ -1,5 +1,20 @@
-const exec = require('shelljs').exec
-module.exports = function (script, bin = 'node ./bin/index') {
- console.log('RUN>', bin + ' ' + script)
- return exec(bin + ' ' + script).toString().trim()
+const exec = function (args, isPipe) {
+ return new Promise(function (resolve) {
+ console.log('RUN >> ', args)
+ var proc = require('child_process').exec(args, {
+ env: Object.assign({}, process.env, { isPipe }
+ )}, (err, ret) => resolve(String(err || ret || '').trim()))
+
+ proc.stdout.on('data', data => {
+ process.stdout.write(data)
+ })
+
+ proc.stderr.on('data', err => {
+ process.stdout.write(err)
+ })
+ })
+}
+
+module.exports = function (script, bin = 'node ./bin/index', isPipe = false) {
+ return exec(bin + ' ' + script, isPipe)
 }

test/calc.js

@@ -1,8 +1,8 @@
 const test = require('ava')
 const exec = require('./_exec')
-test('calc', (t) => {
- t.is(exec('examples/calc.js add 3 4'), '7')
- t.is(exec('examples/calc.js multiply 3 4'), '12')
- t.is(exec('examples/calc.js pow 3'), '9')
- t.is(exec('examples/calc.js div 8 0 --b 2'), '4')
+test('calc', async (t) => {
+ t.is(await exec('examples/calc.js add 3 4'), '7')
+ t.is(await exec('examples/calc.js multiply 3 4'), '12')
+ t.is(await exec('examples/calc.js pow 3'), '9')
+ t.is(await exec('examples/calc.js div 8 0 --b 2'), '4')
 })

test/force-input.js

@@ -1,7 +1,7 @@
 const test = require('ava')
 const exec = require('./_exec')
-test('force input', (t) => {
- let ret = exec('./test/fixtures/dynamicArgs.js ...2,4')
+test('force input', async (t) => {
+ let ret = await exec('./test/fixtures/dynamicArgs.js ...2,4')
  console.log(ret)
  t.is('6', ret)
 })

test/index.js

@@ -1,33 +1,33 @@
 const test = require('ava')
 const exec = require('./_exec')
-test('exec', (t) => {
- exec('./test/fixtures/test.js')
+test('exec', async (t) => {
+ await exec('./test/fixtures/test.js')
  t.pass()
 })
 
-test('relative path', (t) => {
- exec('test/fixtures/test.js')
+test('relative path', async (t) => {
+ await exec('test/fixtures/test.js')
  t.pass()
 })
 
-test('json & multi params', (t) => {
- t.is(exec('./test/fixtures/test.json repository type'), 'git')
+test('json & multi params', async (t) => {
+ t.is(await exec('./test/fixtures/test.json repository type'), 'git')
  t.pass()
 })
 
-test('test2', (t) => {
- t.is(exec('./test/fixtures/test2.js'), `{ a: [Function],
+test('test2', async (t) => {
+ t.is(await exec('./test/fixtures/test2.js'), `{ a: [Function],
  b: [Function],
  c: [Function],
  d: [Function],
  e: [Function] }`)
 })
 
-test('test2 with second param', (t) => {
- exec('./test/fixtures/test2.js a')
+test('test2 with second param', async (t) => {
+ await exec('./test/fixtures/test2.js a')
 })
 
-test('deep get', t => {
- t.is(exec('./test/fixtures/deep.js b d'), 'delay deep')
+test('deep get', async (t) => {
+ t.is(await exec('./test/fixtures/deep.js b d'), 'delay deep')
  t.pass()
 })

test/input-object.js

@@ -1,7 +1,7 @@
 const test = require('ava')
 const exec = require('./_exec')
-test('calc', (t) => {
- let ret = exec('./test/fixtures/dynamicArgs.js ...2,4')
+test('calc', async (t) => {
+ let ret = await exec('./test/fixtures/dynamicArgs.js ...2,4')
  console.log(ret)
  t.is('6', ret)
 })

test/node-module.js

@@ -1,15 +1,15 @@
 const test = require('ava')
 const exec = require('./_exec')
-test('run shelljs', (t) => {
+test('run shelljs', async (t) => {
  let filename = '0000testfile' + Date.now()
- exec('shelljs touch ...' + filename)
- t.regex(exec('shelljs ls'), new RegExp(filename))
- t.is(exec('shelljs ls ..../ 0'), filename)
- exec('shelljs rm ...' + filename)
+ await exec('shelljs touch ...' + filename)
+ t.regex(await exec('shelljs ls'), new RegExp(filename))
+ t.is(await exec('shelljs ls ..../ 0'), filename)
+ await exec('shelljs rm ...' + filename)
  t.pass()
 })
 
-test('run mathjs', (t) => {
- t.is(exec('mathjs add 5.3 4.2'), '9.5')
+test('run mathjs', async (t) => {
+ t.is(await exec('mathjs add 5.3 4.2'), '9.5')
  t.pass()
 })

test/npm-scripts.js

@@ -2,10 +2,10 @@ const test = require('ava')
 const exec = require('./_exec')
 const testDir = 'quick_test' + Math.random()
 
-test('test2 with second param', (t) => {
- let ret = exec(command, '')
+test('npm scripts', async (t) => {
+ let ret = await exec(command, '')
  t.regex(ret, new RegExp(testDir))
- ret = exec(cleanCommand, '')
+ ret = await exec(cleanCommand, '')
  t.regex(ret, new RegExp('^((?!' + testDir + ')[\\w\\W])+$'), 'rm failed, you may delete it manualy')
  t.pass()
 })