test(case): project names are kebabs

src/interactive.rs

@@ -1,7 +1,6 @@
 use console::style;
 use dialoguer::Input;
 use emoji;
-use heck::KebabCase;
 use quicli::prelude::Error;
 use regex;
 
@@ -14,14 +13,6 @@ pub fn name() -> Result<String, Error> {
             style("Project Name").bold()
         )).interact()?;
         if valid_ident.is_match(&name) {
-
-            println!(
-                "{} {} `{}`{}",
-                emoji::WRENCH,
-                style("Creating project called").bold(),
-                style(&name.to_kebab_case()).bold().yellow(),
-                style("...").bold()
-            );
             break name;
         } else {
             eprintln!(

src/main.rs

@@ -15,9 +15,11 @@ mod emoji;
 mod git;
 mod interactive;
 mod progressbar;
+mod projectname;
 mod template;
 
 use console::style;
+use projectname::ProjectName;
 use quicli::prelude::*;
 use std::env;
 
@@ -58,13 +60,21 @@ pub struct Args {
 main!(|_cli: Cli| {
     let Cli::Generate(args) = Cli::from_args();
     let name = match &args.name {
-        Some(ref n) => n.to_string(),
-        None => interactive::name()?,
+        Some(ref n) => ProjectName::new(n),
+        None => ProjectName::new(&interactive::name()?),
     };
 
+    println!(
+        "{} {} `{}`{}",
+        emoji::WRENCH,
+        style("Creating project called").bold(),
+        style(&name.kebab_case()).bold().yellow(),
+        style("...").bold()
+    );
+
     let project_dir = env::current_dir()
         .unwrap_or_else(|_e| ".".into())
-        .join(&name);
+        .join(&name.kebab_case());
 
     ensure!(
         !project_dir.exists(),

src/projectname.rs

@@ -0,0 +1,23 @@
+use heck::{KebabCase, SnakeCase};
+
+/// Stores user inputted name and provides convenience methods
+/// for handling casing.
+pub struct ProjectName {
+    user_input: String,
+}
+
+impl ProjectName {
+    pub fn new(name: &str) -> ProjectName {
+        ProjectName {
+            user_input: name.to_string(),
+        }
+    }
+
+    pub fn kebab_case(&self) -> String {
+        self.user_input.to_kebab_case()
+    }
+
+    pub fn snake_case(&self) -> String {
+        self.user_input.to_snake_case()
+    }
+}

src/template.rs

@@ -3,6 +3,7 @@ use console::style;
 use emoji;
 use indicatif::ProgressBar;
 use liquid;
+use projectname::ProjectName;
 use quicli::prelude::*;
 use std::fs;
 use std::path::PathBuf;
@@ -12,12 +13,15 @@ fn engine() -> liquid::Parser {
     liquid::ParserBuilder::new().build()
 }
 
-pub fn substitute(name: &str) -> Result<liquid::Object> {
+pub fn substitute(name: &ProjectName) -> Result<liquid::Object> {
     let mut template = liquid::Object::new();
-    template.insert(String::from("project-name"), liquid::Value::scalar(name));
+    template.insert(
+        String::from("project-name"),
+        liquid::Value::scalar(&name.kebab_case()),
+    );
     template.insert(
         String::from("crate_name"),
-        liquid::Value::scalar(&hyphen_to_lodash(name)),
+        liquid::Value::scalar(&name.snake_case()),
     );
     template.insert(
         String::from("authors"),
@@ -26,10 +30,6 @@ pub fn substitute(name: &str) -> Result<liquid::Object> {
     Ok(template)
 }
 
-fn hyphen_to_lodash(string: &str) -> String {
-    string.to_string().replace("-", "_")
-}
-
 pub fn walk_dir(project_dir: &PathBuf, template: liquid::Object, pbar: ProgressBar) -> Result<()> {
     let engine = engine();
     for entry in WalkDir::new(project_dir) {

tests/integration/basics.rs

@@ -40,6 +40,40 @@ version = "0.1.0"
     );
 }
 
+#[test]
+fn it_snakecases_projectname_when_passed_to_flag() {
+    let template = dir("template")
+        .file(
+            "Cargo.toml",
+            r#"[package]
+name = "{{project-name}}"
+description = "A wonderful project"
+version = "0.1.0"
+"#,
+        )
+        .init_git()
+        .build();
+
+    let dir = dir("main").build();
+
+    Command::main_binary()
+        .unwrap()
+        .arg("generate")
+        .arg("--git")
+        .arg(template.path())
+        .arg("--name")
+        .arg("foobar_project")
+        .current_dir(&dir.path())
+        .assert()
+        .success()
+        .stdout(predicates::str::contains("Done!").from_utf8());
+
+    assert!(
+        dir.read("foobar-project/Cargo.toml")
+            .contains("foobar-project")
+    );
+}
+
 #[test]
 fn it_substitutes_cratename_in_a_rust_file() {
     let template = dir("template")