factorio-test-cli 1.0.4 → 1.0.6

package/buffer-line-splitter.js

@@ -17,7 +17,7 @@ export default class BufferLineSplitter extends EventEmitter {
         instream.on("data", (chunk) => {
             this.buf += chunk.toString();
             while (this.buf.length > 0) {
-                const index = this.buf.indexOf("\n");
+                const index = this.buf.search(/\r?\n/);
                 if (index === -1)
                     break;
                 this.emit("line", this.buf.slice(0, index));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "factorio-test-cli",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "A CLI to run FactorioTest.",
   "license": "MIT",
   "repository": "https://github.com/GlassBricks/FactorioTest",

package/run.js

@@ -1,17 +1,16 @@
-import { program as theProgram } from "commander";
+import { program } from "commander";
 import * as os from "os";
 import * as fsp from "fs/promises";
 import * as fs from "fs";
 import * as path from "path";
-import { spawn } from "child_process";
+import { spawn, spawnSync } from "child_process";
 import BufferLineSplitter from "./buffer-line-splitter.js";
 import chalk from "chalk";
-const program = theProgram;
 const thisCommand = program
     .command("run")
     .summary("Runs tests with Factorio test.")
     .description("Runs tests for the specified mod with Factorio test. Exits with code 0 only if all tests pass.\n")
-    .argument("[mod-path]", "The path to the mod to test (containing info.json). A symlink will be created in the factorio mods folder, to this folder. Alternatively, you can specify --mod-name for manual test setup.")
+    .argument("[mod-path]", "The path to the mod to test (containing info.json). A symlink will be created in the mods folder to this folder. Alternatively, you can specify --mod-name for manual setup.")
     .option("--mod-name <name>", "The name of the mod to test. If specified, the mod must already be present in the mods directory (sse --data-directory below). One of [mod-path] or --mod-name must be specified.")
     .option("--factorio-path <path>", "The path to the factorio binary. If not specified, tries to auto-detect the factorio installation.")
     .option("-d --data-directory <path>", 'The path to the data directory. The "config.ini" file and the "mods" folder will be in this directory.', "./factorio-test-data")
@@ -109,12 +108,11 @@ async function checkModExists(modsDir, modName) {
 }
 async function installFactorioTest(modsDir) {
     await fsp.mkdir(modsDir, { recursive: true });
-    // const testModName = "testorio"
     const testModName = "factorio-test";
     // if not found, install it
     const alreadyExists = await checkModExists(modsDir, testModName);
     if (!alreadyExists) {
-        console.log(`Downloading ${testModName} from mod portal...`);
+        console.log(`Downloading ${testModName} from mod portal using fmtk. This may ask for factorio login credentials.`);
         await runScript("fmtk mods install", "--modsPath", modsDir, testModName);
     }
 }
@@ -142,7 +140,7 @@ async function setSettingsForAutorun(factorioPath, dataDir, modsDir, modToTest)
             console.log("Creating mod-settings.dat file by running factorio");
         // run factorio once to create it
         const dummySaveFile = path.join(dataDir, "____dummy_save_file.zip");
-        await runProcess(false, factorioPath, "--create", dummySaveFile, "--mod-directory", modsDir, "-c", path.join(dataDir, "config.ini"));
+        await runProcess(false, `"${factorioPath}"`, "--create", dummySaveFile, "--mod-directory", modsDir, "-c", path.join(dataDir, "config.ini"));
         if (fs.existsSync(dummySaveFile)) {
             await fsp.rm(dummySaveFile);
         }
@@ -226,22 +224,29 @@ function runProcess(inheritStdio, command, ...args) {
         shell: true,
     });
     return new Promise((resolve, reject) => {
+        process.on("error", reject);
         process.on("exit", (code) => {
             if (code === 0) {
                 resolve();
             }
             else {
-                reject(new Error(`Command exited with code ${code}`));
+                reject(new Error(`Command exited with code ${code}: ${command} ${args.join(" ")}`));
             }
         });
     });
 }
+function factorioIsInPath() {
+    const result = spawnSync("factorio", ["--version"], { stdio: "ignore" });
+    return result.status === 0;
+}
 function autoDetectFactorioPath() {
+    if (factorioIsInPath()) {
+        return "factorio";
+    }
     let pathsToTry;
     // check if is linux
     if (os.platform() === "linux" || os.platform() === "darwin") {
         pathsToTry = [
-            "factorio",
             "~/.local/share/Steam/steamapps/common/Factorio/bin/x64/factorio",
             "~/Library/Application Support/Steam/steamapps/common/Factorio/factorio.app/Contents/MacOS/factorio",
             "~/.factorio/bin/x64/factorio",