Move promisification of child_process.exec to util file

John Haley · John Haley · commit 26ca8b4f39fb · 2016-04-29T08:36:34.000-07:00
diff --git a/generate/scripts/generateNativeCode.js b/generate/scripts/generateNativeCode.js
@@ -1,10 +1,7 @@
 const path = require("path");
 const promisify = require("promisify-node");
 const fse = promisify(require("fs-extra"));
-const exec = promisify(function(command, opts, callback) {
-  return require("child_process").exec(command, opts, callback);
-});
-
+const exec = require('../../utils/execPromise');
 const utils = require("./utils");
 
 module.exports = function generateNativeCode() {
diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js
@@ -1,14 +1,11 @@
-var promisify = require("promisify-node");
 var path = require("path");
 var fs = require("fs");
 var cp = require("child_process");
 var prepareForBuild = require("./prepareForBuild");
-
-var exec = promisify(function(command, opts, callback) {
-  return cp.exec(command, opts, callback);
-});
+var exec = require("../utils/execPromise");
 
 var fromRegistry;
+
 try {
   fs.statSync(path.join(__dirname, "..", "include"));
   fs.statSync(path.join(__dirname, "..", "src"));
diff --git a/test/runner.js b/test/runner.js
@@ -2,6 +2,7 @@ var promisify = require("promisify-node");
 var fse = promisify("fs-extra");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
+var exec = require('../utils/execPromise');
 
 var NodeGit = require('..');
 
@@ -13,11 +14,6 @@ if(process.env.NODEGIT_TEST_THREADSAFETY) {
   NodeGit.setThreadSafetyStatus(NodeGit.THREAD_SAFETY.ENABLED_FOR_ASYNC_ONLY);
 }
 
-// Have to wrap exec, since it has a weird callback signature.
-var exec = promisify(function(command, opts, callback) {
-  return require("child_process").exec(command, opts, callback);
-});
-
 var workdirPath = local("repos/workdir");
 
 before(function() {
diff --git a/test/tests/commit.js b/test/tests/commit.js
@@ -8,10 +8,7 @@ var leakTest = require("../utils/leak_test");
 
 var local = path.join.bind(path, __dirname);
 
-// Have to wrap exec, since it has a weird callback signature.
-var exec = promisify(function(command, opts, callback) {
-  return require("child_process").exec(command, opts, callback);
-});
+var exec = require("../../utils/execPromise");
 
 describe("Commit", function() {
   var NodeGit = require("../../");
diff --git a/test/tests/config.js b/test/tests/config.js
@@ -1,12 +1,8 @@
 var assert = require("assert");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
-var promisify = require("promisify-node");
 
-// Have to wrap exec, since it has a weird callback signature.
-var exec = promisify(function(command, opts, callback) {
-  return require("child_process").exec(command, opts, callback);
-});
+var exec = require("../../utils/execPromise");
 
 describe("Config", function() {
   var NodeGit = require("../../");
diff --git a/test/tests/refs.js b/test/tests/refs.js
@@ -1,12 +1,8 @@
 var assert = require("assert");
 var path = require("path");
-var promisify = require("promisify-node");
 var local = path.join.bind(path, __dirname);
 
-// Have to wrap exec, since it has a weird callback signature.
-var exec = promisify(function(command, opts, callback) {
-  return require("child_process").exec(command, opts, callback);
-});
+var exec = require("../../utils/execPromise");
 
 describe("Reference", function() {
   var NodeGit = require("../../");
diff --git a/test/tests/signature.js b/test/tests/signature.js
@@ -1,12 +1,8 @@
 var assert = require("assert");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
-var promisify = require("promisify-node");
 
-// Have to wrap exec, since it has a weird callback signature.
-var exec = promisify(function(command, opts, callback) {
-  return require("child_process").exec(command, opts, callback);
-});
+var exec = require("../../utils/execPromise");
 
 describe("Signature", function() {
   var NodeGit = require("../../");
diff --git a/test/tests/stage.js b/test/tests/stage.js
@@ -3,9 +3,7 @@ var path = require("path");
 var promisify = require("promisify-node");
 var fse = promisify(require("fs-extra"));
 
-var exec = promisify(function(command, opts, callback) {
-  return require("child_process").exec(command, opts, callback);
-});
+var exec = require("../../utils/execPromise");
 
 describe("Stage", function() {
   var RepoUtils = require("../utils/repository_setup");
diff --git a/test/tests/status.js b/test/tests/status.js
@@ -3,9 +3,7 @@ var path = require("path");
 var promisify = require("promisify-node");
 var fse = promisify(require("fs-extra"));
 var local = path.join.bind(path, __dirname);
-var exec = promisify(function(command, opts, callback) {
-  return require("child_process").exec(command, opts, callback);
-});
+var exec = require("../../utils/execPromise");
 
 describe("Status", function() {
   var NodeGit = require("../../");
diff --git a/test/tests/status_list.js b/test/tests/status_list.js
@@ -3,9 +3,7 @@ var path = require("path");
 var promisify = require("promisify-node");
 var fse = promisify(require("fs-extra"));
 var local = path.join.bind(path, __dirname);
-var exec = promisify(function(command, opts, callback) {
-  return require("child_process").exec(command, opts, callback);
-});
+var exec = require("../../utils/execPromise");
 
 describe("StatusList", function() {
   var NodeGit = require("../../");
diff --git a/utils/execPromise.js b/utils/execPromise.js
@@ -0,0 +1,6 @@
+var promisify = require("promisify-node");
+var cp = require('child_process');
+
+module.exports = promisify(function(command, opts, callback) {
+  return cp.exec(command, opts, callback);
+});
