fixup! Extract logic to detect Asdf version manager into the Asdf class

Author: rafaelfranca

vscode/src/ruby/asdf.ts

@@ -34,8 +34,8 @@ export class Asdf extends VersionManager {
   }
 
   static async detect(
-    _workspaceFolder: vscode.WorkspaceFolder,
-    _outputChannel: WorkspaceChannel,
+    workspaceFolder: vscode.WorkspaceFolder,
+    outputChannel: WorkspaceChannel,
   ): Promise<DetectionResult> {
     // Check for v0.16+ executables first
     const executablePaths = Asdf.getPossibleExecutablePaths();
@@ -51,6 +51,12 @@ export class Asdf extends VersionManager {
       return { type: "path", uri: scriptResult };
     }
 
+    // check on PATH
+    const toolExists = await VersionManager.toolExists("asdf", workspaceFolder, outputChannel);
+    if (toolExists) {
+      return { type: "semantic", marker: "asdf" };
+    }
+
     return { type: "none" };
   }
 
@@ -63,24 +69,31 @@ export class Asdf extends VersionManager {
       asdfUri = vscode.Uri.file(configuredPath);
     } else {
       const result = await Asdf.detect(this.workspaceFolder, this.outputChannel);
+
       if (result.type === "path") {
         asdfUri = result.uri;
+      } else if (result.type === "semantic") {
+        // Use ASDF from PATH
+      } else {
+        throw new Error(
+          `Could not find ASDF installation. Searched in ${[
+            ...Asdf.getPossibleExecutablePaths(),
+            ...Asdf.getPossibleScriptPaths(),
+          ].join(", ")}`,
+        );
       }
     }
 
-    if (!asdfUri) {
-      throw new Error(
-        `Could not find ASDF installation. Searched in ${[
-          ...Asdf.getPossibleExecutablePaths(),
-          ...Asdf.getPossibleScriptPaths(),
-        ].join(", ")}`,
-      );
-    }
+    let baseCommand: string;
 
-    const asdfPath = asdfUri.fsPath;
-    // If there's no extension name, then we are using the ASDF executable directly. If there is an extension, then it's
-    // a shell script and we have to source it first
-    const baseCommand = path.extname(asdfPath) === "" ? asdfPath : `. ${asdfPath} && asdf`;
+    if (asdfUri) {
+      const asdfPath = asdfUri.fsPath;
+      // If there's no extension name, then we are using the ASDF executable directly. If there is an extension, then it's
+      // a shell script and we have to source it first
+      baseCommand = path.extname(asdfPath) === "" ? asdfPath : `. ${asdfPath} && asdf`;
+    } else {
+      baseCommand = "asdf";
+    }
 
     const parsedResult = await this.runEnvActivationScript(`${baseCommand} exec ruby`);
 

vscode/src/test/suite/ruby/asdf.test.ts

@@ -9,7 +9,7 @@ import { afterEach, beforeEach } from "mocha";
 import { Asdf } from "../../../ruby/asdf";
 import { WorkspaceChannel } from "../../../workspaceChannel";
 import * as common from "../../../common";
-import { ACTIVATION_SEPARATOR, FIELD_SEPARATOR, VALUE_SEPARATOR } from "../../../ruby/versionManager";
+import { ACTIVATION_SEPARATOR, FIELD_SEPARATOR, VALUE_SEPARATOR, VersionManager } from "../../../ruby/versionManager";
 import { createContext, FakeContext } from "../helpers";
 
 suite("Asdf", () => {
@@ -136,4 +136,32 @@ suite("Asdf", () => {
     assert.strictEqual(yjit, true);
     assert.strictEqual(env.ANY, "true");
   });
+
+  test("Uses ASDF executable in PATH if script and Homebrew executable are not available", async () => {
+    const asdf = new Asdf(workspaceFolder, outputChannel, context, async () => {});
+
+    const envStub = ["3.0.0", "/path/to/gems", "true", `ANY${VALUE_SEPARATOR}true`].join(FIELD_SEPARATOR);
+    const execStub = sandbox.stub(common, "asyncExec").resolves({
+      stdout: "",
+      stderr: `${ACTIVATION_SEPARATOR}${envStub}${ACTIVATION_SEPARATOR}`,
+    });
+
+    sandbox.stub(VersionManager, "toolExists").resolves(true);
+
+    const { env, version, yjit } = await asdf.activate();
+
+    assert.ok(
+      execStub.calledOnceWithExactly(`asdf exec ruby -EUTF-8:UTF-8 '${activationPath.fsPath}'`, {
+        cwd: workspacePath,
+        shell: vscode.env.shell,
+
+        env: process.env,
+        encoding: "utf-8",
+      }),
+    );
+
+    assert.strictEqual(version, "3.0.0");
+    assert.strictEqual(yjit, true);
+    assert.strictEqual(env.ANY, "true");
+  });
 });