refactor: move core crate into subdirectory

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
-    ".",
+    "ciel/",
     "cli/",
 ]
 
@@ -13,44 +13,6 @@ authors = ["liushuyu <[email protected]>", "xtex <[email protected]>"]
 repository = "https://github.com/AOSC-Dev/ciel-rs"
 edition = "2021"
 
-[package]
-name = "ciel"
-version.workspace = true
-description.workspace = true
-license.workspace = true
-authors.workspace = true
-repository.workspace = true
-edition.workspace = true
-
-[dependencies]
-zbus = { version = "^5", features = ["blocking"] }
-nix = { version = "0.29", features = ["fs", "hostname", "mount", "signal", "user"] }
-toml = "0.8"
-bincode = "1.3"
-serde = { version = "1.0", features = ["derive"] }
-git2 = "0.19"
-libmount = { git = "https://github.com/liushuyu/libmount", rev = "6fe8dba03a6404dfe1013995dd17af1c4e21c97b" }
-adler32 = "1.2"
-rayon = "1.10"
-tempfile = "3.14"
-libsystemd-sys = "0.9"
-walkdir = "2"
-xattr = "^1"
-rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
-time = { version = "0.3", default-features = false, features = ["serde-human-readable", "macros"] }
-fs3 = "0.5"
-ar = "0.9"
-faster-hex = "0.10"
-flate2 = "1.0"
-inotify = "0.11"
-zstd = "0.13.2"
-thiserror = "2.0.8"
-log = "0.4.22"
-test-log = { version = "0.2.16", features = ["log"] }
-sha2 = "0.10.8"
-tar = "0.4.43"
-xz2 = "0.1.7"
-
 [profile.release]
 lto = true
 

ciel/Cargo.toml

@@ -0,0 +1,37 @@
+[package]
+name = "ciel"
+version.workspace = true
+description.workspace = true
+license.workspace = true
+authors.workspace = true
+repository.workspace = true
+edition.workspace = true
+
+[dependencies]
+zbus = { version = "^5", features = ["blocking"] }
+nix = { version = "0.29", features = ["fs", "hostname", "mount", "signal", "user"] }
+toml = "0.8"
+bincode = "1.3"
+serde = { version = "1.0", features = ["derive"] }
+git2 = "0.19"
+libmount = { git = "https://github.com/liushuyu/libmount", rev = "6fe8dba03a6404dfe1013995dd17af1c4e21c97b" }
+adler32 = "1.2"
+rayon = "1.10"
+tempfile = "3.14"
+libsystemd-sys = "0.9"
+walkdir = "2"
+xattr = "^1"
+rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
+time = { version = "0.3", default-features = false, features = ["serde-human-readable", "macros"] }
+fs3 = "0.5"
+ar = "0.9"
+faster-hex = "0.10"
+flate2 = "1.0"
+inotify = "0.11"
+zstd = "0.13.2"
+thiserror = "2.0.8"
+log = "0.4.22"
+test-log = { version = "0.2.16", features = ["log"] }
+sha2 = "0.10.8"
+tar = "0.4.43"
+xz2 = "0.1.7"

src/container.rs → ciel/src/container.rs

@@ -567,7 +567,9 @@ impl OwnedContainer {
     /// Destroies the owned container.
     pub fn discard(self) -> Result<()> {
         let instance = self.0.instance().to_owned();
-        self.0.lock.force_unlock();
+        if let Some(lock) = &self.0.lock {
+            lock.force_unlock();
+        }
         forget(self);
         instance.destroy()
     }
@@ -632,7 +634,7 @@ mod test {
 
     #[test]
     fn test_container_migration() {
-        let testdir = TestDir::from("testdata/old-workspace");
+        let testdir = TestDir::from("old-workspace");
         let ws = testdir.workspace().unwrap();
         dbg!(&ws);
         assert!(ws.is_system_loaded());
@@ -645,7 +647,7 @@ mod test {
 
     #[test]
     fn test_container_state() {
-        let testdir = TestDir::from("testdata/simple-workspace");
+        let testdir = TestDir::from("simple-workspace");
         let ws = testdir.workspace().unwrap();
         dbg!(&ws);
         assert!(ws.is_system_loaded());
@@ -658,7 +660,7 @@ mod test {
 
     #[test]
     fn test_owned_container() {
-        let testdir = TestDir::from("testdata/simple-workspace");
+        let testdir = TestDir::from("simple-workspace");
         let ws = testdir.workspace().unwrap();
         dbg!(&ws);
         assert!(ws.is_system_loaded());
@@ -676,7 +678,7 @@ mod test {
 
     #[test]
     fn test_owned_container_leak() {
-        let testdir = TestDir::from("testdata/simple-workspace");
+        let testdir = TestDir::from("simple-workspace");
         let ws = testdir.workspace().unwrap();
         dbg!(&ws);
         assert!(ws.is_system_loaded());
@@ -692,7 +694,7 @@ mod test {
 
     #[test]
     fn test_container_config_apt_repos() {
-        let testdir = TestDir::from("testdata/simple-workspace");
+        let testdir = TestDir::from("simple-workspace");
         let ws = testdir.workspace().unwrap();
         dbg!(&ws);
         let inst = ws.instance("test").unwrap();

src/instance.rs → ciel/src/instance.rs

@@ -255,7 +255,7 @@ readonly-tree = false
 
     #[test]
     fn test_instance() {
-        let testdir = TestDir::from("testdata/simple-workspace");
+        let testdir = TestDir::from("simple-workspace");
         let workspace = testdir.workspace().unwrap();
         dbg!(&workspace);
 
@@ -276,7 +276,7 @@ readonly-tree = false
 
     #[test]
     fn test_instance_migration() {
-        let testdir = TestDir::from("testdata/old-workspace");
+        let testdir = TestDir::from("old-workspace");
         let ws = testdir.workspace().unwrap();
         dbg!(&ws);
         assert!(ws.is_system_loaded());
@@ -286,7 +286,7 @@ readonly-tree = false
 
     #[test]
     fn test_instance_destroy() {
-        let testdir = TestDir::from("testdata/simple-workspace");
+        let testdir = TestDir::from("simple-workspace");
         let workspace = testdir.workspace().unwrap();
         dbg!(&workspace);
         assert_eq!(

src/lib.rs → ciel/src/lib.rs

@@ -119,9 +119,9 @@ pub(crate) mod test {
     use tempfile::TempDir;
 
     use crate::{
-        Result,
         repo::SimpleAptRepository,
         workspace::{Workspace, WorkspaceConfig},
+        Result,
     };
 
     pub fn is_root() -> bool {
@@ -144,6 +144,7 @@ pub(crate) mod test {
     }
 
     fn copy_file(from: &Path, to: &Path) {
+        assert!(from.exists());
         if from.is_symlink() {
             std::os::unix::fs::symlink(fs::read_link(from).unwrap(), to).unwrap();
         } else if from.is_file() {
@@ -170,7 +171,7 @@ pub(crate) mod test {
         pub fn from(template: &str) -> Self {
             let dir = Self::new();
             println!("copying test data: {} -> {:?}", template, dir.path());
-            copy_file(Path::new(template), dir.path());
+            copy_file(&Path::new("testdata").join(template), dir.path());
             dir
         }
 

src/machine.rs → ciel/src/machine.rs

@@ -338,7 +338,7 @@ mod test {
 
     #[test(ignore)]
     fn test_container_boot() {
-        let testdir = TestDir::from("testdata/simple-workspace");
+        let testdir = TestDir::from("simple-workspace");
         let ws = testdir.workspace().unwrap();
         dbg!(&ws);
         assert!(ws.is_system_loaded());

src/repo/mod.rs → ciel/src/repo/mod.rs

@@ -110,7 +110,7 @@ mod test {
 
     #[test]
     fn test_simple_apt_repo_refresh() {
-        let testdir = TestDir::from("testdata/simple-repo");
+        let testdir = TestDir::from("simple-repo");
         let repo = testdir.apt_repo();
         repo.refresh().unwrap();
         assert_eq!(

src/repo/scan.rs → ciel/src/repo/scan.rs

@@ -156,7 +156,7 @@ mod test {
 
     #[test]
     fn test_collect_all_packages() {
-        let testdir = TestDir::from("testdata/simple-repo");
+        let testdir = TestDir::from("simple-repo");
         assert_eq!(
             collect_all_packages(testdir.path().join("debs")).unwrap(),
             vec![
@@ -169,7 +169,7 @@ mod test {
 
     #[test]
     fn test_scan_single_deb_simple() {
-        let testdir = TestDir::from("testdata/simple-repo");
+        let testdir = TestDir::from("simple-repo");
         assert_eq!(
             String::from_utf8(
                 scan_single_deb_simple(
@@ -204,7 +204,7 @@ SHA256: dd386883fa246cc50826cced5df4353b64a490d3f0f487e2d8764b4d7d00151e
 
     #[test]
     fn test_scan_packages_simple() {
-        let testdir = TestDir::from("testdata/simple-repo");
+        let testdir = TestDir::from("simple-repo");
         assert_eq!(
             String::from_utf8(
                 scan_packages_simple(

src/workspace.rs → ciel/src/workspace.rs

@@ -640,7 +640,7 @@ volatile-mount = false
     #[test]
     fn test_workspace_migration_v3() {
         // migration from Ciel <= 3.6.0
-        let testdir = TestDir::from("testdata/old-workspace");
+        let testdir = TestDir::from("old-workspace");
         let ws = testdir.workspace().unwrap();
         dbg!(&ws);
         assert!(ws.is_system_loaded());
@@ -654,7 +654,7 @@ volatile-mount = false
     #[test]
     fn test_workspace_migration_v2() {
         // migration from Ciel 2.x.x
-        let testdir = TestDir::from("testdata/v2-workspace");
+        let testdir = TestDir::from("v2-workspace");
         let ws = testdir.workspace().unwrap();
         dbg!(&ws);
         assert!(ws.is_system_loaded());
@@ -664,7 +664,7 @@ volatile-mount = false
 
     #[test]
     fn test_incompatible_workspace() {
-        let testdir = TestDir::from("testdata/incompat-ws-version");
+        let testdir = TestDir::from("incompat-ws-version");
         assert!(matches!(
             testdir.workspace(),
             Err(Error::UnsupportedWorkspaceVersion(0))
@@ -673,13 +673,13 @@ volatile-mount = false
 
     #[test]
     fn test_broken_workspace() {
-        let testdir = TestDir::from("testdata/broken-workspace");
+        let testdir = TestDir::from("broken-workspace");
         assert!(matches!(testdir.workspace(), Err(Error::BrokenWorkspace)));
     }
 
     #[test]
     fn test_workspace_instances() {
-        let testdir = TestDir::from("testdata/simple-workspace");
+        let testdir = TestDir::from("simple-workspace");
         let workspace = testdir.workspace().unwrap();
         dbg!(&workspace);
         assert_eq!(
@@ -698,7 +698,7 @@ volatile-mount = false
 
     #[test]
     fn test_workspace_add_instance() {
-        let testdir = TestDir::from("testdata/simple-workspace");
+        let testdir = TestDir::from("simple-workspace");
         let workspace = testdir.workspace().unwrap();
         dbg!(&workspace);
         assert_eq!(
@@ -733,7 +733,7 @@ volatile-mount = false
 
     #[test]
     fn test_workspace_commit() {
-        let testdir = TestDir::from("testdata/simple-workspace");
+        let testdir = TestDir::from("simple-workspace");
         let workspace = testdir.workspace().unwrap();
         dbg!(&workspace);
         let instance = workspace.instance("test").unwrap();
@@ -758,7 +758,7 @@ volatile-mount = false
 
     #[test]
     fn test_workspace_commit_tmpfs() {
-        let testdir = TestDir::from("testdata/simple-workspace");
+        let testdir = TestDir::from("simple-workspace");
         let workspace = testdir.workspace().unwrap();
         dbg!(&workspace);
         let instance = workspace.instance("tmpfs").unwrap();
@@ -783,7 +783,7 @@ volatile-mount = false
 
     #[test]
     fn test_workspace_destroy() {
-        let testdir = TestDir::from("testdata/simple-workspace");
+        let testdir = TestDir::from("simple-workspace");
         let workspace = testdir.workspace().unwrap();
         dbg!(&workspace);
         workspace.destroy().unwrap();
@@ -793,7 +793,7 @@ volatile-mount = false
 
     #[test]
     fn test_workspace_ephemeral_container() {
-        let testdir = TestDir::from("testdata/simple-workspace");
+        let testdir = TestDir::from("simple-workspace");
         let workspace = testdir.workspace().unwrap();
         dbg!(&workspace);
         let cont = workspace

cli/Cargo.toml

@@ -9,7 +9,7 @@ edition.workspace = true
 
 [dependencies]
 anyhow = "1.0.94"
-ciel = { version = "4.0.0", path = ".." }
+ciel = { version = "4.0.0", path = "../ciel" }
 clap = { version = "^4", features = ["string", "env"] }
 console = "0.15.10"
 dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }