address review concerns about bad pantry paths.

Author: jhheider

Cargo.lock

@@ -20,6 +20,9 @@ console = { version = "0.16", default-features = false, features = [
   "ansi-parsing",
 ] }
 
+[dev-dependencies]
+tempfile = "3"
+
 [target.'cfg(not(target_os = "macos"))'.dependencies]
 rusqlite = { workspace = true, features = ["bundled"] }
 native-tls = { version = "0.2", features = ["vendored"] }

crates/cli/Cargo.toml

@@ -1 +1,2 @@
 mod main;
+mod sync;

crates/cli/src/tests/mod.rs

@@ -0,0 +1,64 @@
+use libpkgx::config::Config;
+use libpkgx::sync;
+use rusqlite::Connection;
+use std::sync::Mutex;
+use tempfile::TempDir;
+
+// serialize tests that mutate PKGX_PANTRY_DIR
+static ENV_MUTEX: Mutex<()> = Mutex::new(());
+
+fn test_config(pantry_dir: &std::path::Path, db_file: &std::path::Path) -> Config {
+    Config {
+        pantry_dir: pantry_dir.to_path_buf(),
+        pantry_db_file: db_file.to_path_buf(),
+        dist_url: "http://localhost:0".to_string(),
+        pkgx_dir: pantry_dir.to_path_buf(),
+    }
+}
+
+#[tokio::test]
+async fn test_update_with_pantry_dir_rebuilds_db_when_projects_exists() {
+    let _lock = ENV_MUTEX.lock().unwrap();
+    let tmp = TempDir::new().unwrap();
+    let pantry_dir = tmp.path().join("pantry");
+    std::fs::create_dir_all(pantry_dir.join("projects")).unwrap();
+    let db_file = tmp.path().join("pantry.2.db");
+
+    let config = test_config(&pantry_dir, &db_file);
+    let mut conn = Connection::open(&db_file).unwrap();
+
+    std::env::set_var("PKGX_PANTRY_DIR", &pantry_dir);
+    let result = sync::update(&config, &mut conn).await;
+    std::env::remove_var("PKGX_PANTRY_DIR");
+
+    assert!(
+        result.is_ok(),
+        "update should succeed when projects/ exists"
+    );
+}
+
+#[tokio::test]
+async fn test_update_with_pantry_dir_errors_when_projects_missing() {
+    let _lock = ENV_MUTEX.lock().unwrap();
+    let tmp = TempDir::new().unwrap();
+    let pantry_dir = tmp.path().join("pantry");
+    std::fs::create_dir_all(&pantry_dir).unwrap();
+    let db_file = tmp.path().join("pantry.2.db");
+
+    let config = test_config(&pantry_dir, &db_file);
+    let mut conn = Connection::open(&db_file).unwrap();
+
+    std::env::set_var("PKGX_PANTRY_DIR", &pantry_dir);
+    let result = sync::update(&config, &mut conn).await;
+    std::env::remove_var("PKGX_PANTRY_DIR");
+
+    assert!(
+        result.is_err(),
+        "update should fail when projects/ is missing"
+    );
+    let err = result.unwrap_err().to_string();
+    assert!(
+        err.contains("missing projects/"),
+        "error should mention missing projects/, got: {err}"
+    );
+}

crates/cli/src/tests/sync.rs

@@ -33,7 +33,16 @@ pub async fn ensure(config: &Config, conn: &mut Connection) -> Result<(), Box<dy
 
 pub async fn update(config: &Config, conn: &mut Connection) -> Result<(), Box<dyn Error>> {
     if std::env::var("PKGX_PANTRY_DIR").is_ok() {
-        return ensure(config, conn).await;
+        if config.pantry_dir.join("projects").is_dir() {
+            let lockfile = lock(config)?;
+            pantry_db::cache(config, conn)?;
+            FileExt::unlock(&lockfile)?;
+            return Ok(());
+        } else {
+            return Err(
+                "PKGX_PANTRY_DIR is set but does not contain a pantry (missing projects/)",
+            )?;
+        }
     }
     replace(config, conn).await
 }