Use same command parsing as mdbook

3 files changed, 46 insertions, 10 deletions

diff --git a/Cargo.lock b/Cargo.lock
index bf20294..7c6210a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -488,6 +488,7 @@ dependencies = [
 name = "mdbook-mermaid"
 version = "0.1.0"
 dependencies = [
+ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "mdbook 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index d67aac5..56de623 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,3 +9,4 @@ pulldown-cmark = "0.1.2"
 pulldown-cmark-to-cmark = "1.1.0"
 env_logger = "0.5.10"
 log = "0.4.3"
+clap = "2.32.0"
diff --git a/src/main.rs b/src/main.rs
index 9db9e11..ce4d361 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,29 +1,63 @@
 extern crate env_logger;
 extern crate mdbook;
 extern crate mdbook_mermaid;
+extern crate clap;
 
 use mdbook::MDBook;
 use mdbook::errors::Result;
 use mdbook_mermaid::Mermaid;
+use clap::{App, ArgMatches};
 
-use std::ffi::OsString;
-use std::env::{args, args_os};
+use std::env;
 use std::process;
+use std::path::{Path, PathBuf};
+
+fn get_book_dir(args: &ArgMatches) -> PathBuf {
+    if let Some(dir) = args.value_of("dir") {
+        // Check if path is relative from current dir, or absolute...
+        let p = Path::new(dir);
+        if p.is_relative() {
+            env::current_dir().unwrap().join(dir)
+        } else {
+            p.to_path_buf()
+        }
+    } else {
+        env::current_dir().expect("Unable to determine the current directory")
+    }
+}
+
+pub fn make_app<'a, 'b>() -> App<'a, 'b> {
+    App::new("mdbook-mermaid")
+        .about("Build the book from the markdown files with mermaid support")
+        .arg_from_usage(
+            "-d, --dest-dir=[dest-dir] 'The output directory for your book{n}(Defaults to ./book \
+             when omitted)'",
+        )
+        .arg_from_usage(
+            "[dir] 'A directory for your book{n}(Defaults to Current Directory when omitted)'",
+        )
+}
+
+pub fn execute(args: &ArgMatches) -> Result<()> {
+    let book_dir = get_book_dir(args);
+    let mut book = MDBook::load(&book_dir)?;
+
+    if let Some(dest_dir) = args.value_of("dest-dir") {
+        book.config.build.build_dir = PathBuf::from(dest_dir);
+    }
 
-fn do_it(book: OsString) -> Result<()> {
-    let mut book = MDBook::load(book)?;
     book.with_preprecessor(Mermaid);
-    book.build()
+    book.build()?;
+
+    Ok(())
 }
 
 fn main() {
     env_logger::init();
+    let app = make_app();
+    let matches = app.get_matches();
 
-    if args_os().count() != 2 {
-        eprintln!("USAGE: {} <book>", args().next().expect("executable"));
-        return;
-    }
-    if let Err(e) = do_it(args_os().skip(1).next().expect("one argument")) {
+    if let Err(e) = execute(&matches) {
         eprintln!("{}", e);
         process::exit(1);
     }