refactor

Author: ken107

gulpfile.js

@@ -8,7 +8,7 @@ gulp.task("default", function() {
 	gutil.log(chalk.yellow("Make sure binaries have execute permission before packaging."));
 	gutil.log(chalk.yellow("This should be run from a Linux shell so that permissions are properly copied into the package."));
 
-	return gulp.src(["index.js", "package.json", "package-lock.json", "bin/*"], {base: "."})
+	return gulp.src(["*.js", "package.json", "package-lock.json", "bin/*"], {base: "."})
 		.pipe(zip("package.zip"))
 		.pipe(gulp.dest("dist"))
 })

index.js

@@ -1,40 +1,8 @@
 
-const childProc = require("child_process");
-const Readable = require("stream").Readable;
-
-process.env.PATH += ":" + require("path").join(__dirname, "bin");
+const shellExec = require("./shell-exec.js");
 
 exports.handler = (event, context, callback) => {
-  const child = childProc.spawn(event.command, event.args, {shell: true});
-  let hasError = false;
-  child.on("error", err => {
-    hasError = true;
-    callback(err);
-  })
-  const getExitCode = new Promise(function(fulfill) {
-    child.on("exit", (code, signal) => fulfill(signal || code));
-  })
-  Promise.all([getExitCode, getStream(child.stdout), getStream(child.stderr)])
-    .then(function([exitCode, stdout, stderr]) {
-      if (!hasError)
-        callback(null, {
-          exitCode,
-          stdout: stdout.toString(event.stdoutEncoding || "utf8"),
-          stderr: stderr.toString(event.stderrEncoding || "utf8")
-        })
-    })
-  if (event.stdin) {
-    const stdin = new Readable();
-    stdin.push(Buffer.from(event.stdin, event.stdinEncoding || "utf8"));
-    stdin.push(null);
-    stdin.pipe(child.stdin);
-  }
+  shellExec(event.command, event.args, event.stdin, event.stdinEncoding, event.stdoutEncoding)
+    .then(result => callback(null, result))
+    .catch(err => callback(err))
 };
-
-function getStream(stream) {
-  return new Promise(function(fulfill) {
-    const chunks = [];
-    stream.on("data", chunk => chunks.push(chunk));
-    stream.on("end", () => fulfill(Buffer.concat(chunks)));
-  })
-}

shell-exec.js

@@ -0,0 +1,36 @@
+
+process.env.PATH = require("path").join(__dirname, "bin") + ":" + process.env.PATH;
+module.exports = shellExec;
+
+function shellExec(command, args, stdin, stdinEncoding, stdoutEncoding) {
+  const child = require("child_process").spawn(command, args, {shell: true});
+  if (stdin) {
+    const Readable = require("stream").Readable;
+    const str = new Readable();
+    str.push(Buffer.from(stdin, stdinEncoding || "utf8"));
+    str.push(null);
+    str.pipe(child.stdin);
+  }
+  return Promise.all([
+      getExitCode(child),
+      getStream(child.stdout, stdoutEncoding || "utf8"),
+      getStream(child.stderr, "utf8")
+    ])
+    .then(([exitCode, stdout, stderr]) => ({exitCode, stdout, stderr}))
+};
+
+function getExitCode(child) {
+  return new Promise(function(fulfill, reject) {
+    child.on("error", reject);
+    child.on("exit", (code, signal) => fulfill(signal || code));
+  })
+}
+
+function getStream(stream, encoding) {
+  return new Promise(function(fulfill) {
+    const chunks = [];
+    stream.on("data", chunk => chunks.push(chunk));
+    stream.on("end", () => fulfill(Buffer.concat(chunks)));
+  })
+  .then(buf => encoding ? buf.toString(encoding) : buf)
+}