mac fixes + remove debugging code (#177)

* mac fixes + remove debugging code

Signed-off-by: stevelr <dev@somecool.net>

* rustfmt

Signed-off-by: stevelr <steve@cosmonic.com>

* bump to crate 0.6.4; update dependencies

Signed-off-by: stevelr <steve@cosmonic.com>

Co-authored-by: stevelr <dev@somecool.net>
Co-authored-by: stevelr <steve@cosmonic.com>

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"

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(

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
     }
 

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)