fix: Fix moon bin command failing. (#626)

* Fix bin command. * Support shims.
moonrepo · Feb 17, 2023 · 59d1c76 · 59d1c76
1 parent ebf2e94
commit 59d1c76
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 18 deletions.
diff --git a/crates/cli/src/commands/bin.rs b/crates/cli/src/commands/bin.rs
@@ -1,6 +1,6 @@
 use crate::helpers::AnyError;
 use clap::ValueEnum;
-use moon::load_workspace;
+use moon::load_workspace_with_toolchain;
 use moon_config::PlatformType;
 use moon_node_tool::NodeTool;
 use moon_terminal::safe_exit;
@@ -21,12 +21,16 @@ enum BinExitCodes {
 }
 
 fn is_installed(tool: &dyn Tool) {
-    match tool.get_bin_path() {
-        Ok(path) => {
-            println!("{}", path.display());
-        }
-        Err(_) => {
-            safe_exit(BinExitCodes::NotInstalled as i32);
+    if let Some(shim_path) = tool.get_shim_path() {
+        println!("{}", shim_path.display());
+    } else {
+        match tool.get_bin_path() {
+            Ok(path) => {
+                println!("{}", path.display());
+            }
+            Err(_) => {
+                safe_exit(BinExitCodes::NotInstalled as i32);
+            }
         }
     }
 }
@@ -36,7 +40,7 @@ fn not_configured() -> ! {
 }
 
 pub async fn bin(tool_type: BinTool) -> Result<(), AnyError> {
-    let workspace = load_workspace().await?;
+    let workspace = load_workspace_with_toolchain().await?;
 
     match tool_type {
         BinTool::Node => {

diff --git a/crates/cli/tests/bin_test.rs b/crates/cli/tests/bin_test.rs
@@ -2,17 +2,25 @@ use moon_test_utils::{
     create_sandbox_with_config, get_cases_fixture_configs, predicates::prelude::*,
 };
 
-// This requires installing the toolchain which is quite heavy in tests!
-// #[test]
-// fn valid_tool() {
-//     let assert = create_moon_command("cases").arg("bin").arg("node").assert();
+#[test]
+fn valid_tool() {
+    let (workspace_config, toolchain_config, tasks_config) = get_cases_fixture_configs();
+    let sandbox = create_sandbox_with_config(
+        "cases",
+        Some(&workspace_config),
+        Some(&toolchain_config),
+        Some(&tasks_config),
+    );
 
-//     assert
-//         .success()
-//         .code(0)
-//         .stdout("")
-//         .stderr(predicate::str::contains("\"unknown\" isn\'t a valid value"));
-// }
+    let assert = sandbox.run_moon(|cmd| {
+        cmd.arg("bin").arg("node");
+    });
+
+    assert
+        .success()
+        .code(0)
+        .stdout(predicate::str::contains("18.0.0"));
+}
 
 #[test]
 fn invalid_tool() {

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -7,6 +7,10 @@
 - Added Homebrew as an installation option.
 - Added a `moon upgrade` command to upgrade moon to the latest version.
 
+#### 🐞 Fixes
+
+- Fixed `moon bin` failing, even when a tool has been configured.
+
 ## 0.24.1
 
 #### 🐞 Fixes