Merge pull request nodegit#1016 from cbargren/babel

johnhaley81 · johnhaley81 · commit 83e55e2be6b8 · 2016-05-03T14:25:00.000-07:00
Add babel to let the library use ES6
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,15 @@
-/node_modules/
 /build/
-/test/coverage/
-/test/repos/
-/test/test/
-/test/home/
-/src/
+/coverage/
+/dist/
 /include/
 /lib/enums.js
 /lib/nodegit.js
-/coverage/
+/node_modules/
+/src/
+/test/coverage/
+/test/home/
+/test/repos/
+/test/test/
 
 /generate/output
 /generate/**/*.json
diff --git a/.jshintrc b/.jshintrc
@@ -2,6 +2,7 @@
   "boss": true,
   "curly": true,
   "eqnull": true,
+  "esnext": true,
   "evil": true,
   "futurehostile": true,
   "globals": {
diff --git a/.npmignore b/.npmignore
@@ -1,6 +1,7 @@
 /build/
 /example/
 /examples/
+/lib/
 /test/
 /vendor/Release/
 
diff --git a/appveyor.yml b/appveyor.yml
@@ -40,6 +40,7 @@ matrix:
 install:
   - ps: Install-Product node $env:nodejs_version $env:platform
   - ps: Start-Process c:\projects\nodegit\vendor\pageant.exe c:\projects\nodegit\vendor\private.ppk
+  - npm install -g npm
   - cmd: npm install -g node-gyp
   - npm install
 
diff --git a/lib/repository.js b/lib/repository.js
@@ -428,9 +428,7 @@ Repository.prototype.deleteTagByName = function(name) {
  * @return {RevWalk}
  */
 Repository.prototype.createRevWalk = function() {
-  var revWalk = Revwalk.create(this);
-  revWalk.repo = this;
-  return revWalk;
+  return Revwalk.create(this);
 };
 
 /**
diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js
@@ -9,6 +9,7 @@ var fromRegistry;
 try {
   fs.statSync(path.join(__dirname, "..", "include"));
   fs.statSync(path.join(__dirname, "..", "src"));
+  fs.statSync(path.join(__dirname, "..", "dist"));
   fromRegistry = true;
 }
 catch(e) {
@@ -60,9 +61,46 @@ function prepareAndBuild() {
   return prepareForBuild()
     .then(function() {
       return build();
+    })
+    .then(function() {
+      return transpileJavascript();
     });
 }
 
+function transpileJavascript() {
+  var cmd = pathForTool("babel");
+  var args = [
+    "--presets",
+    "es2015",
+    "-d",
+    "./dist",
+    "./lib"
+  ];
+  var opts = {
+    cwd: ".",
+    maxBuffer: Number.MAX_VALUE,
+    env: process.env,
+    stdio: "inherit"
+  };
+  var home = process.platform == "win32" ?
+              process.env.USERPROFILE : process.env.HOME;
+
+  opts.env.HOME = path.join(home, ".nodegit-gyp");
+
+  return new Promise(function(resolve, reject) {
+    var child = cp.spawn(cmd, args, opts);
+    child.on("close", function(code) {
+      if (code) {
+        reject(code);
+        process.exitCode = 13;
+      }
+      else {
+        resolve();
+      }
+    });
+  });
+}
+
 function build() {
   console.info("[nodegit] Everything is ready to go, attempting compilation");
 
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
       "email": "maxkorp@8bytealchemy.com"
     }
   ],
-  "main": "lib/nodegit.js",
+  "main": "dist/nodegit.js",
   "repository": {
     "type": "git",
     "url": "git://github.com/nodegit/nodegit.git"
@@ -42,6 +42,8 @@
     "promisify-node": "~0.3.0"
   },
   "devDependencies": {
+    "babel-cli": "^6.7.7",
+    "babel-preset-es2015": "^6.6.0",
     "clean-for-publish": "~1.0.2",
     "combyne": "~0.8.1",
     "coveralls": "~2.11.4",
@@ -68,26 +70,27 @@
     "host": "https://nodegit.s3.amazonaws.com/nodegit/nodegit/"
   },
   "scripts": {
-    "lint": "jshint lib test/tests test/utils examples lifecycleScripts",
+    "babel": "babel --presets es2015 -d ./dist ./lib",
+    "cov": "npm run cppcov && npm run filtercov && npm run mergecov",
     "coveralls": "cat ./test/coverage/merged.lcov | coveralls",
-    "filtercov": "./lcov-1.10/bin/lcov --extract test/coverage/cpp/lcov_full.info $(pwd)/src/* $(pwd)/src/**/* $(pwd)/include/* $(pwd)/include/**/* --output-file test/coverage/cpp/lcov.info && rm test/coverage/cpp/lcov_full.info",
     "cppcov": "mkdir -p test/coverage/cpp && ./lcov-1.10/bin/lcov --gcov-tool /usr/bin/gcov-4.9 --capture --directory build/Release/obj.target/nodegit/src --output-file test/coverage/cpp/lcov_full.info",
-    "mergecov": "lcov-result-merger 'test/**/*.info' 'test/coverage/merged.lcov' && ./lcov-1.10/bin/genhtml test/coverage/merged.lcov --output-directory test/coverage/report",
-    "cov": "npm run cppcov && npm run filtercov && npm run mergecov",
-    "mocha": "mocha test/runner test/tests --timeout 15000",
-    "mochaDebug": "mocha --debug-brk test/runner test/tests --timeout 15000",
-    "test": "npm run lint && node --expose-gc test",
+    "filtercov": "./lcov-1.10/bin/lcov --extract test/coverage/cpp/lcov_full.info $(pwd)/src/* $(pwd)/src/**/* $(pwd)/include/* $(pwd)/include/**/* --output-file test/coverage/cpp/lcov.info && rm test/coverage/cpp/lcov_full.info",
     "generateJson": "node generate/scripts/generateJson",
-    "generateNativeCode": "node generate/scripts/generateNativeCode",
     "generateMissingTests": "node generate/scripts/generateMissingTests",
-    "prepublish": "node lifecycleScripts/prepareForBuild.js",
+    "generateNativeCode": "node generate/scripts/generateNativeCode",
     "install": "node lifecycleScripts/install",
     "installDebug": "BUILD_DEBUG=true npm install",
+    "lint": "jshint lib test/tests test/utils examples lifecycleScripts",
+    "mergecov": "lcov-result-merger 'test/**/*.info' 'test/coverage/merged.lcov' && ./lcov-1.10/bin/genhtml test/coverage/merged.lcov --output-directory test/coverage/report",
+    "mocha": "mocha test/runner test/tests --timeout 15000",
+    "mochaDebug": "mocha --debug-brk test/runner test/tests --timeout 15000",
+    "postinstall": "node postinstall.js",
+    "prepublish": "node lifecycleScripts/prepareForBuild.js && npm run babel",
+    "rebuild": "node generate && npm run babel && node-gyp configure build",
+    "rebuildDebug": "node generate && npm run babel && node-gyp configure --debug build",
     "recompile": "node-gyp configure build",
-    "rebuild": "node generate && node-gyp configure build",
     "recompileDebug": "node-gyp configure --debug build",
-    "rebuildDebug": "node generate && node-gyp configure --debug build",
-    "xcodeDebug": "node-gyp configure -- -f xcode",
-    "postinstall": "node postinstall.js"
+    "test": "npm run lint && node --expose-gc test",
+    "xcodeDebug": "node-gyp configure -- -f xcode"
   }
 }
diff --git a/postinstall.js b/postinstall.js
@@ -7,7 +7,7 @@ if (process.platform !== "linux") {
 	return;
 }
 
-child_process.exec("node lib/nodegit.js", function(error, stdout, stderr) {
+child_process.exec("node dist/nodegit.js", function(error, stdout, stderr) {
 	if (stderr && ~stderr.indexOf("libstdc++")) {
 		console.log("[ERROR] Seems like the latest libstdc++ is missing on your system!");
 		console.log("");

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ if (process.platform !== "linux") {`
`7`	`7`	`return;`
`8`	`8`	`}`
`9`	`9`
`10`		`-child_process.exec("node lib/nodegit.js", function(error, stdout, stderr) {`
	`10`	`+child_process.exec("node dist/nodegit.js", function(error, stdout, stderr) {`
`11`	`11`	`if (stderr && ~stderr.indexOf("libstdc++")) {`
`12`	`12`	`console.log("[ERROR] Seems like the latest libstdc++ is missing on your system!");`
`13`	`13`	`console.log("");`