Move commands into module

src/commands.rs

@@ -0,0 +1,230 @@
+use std::{env, fs};
+
+use fs_extra::dir;
+use toml::Value;
+
+use config::Config;
+use post::{parse_post, read_posts_dir};
+use write::{write_post, write_post_listing};
+
+pub fn build() {
+    let cwd = env::current_dir().expect("Couldn't read current directory");
+    let config = match fs::read_to_string(cwd.join("tlon.toml")) {
+        Ok(contents) => match contents.parse::<Value>() {
+            Ok(config) => Config {
+                site_name: String::from(config["site_name"].as_str().unwrap()),
+            },
+            Err(_) => panic!("Invalid tlon.toml"),
+        },
+        Err(_) => {
+            panic!("Can't find tlon.toml");
+        }
+    };
+
+    match fs::read_dir(cwd.join("public")) {
+        Ok(_) => {
+            fs::remove_dir_all(cwd.join("public")).unwrap();
+        }
+        Err(_) => {}
+    }
+
+    fs::create_dir(cwd.join("public")).expect("Couldn't create public directory");
+
+    let layout_template = fs::read_to_string(&cwd.join("templates").join("layout.html"))
+        .expect("Couldn't find layout template");
+    let post_template = fs::read_to_string(cwd.join("templates").join("post.html"))
+        .expect("Couldn't find post template");
+    let post_listing_template = fs::read_to_string(cwd.join("templates").join("post_listing.html"))
+        .expect("Couldn't find post listing item template");
+    let post_item_template =
+        fs::read_to_string(cwd.join("templates").join("post_listing_item.html"))
+            .expect("Couldn't find post listing item template");
+
+    let post_paths = read_posts_dir(&cwd.join("posts"));
+    let posts = post_paths
+        .into_iter()
+        .map(|path| match path {
+            Ok(p) => {
+                let post = parse_post(p.path());
+                write_post(&cwd, &layout_template, &post_template, &post, &config);
+                post
+            }
+            Err(err) => panic!(err),
+        }).collect();
+
+    write_post_listing(
+        &cwd,
+        &layout_template,
+        &post_listing_template,
+        &post_item_template,
+        &posts,
+        &config,
+    );
+
+    fs_extra::copy_items(
+        &vec![cwd.join("css"), cwd.join("js")],
+        cwd.join("public"),
+        &dir::CopyOptions::new(),
+    ).expect("Couldn't copy css/js directories");
+}
+
+pub fn new(name: &str) {
+    let cwd = env::current_dir().expect("Couldn't read current directory");
+    let project_path = cwd.join(name);
+
+    fs::create_dir(&project_path).expect(&format!("Couldn't create directory '{}'", &name));
+    fs::write(
+        project_path.join("tlon.toml"),
+        format!("site_name = \"{}\"", &name),
+    ).expect("Could not create tlon.toml");
+
+    for dir in &["posts", "public", "templates", "css", "js"] {
+        fs::create_dir(&project_path.join(&dir))
+            .expect(&format!("Couldn't create {} directory", &dir));
+    }
+
+    fs::write(project_path.join("css").join("style.css"), "")
+        .expect("Couldn't create css/style.css");
+    fs::write(project_path.join("js").join("index.js"), "").expect("Couldn't create js/index.js");
+
+    for file in &["layout", "post_listing", "post", "post_listing_item"] {
+        fs::write(
+            &project_path
+                .join("templates")
+                .join(format!("{}.html", file)),
+            "",
+        ).expect(&format!("Couldn't write templates/{}.html", file));
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    #[allow(unused_imports)]
+    use super::*;
+    #[allow(unused_imports)]
+    use uuid::Uuid;
+
+    #[test]
+    fn test_new() {
+        let temp_dir = env::temp_dir();
+        env::set_current_dir(&temp_dir).unwrap();
+
+        let uuid = Uuid::new_v4().to_string();
+        let project_dir = temp_dir.join(&uuid);
+        new(&uuid);
+
+        for dir in &["public", "posts", "templates"] {
+            fs::read_dir(&project_dir.join(dir)).unwrap();
+        }
+
+        assert_eq!(
+            "",
+            fs::read_to_string(&project_dir.join("templates").join("post_listing.html")).unwrap()
+        );
+        assert_eq!(
+            "",
+            fs::read_to_string(&project_dir.join("templates").join("layout.html")).unwrap()
+        );
+        assert_eq!(
+            "",
+            fs::read_to_string(&project_dir.join("templates").join("post_listing_item.html"))
+                .unwrap()
+        );
+        assert_eq!(
+            "",
+            fs::read_to_string(&project_dir.join("templates").join("post.html")).unwrap()
+        );
+        assert_eq!(
+            "",
+            fs::read_to_string(&project_dir.join("css").join("style.css")).unwrap()
+        );
+        assert_eq!(
+            "",
+            fs::read_to_string(&project_dir.join("js").join("index.js")).unwrap()
+        );
+        assert_eq!(
+            format!("site_name = \"{}\"", &uuid),
+            fs::read_to_string(&project_dir.join("tlon.toml")).unwrap()
+        );
+
+        fs::remove_dir_all(project_dir).unwrap();
+    }
+
+    #[test]
+    fn test_build() {
+        let temp_dir = env::temp_dir();
+        let uuid = Uuid::new_v4().to_string();
+        let project_dir = temp_dir.join(&uuid);
+        fs::create_dir(&project_dir).unwrap();
+        env::set_current_dir(&project_dir).unwrap();
+
+        fs::create_dir(project_dir.join("posts")).unwrap();
+        fs::create_dir(project_dir.join("public")).unwrap();
+        fs::create_dir(project_dir.join("templates")).unwrap();
+        fs::create_dir(project_dir.join("css")).unwrap();
+        fs::create_dir(project_dir.join("js")).unwrap();
+
+        fs::write(
+            project_dir.join("css").join("style.css"),
+            "body { background: blue; }",
+        ).unwrap();
+        fs::write(
+            project_dir.join("js").join("index.js"),
+            "window.onload = function () { alert() }",
+        ).unwrap();
+        fs::write(
+            project_dir.join("templates").join("layout.html"),
+            "<html><head><title>{{ page_title }}</title></head><body>{{ contents }}</body></html>",
+        ).unwrap();
+        fs::write(
+            project_dir.join("templates").join("post.html"),
+            "<article><h1>{{ title }}</h1><div>{{ body }}</div></article>",
+        ).unwrap();
+        fs::write(
+            project_dir.join("templates").join("post_listing.html"),
+            "<ul>{{ post_listing }}</ul>",
+        ).unwrap();
+        fs::write(
+            project_dir.join("templates").join("post_listing_item.html"),
+            "<li><a href=\"/{{ slug }}\">{{ title }}</a></li>",
+        ).unwrap();
+        fs::write(
+            project_dir.join("posts").join("first-post.md"),
+            "# First post\n\nThis is the first post\n\nIt has multiple paragraphs",
+        ).unwrap();
+        fs::write(project_dir.join("tlon.toml"), "site_name = \"Test Site\"").unwrap();
+
+        build();
+
+        assert_eq!(
+            "<html><head><title>Test Site</title></head><body><ul><li><a href=\"/fir\
+             st-post\">First post</a></li></ul></body></html>",
+            fs::read_to_string(project_dir.join("public").join("index.html")).unwrap(),
+        );
+
+        assert_eq!(
+            "<html><head><title>First post | Test Site</title></head><body><article><h1>First pos\
+             t</h1><div><p>This is the first post</p><p>It has multiple paragra\
+             phs</p></div></article></body></html>",
+            fs::read_to_string(
+                project_dir
+                    .join("public")
+                    .join("first-post")
+                    .join("index.html")
+            ).unwrap()
+            .replace("\n", ""),
+        );
+
+        assert_eq!(
+            "body { background: blue; }",
+            fs::read_to_string(project_dir.join("public").join("css").join("style.css")).unwrap()
+        );
+
+        assert_eq!(
+            "window.onload = function () { alert() }",
+            fs::read_to_string(project_dir.join("public").join("js").join("index.js")).unwrap()
+        );
+
+        fs::remove_dir_all(project_dir).unwrap();
+    }
+}

src/main.rs

@@ -7,111 +7,16 @@ extern crate regex;
 extern crate toml;
 extern crate uuid;
 
-use std::{env, fs};
-
 use clap::{App, Arg};
-use fs_extra::dir;
-use toml::Value;
 
-use config::Config;
-use post::{parse_post, read_posts_dir};
-use write::{write_post, write_post_listing};
+use commands::{build, new};
 
+mod commands;
 mod config;
 mod post;
 mod render;
 mod write;
 
-fn build() {
-    let cwd = env::current_dir().expect("Couldn't read current directory");
-    let config = match fs::read_to_string(cwd.join("tlon.toml")) {
-        Ok(contents) => match contents.parse::<Value>() {
-            Ok(config) => Config {
-                site_name: String::from(config["site_name"].as_str().unwrap()),
-            },
-            Err(_) => panic!("Invalid tlon.toml"),
-        },
-        Err(_) => {
-            panic!("Can't find tlon.toml");
-        }
-    };
-
-    match fs::read_dir(cwd.join("public")) {
-        Ok(_) => {
-            fs::remove_dir_all(cwd.join("public")).unwrap();
-        }
-        Err(_) => {}
-    }
-
-    fs::create_dir(cwd.join("public")).expect("Couldn't create public directory");
-
-    let layout_template = fs::read_to_string(&cwd.join("templates").join("layout.html"))
-        .expect("Couldn't find layout template");
-    let post_template = fs::read_to_string(cwd.join("templates").join("post.html"))
-        .expect("Couldn't find post template");
-    let post_listing_template = fs::read_to_string(cwd.join("templates").join("post_listing.html"))
-        .expect("Couldn't find post listing item template");
-    let post_item_template =
-        fs::read_to_string(cwd.join("templates").join("post_listing_item.html"))
-            .expect("Couldn't find post listing item template");
-
-    let post_paths = read_posts_dir(&cwd.join("posts"));
-    let posts = post_paths
-        .into_iter()
-        .map(|path| match path {
-            Ok(p) => {
-                let post = parse_post(p.path());
-                write_post(&cwd, &layout_template, &post_template, &post, &config);
-                post
-            }
-            Err(err) => panic!(err),
-        }).collect();
-
-    write_post_listing(
-        &cwd,
-        &layout_template,
-        &post_listing_template,
-        &post_item_template,
-        &posts,
-        &config,
-    );
-
-    fs_extra::copy_items(
-        &vec![cwd.join("css"), cwd.join("js")],
-        cwd.join("public"),
-        &dir::CopyOptions::new(),
-    ).expect("Couldn't copy css/js directories");
-}
-
-fn new(name: &str) {
-    let cwd = env::current_dir().expect("Couldn't read current directory");
-    let project_path = cwd.join(name);
-
-    fs::create_dir(&project_path).expect(&format!("Couldn't create directory '{}'", &name));
-    fs::write(
-        project_path.join("tlon.toml"),
-        format!("site_name = \"{}\"", &name),
-    ).expect("Could not create tlon.toml");
-
-    for dir in &["posts", "public", "templates", "css", "js"] {
-        fs::create_dir(&project_path.join(&dir))
-            .expect(&format!("Couldn't create {} directory", &dir));
-    }
-
-    fs::write(project_path.join("css").join("style.css"), "")
-        .expect("Couldn't create css/style.css");
-    fs::write(project_path.join("js").join("index.js"), "").expect("Couldn't create js/index.js");
-
-    for file in &["layout", "post_listing", "post", "post_listing_item"] {
-        fs::write(
-            &project_path
-                .join("templates")
-                .join(format!("{}.html", file)),
-            "",
-        ).expect(&format!("Couldn't write templates/{}.html", file));
-    }
-}
-
 fn main() {
     let matches = App::new("tlon")
         .version("0.1.0")
@@ -135,135 +40,3 @@ fn main() {
         new(&matches.value_of("name").unwrap());
     }
 }
-
-#[cfg(test)]
-mod tests {
-    #[allow(unused_imports)]
-    use super::*;
-    #[allow(unused_imports)]
-    use uuid::Uuid;
-
-    #[test]
-    fn test_new() {
-        let temp_dir = env::temp_dir();
-        env::set_current_dir(&temp_dir).unwrap();
-
-        let uuid = Uuid::new_v4().to_string();
-        let project_dir = temp_dir.join(&uuid);
-        new(&uuid);
-
-        for dir in &["public", "posts", "templates"] {
-            fs::read_dir(&project_dir.join(dir)).unwrap();
-        }
-
-        assert_eq!(
-            "",
-            fs::read_to_string(&project_dir.join("templates").join("post_listing.html")).unwrap()
-        );
-        assert_eq!(
-            "",
-            fs::read_to_string(&project_dir.join("templates").join("layout.html")).unwrap()
-        );
-        assert_eq!(
-            "",
-            fs::read_to_string(&project_dir.join("templates").join("post_listing_item.html"))
-                .unwrap()
-        );
-        assert_eq!(
-            "",
-            fs::read_to_string(&project_dir.join("templates").join("post.html")).unwrap()
-        );
-        assert_eq!(
-            "",
-            fs::read_to_string(&project_dir.join("css").join("style.css")).unwrap()
-        );
-        assert_eq!(
-            "",
-            fs::read_to_string(&project_dir.join("js").join("index.js")).unwrap()
-        );
-        assert_eq!(
-            format!("site_name = \"{}\"", &uuid),
-            fs::read_to_string(&project_dir.join("tlon.toml")).unwrap()
-        );
-
-        fs::remove_dir_all(project_dir).unwrap();
-    }
-
-    #[test]
-    fn test_build() {
-        let temp_dir = env::temp_dir();
-        let uuid = Uuid::new_v4().to_string();
-        let project_dir = temp_dir.join(&uuid);
-        fs::create_dir(&project_dir).unwrap();
-        env::set_current_dir(&project_dir).unwrap();
-
-        fs::create_dir(project_dir.join("posts")).unwrap();
-        fs::create_dir(project_dir.join("public")).unwrap();
-        fs::create_dir(project_dir.join("templates")).unwrap();
-        fs::create_dir(project_dir.join("css")).unwrap();
-        fs::create_dir(project_dir.join("js")).unwrap();
-
-        fs::write(
-            project_dir.join("css").join("style.css"),
-            "body { background: blue; }",
-        ).unwrap();
-        fs::write(
-            project_dir.join("js").join("index.js"),
-            "window.onload = function () { alert() }",
-        ).unwrap();
-        fs::write(
-            project_dir.join("templates").join("layout.html"),
-            "<html><head><title>{{ page_title }}</title></head><body>{{ contents }}</body></html>",
-        ).unwrap();
-        fs::write(
-            project_dir.join("templates").join("post.html"),
-            "<article><h1>{{ title }}</h1><div>{{ body }}</div></article>",
-        ).unwrap();
-        fs::write(
-            project_dir.join("templates").join("post_listing.html"),
-            "<ul>{{ post_listing }}</ul>",
-        ).unwrap();
-        fs::write(
-            project_dir.join("templates").join("post_listing_item.html"),
-            "<li><a href=\"/{{ slug }}\">{{ title }}</a></li>",
-        ).unwrap();
-        fs::write(
-            project_dir.join("posts").join("first-post.md"),
-            "# First post\n\nThis is the first post\n\nIt has multiple paragraphs",
-        ).unwrap();
-        fs::write(project_dir.join("tlon.toml"), "site_name = \"Test Site\"").unwrap();
-
-        build();
-
-        assert_eq!(
-            "<html><head><title>Test Site</title></head><body><ul><li><a href=\"/fir\
-             st-post\">First post</a></li></ul></body></html>",
-            fs::read_to_string(project_dir.join("public").join("index.html")).unwrap(),
-        );
-
-        assert_eq!(
-            "<html><head><title>First post | Test Site</title></head><body><article><h1>First pos\
-             t</h1><div><p>This is the first post</p><p>It has multiple paragra\
-             phs</p></div></article></body></html>",
-            fs::read_to_string(
-                project_dir
-                    .join("public")
-                    .join("first-post")
-                    .join("index.html")
-            ).unwrap()
-            .replace("\n", ""),
-        );
-
-        assert_eq!(
-            "body { background: blue; }",
-            fs::read_to_string(project_dir.join("public").join("css").join("style.css")).unwrap()
-        );
-
-        assert_eq!(
-            "window.onload = function () { alert() }",
-            fs::read_to_string(project_dir.join("public").join("js").join("index.js")).unwrap()
-        );
-
-        fs::remove_dir_all(project_dir).unwrap();
-    }
-}