Skip to content

Commit 26ca8b4

Browse files
author
John Haley
committed
Move promisification of child_process.exec to util file
1 parent d79d1b1 commit 26ca8b4

File tree

11 files changed

+17
-42
lines changed

11 files changed

+17
-42
lines changed

generate/scripts/generateNativeCode.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
const path = require("path");
22
const promisify = require("promisify-node");
33
const fse = promisify(require("fs-extra"));
4-
const exec = promisify(function(command, opts, callback) {
5-
return require("child_process").exec(command, opts, callback);
6-
});
7-
4+
const exec = require('../../utils/execPromise');
85
const utils = require("./utils");
96

107
module.exports = function generateNativeCode() {

lifecycleScripts/install.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
var promisify = require("promisify-node");
21
var path = require("path");
32
var fs = require("fs");
43
var cp = require("child_process");
54
var prepareForBuild = require("./prepareForBuild");
6-
7-
var exec = promisify(function(command, opts, callback) {
8-
return cp.exec(command, opts, callback);
9-
});
5+
var exec = require("../utils/execPromise");
106

117
var fromRegistry;
8+
129
try {
1310
fs.statSync(path.join(__dirname, "..", "include"));
1411
fs.statSync(path.join(__dirname, "..", "src"));

test/runner.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var promisify = require("promisify-node");
22
var fse = promisify("fs-extra");
33
var path = require("path");
44
var local = path.join.bind(path, __dirname);
5+
var exec = require('../utils/execPromise');
56

67
var NodeGit = require('..');
78

@@ -13,11 +14,6 @@ if(process.env.NODEGIT_TEST_THREADSAFETY) {
1314
NodeGit.setThreadSafetyStatus(NodeGit.THREAD_SAFETY.ENABLED_FOR_ASYNC_ONLY);
1415
}
1516

16-
// Have to wrap exec, since it has a weird callback signature.
17-
var exec = promisify(function(command, opts, callback) {
18-
return require("child_process").exec(command, opts, callback);
19-
});
20-
2117
var workdirPath = local("repos/workdir");
2218

2319
before(function() {

test/tests/commit.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ var leakTest = require("../utils/leak_test");
88

99
var local = path.join.bind(path, __dirname);
1010

11-
// Have to wrap exec, since it has a weird callback signature.
12-
var exec = promisify(function(command, opts, callback) {
13-
return require("child_process").exec(command, opts, callback);
14-
});
11+
var exec = require("../../utils/execPromise");
1512

1613
describe("Commit", function() {
1714
var NodeGit = require("../../");

test/tests/config.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
var assert = require("assert");
22
var path = require("path");
33
var local = path.join.bind(path, __dirname);
4-
var promisify = require("promisify-node");
54

6-
// Have to wrap exec, since it has a weird callback signature.
7-
var exec = promisify(function(command, opts, callback) {
8-
return require("child_process").exec(command, opts, callback);
9-
});
5+
var exec = require("../../utils/execPromise");
106

117
describe("Config", function() {
128
var NodeGit = require("../../");

test/tests/refs.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
var assert = require("assert");
22
var path = require("path");
3-
var promisify = require("promisify-node");
43
var local = path.join.bind(path, __dirname);
54

6-
// Have to wrap exec, since it has a weird callback signature.
7-
var exec = promisify(function(command, opts, callback) {
8-
return require("child_process").exec(command, opts, callback);
9-
});
5+
var exec = require("../../utils/execPromise");
106

117
describe("Reference", function() {
128
var NodeGit = require("../../");

test/tests/signature.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
var assert = require("assert");
22
var path = require("path");
33
var local = path.join.bind(path, __dirname);
4-
var promisify = require("promisify-node");
54

6-
// Have to wrap exec, since it has a weird callback signature.
7-
var exec = promisify(function(command, opts, callback) {
8-
return require("child_process").exec(command, opts, callback);
9-
});
5+
var exec = require("../../utils/execPromise");
106

117
describe("Signature", function() {
128
var NodeGit = require("../../");

test/tests/stage.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ var path = require("path");
33
var promisify = require("promisify-node");
44
var fse = promisify(require("fs-extra"));
55

6-
var exec = promisify(function(command, opts, callback) {
7-
return require("child_process").exec(command, opts, callback);
8-
});
6+
var exec = require("../../utils/execPromise");
97

108
describe("Stage", function() {
119
var RepoUtils = require("../utils/repository_setup");

test/tests/status.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ var path = require("path");
33
var promisify = require("promisify-node");
44
var fse = promisify(require("fs-extra"));
55
var local = path.join.bind(path, __dirname);
6-
var exec = promisify(function(command, opts, callback) {
7-
return require("child_process").exec(command, opts, callback);
8-
});
6+
var exec = require("../../utils/execPromise");
97

108
describe("Status", function() {
119
var NodeGit = require("../../");

test/tests/status_list.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ var path = require("path");
33
var promisify = require("promisify-node");
44
var fse = promisify(require("fs-extra"));
55
var local = path.join.bind(path, __dirname);
6-
var exec = promisify(function(command, opts, callback) {
7-
return require("child_process").exec(command, opts, callback);
8-
});
6+
var exec = require("../../utils/execPromise");
97

108
describe("StatusList", function() {
119
var NodeGit = require("../../");

utils/execPromise.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
var promisify = require("promisify-node");
2+
var cp = require('child_process');
3+
4+
module.exports = promisify(function(command, opts, callback) {
5+
return cp.exec(command, opts, callback);
6+
});

0 commit comments

Comments
 (0)