fix: valid in-repo yaml config wasn't applied

Author: queil

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rooz"
-version = "0.65.0"
+version = "0.66.0"
 edition = "2021"
 
 [dependencies]

Cargo.toml

@@ -8,7 +8,6 @@ use crate::{
         types::{AnyError, EnterSpec, WorkSpec},
     },
 };
-use colored::Colorize;
 
 impl<'a> WorkspaceApi<'a> {
     pub async fn new(
@@ -113,15 +112,12 @@ impl<'a> WorkspaceApi<'a> {
                         let mut cfg_builder = RoozCfg::default().from_cli_env(spec.clone());
 
                         match repo_config {
-                            Some(Ok(c)) => {
-                                log::debug!(".rooz.toml found in the repository and applied.");
+                            Some(c) => {
+                                log::debug!("Config file applied.");
                                 cfg_builder = cfg_builder.from_config(c.clone());
                             }
-                            Some(Err(e)) => {
-                                eprintln!("{}\n{}", e, "WARNING: Ignoring the invalid .rooz.toml file from the repository".yellow());
-                            }
                             None => {
-                                log::debug!(".rooz.toml not found in the repository");
+                                log::debug!("No valid config file found in the repository.");
                             }
                         }
 

src/cmd/new.rs

@@ -1,3 +1,5 @@
+use colored::Colorize;
+
 use crate::{
     api::{container, ExecApi, GitApi},
     id,
@@ -32,7 +34,7 @@ impl<'a> ExecApi<'a> {
         container_id: &str,
         clone_dir: &str,
         file_format: FileFormat,
-    ) -> Result<(FileFormat, String), AnyError> {
+    ) -> Result<Option<RoozCfg>, AnyError> {
         let file_path = &format!("{}/.rooz.{}", clone_dir, file_format.to_string());
 
         let config = self
@@ -51,7 +53,27 @@ impl<'a> ExecApi<'a> {
                 ]),
             )
             .await?;
-        Ok((file_format, config))
+
+        if config.is_empty() {
+            Ok(None)
+        } else {
+            match RoozCfg::from_string(config, file_format) {
+                Ok(cfg) => Ok(Some(cfg)),
+                Err(e) => {
+                    eprintln!(
+                        "{}\n{}",
+                        format!(
+                            "WARNING: Could not read repo config ({})",
+                            file_format.to_string()
+                        )
+                        .bold()
+                        .yellow(),
+                        e.to_string().yellow()
+                    );
+                    Ok(None)
+                }
+            }
+        }
     }
 }
 
@@ -63,7 +85,7 @@ impl<'a> GitApi<'a> {
         url: &str,
         workspace_key: &str,
         working_dir: &str,
-    ) -> Result<(Option<Result<RoozCfg, AnyError>>, GitCloneSpec), AnyError> {
+    ) -> Result<(Option<RoozCfg>, GitCloneSpec), AnyError> {
         let clone_dir = get_clone_dir(working_dir, url);
 
         let clone_cmd = container::inject(
@@ -125,28 +147,27 @@ impl<'a> GitApi<'a> {
                 .await?;
         };
 
-        let (file_format, rooz_cfg) = self
-            .api
-            .exec
-            .read_rooz_config(container_id, &clone_dir, FileFormat::Toml)
-            .await
-            .or(self
-                .api
-                .exec
-                .read_rooz_config(container_id, &clone_dir, FileFormat::Yaml)
-                .await)?;
+        let exec = &self.api.exec;
 
-        log::debug!("Repo config result: {}", &rooz_cfg);
+        let rooz_cfg = if let Some(cfg) = exec
+            .read_rooz_config(container_id, &clone_dir, FileFormat::Toml)
+            .await?
+        {
+            log::debug!("Config file found (TOML)");
+            Some(cfg)
+        } else if let Some(cfg) = exec
+            .read_rooz_config(container_id, &clone_dir, FileFormat::Yaml)
+            .await?
+        {
+            log::debug!("Config file found (YAML)");
+            Some(cfg)
+        } else {
+            log::debug!("No valid config file found");
+            None
+        };
 
         self.api.container.remove(&container_id, true).await?;
 
-        Ok((
-            if rooz_cfg.is_empty() {
-                None
-            } else {
-                Some(RoozCfg::from_string(rooz_cfg, file_format))
-            },
-            GitCloneSpec { dir: clone_dir },
-        ))
+        Ok((rooz_cfg, GitCloneSpec { dir: clone_dir }))
     }
 }

src/git.rs

@@ -43,7 +43,7 @@ pub struct RoozCfg {
     pub sidecars: Option<HashMap<String, RoozSidecar>>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub enum FileFormat {
     Toml,
     Yaml,