diff --git a/Cargo.lock b/Cargo.lock index 72712a22..fcc50da3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -369,9 +369,9 @@ dependencies = [ [[package]] name = "bstr" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ "lazy_static", "memchr", @@ -831,9 +831,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.47+curl-7.79.0" +version = "0.4.48+curl-7.79.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab94a47d9b61f2d905beb7a3d46aba7704c9f1dfcf84e7d178998d9e95f7989" +checksum = "a6a77a741f832116da66aeb126b4f19190ecf46144a74a9bde43c2086f38da0e" dependencies = [ "cc", "libc", @@ -1483,7 +1483,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.4", + "http 0.2.5", "indexmap", "slab", "tokio", @@ -1574,9 +1574,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" dependencies = [ "bytes 1.1.0", "fnv", @@ -1590,7 +1590,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" dependencies = [ "bytes 1.1.0", - "http 0.2.4", + "http 0.2.5", "pin-project-lite", ] @@ -1632,7 +1632,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 0.2.4", + "http 0.2.5", "http-body", "httparse", "httpdate", @@ -1760,9 +1760,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "716d3d89f35ac6a34fd0eed635395f4c3b76fa889338a4632e5231a8684216bd" dependencies = [ "cfg-if 1.0.0", ] @@ -1870,9 +1870,9 @@ dependencies = [ [[package]] name = "libnghttp2-sys" -version = "0.1.6+1.43.0" +version = "0.1.7+1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0af55541a8827e138d59ec9e5877fb6095ece63fb6f4da45e7491b4fbd262855" +checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" dependencies = [ "cc", "libc", @@ -2217,9 +2217,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.66" +version = "0.9.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82" +checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058" dependencies = [ "autocfg 1.0.1", "cc", @@ -2282,18 +2282,18 @@ checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" [[package]] name = "path-absolutize" -version = "3.0.10" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0feea2f0a6009a0fefe6ee3aae1871e4a57d7f2aae4681ac4a34a201071c9b9" +checksum = "b288298a7a3a7b42539e3181ba590d32f2d91237b0691ed5f103875c754b3bf5" dependencies = [ "path-dedot", ] [[package]] name = "path-dedot" -version = "3.0.12" +version = "3.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a14ca47b49e6abd75cf68db85e1e161d9f2b675716894a18af0e9add0266b26" +checksum = "4bfa72956f6be8524f7f7e2b07972dda393cb0008a6df4451f658b7e1bd1af80" dependencies = [ "once_cell", ] @@ -2924,7 +2924,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "http 0.2.4", + "http 0.2.5", "http-body", "hyper", "hyper-tls", @@ -3610,9 +3610,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce" +checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" dependencies = [ "autocfg 1.0.1", "bytes 1.1.0", @@ -3950,7 +3950,7 @@ dependencies = [ [[package]] name = "wash-cli" -version = "0.6.3" +version = "0.6.4" dependencies = [ "anyhow", "atelier_core 0.2.22", @@ -4092,9 +4092,9 @@ dependencies = [ [[package]] name = "wasmbus-rpc" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e684022298d270df31248222fd53cbbd9546ca43cae262140a3a996ef518ac" +checksum = "8cd0f0228ceaf54a7072d5073d8ee083674ca2cb02c667d3d06d2aa1b2464c6e" dependencies = [ "async-trait", "base64 0.13.0", @@ -4314,18 +4314,18 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd" +checksum = "bf68b08513768deaa790264a7fac27a58cbf2705cfcdc9448362229217d7e970" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1" +checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7" dependencies = [ "proc-macro2 1.0.29", "quote 1.0.9", diff --git a/Cargo.toml b/Cargo.toml index 197f1639..9c9368b7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wash-cli" -version = "0.6.3" +version = "0.6.4" authors = ["wasmCloud Team"] edition = "2018" repository = "https://github.com/wasmcloud/wash" diff --git a/src/generate/mod.rs b/src/generate/mod.rs index b492aa1f..a014b157 100644 --- a/src/generate/mod.rs +++ b/src/generate/mod.rs @@ -314,14 +314,15 @@ pub(crate) fn make_project( let (template_base_dir, template_folder, _branch) = prepare_local_template(&args)?; // read configuration file `project-generate.toml` from template. - let project_config_path = + let project_config_path = fs::canonicalize( locate_project_config_file(CONFIG_FILE_NAME, &template_base_dir, &args.subfolder) .with_context(|| { format!( "Invalid template folder: Required configuration file `{}` is missing.", CONFIG_FILE_NAME ) - })?; + })?, + )?; let mut config = Config::from_path(&project_config_path)?; // prevent copying config file to project dir by adding it to the exclude list config.exclude( diff --git a/src/generate/template.rs b/src/generate/template.rs index 6ceedce3..c36fbee8 100644 --- a/src/generate/template.rs +++ b/src/generate/template.rs @@ -68,14 +68,6 @@ impl Matcher { .iter() .find(|rc| rc.from == rel_path) .map(|rc| rc.to.as_str()); - match ren { - None => { - println!("DBG: ren: {}: no", &rel_path.display()); - } - Some(p) => { - println!("DBG: ren: {}: {}", &rel_path.display(), p); - } - } ren } diff --git a/tests/integration_drain.rs b/tests/integration_drain.rs index 393c3fac..e722f4ea 100644 --- a/tests/integration_drain.rs +++ b/tests/integration_drain.rs @@ -171,7 +171,7 @@ fn set_smithy_cache_dir() -> (PathBuf, String) { let tmp_dir = test_dir_with_subfolder("drain_smithy"); std::env::set_var("HOME", &format!("{}", &tmp_dir.display())); let smithy_cache = format!("{}/Library/Caches/smithy", &tmp_dir.display()); - create_dir_all(&PathBuf::from(&smithy_cache)).unwrap; + create_dir_all(&PathBuf::from(&smithy_cache)).unwrap(); // write a dummy file inside the smithy cache folder std::fs::write(&path_to_test_file(&smithy_cache), b"junk").unwrap(); (tmp_dir, smithy_cache)