From 2e0a0c674752fcfd84f9d7e3e89277dfb5a8afe0 Mon Sep 17 00:00:00 2001 From: flames of love Date: Thu, 29 Nov 1973 22:33:09 +0100 Subject: [PATCH] native-or-bluebird promises + thenify also, add reserved word fixes to thenify (temporarily) --- examples/add-and-commit.js | 11 +++-------- examples/clone.js | 6 +++--- examples/cloneFromGithubWith2Factor.js | 6 +++--- examples/create-branch.js | 2 +- examples/create-new-repo.js | 8 +++----- examples/details-for-tree-entry.js | 2 +- examples/diff-commits.js | 2 +- examples/fetch.js | 2 +- examples/general.js | 4 ++-- examples/index-add-and-remove.js | 8 ++++---- examples/merge-cleanly.js | 7 +++---- examples/merge-with-conflicts.js | 10 +++++----- examples/pull.js | 2 +- examples/push.js | 7 +++---- examples/read-file.js | 2 +- examples/remove-and-commit.js | 2 +- examples/walk-history-for-file.js | 2 +- examples/walk-history.js | 2 +- examples/walk-tree.js | 2 +- generate/scripts/generateMissingTests.js | 4 +--- generate/scripts/generateNativeCode.js | 9 +++------ generate/scripts/utils.js | 4 ++-- generate/templates/templates/nodegit.js | 4 ++-- guides/repositories/README.md | 2 +- guides/repositories/index.js | 2 +- lib/commit.js | 2 +- lib/convenient_hunk.js | 2 +- lib/convenient_patch.js | 2 +- lib/diff.js | 2 +- lib/merge.js | 2 +- lib/repository.js | 2 +- lib/revwalk.js | 2 +- lib/utils/lookup_wrapper.js | 2 +- lifecycleScripts/checkPrepared.js | 2 +- lifecycleScripts/clean.js | 2 +- lifecycleScripts/install.js | 4 ++-- lifecycleScripts/prepareForBuild.js | 2 +- lifecycleScripts/retrieveExternalDependencies.js | 6 +++--- package.json | 5 +++-- test/runner.js | 10 +++------- test/tests/branch.js | 8 ++++++-- test/tests/checkout.js | 4 ++-- test/tests/cherrypick.js | 7 ++++--- test/tests/clone.js | 4 ++-- test/tests/commit.js | 6 +++--- test/tests/config.js | 2 +- test/tests/diff.js | 7 ++++--- test/tests/index.js | 6 +++--- test/tests/merge.js | 9 ++++----- test/tests/rebase.js | 7 ++++--- test/tests/refs.js | 2 +- test/tests/remote.js | 8 ++++++-- test/tests/repository.js | 6 +++--- test/tests/reset.js | 4 ++-- test/tests/signature.js | 12 ++++++------ test/tests/stash.js | 6 +++--- test/tests/status.js | 10 ++++------ test/tests/status_list.js | 10 ++++------ test/tests/tag.js | 2 +- test/tests/tree_entry.js | 4 ++-- 60 files changed, 136 insertions(+), 147 deletions(-) diff --git a/examples/add-and-commit.js b/examples/add-and-commit.js index 6366f3ba3..91f31525a 100644 --- a/examples/add-and-commit.js +++ b/examples/add-and-commit.js @@ -1,15 +1,10 @@ var nodegit = require("../"); var path = require("path"); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), ["ensureDir", "writeFile"]); var fileName = "newfile.txt"; var fileContent = "hello world"; var directoryName = "salad/toast/strangerinastrangeland/theresnowaythisexists"; -// ensureDir is an alias to mkdirp, which has the callback with a weird name -// and in the 3rd position of 4 (the 4th being used for recursion). We have to -// force promisify it, because promisify-node won't detect it on its -// own and assumes sync -fse.ensureDir = promisify(fse.ensureDir); /** * This example creates a certain file `newfile.txt`, adds it to the git @@ -71,6 +66,6 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) return repo.createCommit("HEAD", author, committer, "message", oid, [parent]); }) -.done(function(commitId) { +.then(function(commitId) { console.log("New Commit: ", commitId); }); diff --git a/examples/clone.js b/examples/clone.js index b01ab99ab..8386a6384 100644 --- a/examples/clone.js +++ b/examples/clone.js @@ -1,6 +1,6 @@ var nodegit = require("../"); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), ["remove"]); var path = "/tmp/nodegit-clone-demo"; fse.remove(path).then(function() { @@ -28,7 +28,7 @@ fse.remove(path).then(function() { entry = entryResult; return entry.getBlob(); }) - .done(function(blob) { + .then(function(blob) { console.log(entry.filename(), entry.sha(), blob.rawsize() + "b"); console.log("========================================================\n\n"); var firstTenLines = blob.toString().split("\n").slice(0, 10).join("\n"); diff --git a/examples/cloneFromGithubWith2Factor.js b/examples/cloneFromGithubWith2Factor.js index 20cda9a46..97a665b8a 100644 --- a/examples/cloneFromGithubWith2Factor.js +++ b/examples/cloneFromGithubWith2Factor.js @@ -1,6 +1,6 @@ var nodegit = require("../"); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), ["remove"]); var path = "/tmp/nodegit-github-2factor-demo"; var token = "{Your GitHub user token}"; @@ -35,7 +35,7 @@ var opts = { fse.remove(path).then(function() { nodegit.Clone(repoUrl, path, opts) - .done(function(repo) { + .then(function(repo) { if (repo instanceof nodegit.Repository) { console.info("We cloned the repo!"); } diff --git a/examples/create-branch.js b/examples/create-branch.js index 28ab6bea5..cc2b2d8ec 100644 --- a/examples/create-branch.js +++ b/examples/create-branch.js @@ -13,6 +13,6 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) repo.defaultSignature(), "Created new-branch on HEAD"); }); - }).done(function() { + }).then(function() { console.log("All done!"); }); diff --git a/examples/create-new-repo.js b/examples/create-new-repo.js index 640bdc33a..3f5cd8cae 100644 --- a/examples/create-new-repo.js +++ b/examples/create-new-repo.js @@ -1,13 +1,11 @@ var nodegit = require("../"); var path = require("path"); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), ["ensureDir", "writeFile"]); var fileName = "newfile.txt"; var fileContent = "hello world"; var repoDir = "../../newRepo"; -fse.ensureDir = promisify(fse.ensureDir); - var repository; var index; @@ -45,6 +43,6 @@ fse.ensureDir(path.resolve(__dirname, repoDir)) // normal we don't get the head either, because there isn't one yet. return repository.createCommit("HEAD", author, committer, "message", oid, []); }) -.done(function(commitId) { +.then(function(commitId) { console.log("New Commit: ", commitId); }); diff --git a/examples/details-for-tree-entry.js b/examples/details-for-tree-entry.js index 405538389..458875a47 100644 --- a/examples/details-for-tree-entry.js +++ b/examples/details-for-tree-entry.js @@ -24,6 +24,6 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) }); }); }) - .done(function() { + .then(function() { console.log("Done!"); }); diff --git a/examples/diff-commits.js b/examples/diff-commits.js index 7d3153c1a..ebbf0aad6 100644 --- a/examples/diff-commits.js +++ b/examples/diff-commits.js @@ -18,7 +18,7 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) return commit.getDiff(); }) -.done(function(diffList) { +.then(function(diffList) { diffList.forEach(function(diff) { diff.patches().forEach(function(patch) { console.log("diff", patch.oldFile().path(), patch.newFile().path()); diff --git a/examples/fetch.js b/examples/fetch.js index fce801ee0..5297372ce 100644 --- a/examples/fetch.js +++ b/examples/fetch.js @@ -8,6 +8,6 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) return nodegit.Cred.sshKeyFromAgent(userName); } }); - }).done(function() { + }).then(function() { console.log("It worked!"); }); diff --git a/examples/general.js b/examples/general.js index 31251a55f..1cfd58135 100644 --- a/examples/general.js +++ b/examples/general.js @@ -1,6 +1,6 @@ var nodegit = require("../"); var path = require("path"); -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var oid; var odb; var repo; @@ -362,6 +362,6 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) return Promise.all(promises); }) - .done(function() { + .then(function() { console.log("Done!"); }); diff --git a/examples/index-add-and-remove.js b/examples/index-add-and-remove.js index 47eddd768..a3de84eda 100644 --- a/examples/index-add-and-remove.js +++ b/examples/index-add-and-remove.js @@ -1,8 +1,8 @@ var nodegit = require("../"); var path = require("path"); -var Promise = require("nodegit-promise"); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); +var Promise = require("bluebird"); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), ["writeFile"]); nodegit.Repository.open(path.resolve(__dirname, "../.git")) .then(function(repo) { @@ -129,6 +129,6 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) console.log("New files in index: " + newFiles.length); }); }); - }).done(function() { + }).then(function() { console.log("All done!"); }); diff --git a/examples/merge-cleanly.js b/examples/merge-cleanly.js index 096714e8e..41b663f42 100644 --- a/examples/merge-cleanly.js +++ b/examples/merge-cleanly.js @@ -1,8 +1,7 @@ var nodegit = require("../"); var path = require("path"); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); -fse.ensureDir = promisify(fse.ensureDir); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), ["remove", "ensureDir", "writeFile"]); var ourFileName = "ourNewFile.txt"; var ourFileContent = "I like Toll Roads. I have an EZ-Pass!"; @@ -123,7 +122,7 @@ fse.remove(path.resolve(__dirname, repoDir)) return repository.createCommit(ourBranch.name(), ourSignature, ourSignature, "we merged their commit", oid, [ourCommit, theirCommit]); }) -.done(function(commitId) { +.then(function(commitId) { // We never changed the HEAD after the initial commit; // it should still be the same as master. console.log("New Commit: ", commitId); diff --git a/examples/merge-with-conflicts.js b/examples/merge-with-conflicts.js index b1f8e95ba..9ac9409da 100644 --- a/examples/merge-with-conflicts.js +++ b/examples/merge-with-conflicts.js @@ -1,8 +1,8 @@ var nodegit = require("../"); var path = require("path"); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); -fse.ensureDir = promisify(fse.ensureDir); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), ["remove", "ensureDir", "writeFile"]); +var fs = require("fs"); var repoDir = "../../newRepo"; var fileName = "newFile.txt"; @@ -163,7 +163,7 @@ fse.remove(path.resolve(__dirname, repoDir)) // if the merge had comflicts, solve them // (in this case, we simply overwrite the file) - fse.writeFileSync( + fs.writeFileSync( path.join(repository.workdir(), fileName), finalFileContent ); @@ -187,6 +187,6 @@ fse.remove(path.resolve(__dirname, repoDir)) return repository.createCommit(ourBranch.name(), baseSignature, baseSignature, "Stop this bob sized fued", oid, [ourCommit, theirCommit]); }) -.done(function(commitId) { +.then(function(commitId) { console.log("New Commit: ", commitId); }); diff --git a/examples/pull.js b/examples/pull.js index 0ef5b133b..26d6c44ce 100644 --- a/examples/pull.js +++ b/examples/pull.js @@ -24,6 +24,6 @@ nodegit.Repository.open(path.resolve(__dirname, repoDir)) .then(function() { return repository.mergeBranches("master", "origin/master"); }) - .done(function() { + .then(function() { console.log("Done!"); }); diff --git a/examples/push.js b/examples/push.js index 1c9b2ee2a..6f91c0f50 100644 --- a/examples/push.js +++ b/examples/push.js @@ -1,8 +1,7 @@ var nodegit = require("../"); var path = require("path"); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); -fse.ensureDir = promisify(fse.ensureDir); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), ["remove", "ensureDir", "writeFile"]); var fileName = "newFile.txt"; var fileContent = "hello world"; @@ -64,6 +63,6 @@ fse.remove(path.resolve(__dirname, repoDir)) repository.defaultSignature(), "Push to master"); }); -}).done(function() { +}).then(function() { console.log("Done!"); }); diff --git a/examples/read-file.js b/examples/read-file.js index 4203a5cf4..71fe67cec 100644 --- a/examples/read-file.js +++ b/examples/read-file.js @@ -22,4 +22,4 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) console.log(firstTenLines); console.log("..."); }) - .done(); + .then(); diff --git a/examples/remove-and-commit.js b/examples/remove-and-commit.js index fd6ddc6b8..4be07eafb 100644 --- a/examples/remove-and-commit.js +++ b/examples/remove-and-commit.js @@ -52,4 +52,4 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) // from the filesystem. console.log("New Commit:", commitId.allocfmt()); }) - .done(); + .then(); diff --git a/examples/walk-history-for-file.js b/examples/walk-history-for-file.js index b1c331ab1..d821dc169 100644 --- a/examples/walk-history-for-file.js +++ b/examples/walk-history-for-file.js @@ -52,4 +52,4 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) // Don't forget to call `start()`! history.start(); }) - .done(); + .then(); diff --git a/examples/walk-history.js b/examples/walk-history.js index 2e41ce2da..2ad82c861 100644 --- a/examples/walk-history.js +++ b/examples/walk-history.js @@ -24,4 +24,4 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) // Don't forget to call `start()`! history.start(); }) - .done(); + .then(); diff --git a/examples/walk-tree.js b/examples/walk-tree.js index 6c564acb6..dc80d7315 100644 --- a/examples/walk-tree.js +++ b/examples/walk-tree.js @@ -22,4 +22,4 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git")) // Don't forget to call `start()`! walker.start(); }) - .done(); + .then(); diff --git a/generate/scripts/generateMissingTests.js b/generate/scripts/generateMissingTests.js index 0a89c7bd8..40dce9585 100644 --- a/generate/scripts/generateMissingTests.js +++ b/generate/scripts/generateMissingTests.js @@ -1,7 +1,5 @@ const path = require("path"); -const Promise = require("nodegit-promise"); -const promisify = require("promisify-node"); -const fse = promisify(require("fs-extra")); +const Promise = require("bluebird"); const utils = require("./utils"); const testFilesPath = "../test/tests"; diff --git a/generate/scripts/generateNativeCode.js b/generate/scripts/generateNativeCode.js index a8efec20d..8355b0911 100644 --- 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 promisify = require("thenify-all"); +const fse = promisify(require("fs-extra"), ["remove", 'copy']); +const exec = promisify(require("child_process").exec); const utils = require("./utils"); module.exports = function generateNativeCode() { diff --git a/generate/scripts/utils.js b/generate/scripts/utils.js index 3395fe272..93810c61f 100644 --- a/generate/scripts/utils.js +++ b/generate/scripts/utils.js @@ -1,5 +1,5 @@ -const promisify = require("promisify-node"); -const fse = require("fs-extra"); +const promisify = require("thenify-all"); +const fse = require("fs-extra", []); const fs = require("fs"); const path = require("path"); diff --git a/generate/templates/templates/nodegit.js b/generate/templates/templates/nodegit.js index eef54207a..1883f8858 100644 --- a/generate/templates/templates/nodegit.js +++ b/generate/templates/templates/nodegit.js @@ -1,5 +1,5 @@ -var Promise = require("nodegit-promise"); -var promisify = require("promisify-node"); +var Promise = require("bluebird"); +var promisify = require("thenify-all"); var rawApi; // Attempt to load the production release first, if it fails fall back to the diff --git a/guides/repositories/README.md b/guides/repositories/README.md index 65cb063c2..37c42fb52 100644 --- a/guides/repositories/README.md +++ b/guides/repositories/README.md @@ -119,7 +119,7 @@ NodeGit.Repository.open(pathToRepo).then(function (sucessfulResult) { // This is the first function of the then which contains the successfully // calculated result of the promise }) -.done(function () { +.then(function () { // If we have a .done then the error will be thrown if there was an error that // wasn't caught by either providing a 2nd function to the `.then` or a // `.catch` function diff --git a/guides/repositories/index.js b/guides/repositories/index.js index 4c018f8f7..85dd7052c 100644 --- a/guides/repositories/index.js +++ b/guides/repositories/index.js @@ -32,7 +32,7 @@ NodeGit.Repository.open(pathToRepo).then(function (repo) { // You can also provide a catch function which will contain the reason why // any above promises that weren't handled have failed }) -.done(function() { +.then(function() { // If we have a .done then the error will be thrown if there was an error that // wasn't caught by either providing a 2nd function to the `.then` or a // `.catch` function diff --git a/lib/commit.js b/lib/commit.js index 3dbd792f3..7a5cc10c8 100644 --- a/lib/commit.js +++ b/lib/commit.js @@ -1,5 +1,5 @@ var events = require("events"); -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var NodeGit = require("../"); var Commit = NodeGit.Commit; var LookupWrapper = NodeGit.Utils.lookupWrapper; diff --git a/lib/convenient_hunk.js b/lib/convenient_hunk.js index de0e6ec2f..4fb847036 100644 --- a/lib/convenient_hunk.js +++ b/lib/convenient_hunk.js @@ -1,5 +1,5 @@ var NodeGit = require("../"); -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var ConvenientLine = NodeGit.ConvenientLine; function ConvenientHunk(hunk, linesInHunk, patch, i) { diff --git a/lib/convenient_patch.js b/lib/convenient_patch.js index 0a4a4822e..602df2c63 100644 --- a/lib/convenient_patch.js +++ b/lib/convenient_patch.js @@ -1,5 +1,5 @@ var NodeGit = require("../"); -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var Diff = NodeGit.Diff; var ConvenientHunk = NodeGit.ConvenientHunk; diff --git a/lib/diff.js b/lib/diff.js index 201f53d49..bea174b48 100644 --- a/lib/diff.js +++ b/lib/diff.js @@ -1,5 +1,5 @@ var NodeGit = require("../"); -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var Diff = NodeGit.Diff; var ConvenientPatch = NodeGit.ConvenientPatch; var normalizeOptions = NodeGit.Utils.normalizeOptions; diff --git a/lib/merge.js b/lib/merge.js index 5dd286fc9..21656aaba 100644 --- a/lib/merge.js +++ b/lib/merge.js @@ -1,6 +1,6 @@ var NodeGit = require("../"); var normalizeOptions = NodeGit.Utils.normalizeOptions; -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var Merge = NodeGit.Merge; var mergeCommits = Merge.commits; diff --git a/lib/repository.js b/lib/repository.js index f83afe452..422fb4b61 100644 --- a/lib/repository.js +++ b/lib/repository.js @@ -1,4 +1,4 @@ -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var NodeGit = require("../"); var Blob = NodeGit.Blob; var Checkout = NodeGit.Checkout; diff --git a/lib/revwalk.js b/lib/revwalk.js index f33991509..0bf278a99 100644 --- a/lib/revwalk.js +++ b/lib/revwalk.js @@ -1,6 +1,6 @@ var NodeGit = require("../"); var Revwalk = NodeGit.Revwalk; -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var oldSorting = Revwalk.prototype.sorting; diff --git a/lib/utils/lookup_wrapper.js b/lib/utils/lookup_wrapper.js index 309c675a2..c5cef49ff 100644 --- a/lib/utils/lookup_wrapper.js +++ b/lib/utils/lookup_wrapper.js @@ -1,4 +1,4 @@ -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var NodeGit = require("../../"); /** diff --git a/lifecycleScripts/checkPrepared.js b/lifecycleScripts/checkPrepared.js index ec3d3da43..57bb58436 100644 --- a/lifecycleScripts/checkPrepared.js +++ b/lifecycleScripts/checkPrepared.js @@ -1,4 +1,4 @@ -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var path = require("path"); var fs = require("fs"); var rooted = path.join.bind(path, __dirname, ".."); diff --git a/lifecycleScripts/clean.js b/lifecycleScripts/clean.js index 43f54e1b4..c76e7ff8f 100644 --- a/lifecycleScripts/clean.js +++ b/lifecycleScripts/clean.js @@ -1,7 +1,7 @@ var fse = require("fs-extra"); var path = require("path"); var npm = require("npm"); -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var rooted = path.join.bind(path, __dirname, ".."); if (fse.existsSync(rooted(".didntcomefromthenpmregistry"))) { diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js index 65b80319b..aaf423e7e 100644 --- a/lifecycleScripts/install.js +++ b/lifecycleScripts/install.js @@ -1,5 +1,5 @@ -var Promise = require("nodegit-promise"); -var promisify = require("promisify-node"); +var Promise = require("bluebird"); +var promisify = require("thenify-all"); var path = require("path"); var fs = require("fs"); diff --git a/lifecycleScripts/prepareForBuild.js b/lifecycleScripts/prepareForBuild.js index e32653157..fa84c7134 100644 --- a/lifecycleScripts/prepareForBuild.js +++ b/lifecycleScripts/prepareForBuild.js @@ -1,4 +1,4 @@ -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var cp = require("child_process"); var path = require("path"); diff --git a/lifecycleScripts/retrieveExternalDependencies.js b/lifecycleScripts/retrieveExternalDependencies.js index 58f91965a..6143220f3 100644 --- a/lifecycleScripts/retrieveExternalDependencies.js +++ b/lifecycleScripts/retrieveExternalDependencies.js @@ -1,6 +1,6 @@ -var Promise = require("nodegit-promise"); -var promisify = require("promisify-node"); -var fse = promisify("fs-extra"); +var Promise = require("bluebird"); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), ["remove", "writeFile"]); var zlib = require("zlib"); var cp = require("child_process"); var path = require("path"); diff --git a/package.json b/package.json index 47582fd73..a9aa9cfab 100644 --- a/package.json +++ b/package.json @@ -54,11 +54,12 @@ "node-pre-gyp" ], "dependencies": { + "bluebird": "^2.9.30", "fs-extra": "^0.18.2", "node-pre-gyp": "^0.6.5", - "nodegit-promise": "^2.0.1", "npm": "^2.9.0", - "promisify-node": "^0.1.5", + "thenify": "heavyk/thenify", + "thenify-all": "^1.6.0", "which-native-nodish": "^1.1.1" }, "devDependencies": { diff --git a/test/runner.js b/test/runner.js index 8a4ff378f..449f6191e 100644 --- a/test/runner.js +++ b/test/runner.js @@ -1,12 +1,8 @@ -var promisify = require("promisify-node"); -var fse = promisify("fs-extra"); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), ['mkdir', "remove", "writeFile"]); var path = require("path"); 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 = promisify(require("child_process").exec); var workdirPath = local("repos/workdir"); diff --git a/test/tests/branch.js b/test/tests/branch.js index 922b48152..226df4106 100644 --- a/test/tests/branch.js +++ b/test/tests/branch.js @@ -1,6 +1,6 @@ var assert = require("assert"); var path = require("path"); -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var local = path.join.bind(path, __dirname); describe("Branch", function() { @@ -45,7 +45,11 @@ describe("Branch", function() { return repo.getBranch(branchName) // Reverse the results, since if we found it it wasn't deleted - .then(Promise.reject, Promise.resolve); + .then(function() { + return Promise.reject(); + }, function() { + return Promise.resolve(); + }); }); it("can see if the branch is pointed to by head", function() { diff --git a/test/tests/checkout.js b/test/tests/checkout.js index 3dbc28ff1..8059d389b 100644 --- a/test/tests/checkout.js +++ b/test/tests/checkout.js @@ -1,7 +1,7 @@ var assert = require("assert"); var path = require("path"); -var Promise = require("nodegit-promise"); -var fse = require("fs-extra"); +var Promise = require("bluebird"); +var fse = require("fs-extra", []); var local = path.join.bind(path, __dirname); describe("Checkout", function() { diff --git a/test/tests/cherrypick.js b/test/tests/cherrypick.js index 4f2f5e992..ba090a24e 100644 --- a/test/tests/cherrypick.js +++ b/test/tests/cherrypick.js @@ -1,9 +1,10 @@ var assert = require("assert"); var path = require("path"); var local = path.join.bind(path, __dirname); -var Promise = require("nodegit-promise"); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); +var Promise = require("bluebird"); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), + ["remove", "ensureDir", "writeFile", "readFile"]); describe("Cherrypick", function() { var NodeGit = require("../../"); diff --git a/test/tests/clone.js b/test/tests/clone.js index b519f3bb5..611e6938b 100644 --- a/test/tests/clone.js +++ b/test/tests/clone.js @@ -1,7 +1,7 @@ var path = require("path"); var assert = require("assert"); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), ["remove"]); var local = path.join.bind(path, __dirname); describe("Clone", function() { diff --git a/test/tests/commit.js b/test/tests/commit.js index 79758a683..2eca081d5 100644 --- a/test/tests/commit.js +++ b/test/tests/commit.js @@ -1,8 +1,8 @@ var assert = require("assert"); var path = require("path"); -var Promise = require("nodegit-promise"); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); +var Promise = require("bluebird"); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), ["writeFile"]); var local = path.join.bind(path, __dirname); describe("Commit", function() { diff --git a/test/tests/config.js b/test/tests/config.js index 3afeb6d8e..68cc39f99 100644 --- a/test/tests/config.js +++ b/test/tests/config.js @@ -1,7 +1,7 @@ var assert = require("assert"); var path = require("path"); var local = path.join.bind(path, __dirname); -var promisify = require("promisify-node"); +var promisify = require("thenify-all"); // Have to wrap exec, since it has a weird callback signature. var exec = promisify(function(command, opts, callback) { diff --git a/test/tests/diff.js b/test/tests/diff.js index afcacd022..6b2ca557f 100644 --- a/test/tests/diff.js +++ b/test/tests/diff.js @@ -1,8 +1,9 @@ var assert = require("assert"); var path = require("path"); -var promisify = require("promisify-node"); -var Promise = require("nodegit-promise"); -var fse = promisify(require("fs-extra")); +var promisify = require("thenify-all"); +var Promise = require("bluebird"); +var fse = promisify(require("fs-extra"), + ["remove", "move", "writeFile"]); var local = path.join.bind(path, __dirname); describe("Diff", function() { diff --git a/test/tests/index.js b/test/tests/index.js index 171439f31..3645d71d7 100644 --- a/test/tests/index.js +++ b/test/tests/index.js @@ -1,9 +1,9 @@ var assert = require("assert"); var path = require("path"); var local = path.join.bind(path, __dirname); -var Promise = require("nodegit-promise"); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); +var Promise = require("bluebird"); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), ["remove", "writeFile"]); var writeFile = promisify(function(filename, data, callback) { return require("fs").writeFile(filename, data, {}, callback); diff --git a/test/tests/merge.js b/test/tests/merge.js index 6832d51b9..399b86cbd 100644 --- a/test/tests/merge.js +++ b/test/tests/merge.js @@ -1,12 +1,11 @@ var assert = require("assert"); var path = require("path"); -var Promise = require("nodegit-promise"); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); +var Promise = require("bluebird"); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), + ["ensureDir", "remove", "writeFile", "readFile"]); var local = path.join.bind(path, __dirname); -fse.ensureDir = promisify(fse.ensureDir); - describe("Merge", function() { var NodeGit = require("../../"); diff --git a/test/tests/rebase.js b/test/tests/rebase.js index 5b14ae44c..bb7838608 100644 --- a/test/tests/rebase.js +++ b/test/tests/rebase.js @@ -1,9 +1,10 @@ var assert = require("assert"); var path = require("path"); var local = path.join.bind(path, __dirname); -var Promise = require("nodegit-promise"); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); +var Promise = require("bluebird"); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), + ["remove", "ensureDir", "writeFile", "readFile"]); describe("Rebase", function() { var NodeGit = require("../../"); diff --git a/test/tests/refs.js b/test/tests/refs.js index 12b44ec54..a2257cf09 100644 --- a/test/tests/refs.js +++ b/test/tests/refs.js @@ -1,6 +1,6 @@ var assert = require("assert"); var path = require("path"); -var promisify = require("promisify-node"); +var promisify = require("thenify-all"); var local = path.join.bind(path, __dirname); // Have to wrap exec, since it has a weird callback signature. diff --git a/test/tests/remote.js b/test/tests/remote.js index d32fda781..18fa05f2b 100644 --- a/test/tests/remote.js +++ b/test/tests/remote.js @@ -1,6 +1,6 @@ var assert = require("assert"); var path = require("path"); -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var local = path.join.bind(path, __dirname); describe("Remote", function() { @@ -88,7 +88,11 @@ describe("Remote", function() { .then(function() { return Remote.lookup(repository, "origin3"); }) - .then(Promise.reject, Promise.resolve); + .then(function() { + return Promise.reject(); + }, function() { + return Promise.resolve(); + }); }); it("can download from a remote", function() { diff --git a/test/tests/repository.js b/test/tests/repository.js index 4062e1440..d5e2ffc4d 100644 --- a/test/tests/repository.js +++ b/test/tests/repository.js @@ -1,8 +1,8 @@ var assert = require("assert"); var path = require("path"); -var promisify = require("promisify-node"); -var Promise = require("nodegit-promise"); -var fse = promisify(require("fs-extra")); +var promisify = require("thenify-all"); +var Promise = require("bluebird"); +var fse = promisify(require("fs-extra"), ["remove", "writeFile"]); var local = path.join.bind(path, __dirname); describe("Repository", function() { diff --git a/test/tests/reset.js b/test/tests/reset.js index 3638c5761..66d484c4d 100644 --- a/test/tests/reset.js +++ b/test/tests/reset.js @@ -1,8 +1,8 @@ var assert = require("assert"); var path = require("path"); var local = path.join.bind(path, __dirname); -var promisify = require("promisify-node"); -var fse = promisify(require("fs-extra")); +var promisify = require("thenify-all"); +var fse = promisify(require("fs-extra"), ["readFile"]); describe("Reset", function() { var NodeGit = require("../../"); diff --git a/test/tests/signature.js b/test/tests/signature.js index 6a369969f..fbdcfefe6 100644 --- a/test/tests/signature.js +++ b/test/tests/signature.js @@ -1,8 +1,8 @@ var assert = require("assert"); var path = require("path"); var local = path.join.bind(path, __dirname); -var promisify = require("promisify-node"); -var Promise = require("nodegit-promise"); +var promisify = require("thenify-all"); +var Promise = require("bluebird"); // Have to wrap exec, since it has a weird callback signature. var exec = promisify(function(command, opts, callback) { @@ -57,13 +57,13 @@ describe("Signature", function() { }; return exec("git config --global user.name") - .then(function(userName) { - savedUserName = userName.trim(); + .then(function(std) { + savedUserName = std[0].trim(); return exec("git config --global user.email"); }) - .then(function(userEmail) { - savedUserEmail = userEmail.trim(); + .then(function(std) { + savedUserEmail = std[0].trim(); return exec("git config --global --unset user.name"); }) diff --git a/test/tests/stash.js b/test/tests/stash.js index 0af8e7587..cc6b6229d 100644 --- a/test/tests/stash.js +++ b/test/tests/stash.js @@ -1,8 +1,8 @@ var assert = require("assert"); var path = require("path"); -var promisify = require("promisify-node"); -var Promise = require("nodegit-promise"); -var fse = promisify(require("fs-extra")); +var promisify = require("thenify-all"); +var Promise = require("bluebird"); +var fse = promisify(require("fs-extra"), ["writeFile", "readFile"]); var local = path.join.bind(path, __dirname); describe("Stash", function() { diff --git a/test/tests/status.js b/test/tests/status.js index 7c8a3ed89..ad9e6c415 100644 --- a/test/tests/status.js +++ b/test/tests/status.js @@ -1,12 +1,10 @@ var assert = require("assert"); var path = require("path"); -var promisify = require("promisify-node"); -var Promise = require("nodegit-promise"); -var fse = promisify(require("fs-extra")); +var promisify = require("thenify-all"); +var Promise = require("bluebird"); +var fse = promisify(require("fs-extra"), ["remove", "writeFile", "readFile"]); var local = path.join.bind(path, __dirname); -var exec = promisify(function(command, opts, callback) { - return require("child_process").exec(command, opts, callback); -}); +var exec = promisify(require("child_process").exec); describe("Status", function() { var NodeGit = require("../../"); diff --git a/test/tests/status_list.js b/test/tests/status_list.js index 95315a9a6..a9e307ec6 100644 --- a/test/tests/status_list.js +++ b/test/tests/status_list.js @@ -1,12 +1,10 @@ var assert = require("assert"); var path = require("path"); -var promisify = require("promisify-node"); -var Promise = require("nodegit-promise"); -var fse = promisify(require("fs-extra")); +var promisify = require("thenify-all"); +var Promise = require("bluebird"); +var fse = promisify(require("fs-extra"), ["remove", "writeFile"]); var local = path.join.bind(path, __dirname); -var exec = promisify(function(command, opts, callback) { - return require("child_process").exec(command, opts, callback); -}); +var exec = promisify(require("child_process").exec); describe("StatusList", function() { var NodeGit = require("../../"); diff --git a/test/tests/tag.js b/test/tests/tag.js index 663c1dd84..6bea86b85 100644 --- a/test/tests/tag.js +++ b/test/tests/tag.js @@ -1,7 +1,7 @@ var assert = require("assert"); var path = require("path"); var local = path.join.bind(path, __dirname); -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); describe("Tag", function() { var NodeGit = require("../../"); diff --git a/test/tests/tree_entry.js b/test/tests/tree_entry.js index 371b8e636..14978565e 100644 --- a/test/tests/tree_entry.js +++ b/test/tests/tree_entry.js @@ -1,5 +1,5 @@ var assert = require("assert"); -var Promise = require("nodegit-promise"); +var Promise = require("bluebird"); var path = require("path"); var local = path.join.bind(path, __dirname); @@ -75,7 +75,7 @@ describe("TreeEntry", function() { return this.commit.getTree() .then(testTree) - .done(function() { + .then(function() { done(); }); });