Merge pull request #95 from thomasjo/tj-fix-cwd-issue-redux

Fix working directory issue
thomasjo · Jun 19, 2015 · a17fa9b · a17fa9b
2 parents 80c2d21 + 337fd26
commit a17fa9b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/lib/builder.js b/lib/builder.js
@@ -8,7 +8,7 @@ export default class Builder {
     this.envPathKey = this.getEnvironmentPathKey(process.platform);
   }
 
-  run(/* args, callback */) {}
+  run(/* filePath */) {}
   constructArgs(/* filePath */) {}
   parseLogFile(/* texFilePath */) {}
 

diff --git a/lib/builders/latexmk.js b/lib/builders/latexmk.js
@@ -7,10 +7,12 @@ import Builder from "../builder";
 import LogParser from "../parsers/log-parser";
 
 export default class LatexmkBuilder extends Builder {
-  run(args) {
+  run(filePath) {
+    const args = this.constructArgs(filePath);
     const command = `latexmk ${args.join(" ")}`;
     const options = this.constructChildProcessOptions();
 
+    options.cwd = path.dirname(filePath); // Run process with sensible CWD.
     options.maxBuffer = 52428800; // Set process' max buffer size to 50 MB.
     options.env.max_print_line = 1000; // Max log file line length.
 

diff --git a/lib/composer.js b/lib/composer.js
@@ -30,7 +30,6 @@ export default class Composer {
 
     const builder = latex.getBuilder();
     const rootFilePath = this.resolveRootFilePath(filePath);
-    const args = builder.constructArgs(rootFilePath);
 
     this.destroyErrorIndicator();
     this.showProgressIndicator();
@@ -45,7 +44,7 @@ export default class Composer {
       };
 
       try {
-        statusCode = await builder.run(args);
+        statusCode = await builder.run(rootFilePath);
         result = builder.parseLogFile(rootFilePath);
         if (statusCode > 0 || !result || !result.outputFilePath) {
           showBuildError(statusCode, result, builder);

diff --git a/spec/builders/latexmk-spec.js b/spec/builders/latexmk-spec.js
@@ -89,10 +89,8 @@ describe("LatexmkBuilder", function() {
     let exitCode;
 
     it("successfully executes latexmk when given a valid TeX file", function() {
-      const args = builder.constructArgs(filePath);
-
       waitsForPromise(function() {
-        return builder.run(args).then(code => exitCode = code);
+        return builder.run(filePath).then(code => exitCode = code);
       });
 
       runs(function() {
@@ -102,10 +100,9 @@ describe("LatexmkBuilder", function() {
 
     it("successfully executes latexmk when given a file path containing spaces", function() {
       filePath = path.join(fixturesPath, "filename with spaces.tex");
-      const args = builder.constructArgs(filePath);
 
       waitsForPromise(function() {
-        return builder.run(args).then(code => exitCode = code);
+        return builder.run(filePath).then(code => exitCode = code);
       });
 
       runs(function() {
@@ -114,10 +111,10 @@ describe("LatexmkBuilder", function() {
     });
 
     it("fails to execute latexmk when given invalid arguments", function() {
-      const args = ["-invalid-argument"];
+      spyOn(builder, "constructArgs").andReturn(["-invalid-argument"]);
 
       waitsForPromise(function() {
-        return builder.run(args).then(code => exitCode = code);
+        return builder.run(filePath).then(code => exitCode = code);
       });
 
       runs(function() {
@@ -128,12 +125,15 @@ describe("LatexmkBuilder", function() {
     it("fails to execute latexmk when given invalid file path", function() {
       filePath = path.join(fixturesPath, "foo.tex");
       const args = builder.constructArgs(filePath);
-      const removed = args.splice(1, 1);
 
+      // Need to remove the "force" flag to trigger the desired failure.
+      const removed = args.splice(1, 1);
       expect(removed).toEqual(["-f"]);
 
+      spyOn(builder, "constructArgs").andReturn(args);
+
       waitsForPromise(function() {
-        return builder.run(args).then(code => exitCode = code);
+        return builder.run(filePath).then(code => exitCode = code);
       });
 
       runs(function() {