Skip to content

Update to 0.4.0 #548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tbranyen merged 7 commits into from
May 7, 2015
Merged

Update to 0.4.0 #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aa6a7ed
Bump version and update dependencies
tbranyen Apr 20, 2015
356fe1a
Revert Combyne has regression in 0.7.0
tbranyen Apr 21, 2015
6d7848d
Removed try/catch for generation, bumped nan
tbranyen May 3, 2015
46d0369
Bumped latest dependencies
tbranyen May 3, 2015
7baa338
Explicitly use `nodegit.node` when requiring native module
May 5, 2015
1b7dddb
Downgraded nan to stop build breaking
May 6, 2015
8039645
Updated changelog
tbranyen May 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
340 changes: 192 additions & 148 deletions CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ NodeGit
</tbody>
</table>

**Stable: 0.3.3**
**Stable: 0.4.0**

## Have a problem? Come chat with us! ##

Expand Down
21 changes: 7 additions & 14 deletions generate/scripts/generateNativeCode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,13 @@ module.exports = function generateNativeCode() {
utils.writeFile("../lib/nodegit.js", beautify(templates.nodegitJS.render(enabled)));
// Write out all the classes.
enabled.forEach(function(idef) {
try {
if (idef.type && idef.type != "enum") {
utils.writeFile(
"../src/" + idef.filename + ".cc", templates[idef.type + "_content"].render(idef)
);
utils.writeFile(
"../include/" + idef.filename + ".h", templates[idef.type + "_header"].render(idef)
);
}
}
catch (e) {
if (process.env.BUILD_ONLY) {
console.error(e);
}
if (idef.type && idef.type != "enum") {
utils.writeFile(
"../src/" + idef.filename + ".cc", templates[idef.type + "_content"].render(idef)
);
utils.writeFile(
"../include/" + idef.filename + ".h", templates[idef.type + "_header"].render(idef)
);
}
});

Expand Down
4 changes: 2 additions & 2 deletions generate/templates/templates/nodegit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ var rawApi;
// Attempt to load the production release first, if it fails fall back to the
// debug release.
try {
rawApi = require("../build/Release/nodegit");
rawApi = require("../build/Release/nodegit.node");
}
catch (ex) {
/* istanbul ignore next */
if (ex.code !== "MODULE_NOT_FOUND") {
throw ex;
}

rawApi = require("../build/Debug/nodegit");
rawApi = require("../build/Debug/nodegit.node");
}

// Native methods do not return an identifiable function, so we
Expand Down
4 changes: 2 additions & 2 deletions lifecycleScripts/checkPrepared.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ function checkVendor(name, skipVersion) {
var version = "";
if (!skipVersion) {
var vendorPackage = pkg[name];
if (NODE_VERSION === 0.1 && vendorPackage["0.10"]) {
vendorPackage = vendorPackage["0.10"];
if (vendorPackage[NODE_VERSION]) {
vendorPackage = vendorPackage[NODE_VERSION];
}
version = vendorPackage.sha || vendorPackage.version;
}
Expand Down
4 changes: 2 additions & 2 deletions lifecycleScripts/retrieveExternalDependencies.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ module.exports = function retrieveExternalDependencies() {
function getVendorLib(name) {
var vendorPath = "vendor/" + name + "/";
var vendorPackage = pkg[name];
if (NODE_VERSION === 0.1 && vendorPackage["0.10"]) {
vendorPackage = vendorPackage["0.10"];
if (vendorPackage[NODE_VERSION]) {
vendorPackage = vendorPackage[NODE_VERSION];
}

var version = vendorPackage.sha || vendorPackage.version;
Expand Down
38 changes: 19 additions & 19 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"name": "nodegit",
"description": "Node.js libgit2 asynchronous native bindings",
"version": "0.3.3",
"version": "0.4.0",
"libgit2": {
"url": "https://github.com/libgit2/libgit2/tarball/fb6df50b7f250a4fd8b2fab257f119a5185e9bf5",
"sha": "fb6df50b7f250a4fd8b2fab257f119a5185e9bf5",
"version": "0.22.2"
},
"libssh2": {
"url": "http://www.libssh2.org/download/libssh2-1.4.3.tar.gz",
"version": "1.4.3"
"url": "http://www.libssh2.org/download/libssh2-1.5.0.tar.gz",
"version": "1.5.0"
},
"http_parser": {
"url": "https://github.com/joyent/http-parser/archive/v2.3.tar.gz",
"version": "2.3.0",
"0.10": {
"url": "https://github.com/joyent/http-parser/archive/v2.4.2.tar.gz",
"version": "2.4.2",
"0.1": {
"url": "https://github.com/joyent/http-parser/archive/v2.0.tar.gz",
"version": "2.0.0"
}
Expand Down Expand Up @@ -54,27 +54,27 @@
"node-pre-gyp"
],
"dependencies": {
"fs-extra": "^0.16.3",
"node-pre-gyp": "^0.6.2",
"nodegit-promise": "^2.0.0",
"npm": "^2.5.0",
"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",
"which-native-nodish": "^1.0.3"
"which-native-nodish": "^1.1.1"
},
"devDependencies": {
"combyne": "^0.6.5",
"combyne": "^0.8.0",
"coveralls": "^2.11.2",
"istanbul": "^0.3.5",
"js-beautify": "^1.5.4",
"jshint": "^2.6.0",
"istanbul": "^0.3.13",
"js-beautify": "^1.5.5",
"jshint": "^2.7.0",
"lcov-result-merger": "^1.0.2",
"lodash": "^3.1.0",
"mocha": "~2.1.0",
"lodash": "^3.8.0",
"mocha": "^2.2.4",
"nan": "~1.7.0",
"nw-gyp": "^0.12.4",
"pangyp": "^2.1.0",
"request": "^2.53.0",
"tar": "^1.0.3"
"request": "^2.55.0",
"tar": "^2.1.0"
},
"binary": {
"module_name": "nodegit",
Expand Down