New set of core functions

Author: fwal

__tests__/get-version.test.ts

@@ -1,31 +1,31 @@
-import { versionFromString } from "../src/get-version";
+import { versionFromString } from "../src/swift";
 
 describe("version lookup", () => {
   it("identifies version from swift version", async () => {
     const version = versionFromString(
-      "Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57)"
+      "Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57)",
     );
     expect(version).toBe("5.4.2");
   });
 
   it("identifies version from swift version with target", async () => {
     const version = versionFromString(
       `Apple Swift version 5.5 (swiftlang-1300.0.31.1 clang-1300.0.29.1)
-Target: x86_64-apple-macosx11.0`
+Target: x86_64-apple-macosx11.0`,
     );
     expect(version).toBe("5.5");
   });
 
   it("identifies version from swift-driver version", async () => {
     const version = versionFromString(
-      "swift-driver version: 1.26.9 Apple Swift version 5.5 (swiftlang-1300.0.31.1 clang-1300.0.29.1)"
+      "swift-driver version: 1.26.9 Apple Swift version 5.5 (swiftlang-1300.0.31.1 clang-1300.0.29.1)",
     );
     expect(version).toBe("5.5");
   });
 
   it("identifies version from swift version on linux", async () => {
     const version = versionFromString(
-      "Swift version 5.5.1 (swift-5.5.1-RELEASE)"
+      "Swift version 5.5.1 (swift-5.5.1-RELEASE)",
     );
     expect(version).toBe("5.5.1");
   });

__tests__/gpg.test.ts

@@ -1,5 +1,5 @@
 import * as exec from "@actions/exec";
-import { setupKeys, verify, refreshKeys } from "../src/gpg";
+import { refreshKeys } from "../src/core";
 
 jest.mock("@actions/exec");
 
@@ -58,7 +58,7 @@ describe("gpg", () => {
       await refreshKeys();
     } catch (e) {
       expect(e).toEqual(
-        new Error("Failed to refresh keys from any server in the pool.")
+        new Error("Failed to refresh keys from any server in the pool."),
       );
     }
   });

__tests__/os.test.ts

@@ -1,4 +1,4 @@
-import * as os from "../src/os";
+import { getOS } from "../src/core";
 
 jest.mock("getos");
 
@@ -8,45 +8,17 @@ describe("os resolver", () => {
   it("finds matching system and version", async () => {
     setSystem({ os: "linux", dist: "Ubuntu", release: "22.04" });
 
-    let ubuntu = await os.getSystem();
-    expect(ubuntu.os).toBe(os.OS.Ubuntu);
-    expect(ubuntu.version).toBe("22.04");
-    expect(ubuntu.name).toBe("Ubuntu");
+    let ubuntu = await getOS();
+    expect(ubuntu).toBe("linux");
 
     setSystem({ os: "darwin", dist: "macOS", release: "latest" });
 
-    let mac = await os.getSystem();
-    expect(mac.os).toBe(os.OS.MacOS);
-    expect(mac.version).toBe("latest");
-    expect(mac.name).toBe("macOS");
+    let mac = await getOS();
+    expect(mac).toBe("darwin");
 
     setSystem({ os: "win32", dist: "Windows", release: "latest" });
 
-    let windows = await os.getSystem();
-    expect(windows.os).toBe(os.OS.Windows);
-    expect(windows.version).toBe("latest");
-    expect(windows.name).toBe("Windows");
-  });
-
-  it("throws an error if the os is not supported", async () => {
-    setSystem({ os: "windows", dist: "Microsoft Windows 10", release: "10.0" });
-    expect.assertions(1);
-    try {
-      await os.getSystem();
-    } catch (e) {
-      expect(e).toEqual(new Error('"windows" is not a supported platform'));
-    }
-  });
-
-  it("throws an error if the version is not supported", async () => {
-    setSystem({ os: "linux", dist: "Ubuntu", release: "15.04" });
-    expect.assertions(1);
-    try {
-      await os.getSystem();
-    } catch (e) {
-      expect(e).toEqual(
-        new Error('Version "15.04" of Ubuntu is not supported')
-      );
-    }
+    let windows = await getOS();
+    expect(windows).toBe("win32");
   });
 });

src/core/cmd.ts

@@ -0,0 +1,36 @@
+import { debug } from "@actions/core";
+import { exec } from "@actions/exec";
+
+/**
+ * Runs a command and returns the output
+ * @param command Command to run
+ * @param args Arguments to pass to the command
+ * @returns Output of the command
+ */
+export async function cmd(command: string, ...args: string[]) {
+  let output = "";
+  let error = "";
+
+  const options = {
+    listeners: {
+      stdout: (data: Buffer) => {
+        output += data.toString();
+      },
+      stderr: (data: Buffer) => {
+        error += data.toString();
+      },
+    },
+  };
+
+  debug(`Running command: ${command} ${args.join(" ")}`);
+
+  await exec(command, args, options);
+
+  if (!output && error) {
+    throw new Error("Error running command " + error);
+  }
+
+  debug(`Command output: ${output}`);
+
+  return output;
+}

src/gpg.ts renamed to src/core/gpg.ts

@@ -5,7 +5,7 @@ import * as toolCache from "@actions/tool-cache";
 export async function setupKeys() {
   core.debug("Fetching verification keys");
   let path = await toolCache.downloadTool(
-    "https://swift.org/keys/all-keys.asc"
+    "https://swift.org/keys/all-keys.asc",
   );
 
   core.debug("Importing verification keys");
@@ -47,7 +47,7 @@ function refreshKeysFromServer(server: string): Promise<boolean> {
     .then((code) => code === 0)
     .catch((error) => {
       core.warning(
-        `An error occurred when trying to refresh keys from ${server}: ${error}`
+        `An error occurred when trying to refresh keys from ${server}: ${error}`,
       );
       return false;
     });

src/core/index.ts

@@ -0,0 +1,3 @@
+export * from "./cmd";
+export * from "./gpg";
+export * from "./os";

src/core/os.ts

@@ -0,0 +1,11 @@
+import getos from "getos";
+
+export async function getOS() {
+  const detectedSystem = await new Promise<getos.Os>((resolve, reject) => {
+    getos((error, os) => {
+      os ? resolve(os) : reject(error || "No OS detected");
+    });
+  });
+
+  return detectedSystem.os;
+}

src/get-version.ts

@@ -0,0 +1,24 @@
+import { cmd } from "../core";
+
+/**
+ * Get the current swift version
+ * @returns Current swift version
+ */
+export async function currentVersion() {
+  const output = await cmd("swift", "--version");
+  return versionFromString(output);
+}
+
+export function versionFromString(subject: string): string | null {
+  const match = subject.match(
+    /Swift\ version (?<version>[0-9]+\.[0-9+]+(\.[0-9]+)?)/,
+  ) || {
+    groups: { version: null },
+  };
+
+  if (!match.groups || !match.groups.version) {
+    return null;
+  }
+
+  return match.groups.version;
+}