Merge pull request #85 from odradev/bugfix/odra-modules-will-smith

Fix for modules dependency being badly replaced in project template
odradev · May 16, 2024 · a668180 · a668180
2 parents 2453c04 + e4f4bbb
commit a668180
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/actions/init.rs b/src/actions/init.rs
@@ -120,6 +120,7 @@ impl InitAction {
             &cargo_toml_path,
             "#odra_dependency",
             "odra",
+            "odra",
         );
 
         Self::replace_package_placeholder(
@@ -128,6 +129,7 @@ impl InitAction {
             &cargo_toml_path,
             "#odra_test_dependency",
             "odra-test",
+            "odra-test",
         );
 
         Self::replace_package_placeholder(
@@ -136,13 +138,15 @@ impl InitAction {
             &cargo_toml_path,
             "#odra_build_dependency",
             "odra-build",
+            "odra-build",
         );
 
         Self::replace_package_placeholder(
             init,
             &odra_location,
             &cargo_toml_path,
             "#odra_modules_dependency",
+            "odra-modules",
             "modules",
         );
 
@@ -156,6 +160,7 @@ impl InitAction {
         cargo_toml_path: &Path,
         placeholder: &str,
         crate_name: &str,
+        crate_path: &str,
     ) {
         replace_in_file(
             cargo_toml_path.to_path_buf(),
@@ -165,7 +170,7 @@ impl InitAction {
                 crate_name,
                 toml::to_string(&Self::odra_project_dependency(
                     odra_location.clone(),
-                    crate_name,
+                    crate_path,
                     init
                 ))
                 .unwrap()
@@ -183,7 +188,7 @@ impl InitAction {
 
     fn odra_project_dependency(
         odra_location: OdraLocation,
-        crate_name: &str,
+        crate_path: &str,
         init: bool,
     ) -> Dependency {
         let (version, path, git, branch) = match odra_location {
@@ -193,7 +198,7 @@ impl InitAction {
                     false => PathBuf::from("..").join(path),
                 };
                 let path = path
-                    .join(crate_name)
+                    .join(crate_path)
                     .into_os_string()
                     .to_str()
                     .unwrap()

diff --git a/src/consts.rs b/src/consts.rs
@@ -26,4 +26,5 @@ pub const MODULE_TEMPLATE: &str = "flipper";
 /// Module register snippet.
 pub const MODULE_REGISTER: &str = "module_register";
 
+/// Path of templates.json file in Odra repository.
 pub const TEMPLATES_JSON_PATH: &str = "templates/templates.json";