change project to rack

Signed-off-by: scepter914 <scepter914@gmail.com>

Author: scepter914

src/bin/ml-cellar.rs

@@ -1,27 +1,29 @@
 use clap::{Parser, Subcommand};
-use ml_cellar::repository_config::RepositoryConfig;
+use ml_cellar::file::{GITATTRIBUTES, TEMPLATE_MD};
+use ml_cellar::rack::RackConfig;
+use ml_cellar::repository::RepositoryConfig;
 use std::path::PathBuf;
 use std::process::{Command, Stdio};
 use toml::to_string_pretty;
 
-use ml_cellar::file::{GITATTRIBUTES, TEMPLATE_MD};
-use ml_cellar::project_config::ProjectConfig;
-
 #[derive(Parser, Debug)]
 #[command(name = "ml-cellar")]
 #[command(about = "ML Cellar CLI", version)]
 struct Cli {
+    /// Subcommands
     #[command(subcommand)]
     command: Commands,
 }
 
 #[derive(Subcommand, Debug)]
 enum Commands {
-    /// Create a project at {path}
-    Project {
-        /// Project path
+    /// Create a new rack at the specified path
+    /// "Rack" is a collection of ML models and related files.
+    Rack {
+        /// Path to the new rack
         path: PathBuf,
     },
+    /// Initialize a new repository
     Init {},
 }
 fn main() {
@@ -30,8 +32,8 @@ fn main() {
         Commands::Init {} => {
             init();
         }
-        Commands::Project { path } => {
-            project(path);
+        Commands::Rack { path } => {
+            rack(path);
         }
     }
 }
@@ -88,29 +90,32 @@ fn init() {
 
     // Make .mlcellar.toml
     let config = RepositoryConfig::default();
-    let toml_str = to_string_pretty(&config).expect("failed to serialize project config to TOML");
+    let toml_str =
+        to_string_pretty(&config).expect("failed to serialize repository config to TOML");
     std::fs::write(".mlcellar.toml", toml_str).expect("failed to write .mlcellar.toml");
 }
 
-fn project(path: PathBuf) {
+fn rack(path: PathBuf) {
     if path.exists() {
         eprintln!("{:?} already exists", path);
         std::process::exit(1);
     } else {
-        std::fs::create_dir_all(&path).expect("failed to create project dir");
-        println!("Create project at {}", path.display());
+        let rack_name = path.file_name().unwrap().to_str().unwrap();
+
+        std::fs::create_dir_all(&path).expect("failed to create the directory for the rack");
+        println!("Create rack at {}", path.display());
 
         // Make README.md
         let readme_path = path.join("README.md");
-        let readme_content = format!("# {}\n\n## Summary\n\n## Release\n", &path.display());
+        let readme_content = format!("# {}\n\n## Summary\n\n## Release\n", &rack_name);
         std::fs::write(&readme_path, readme_content).expect("failed to write README.md");
 
-        // Make project.toml
-        let config_path = path.join("project.toml");
-        let config = ProjectConfig::default();
-        let toml_str =
-            to_string_pretty(&config).expect("failed to serialize project config to TOML");
-        std::fs::write(&config_path, toml_str).expect("failed to write project.toml");
+        // Make config.toml
+        let config_path = path.join("config.toml");
+        let mut config = RackConfig::default();
+        config.rack.name = rack_name.to_owned();
+        let toml_str = to_string_pretty(&config).expect("failed to serialize rack config to TOML");
+        std::fs::write(&config_path, toml_str).expect("failed to write config.toml");
 
         // Make template.md
         let template_path = path.join("template.md");

src/lib.rs

@@ -1,3 +1,3 @@
 pub mod file;
-pub mod project_config;
-pub mod repository_config;
+pub mod rack;
+pub mod repository;

src/project_config.rs

@@ -0,0 +1,39 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Deserialize, Serialize, Default)]
+#[serde(default)]
+pub struct RackConfig {
+    pub rack: RackInfoConfig,
+    pub artifact: ArtifactConfig,
+    pub project: ProjectConfig,
+    pub document: DocumentConfig,
+}
+
+#[derive(Debug, Deserialize, Serialize, Default)]
+#[serde(default)]
+pub struct RackInfoConfig {
+    pub name: String,
+}
+
+#[derive(Debug, Deserialize, Serialize, Default)]
+#[serde(default)]
+pub struct ArtifactConfig {
+    pub required_files: Vec<String>,
+    pub optional_files: Vec<String>,
+}
+
+#[derive(Debug, Deserialize, Serialize, Default)]
+#[serde(default)]
+pub struct ProjectConfig {
+    pub project: Option<Vec<String>>,
+    pub version_yymmdd: Option<Vec<String>>,
+    pub version_x: Option<Vec<String>>,
+    pub version_x_y: Option<Vec<String>>,
+}
+
+#[derive(Debug, Deserialize, Serialize, Default)]
+#[serde(default)]
+pub struct DocumentConfig {
+    pub template_file: Option<String>,
+    pub result_file: Option<String>,
+}

src/rack.rs

@@ -20,7 +20,7 @@ fn test_init() {
     assert!(gitattributes_path.is_file(), ".gitattributes should exist");
 
     let gitattributes_text = fs::read_to_string(&gitattributes_path).unwrap();
-    let target_gitattributes = fs::read_to_string("tests/fixtures/.gitattributes").unwrap();
+    let target_gitattributes = fs::read_to_string("tests/fixtures/init_test/.gitattributes").unwrap();
     assert_eq!(
         gitattributes_text, target_gitattributes,
         ".gitattributes is \n***\n{} \n*** \n and different from the target file.",
@@ -35,7 +35,7 @@ fn test_init() {
     );
 
     let mlcellar_text = fs::read_to_string(&repository_config_path).unwrap();
-    let target_mlcellar = fs::read_to_string("tests/fixtures/.mlcellar.toml").unwrap();
+    let target_mlcellar = fs::read_to_string("tests/fixtures/init_test/.mlcellar.toml").unwrap();
     assert_eq!(
         mlcellar_text, target_mlcellar,
         ".mlcellar.toml is \n***\n{} \n*** \n and different from the target file.",

src/repository_config.rs src/repository.rssrc/repository_config.rs renamed to src/repository.rs

@@ -0,0 +1,57 @@
+use assert_cmd::cargo::cargo_bin_cmd;
+use predicates::prelude::*;
+use std::fs;
+use tempfile::tempdir;
+
+/// Test `ml-cellar rack {path}`
+/// This test uses `tests/fixtures/test_registry/algorithm_1/` as test directory
+/// The directory `tests/fixtures/test_registry/algorithm_1/` is the expected output of `ml-cellar rack tests/fixtures/test_registry/algorithm_1/`.
+#[test]
+fn test_rack() {
+    let temp_dir = tempdir().unwrap();
+    let rack_path = temp_dir.path().join("my_rack");
+
+    let mut cmd = cargo_bin_cmd!("ml-cellar");
+    cmd.arg("rack").arg(&rack_path);
+    cmd.assert()
+        .success()
+        .stdout(predicate::str::contains("Create rack at"));
+
+    // Check that the rack directory was created
+    assert!(rack_path.is_dir());
+
+    // Check README.md, project.toml, and template.md
+    let readme = rack_path.join("README.md");
+    let config = rack_path.join("config.toml");
+    let template = rack_path.join("template.md");
+
+    assert!(readme.is_file(), "README.md should exist");
+    assert!(config.is_file(), "config.toml should exist");
+    assert!(template.is_file(), "template.md should exist");
+
+    // Check contents of README.md
+    let readme_text = fs::read_to_string(&readme).unwrap();
+    assert!(readme_text.contains("my_rack"), "README content is wrong");
+
+    // Check contents of config.toml
+    let config_text = fs::read_to_string(&config).unwrap();
+    let target_config =
+        fs::read_to_string("tests/fixtures/test_registry/algorithm_1/config.toml").unwrap();
+
+    assert_eq!(
+        config_text, target_config,
+        "config.toml is \n***\n{} \n*** \n and different from the config file.",
+        config_text
+    );
+
+    // Check contents of template.md
+    let template_text = fs::read_to_string(&template).unwrap();
+    let target_template =
+        fs::read_to_string("tests/fixtures/test_registry/algorithm_1/template.md").unwrap();
+
+    assert_eq!(
+        template_text, target_template,
+        "template.md is \n***\n{} \n*** \n and different from the template file.",
+        template_text
+    );
+}