nodegit · johnhaley81 · Feb 7, 2017 · Jul 26, 2016 · Nov 12, 2016 · Nov 12, 2016
diff --git a/generate/scripts/generateJson.js b/generate/scripts/generateJson.js
@@ -231,8 +231,7 @@ module.exports = function generateJson() {
   }
 
 
-  utils.writeFile("output/idefs.json", output);
-
+  utils.writeLocalFile("output/idefs.json", output);
 };
 
 if (require.main === module) {

diff --git a/generate/scripts/generateMissingTests.js b/generate/scripts/generateMissingTests.js
@@ -12,7 +12,7 @@ module.exports = function generateMissingTests() {
       var testFilePath = path.join(testFilesPath, idef.filename + ".js");
       var result = {};
 
-      var file = utils.readFile(testFilePath);
+      var file = utils.readLocalFile(testFilePath);
       if (file) {
         var fieldsResult = [];
         var functionsResult = [];
@@ -58,7 +58,7 @@ module.exports = function generateMissingTests() {
 
   Promise.all(promises).then(
     function() {
-      utils.writeFile("output/missing-tests.json", output);
+      utils.writeLocalFile("/output/missing-tests.json", output);
     },
     function(fail) {
       console.error(fail);

diff --git a/generate/scripts/generateNativeCode.js b/generate/scripts/generateNativeCode.js
@@ -1,6 +1,7 @@
 const path = require("path");
 const promisify = require("promisify-node");
 const fse = promisify(require("fs-extra"));
+const os = require('os');
 const exec = require('../../utils/execPromise');
 const utils = require("./utils");
 
@@ -24,27 +25,27 @@ module.exports = function generateNativeCode() {
   };
 
   var partials = {
-    asyncFunction: utils.readFile("templates/partials/async_function.cc"),
-    callbackHelpers: utils.readFile("templates/partials/callback_helpers.cc"),
-    convertFromV8: utils.readFile("templates/partials/convert_from_v8.cc"),
-    convertToV8: utils.readFile("templates/partials/convert_to_v8.cc"),
-    doc: utils.readFile("templates/partials/doc.cc"),
-    fields: utils.readFile("templates/partials/fields.cc"),
-    guardArguments: utils.readFile("templates/partials/guard_arguments.cc"),
-    syncFunction: utils.readFile("templates/partials/sync_function.cc"),
-    fieldAccessors: utils.readFile("templates/partials/field_accessors.cc"),
-    traits: utils.readFile("templates/partials/traits.h")
+    asyncFunction: utils.readLocalFile("templates/partials/async_function.cc"),
+    callbackHelpers: utils.readLocalFile("templates/partials/callback_helpers.cc"),
+    convertFromV8: utils.readLocalFile("templates/partials/convert_from_v8.cc"),
+    convertToV8: utils.readLocalFile("templates/partials/convert_to_v8.cc"),
+    doc: utils.readLocalFile("templates/partials/doc.cc"),
+    fields: utils.readLocalFile("templates/partials/fields.cc"),
+    guardArguments: utils.readLocalFile("templates/partials/guard_arguments.cc"),
+    syncFunction: utils.readLocalFile("templates/partials/sync_function.cc"),
+    fieldAccessors: utils.readLocalFile("templates/partials/field_accessors.cc"),
+    traits: utils.readLocalFile("templates/partials/traits.h")
   };
 
   var templates = {
-    class_content: utils.readFile("templates/templates/class_content.cc"),
-    struct_content: utils.readFile("templates/templates/struct_content.cc"),
-    class_header: utils.readFile("templates/templates/class_header.h"),
-    struct_header: utils.readFile("templates/templates/struct_header.h"),
-    binding: utils.readFile("templates/templates/binding.gyp"),
-    nodegitCC: utils.readFile("templates/templates/nodegit.cc"),
-    nodegitJS: utils.readFile("templates/templates/nodegit.js"),
-    enums: utils.readFile("templates/templates/enums.js")
+    class_content: utils.readLocalFile("templates/templates/class_content.cc"),
+    struct_content: utils.readLocalFile("templates/templates/struct_content.cc"),
+    class_header: utils.readLocalFile("templates/templates/class_header.h"),
+    struct_header: utils.readLocalFile("templates/templates/struct_header.h"),
+    binding: utils.readLocalFile("templates/templates/binding.gyp"),
+    nodegitCC: utils.readLocalFile("templates/templates/nodegit.cc"),
+    nodegitJS: utils.readLocalFile("templates/templates/nodegit.js"),
+    enums: utils.readLocalFile("templates/templates/enums.js")
   };
 
   var filters = {
@@ -99,51 +100,63 @@ module.exports = function generateNativeCode() {
     return !idef.ignore;
   });
 
+  const tempDirPath = path.join(os.tmpdir(), 'nodegit_build');
+  const tempSrcDirPath = path.join(tempDirPath, "src");
+  const tempIncludeDirPath = path.join(tempDirPath, "include");
 
-  fse.remove(path.resolve(__dirname, "../../src")).then(function() {
-    return fse.remove(path.resolve(__dirname, "../../include"));
-  }).then(function() {
-    return fse.copy(path.resolve(__dirname, "../templates/manual/include"), path.resolve(__dirname, "../../include"));
+  const finalSrcDirPath = path.join(__dirname, '../../src');
+  const finalIncludeDirPath = path.join(__dirname, '../../include');
+
+  fse.remove(tempDirPath).then(function() {
+    return fse.copy(path.resolve(__dirname, "../templates/manual/include"), tempIncludeDirPath);
   }).then(function() {
-    return fse.copy(path.resolve(__dirname, "../templates/manual/src"), path.resolve(__dirname, "../../src"));
+    return fse.copy(path.resolve(__dirname, "../templates/manual/src"), tempSrcDirPath);
   }).then(function() {
     // Write out single purpose templates.
-    utils.writeFile("../binding.gyp", beautify(templates.binding.render(enabled)), "binding.gyp");
-    utils.writeFile("../src/nodegit.cc", templates.nodegitCC.render(enabled), "nodegit.cc");
-    utils.writeFile("../lib/nodegit.js", beautify(templates.nodegitJS.render(enabled)), "nodegit.js");
+    utils.writeLocalFile("../binding.gyp", beautify(templates.binding.render(enabled)), "binding.gyp");
+    utils.writeFile(path.join(tempSrcDirPath, "nodegit.cc"), templates.nodegitCC.render(enabled), "nodegit.cc");
+    utils.writeLocalFile("../lib/nodegit.js", beautify(templates.nodegitJS.render(enabled)), "nodegit.js");
     // Write out all the classes.
     enabled.forEach(function(idef) {
       if (idef.type && idef.type != "enum") {
         utils.writeFile(
-          "../src/" + idef.filename + ".cc",
+          path.join(tempSrcDirPath, idef.filename + ".cc"),
           templates[idef.type + "_content"].render(idef),
           idef.type + "_content.cc"
         );
+
         utils.writeFile(
-          "../include/" + idef.filename + ".h",
+          path.join(tempIncludeDirPath, idef.filename + ".h"),
           templates[idef.type + "_header"].render(idef),
           idef.type + "_header.h"
         );
       }
     });
 
-    utils.writeFile("../lib/enums.js", beautify(templates.enums.render(enabled)), "enums.js");
+    utils.writeLocalFile("../lib/enums.js", beautify(templates.enums.render(enabled)), "enums.js");
   }).then(function() {
     return exec("command -v astyle").then(function(astyle) {
       if (astyle) {
         return exec(
           "astyle --options=\".astylerc\" "
-          + path.resolve(__dirname, "../../src") + "/*.cc "
-          + path.resolve(__dirname, "../../include") + "/*.h"
+          + tempSrcDirPath + "/*.cc "
+          + tempIncludeDirPath + "/*.h"
         ).then(function() {
           return exec(
             "rm "
-            + path.resolve(__dirname, "../../src") + "/*.cc.orig "
-            + path.resolve(__dirname, "../../include") + "/*.h.orig "
+            + tempSrcDirPath + "/*.cc.orig "
+            + tempIncludeDirPath + "/*.h.orig "
           );
         });
       }
     }, function() {})
+  }).then(function() {
+    return Promise.all([
+      utils.syncDirs(tempSrcDirPath, finalSrcDirPath),
+      utils.syncDirs(tempIncludeDirPath, finalIncludeDirPath),
+    ]);
+  }).then(function() {
+    return fse.remove(tempDirPath);
   }).catch(console.log);
 
 };

diff --git a/generate/scripts/utils.js b/generate/scripts/utils.js
@@ -1,4 +1,5 @@
 const fse = require("fs-extra");
+const walk = require("walk");
 
 const fs = require("fs");
 const path = require("path");
@@ -10,18 +11,25 @@ var util = {
   pointerRegex: /\s*\*\s*/,
   doublePointerRegex: /\s*\*\*\s*/,
 
-  readFile: function(file) {
+  readLocalFile: function(filePath) {
+    return util.readFile(local(filePath));
+  },
+
+  readFile: function(filePath) {
     try {
-      return fs.readFileSync(local(file)).toString();
+      return fs.readFileSync(filePath).toString();
     }
     catch (unhandledException) {
       return "";
     }
   },
 
-  writeFile: function(file, content, header) {
+  writeLocalFile: function(filePath, content, header) {
+    return util.writeFile(local(filePath), content, header);
+  },
+
+  writeFile: function(filePath, content, header) {
     try {
-      var file = local(file);
       if (typeof content == "object") {
         content = JSON.stringify(content, null, 2)
       }
@@ -35,8 +43,8 @@ var util = {
           content;
       }
 
-      fse.ensureFileSync(file);
-      fse.writeFileSync(file, content);
+      fse.ensureFileSync(filePath);
+      fse.writeFileSync(filePath, content);
       return true;
     }
     catch (exception) {
@@ -62,14 +70,84 @@ var util = {
     }).join("");
   },
 
+  getFilePathsRelativeToDir: function(dir) {
+    const files = [];
+    const walker = walk.walk(dir, { followLinks: false });
+    if (!util.isDirectory(dir)) {
+      return Promise.resolve([]);
+    }
+
+    return new Promise(function(resolve, reject) {
+      walker.on('file', function(root, stat, next) {
+        files.push(path.relative(dir, path.join(root, stat.name)));
+        next();
+      });
+
+      walker.on('end', function() {
+        resolve(files);
+      });
+
+      walker.on('errors', function() {
+        reject();
+      });
+    });
+  },
+
+  isFile: function(path) {
+    var isFile;
+    try {
+      isFile = fse.statSync(path).isFile();
+    } catch(e) {
+      isFile = false;
+    }
+
+    return isFile;
+  },
+
+  isDirectory: function(path) {
+    var isDirectory;
+    try {
+      isDirectory = fse.statSync(path).isDirectory();
+    } catch(e) {
+      isDirectory = false;
+    }
+
+    return isDirectory;
+  },
+
   isPointer: function(type) {
     return util.pointerRegex.test(type) || util.doublePointerRegex.test(type);
   },
 
   isDoublePointer: function(type) {
     return util.doublePointerRegex.test(type);
-  }
+  },
 
+  syncDirs: function(fromDir, toDir) {
+    return Promise.all([
+      util.getFilePathsRelativeToDir(toDir),
+      util.getFilePathsRelativeToDir(fromDir)
+    ]).then(function(filePaths) {
+      const toFilePaths = filePaths[0];
+      const fromFilePaths = filePaths[1];
+
+      // Delete files that aren't in fromDir
+      toFilePaths.forEach(function(filePath) {
+        if (!util.isFile(path.join(fromDir, filePath))) {
+          fse.remove(path.join(toDir, filePath));
+        }
+      });
+
+      // Copy files that don't exist in toDir or have different contents
+      fromFilePaths.forEach(function(filePath) {
+        const toFilePath = path.join(toDir, filePath);
+        const fromFilePath = path.join(fromDir, filePath);
+        if (!util.isFile(toFilePath) || util.readFile(toFilePath) !== util.readFile(fromFilePath)) {
+          fse.copy(fromFilePath, toFilePath);
+        }
+      });
+    });
+  }
 };
 
 module.exports = util;
diff --git a/package.json b/package.json
@@ -52,7 +52,8 @@
     "js-beautify": "~1.5.10",
     "jshint": "~2.8.0",
     "lcov-result-merger": "~1.0.2",
-    "mocha": "~2.3.4"
+    "mocha": "~2.3.4",
+    "walk": "^2.3.9"
   },
   "vendorDependencies": {
     "libssh2": "1.7.0",
-Original file line number
+Diff line change
@@ Expand Up / @@ -231,8 +231,7 @@ module.exports = function generateJson() { @@
       }
-      utils.writeFile("output/idefs.json", output);
+      utils.writeLocalFile("output/idefs.json", output);
     };
     if (require.main === module) {
@@ Expand Down @@