From 38910b02c0c70e070d8eac0d460f63c5b3e6abf0 Mon Sep 17 00:00:00 2001 From: tmorin Date: Mon, 20 Mar 2023 21:51:25 +0100 Subject: [PATCH] chore(library): move the model of the library in the library module of the commands --- src/cmd/library/generate/generator.rs | 6 +++--- src/cmd/library/generate/mod.rs | 2 +- .../generate/tasks/item/element_snippet.rs | 14 ++++++++------ .../generate/tasks/item/item_documentation.rs | 4 ++-- src/cmd/library/generate/tasks/item/item_icon.rs | 6 +++--- .../library/generate/tasks/item/item_source.rs | 16 ++++++++-------- src/cmd/library/generate/tasks/item/mod.rs | 12 ++++++------ .../library/generate/tasks/item/sprite_icon.rs | 4 ++-- .../library/generate/tasks/item/sprite_value.rs | 4 ++-- .../generate/tasks/library/library_bootstrap.rs | 2 +- .../tasks/library/library_documentation.rs | 2 +- .../generate/tasks/library/library_summary.rs | 2 +- src/cmd/library/generate/tasks/library/mod.rs | 2 +- src/cmd/library/generate/tasks/module/mod.rs | 6 +++--- .../tasks/module/module_documentation.rs | 10 +++++----- src/cmd/library/generate/tasks/package/mod.rs | 4 ++-- .../generate/tasks/package/package_bootstrap.rs | 4 ++-- .../tasks/package/package_documentation.rs | 4 ++-- .../generate/tasks/package/package_embedded.rs | 4 ++-- .../generate/tasks/package/package_example.rs | 6 +++--- src/{ => cmd/library}/manifest/element.rs | 0 src/{ => cmd/library}/manifest/example.rs | 0 src/{ => cmd/library}/manifest/icon.rs | 0 src/{ => cmd/library}/manifest/item.rs | 6 +++--- src/{ => cmd/library}/manifest/library.rs | 6 +++--- src/{ => cmd/library}/manifest/mod.rs | 0 src/{ => cmd/library}/manifest/module.rs | 4 ++-- src/{ => cmd/library}/manifest/package.rs | 8 ++++---- src/cmd/library/mod.rs | 1 + src/main.rs | 1 - 30 files changed, 71 insertions(+), 69 deletions(-) rename src/{ => cmd/library}/manifest/element.rs (100%) rename src/{ => cmd/library}/manifest/example.rs (100%) rename src/{ => cmd/library}/manifest/icon.rs (100%) rename src/{ => cmd/library}/manifest/item.rs (93%) rename src/{ => cmd/library}/manifest/library.rs (97%) rename src/{ => cmd/library}/manifest/mod.rs (100%) rename src/{ => cmd/library}/manifest/module.rs (92%) rename src/{ => cmd/library}/manifest/package.rs (92%) diff --git a/src/cmd/library/generate/generator.rs b/src/cmd/library/generate/generator.rs index fa5a9f4..d9255fc 100644 --- a/src/cmd/library/generate/generator.rs +++ b/src/cmd/library/generate/generator.rs @@ -8,8 +8,8 @@ use crate::cmd::library::generate::tasks::item::parse_item; use crate::cmd::library::generate::tasks::library::parse_library; use crate::cmd::library::generate::tasks::module::parse_module; use crate::cmd::library::generate::tasks::package::parse_package; +use crate::cmd::library::manifest::library::Library; use crate::counter::Counter; -use crate::manifest::library::Library; use crate::plantuml::PlantUML; use crate::result::Result; use crate::urn::Urn; @@ -157,7 +157,7 @@ mod tests { &config.plantuml_jar, &config.plantuml_version, ) - .unwrap(); + .unwrap(); let yaml = &read_to_string(Path::new("test/library-full.yaml")).unwrap(); let library: &Library = &serde_yaml::from_str(yaml).unwrap(); let generator = &Generator::create(config, library, &[]).unwrap(); @@ -188,7 +188,7 @@ mod tests { &config.plantuml_jar, &config.plantuml_version, ) - .unwrap(); + .unwrap(); let yaml = &read_to_string(Path::new("test/library-icon_reference.yaml")).unwrap(); let library: &Library = &serde_yaml::from_str(yaml).unwrap(); let generator = &Generator::create(config, library, &[]).unwrap(); diff --git a/src/cmd/library/generate/mod.rs b/src/cmd/library/generate/mod.rs index 377ad36..18eca5a 100644 --- a/src/cmd/library/generate/mod.rs +++ b/src/cmd/library/generate/mod.rs @@ -8,8 +8,8 @@ use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::generator::Generator; use crate::cmd::library::generate::task::CleanupScope; use crate::cmd::library::generate::templates::TEMPLATES; +use crate::cmd::library::manifest::library::Library; use crate::error::Error; -use crate::manifest::library::Library; use crate::plantuml::create_plantuml; use crate::result::Result; use crate::tera::create_tera; diff --git a/src/cmd/library/generate/tasks/item/element_snippet.rs b/src/cmd/library/generate/tasks/item/element_snippet.rs index a29c4ee..ce99478 100644 --- a/src/cmd/library/generate/tasks/item/element_snippet.rs +++ b/src/cmd/library/generate/tasks/item/element_snippet.rs @@ -10,11 +10,11 @@ use tera::{Context, Tera}; use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::{CleanupScope, Task}; +use crate::cmd::library::manifest::element::{Element, Shape}; +use crate::cmd::library::manifest::item::Item; +use crate::cmd::library::manifest::library::Library; +use crate::cmd::library::manifest::package::Package; use crate::error::Error; -use crate::manifest::element::{Element, Shape}; -use crate::manifest::item::Item; -use crate::manifest::library::Library; -use crate::manifest::package::Package; use crate::plantuml::PlantUML; use crate::result::Result; use crate::utils::{create_parent_directory, delete_file}; @@ -325,8 +325,10 @@ mod test { technical_label: None, description_label: None, template: "custom_item_snippet.tera".to_string(), - full_destination_source_path: "target/tests/element_snippet/source.Custom.puml".to_string(), - full_destination_image_path: "target/tests/element_snippet/source.Custom.png".to_string(), + full_destination_source_path: "target/tests/element_snippet/source.Custom.puml" + .to_string(), + full_destination_image_path: "target/tests/element_snippet/source.Custom.png" + .to_string(), properties: HashMap::default(), }; generator.cleanup(&[CleanupScope::All]).unwrap(); diff --git a/src/cmd/library/generate/tasks/item/item_documentation.rs b/src/cmd/library/generate/tasks/item/item_documentation.rs index d4334a6..7e2015c 100644 --- a/src/cmd/library/generate/tasks/item/item_documentation.rs +++ b/src/cmd/library/generate/tasks/item/item_documentation.rs @@ -6,9 +6,9 @@ use tera::{Context, Tera}; use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::{CleanupScope, Task}; +use crate::cmd::library::manifest::item::Item; +use crate::cmd::library::manifest::library::Library; use crate::error::Error; -use crate::manifest::item::Item; -use crate::manifest::library::Library; use crate::result::Result; use crate::utils::{create_parent_directory, delete_file}; diff --git a/src/cmd/library/generate/tasks/item/item_icon.rs b/src/cmd/library/generate/tasks/item/item_icon.rs index 4fcd536..3eed8db 100644 --- a/src/cmd/library/generate/tasks/item/item_icon.rs +++ b/src/cmd/library/generate/tasks/item/item_icon.rs @@ -9,10 +9,10 @@ use image::GenericImageView; use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::{CleanupScope, Task}; +use crate::cmd::library::manifest::icon::Icon; +use crate::cmd::library::manifest::item::Item; +use crate::cmd::library::manifest::library::Library; use crate::error::Error; -use crate::manifest::icon::Icon; -use crate::manifest::item::Item; -use crate::manifest::library::Library; use crate::result::Result; use crate::utils::{create_parent_directory, delete_file}; diff --git a/src/cmd/library/generate/tasks/item/item_source.rs b/src/cmd/library/generate/tasks/item/item_source.rs index f31cdbf..60b1e32 100644 --- a/src/cmd/library/generate/tasks/item/item_source.rs +++ b/src/cmd/library/generate/tasks/item/item_source.rs @@ -1,5 +1,5 @@ use std::collections::HashMap; -use std::fs::{File, read_to_string}; +use std::fs::{read_to_string, File}; use std::path::Path; use serde::{Deserialize, Serialize}; @@ -8,10 +8,10 @@ use tera::{Context, Tera}; use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::{CleanupScope, Task}; -use crate::constants::{SPRITE_LG, SPRITES}; +use crate::cmd::library::manifest::element::Shape; +use crate::cmd::library::manifest::item::Item; +use crate::constants::{SPRITES, SPRITE_LG}; use crate::error::Error; -use crate::manifest::element::Shape; -use crate::manifest::item::Item; use crate::result::Result; use crate::utils::{create_parent_directory, delete_file}; @@ -172,7 +172,7 @@ impl ItemSourceTask { }) } fn get_relative_source_path(&self) -> Box { - Box::from(Path::new(format!("{}.puml", self.item_urn, ).as_str())) + Box::from(Path::new(format!("{}.puml", self.item_urn,).as_str())) } fn get_full_source_path(&self) -> Box { Path::new(&self.output_directory) @@ -303,7 +303,7 @@ mod test { "{}/{}.puml", generator.output_directory, generator.item_urn, )) - .unwrap(); + .unwrap(); assert!(content.contains("LX_6N8UPcPbT0G")); assert!(content.contains( r"IconElement($id, 'IconElement', 'Package/Module/Family/BuiltInItem', $name, $tech, $desc)" @@ -325,7 +325,7 @@ mod test { keyB: [ itemA, itemB ] "#, ) - .unwrap(); + .unwrap(); let generator = ItemSourceTask { item_urn: "Package/Module/Family/CustomItem".to_string(), cached_sprite_paths: vec![], @@ -343,7 +343,7 @@ mod test { "{}/{}.puml", generator.output_directory, generator.item_urn, )) - .unwrap(); + .unwrap(); assert!(content.contains("' valueA")); assert!(content.contains("' itemA,itemB")); assert!(content.contains("!procedure CustomItem($id)")); diff --git a/src/cmd/library/generate/tasks/item/mod.rs b/src/cmd/library/generate/tasks/item/mod.rs index e80fc23..dd27758 100644 --- a/src/cmd/library/generate/tasks/item/mod.rs +++ b/src/cmd/library/generate/tasks/item/mod.rs @@ -8,12 +8,12 @@ use crate::cmd::library::generate::tasks::item::item_icon::ItemIconTask; use crate::cmd::library::generate::tasks::item::item_source::ItemSourceTask; use crate::cmd::library::generate::tasks::item::sprite_icon::SpriteIconTask; use crate::cmd::library::generate::tasks::item::sprite_value::SpriteValueTask; +use crate::cmd::library::manifest::icon::Icon; +use crate::cmd::library::manifest::item::Item; +use crate::cmd::library::manifest::library::Library; +use crate::cmd::library::manifest::module::Module; +use crate::cmd::library::manifest::package::Package; use crate::error::Error; -use crate::manifest::icon::Icon; -use crate::manifest::item::Item; -use crate::manifest::library::Library; -use crate::manifest::module::Module; -use crate::manifest::package::Package; mod element_snippet; mod item_documentation; @@ -28,7 +28,7 @@ pub fn parse_item( _package: &Package, _module: &Module, _item: &Item, -) -> std::result::Result>, Error> { +) -> Result>, Error> { log::debug!("parse item {}", &_item.urn); let mut tasks: Vec> = vec![]; diff --git a/src/cmd/library/generate/tasks/item/sprite_icon.rs b/src/cmd/library/generate/tasks/item/sprite_icon.rs index 90e37b5..ca98bf4 100644 --- a/src/cmd/library/generate/tasks/item/sprite_icon.rs +++ b/src/cmd/library/generate/tasks/item/sprite_icon.rs @@ -5,9 +5,9 @@ use serde::{Deserialize, Serialize}; use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::{CleanupScope, Task}; +use crate::cmd::library::manifest::icon::Icon; +use crate::cmd::library::manifest::item::Item; use crate::error::Error; -use crate::manifest::icon::Icon; -use crate::manifest::item::Item; use crate::result::Result; use crate::utils::{create_parent_directory, delete_file}; diff --git a/src/cmd/library/generate/tasks/item/sprite_value.rs b/src/cmd/library/generate/tasks/item/sprite_value.rs index 26ee0eb..012d2a2 100644 --- a/src/cmd/library/generate/tasks/item/sprite_value.rs +++ b/src/cmd/library/generate/tasks/item/sprite_value.rs @@ -8,9 +8,9 @@ use serde::{Deserialize, Serialize}; use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::{CleanupScope, Task}; +use crate::cmd::library::manifest::icon::Icon; +use crate::cmd::library::manifest::item::Item; use crate::error::Error; -use crate::manifest::icon::Icon; -use crate::manifest::item::Item; use crate::result::Result; use crate::utils::{create_parent_directory, delete_file}; diff --git a/src/cmd/library/generate/tasks/library/library_bootstrap.rs b/src/cmd/library/generate/tasks/library/library_bootstrap.rs index 6ff5e91..c8bc978 100644 --- a/src/cmd/library/generate/tasks/library/library_bootstrap.rs +++ b/src/cmd/library/generate/tasks/library/library_bootstrap.rs @@ -6,8 +6,8 @@ use tera::{Context, Tera}; use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::{CleanupScope, Task}; +use crate::cmd::library::manifest::library::Library; use crate::error::Error; -use crate::manifest::library::Library; use crate::result::Result; use crate::utils::{create_parent_directory, delete_file}; diff --git a/src/cmd/library/generate/tasks/library/library_documentation.rs b/src/cmd/library/generate/tasks/library/library_documentation.rs index 222be4f..ca79cef 100644 --- a/src/cmd/library/generate/tasks/library/library_documentation.rs +++ b/src/cmd/library/generate/tasks/library/library_documentation.rs @@ -6,8 +6,8 @@ use tera::{Context, Tera}; use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::{CleanupScope, Task}; +use crate::cmd::library::manifest::library::Library; use crate::error::Error; -use crate::manifest::library::Library; use crate::result::Result; use crate::utils::{create_parent_directory, delete_file}; diff --git a/src/cmd/library/generate/tasks/library/library_summary.rs b/src/cmd/library/generate/tasks/library/library_summary.rs index 1187c9f..230ebeb 100644 --- a/src/cmd/library/generate/tasks/library/library_summary.rs +++ b/src/cmd/library/generate/tasks/library/library_summary.rs @@ -6,8 +6,8 @@ use tera::{Context, Tera}; use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::{CleanupScope, Task}; +use crate::cmd::library::manifest::library::Library; use crate::error::Error; -use crate::manifest::library::Library; use crate::result::Result; use crate::utils::{create_parent_directory, delete_file}; diff --git a/src/cmd/library/generate/tasks/library/mod.rs b/src/cmd/library/generate/tasks/library/mod.rs index 9830e7e..fdfc728 100644 --- a/src/cmd/library/generate/tasks/library/mod.rs +++ b/src/cmd/library/generate/tasks/library/mod.rs @@ -3,7 +3,7 @@ use crate::cmd::library::generate::task::Task; use crate::cmd::library::generate::tasks::library::library_bootstrap::LibraryBootstrapTask; use crate::cmd::library::generate::tasks::library::library_documentation::LibraryDocumentationTask; use crate::cmd::library::generate::tasks::library::library_summary::LibrarySummaryTask; -use crate::manifest::library::Library; +use crate::cmd::library::manifest::library::Library; use crate::result::Result; mod library_bootstrap; diff --git a/src/cmd/library/generate/tasks/module/mod.rs b/src/cmd/library/generate/tasks/module/mod.rs index c1d47d4..b231a9a 100644 --- a/src/cmd/library/generate/tasks/module/mod.rs +++ b/src/cmd/library/generate/tasks/module/mod.rs @@ -1,9 +1,9 @@ use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::Task; use crate::cmd::library::generate::tasks::module::module_documentation::ModuleDocumentationTask; -use crate::manifest::library::Library; -use crate::manifest::module::Module; -use crate::manifest::package::Package; +use crate::cmd::library::manifest::library::Library; +use crate::cmd::library::manifest::module::Module; +use crate::cmd::library::manifest::package::Package; use crate::result::Result; mod module_documentation; diff --git a/src/cmd/library/generate/tasks/module/module_documentation.rs b/src/cmd/library/generate/tasks/module/module_documentation.rs index 452e4d8..a57ff7f 100644 --- a/src/cmd/library/generate/tasks/module/module_documentation.rs +++ b/src/cmd/library/generate/tasks/module/module_documentation.rs @@ -6,13 +6,13 @@ use tera::{Context, Tera}; use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::{CleanupScope, Task}; +use crate::cmd::library::manifest::library::Library; +use crate::cmd::library::manifest::module::Module; use crate::error::Error; -use crate::manifest::library::Library; -use crate::manifest::module::Module; use crate::result::Result; use crate::utils::{create_parent_directory, delete_file}; -type ItemManifest = crate::manifest::item::Item; +type ItemManifest = crate::cmd::library::manifest::item::Item; #[derive(Debug, Deserialize, Serialize)] pub struct Item { @@ -87,7 +87,7 @@ impl ModuleDocumentationTask { } fn get_relative_destination_path(&self) -> Box { Box::from(Path::new( - format!("{}/README.md", self.module_urn, ).as_str(), + format!("{}/README.md", self.module_urn,).as_str(), )) } fn get_full_destination_path(&self) -> Box { @@ -190,7 +190,7 @@ mod test { "{}/Package/Module/README.md", generator.output_directory )) - .unwrap(); + .unwrap(); assert!(content.contains("The module contains 4 items.")); assert!(content.contains("[Package/Module/itemD](../../Package/Module/itemD.md)")); assert!(content.contains("## FamilyA")); diff --git a/src/cmd/library/generate/tasks/package/mod.rs b/src/cmd/library/generate/tasks/package/mod.rs index aa462bf..2ca57d8 100644 --- a/src/cmd/library/generate/tasks/package/mod.rs +++ b/src/cmd/library/generate/tasks/package/mod.rs @@ -6,8 +6,8 @@ use crate::cmd::library::generate::tasks::package::package_embedded::{ EmbeddedMode, PackageEmbeddedTask, }; use crate::cmd::library::generate::tasks::package::package_example::PackageExampleTask; -use crate::manifest::library::Library; -use crate::manifest::package::Package; +use crate::cmd::library::manifest::library::Library; +use crate::cmd::library::manifest::package::Package; use crate::result::Result; mod package_bootstrap; diff --git a/src/cmd/library/generate/tasks/package/package_bootstrap.rs b/src/cmd/library/generate/tasks/package/package_bootstrap.rs index afc1ace..aa8800e 100644 --- a/src/cmd/library/generate/tasks/package/package_bootstrap.rs +++ b/src/cmd/library/generate/tasks/package/package_bootstrap.rs @@ -6,8 +6,8 @@ use tera::{Context, Tera}; use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::{CleanupScope, Task}; +use crate::cmd::library::manifest::package::Package; use crate::error::Error; -use crate::manifest::package::Package; use crate::result::Result; use crate::utils::{create_parent_directory, delete_file}; @@ -103,7 +103,7 @@ mod test { "{}/Package/bootstrap.puml", generator.output_directory )) - .unwrap(); + .unwrap(); assert!(content.trim().contains("header")); assert!(content.trim().contains("content")); assert!(content.trim().contains("footer")); diff --git a/src/cmd/library/generate/tasks/package/package_documentation.rs b/src/cmd/library/generate/tasks/package/package_documentation.rs index aa4ee62..4b9eb74 100644 --- a/src/cmd/library/generate/tasks/package/package_documentation.rs +++ b/src/cmd/library/generate/tasks/package/package_documentation.rs @@ -6,9 +6,9 @@ use tera::{Context, Tera}; use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::{CleanupScope, Task}; +use crate::cmd::library::manifest::library::Library; +use crate::cmd::library::manifest::package::Package; use crate::error::Error; -use crate::manifest::library::Library; -use crate::manifest::package::Package; use crate::result::Result; use crate::utils::{create_parent_directory, delete_file}; diff --git a/src/cmd/library/generate/tasks/package/package_embedded.rs b/src/cmd/library/generate/tasks/package/package_embedded.rs index 85d3c7c..f08bc9e 100644 --- a/src/cmd/library/generate/tasks/package/package_embedded.rs +++ b/src/cmd/library/generate/tasks/package/package_embedded.rs @@ -6,8 +6,8 @@ use tera::{Context, Tera}; use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::{CleanupScope, Task}; +use crate::cmd::library::manifest::package::Package; use crate::error::Error; -use crate::manifest::package::Package; use crate::result::Result; use crate::utils::{create_parent_directory, delete_file, read_file_to_string}; @@ -109,7 +109,7 @@ impl PackageEmbeddedTask { EmbeddedMode::Full => "full", } ) - .as_str(), + .as_str(), )) } fn get_embedded_destination_path(&self) -> Box { diff --git a/src/cmd/library/generate/tasks/package/package_example.rs b/src/cmd/library/generate/tasks/package/package_example.rs index 4d05185..084e7cd 100644 --- a/src/cmd/library/generate/tasks/package/package_example.rs +++ b/src/cmd/library/generate/tasks/package/package_example.rs @@ -6,10 +6,10 @@ use tera::{Context, Tera}; use crate::cmd::library::generate::config::Config; use crate::cmd::library::generate::task::{CleanupScope, Task}; +use crate::cmd::library::manifest::example::Example; +use crate::cmd::library::manifest::library::Library; +use crate::cmd::library::manifest::package::Package; use crate::error::Error; -use crate::manifest::example::Example; -use crate::manifest::library::Library; -use crate::manifest::package::Package; use crate::plantuml::PlantUML; use crate::result::Result; use crate::utils::{create_parent_directory, delete_file}; diff --git a/src/manifest/element.rs b/src/cmd/library/manifest/element.rs similarity index 100% rename from src/manifest/element.rs rename to src/cmd/library/manifest/element.rs diff --git a/src/manifest/example.rs b/src/cmd/library/manifest/example.rs similarity index 100% rename from src/manifest/example.rs rename to src/cmd/library/manifest/example.rs diff --git a/src/manifest/icon.rs b/src/cmd/library/manifest/icon.rs similarity index 100% rename from src/manifest/icon.rs rename to src/cmd/library/manifest/icon.rs diff --git a/src/manifest/item.rs b/src/cmd/library/manifest/item.rs similarity index 93% rename from src/manifest/item.rs rename to src/cmd/library/manifest/item.rs index 6a7a6e9..d96c137 100644 --- a/src/manifest/item.rs +++ b/src/cmd/library/manifest/item.rs @@ -1,8 +1,8 @@ use serde::{Deserialize, Serialize}; -use crate::manifest::element::Element; -use crate::manifest::icon::Icon; -use crate::manifest::item::templates::ItemTemplates; +use crate::cmd::library::manifest::element::Element; +use crate::cmd::library::manifest::icon::Icon; +use crate::cmd::library::manifest::item::templates::ItemTemplates; use crate::urn::Urn; mod templates { diff --git a/src/manifest/library.rs b/src/cmd/library/manifest/library.rs similarity index 97% rename from src/manifest/library.rs rename to src/cmd/library/manifest/library.rs index 052b382..63f314d 100644 --- a/src/manifest/library.rs +++ b/src/cmd/library/manifest/library.rs @@ -1,8 +1,8 @@ use serde::{Deserialize, Serialize}; -use crate::manifest::library::customization::Customization; -use crate::manifest::library::templates::LibraryTemplates; -use crate::manifest::package::Package; +use crate::cmd::library::manifest::library::customization::Customization; +use crate::cmd::library::manifest::library::templates::LibraryTemplates; +use crate::cmd::library::manifest::package::Package; pub mod customization { use serde::{Deserialize, Serialize}; diff --git a/src/manifest/mod.rs b/src/cmd/library/manifest/mod.rs similarity index 100% rename from src/manifest/mod.rs rename to src/cmd/library/manifest/mod.rs diff --git a/src/manifest/module.rs b/src/cmd/library/manifest/module.rs similarity index 92% rename from src/manifest/module.rs rename to src/cmd/library/manifest/module.rs index 37e23a3..084cf35 100644 --- a/src/manifest/module.rs +++ b/src/cmd/library/manifest/module.rs @@ -1,7 +1,7 @@ use serde::{Deserialize, Serialize}; -use crate::manifest::item::Item; -use crate::manifest::module::templates::ModuleTemplates; +use crate::cmd::library::manifest::item::Item; +use crate::cmd::library::manifest::module::templates::ModuleTemplates; use crate::urn::Urn; mod templates { diff --git a/src/manifest/package.rs b/src/cmd/library/manifest/package.rs similarity index 92% rename from src/manifest/package.rs rename to src/cmd/library/manifest/package.rs index 09337ae..17dc798 100644 --- a/src/manifest/package.rs +++ b/src/cmd/library/manifest/package.rs @@ -1,9 +1,9 @@ use serde::{Deserialize, Serialize}; -use crate::manifest::example::Example; -use crate::manifest::module::Module; -use crate::manifest::package::rendering::PackageRendering; -use crate::manifest::package::templates::PackageTemplates; +use crate::cmd::library::manifest::example::Example; +use crate::cmd::library::manifest::module::Module; +use crate::cmd::library::manifest::package::rendering::PackageRendering; +use crate::cmd::library::manifest::package::templates::PackageTemplates; use crate::urn::Urn; mod templates { diff --git a/src/cmd/library/mod.rs b/src/cmd/library/mod.rs index 2226e14..0f64d84 100644 --- a/src/cmd/library/mod.rs +++ b/src/cmd/library/mod.rs @@ -1,3 +1,4 @@ pub use self::generate::execute_library_generate; mod generate; +pub mod manifest; diff --git a/src/main.rs b/src/main.rs index ba3156f..cd6b6b7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,7 +11,6 @@ mod cmd; mod constants; mod counter; mod error; -mod manifest; mod plantuml; mod result; mod tera;