Merge pull request #117 from alibaba/dev

0.9.3

lib/common/exec.js

@@ -5,9 +5,10 @@
 
 const shify = require('shify');
 const path = require('path');
+const BufferHelper = require('bufferhelper');
 const debug = require('debug')('exec');
 
-module.exports = function (script, opts) {
+function exec(script, opts) {
   opts = opts || {};
   opts.cwd = opts.cwd || process.cwd();
   opts.env = opts.env || Object.assign({}, process.env);
@@ -19,13 +20,31 @@ module.exports = function (script, opts) {
   script = script || '';
   debug('script', opts);
   return new Promise((resolve, reject) => {
-    let io = shify(script, opts);
-    io.on('exit', code => {
+    let childProcess = shify(script, opts);
+    if (opts.onStart) opts.onStart(childProcess);
+    childProcess.on('exit', code => {
       debug('exit', code);
-      if (code > 0) {
+      if (code !== 0) {
         return reject(new Error(`Script Error, exit ${code}`));
       }
-      resolve(io);
+      if (opts.onExit) opts.onExit(code, childProcess);
+      resolve(childProcess);
     });
   });
-};
+}
+
+async function withResult(script, opts) {
+  const helper = new BufferHelper();
+  opts = Object.assign({}, opts, {
+    stdio: 'pipe',
+    onStart: child => {
+      child.stdout.on('data', chunk => helper.concat(chunk));
+      child.stderr.on('data', chunk => helper.concat(chunk));
+    }
+  });
+  await exec(script, opts);
+  return helper.toBuffer().toString();
+}
+
+exec.withResult = withResult;
+module.exports = exec;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dawn",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "dawn cli",
   "main": "./lib/index.js",
   "bin": {
@@ -53,6 +53,7 @@
   },
   "dependencies": {
     "buffer-to-stream": "^1.0.0",
+    "bufferhelper": "^0.2.1",
     "cmdline": "^2.0.4",
     "cnpm": "^5.1.1",
     "confman": "^0.2.8",
@@ -84,4 +85,4 @@
     "nyc": "^11.1.0",
     "pre-push": "^0.1.1"
   }
-}
+}

packages/dn-middleware-shell/.dawn/pipe.yml

@@ -7,7 +7,6 @@ dev:
     location: ./lib/index.js
     script:
       - echo 你好${project.name}
-      - echo $PATH
   - name: $local
     location: ./lib/index.js
     script: