WIP

vercel · Nov 1, 2024 · f8dbe6f · f8dbe6f
1 parent 125f960
commit f8dbe6f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/crates/turborepo-lib/src/cli/mod.rs b/crates/turborepo-lib/src/cli/mod.rs
@@ -1219,8 +1219,11 @@ pub async fn run(
                 .with_parent(&root_telemetry)
                 .track_call();
             let base = CommandBase::new(cli_args.clone(), repo_root, version, color_config);
-            info::run(base).await;
 
+            match info::run(base).await {
+                Ok(()) => {}
+                Err(e) => println!("Command failed. Please file a GitHub Issue.\n{}", e),
+            }
             Ok(0)
         }
         Command::Telemetry { command } => {

diff --git a/crates/turborepo-lib/src/commands/info.rs b/crates/turborepo-lib/src/commands/info.rs
@@ -2,6 +2,7 @@ use std::{env, io};
 
 use sysinfo::{System, SystemExt};
 use thiserror::Error;
+use turborepo_repository::{package_json::PackageJson, package_manager::PackageManager};
 
 use super::CommandBase;
 use crate::{DaemonConnector, DaemonConnectorError};
@@ -21,21 +22,25 @@ pub async fn run(base: CommandBase) -> Result<(), Error> {
         Err(_e) => "Error getting status",
     };
 
+    let package_manager = match PackageJson::load(&base.repo_root.join_component("package.json")) {
+        Ok(package_json) => {
+            match PackageManager::read_or_detect_package_manager(&package_json, &base.repo_root) {
+                Ok(pm) => pm.to_string(),
+                Err(_) => "Not found".to_owned(),
+            }
+        }
+        Err(_) => "Not found".to_owned(),
+    };
+
     println!("CLI:");
     println!("   Version: {}", base.version);
     println!(
         "   Location: {}",
         std::env::current_exe()?.to_string_lossy()
     );
     println!("   Daemon status: {}", daemon_status);
-    println!("");
-
-    println!("Package managers:");
-    println!("   npm version: {}", "TODO");
-    println!("   yarn version: {}", "TODO");
-    println!("   pnpm version: {}", "TODO");
-    println!("   bun version: {}", "TODO");
-    println!("");
+    println!("   Package manager: {}", package_manager);
+    println!();
 
     println!("Platform:");
     println!("   Architecture: {}", std::env::consts::ARCH);
@@ -45,7 +50,7 @@ pub async fn run(base: CommandBase) -> Result<(), Error> {
         system.available_memory() / 1024 / 1024
     );
     println!("   Available CPU cores: {}", num_cpus::get());
-    println!("");
+    println!();
 
     println!("Environment:");
     println!("   CI: {:#?}", turborepo_ci::Vendor::get_name());
@@ -67,15 +72,15 @@ pub async fn run(base: CommandBase) -> Result<(), Error> {
         env::var("SHELL").unwrap_or_else(|_| "unknown".to_owned())
     );
     println!("   stdin: {}", turborepo_ci::is_ci());
-    println!("");
+    println!();
 
     println!("Turborepo System Environment Variables:");
     for (key, value) in env::vars() {
         // Don't print sensitive information
-        if key == "TURBO_TEAM".to_string()
-            || key == "TURBO_TEAMID".to_string()
-            || key == "TURBO_TOKEN".to_string()
-            || key == "TURBO_API".to_string()
+        if key == "TURBO_TEAM"
+            || key == "TURBO_TEAMID"
+            || key == "TURBO_TOKEN"
+            || key == "TURBO_API"
         {
             continue;
         }