From 0e82c141c0fb980e51ff5757e65128454d67166e Mon Sep 17 00:00:00 2001 From: Denys Zadorozhnyi Date: Wed, 24 Jul 2024 10:47:54 +0300 Subject: [PATCH] fix(cargo-miden): force new project name to not be kebab-cased --- tools/cargo-miden/src/new_project.rs | 21 ++++++++++++--------- tools/cargo-miden/tests/build.rs | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/cargo-miden/src/new_project.rs b/tools/cargo-miden/src/new_project.rs index fbf865fb0..6fc533ce8 100644 --- a/tools/cargo-miden/src/new_project.rs +++ b/tools/cargo-miden/src/new_project.rs @@ -80,18 +80,21 @@ impl NewCommand { }, }; + let destination = self + .path + .parent() + .map(|p| { + use path_absolutize::Absolutize; + p.absolutize().map(|p| p.to_path_buf()) + }) + .transpose() + .context("Failed to convert destination path to an absolute path")?; let generate_args = GenerateArgs { template_path, - destination: self - .path - .parent() - .map(|p| { - use path_absolutize::Absolutize; - p.absolutize().map(|p| p.to_path_buf()) - }) - .transpose() - .context("Failed to convert destination path to an absolute path")?, + destination, name: Some(name), + // Force the `name` to not be kebab-cased + force: true, force_git_init: true, verbose: true, define, diff --git a/tools/cargo-miden/tests/build.rs b/tools/cargo-miden/tests/build.rs index 71d51de88..a0a780308 100644 --- a/tools/cargo-miden/tests/build.rs +++ b/tools/cargo-miden/tests/build.rs @@ -25,7 +25,7 @@ fn build_new_project_from_template() { let restore_dir = env::current_dir().unwrap(); let temp_dir = env::temp_dir(); env::set_current_dir(&temp_dir).unwrap(); - let project_name = "test-proj"; + let project_name = "test_proj_underscore"; let expected_new_project_dir = &temp_dir.join(project_name); dbg!(&expected_new_project_dir); if expected_new_project_dir.exists() {