Improve install command

-> converge the command with the tools install command
-> imoprove help

Author: dragonstyle

src/command/install/cmd.ts

@@ -8,38 +8,61 @@ import { Command } from "cliffy/command/mod.ts";
 import { initYamlIntelligenceResourcesFromFilesystem } from "../../core/schema/utils.ts";
 import { createTempContext } from "../../core/temp.ts";
 import { installExtension } from "../../extension/install.ts";
+import { installTool } from "../tools/tools.ts";
+
+import { info } from "log/mod.ts";
 
 export const installCommand = new Command()
-  .hidden() // TODO: unhide when ready
+  .hidden()
   .name("install")
   .arguments("[target:string]")
+  .arguments("<type:string> <target:string>")
   .option(
     "--no-prompt",
-    "Do not prompt to confirm installation extension",
+    "Do not prompt to confirm actions during installation",
   )
   .description(
-    "Installs a Quarto Extension into the current directory or Project directory.",
+    "Installs an extension or global dependency.",
   )
   .example(
-    "Install extension from file",
-    "quarto install /Users/catmemes/tools/my-extension.tar.gz",
+    "Install extension from Github",
+    "quarto install extension <gh-organization>/<gh-repo>",
   )
   .example(
-    "Install extension from folder",
-    "quarto install /Users/catmemes/tools/my-extension/",
+    "Install extension from file",
+    "quarto install extension tools/my-extension.tar.gz",
   )
   .example(
     "Install extension from url",
-    "quarto install https://github.com/quarto-dev/quarto-extensions/releases/download/latest/my-extension.tar.gz",
+    "quarto install extension <url>",
+  )
+  .example(
+    "Install TinyTeX",
+    "quarto install tool tinytex",
+  )
+  .example(
+    "Install Chromium",
+    "quarto install tool chromium",
   )
-  .action(async (options: { prompt?: boolean }, target?: string) => {
-    await initYamlIntelligenceResourcesFromFilesystem();
-    const temp = createTempContext();
-    try {
-      if (target) {
-        await installExtension(target, temp, options.prompt !== false);
+  .action(
+    async (options: { prompt?: boolean }, type: string, target: string) => {
+      await initYamlIntelligenceResourcesFromFilesystem();
+      const temp = createTempContext();
+      try {
+        if (type.toLowerCase() === "extension") {
+          // Install an extension
+          await installExtension(target, temp, options.prompt !== false);
+        } else if (type.toLowerCase() === "tool") {
+          // Install a tool
+          await installTool(target);
+        } else {
+          // This is an unrecognized type option
+          info(
+            `Unrecorgnized option '${type}' - please choose 'tool' or 'extension'.`,
+          );
+        }
+      } finally {
+        temp.cleanup();
       }
-    } finally {
-      temp.cleanup();
-    }
-  });
+    },
+  );

src/command/tools/tools.ts

@@ -116,7 +116,7 @@ export async function installTool(name: string) {
       `Could not install '${name}'- try again with one of the following:`,
     );
     installableTools().forEach((name) =>
-      info("quarto install " + name, { indent: 2 })
+      info("quarto install tool " + name, { indent: 2 })
     );
   }
 }
@@ -143,7 +143,7 @@ export async function uninstallTool(name: string) {
       }
     } else {
       info(
-        `${name} is not installed Use 'quarto install ${name} to install it.`,
+        `${name} is not installed Use 'quarto install tool ${name} to install it.`,
       );
     }
   }

tests/smoke/extensions/install.test.ts

@@ -41,7 +41,7 @@ inInstallDir(() => {
   // Verify installation using a remote github repo
   testQuartoCmd(
     "install",
-    ["dragonstyle/test-ext", "--no-prompt"],
+    ["extension", "dragonstyle/test-ext", "--no-prompt"],
     [noErrorsOrWarnings, verifySubDirCount("_extensions", 1)],
     {
       teardown: () => {
@@ -63,7 +63,7 @@ inInstallDir(() => {
     const zipPath = join(testDirAbs, "ext-repo", zipFile.path);
     testQuartoCmd(
       "install",
-      [zipPath, "--no-prompt"],
+      ["extension", zipPath, "--no-prompt"],
       [noErrorsOrWarnings, verifySubDirCount("_extensions", zipFile.count)],
       {
         teardown: () => {