Generate utils: separated writeFile into writeFile and writeLocalFile

Kyle Smith · Kyle Smith · commit 272c37b800c7 · 2017-01-30T13:23:01.000-07:00
diff --git a/generate/scripts/generateJson.js b/generate/scripts/generateJson.js
@@ -231,7 +231,7 @@ module.exports = function generateJson() {
   }
 
 
-  utils.writeFile(path.join(__dirname, "..", "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
@@ -58,7 +58,7 @@ module.exports = function generateMissingTests() {
 
   Promise.all(promises).then(
     function() {
-      utils.writeFile(path.join(__dirname, "..", "/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
@@ -113,9 +113,9 @@ module.exports = function generateNativeCode() {
     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.writeLocalFile("../binding.gyp", beautify(templates.binding.render(enabled)), "binding.gyp");
     utils.writeFile(path.join(tempSrcDirPath, "nodegit.cc"), templates.nodegitCC.render(enabled), "nodegit.cc");
-    utils.writeFile("../lib/nodegit.js", beautify(templates.nodegitJS.render(enabled)), "nodegit.js");
+    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") {
@@ -133,7 +133,7 @@ module.exports = function generateNativeCode() {
       }
     });
 
-    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) {
diff --git a/generate/scripts/utils.js b/generate/scripts/utils.js
@@ -11,13 +11,8 @@ var util = {
   pointerRegex: /\s*\*\s*/,
   doublePointerRegex: /\s*\*\*\s*/,
 
-  readLocalFile: function(file) {
-    try {
-      return fs.readFileSync(local(file)).toString();
-    }
-    catch (unhandledException) {
-      return "";
-    }
+  readLocalFile: function(filePath) {
+    return util.readFile(local(filePath));
   },
 
   readFile: function(filePath) {
@@ -29,6 +24,10 @@ var util = {
     }
   },
 
+  writeLocalFile: function(filePath, content, header) {
+    return util.writeFile(local(filePath), content, header);
+  },
+
   writeFile: function(filePath, content, header) {
     try {
       if (typeof content == "object") {

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ module.exports = function generateJson() {`
`231`	`231`	`}`
`232`	`232`
`233`	`233`
`234`		`- utils.writeFile(path.join(__dirname, "..", "output", "idefs.json"), output);`
	`234`	`+ utils.writeLocalFile("output/idefs.json", output);`
`235`	`235`	`};`
`236`	`236`
`237`	`237`	`if (require.main === module) {`