chore: Make pup.ron discovery respect workspace root

Author: scottgerring

Cargo.lock

@@ -26,12 +26,14 @@ anyhow = "1.0.95"
 regex = "1.11.1"
 tempfile = "3.14.0"
 ron = "0.8.1"
+cargo_metadata = "0.18"
 
 [dependencies]
 ansi_term = "0.12.1"
 anyhow = { workspace = true }
 tempfile = { workspace = true }
 ron = { workspace = true }
+cargo_metadata = { workspace = true }
 cargo_pup_common = { path = "cargo_pup_common", version = "0.1.1" }
 cargo_pup_lint_impl = { path = "cargo_pup_lint_impl", version = "0.1.1" }
 cargo_pup_lint_config = { path = "cargo_pup_lint_config", version = "0.1.1" }

Cargo.toml

@@ -13,3 +13,4 @@ serde = { workspace = true }
 serde_json = {workspace = true }
 anyhow = { workspace = true }
 tempfile.workspace = true
+cargo_metadata = { workspace = true }

cargo_pup_common/Cargo.toml

@@ -2,3 +2,4 @@
 
 pub mod cli;
 pub mod project_context;
+pub mod workspace;

cargo_pup_common/src/lib.rs

@@ -0,0 +1,15 @@
+// This product includes software developed at Datadog (https://www.datadoghq.com/) Copyright 2024 Datadog, Inc.
+
+use cargo_metadata::MetadataCommand;
+use std::path::PathBuf;
+
+/// Find pup.ron in workspace root using cargo metadata
+pub fn find_workspace_pup_ron() -> Option<PathBuf> {
+    let metadata = MetadataCommand::new().no_deps().exec().ok()?;
+    let pup_ron = metadata.workspace_root.join("pup.ron");
+    if pup_ron.exists() {
+        Some(pup_ron.into_std_path_buf())
+    } else {
+        None
+    }
+}

cargo_pup_common/src/workspace.rs

@@ -69,11 +69,12 @@ use cargo_pup_common::cli::{PupArgs, PupCli, PupCommand};
 use ansi_term::Colour::{Blue, Cyan, Green, Red, Yellow};
 use ansi_term::Style;
 use cargo_pup_common::project_context::{PUP_DIR, ProjectContext};
+use cargo_pup_common::workspace::find_workspace_pup_ron;
 use cargo_pup_lint_config::LintBuilder;
 use std::env;
 use std::error::Error;
 use std::fmt;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::process::{Command, exit};
 
 #[derive(Debug, PartialEq)]
@@ -105,8 +106,11 @@ impl Error for CommandExitStatus {}
 /// Validates the current directory to determine the project type
 fn validate_project(config_path: Option<&str>) -> ProjectType {
     let pup_ron_path = match config_path {
-        Some(path) => Path::new(path),
-        None => Path::new("./pup.ron"),
+        Some(path) => PathBuf::from(path),
+        None => {
+            // Prioritize workspace root pup.ron, fallback to local only if not in workspace
+            find_workspace_pup_ron().unwrap_or_else(|| PathBuf::from("./pup.ron"))
+        }
     };
     let cargo_toml_path = Path::new("./Cargo.toml");
 
@@ -123,6 +127,7 @@ fn validate_project(config_path: Option<&str>) -> ProjectType {
     }
 }
 
+
 fn show_ascii_puppy() {
     println!(
         "{}",
@@ -352,9 +357,11 @@ where
     cmd.arg("run").arg(&toolchain).arg("cargo");
 
     // Set up environment variables
+    let current_dir = env::current_dir().map_err(|_| CommandExitStatus(1))?;
     cmd.env("RUSTC_WORKSPACE_WRAPPER", get_pup_path())
         .env("PUP_CLI_ARGS", cli_args)
         .env("PUP_CARGO_ARGS", cargo_args_str)
+        .env("PUP_ORIGINAL_DIR", current_dir.to_str().unwrap())
         .arg("check")
         .arg("--target-dir")
         .arg(".pup");

src/main.rs

@@ -18,6 +18,7 @@ extern crate rustc_trait_selection;
 
 use anyhow::Result;
 use cargo_pup_common::cli::{PupCli, PupCommand};
+use cargo_pup_common::workspace::find_workspace_pup_ron;
 
 use rustc_session::{EarlyDiagCtxt, config::ErrorOutputType};
 use std::{
@@ -31,6 +32,7 @@ use std::{
 use cargo_pup_lint_impl::{ArchitectureLintCollection, ArchitectureLintRunner, Mode};
 use cargo_pup_lint_impl::lints::configuration_factory::LintConfigurationFactory;
 
+
 pub fn main() -> Result<()> {
 
     let early_dcx = EarlyDiagCtxt::new(ErrorOutputType::default());
@@ -124,13 +126,22 @@ pub fn main() -> Result<()> {
             PupCli::from_env_str(cli_args)
         };
 
-        let cwd = env::current_dir()?;
+        let original_dir = if let Ok(original_dir) = env::var("PUP_ORIGINAL_DIR") {
+            PathBuf::from(original_dir)
+        } else {
+            env::current_dir()?
+        };
+        
         let config_path = if let Some(path) = cli_config.config_path {
-            // Use provided config path
-            PathBuf::from(path)
+            // Use provided config path, resolve relative to original directory
+            if Path::new(&path).is_absolute() {
+                PathBuf::from(path)
+            } else {
+                original_dir.join(path)
+            }
         } else {
-            // Default to pup.ron in current directory
-            cwd.join("pup.ron")
+            // Default to workspace root pup.ron, fallback to local only if not in workspace
+            find_workspace_pup_ron().unwrap_or_else(|| original_dir.join("pup.ron"))
         };
 
         if config_path.exists() {