fix a few things with warning about old nupackage.toml projects

Author: freepicheep

src/config.rs

@@ -259,16 +259,17 @@ fn warn_if_legacy_toml_config(nuon_path: &Path) {
     let toml_path = nuon_path.with_extension("toml");
     if toml_path.exists() {
         ui::warn("config.toml detected but quiver now requires config.nuon. Migrate with:");
-        eprintln!();
-        eprintln!(
+        ui::plain(format!(
             "  open {} | to nuon --indent 2 | save -f {}",
             toml_path.display(),
             nuon_path.display()
-        );
-        eprintln!("  rm {}", toml_path.display());
-        eprintln!("  rm {}", nuon_path.with_file_name("config.lock").display());
-        eprintln!("  qv install -g");
-        eprintln!();
+        ));
+        ui::plain(format!("  rm {}", toml_path.display()));
+        ui::plain(format!(
+            "  rm {}",
+            nuon_path.with_file_name("config.lock").display()
+        ));
+        ui::plain("  qv install -g");
     }
 }
 

src/installer.rs

@@ -518,7 +518,7 @@ fn install_resolved_global(
             "To load quiver autoload files from {}, add this to config.nu:",
             global_autoload_dir_expression()
         ));
-        ui::info(format!("  {}", global_autoload_config_hint()));
+        ui::plain(format!("  {}", global_autoload_config_hint()));
     }
 
     Ok(())

src/main.rs

@@ -191,8 +191,17 @@ fn cmd_tui(cwd: &Path, global: bool) -> Result<()> {
 }
 
 fn require_project_dir(start: &Path) -> Result<PathBuf> {
-    Manifest::find_project_dir(start)
-        .ok_or_else(|| error::QuiverError::NoManifest(start.to_path_buf()))
+    if let Some(dir) = Manifest::find_project_dir(start) {
+        return Ok(dir);
+    }
+    if let Some(dir) = start
+        .ancestors()
+        .find(|d| d.join("nupackage.toml").exists())
+    {
+        manifest::warn_if_legacy_toml_manifest(dir);
+        return Err(error::QuiverError::NoManifest(dir.to_path_buf()));
+    }
+    Err(error::QuiverError::NoManifest(start.to_path_buf()))
 }
 
 fn cmd_init(

src/manifest.rs

@@ -200,6 +200,16 @@ impl PluginDependencySpec {
     }
 }
 
+pub(crate) fn warn_if_legacy_toml_manifest(dir: &Path) {
+    if dir.join("nupackage.toml").exists() {
+        ui::warn("nupackage.toml detected but quiver now requires nupackage.nuon. Migrate with:");
+        ui::plain("  open nupackage.toml | to nuon --indent 2 | save -f nupackage.nuon");
+        ui::plain("  rm nupackage.toml");
+        ui::plain("  rm quiver.lock");
+        ui::plain("  qv install");
+    }
+}
+
 fn validate_ref_fields(
     name: &str,
     kind: &str,
@@ -235,17 +245,7 @@ impl Manifest {
     pub fn from_dir(dir: &Path) -> Result<Self> {
         let path = dir.join(MANIFEST_FILE_NAME);
         if !path.exists() {
-            if dir.join("nupackage.toml").exists() {
-                ui::warn(
-                    "nupackage.toml detected but quiver now requires nupackage.nuon. Migrate with:",
-                );
-                eprintln!();
-                eprintln!("  open nupackage.toml | to nuon --indent 2 | save -f nupackage.nuon");
-                eprintln!("  rm nupackage.toml");
-                eprintln!("  rm quiver.lock");
-                eprintln!("  qv install");
-                eprintln!();
-            }
+            warn_if_legacy_toml_manifest(dir);
             return Err(QuiverError::NoManifest(dir.to_path_buf()));
         }
         let content = std::fs::read_to_string(&path)?;

src/ui.rs

@@ -49,6 +49,13 @@ fn is_capturing() -> bool {
     LOG_CAPTURE.with(|capture| capture.borrow().is_some())
 }
 
+pub fn plain(message: impl AsRef<str>) {
+    let message = message.as_ref();
+    if !capture_line(LogKind::Info, message.to_string()) {
+        eprintln!("{}", message);
+    }
+}
+
 pub fn info(message: impl AsRef<str>) {
     let message = message.as_ref();
     if !capture_line(LogKind::Info, message.to_string()) {