Added command-line args, execution in context

1 files changed, 55 insertions, 37 deletions

diff --git a/src/main.rs b/src/main.rs
index 182376c..25749de 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,54 +2,72 @@ mod barbfile;
 
 use jsonformat::{format_json, Indentation};
 
-// use std::collections::HashMap;
-// use std::env;
+use barbfile::BarbFile;
+
+use clap::Parser;
+
+use std::collections::HashMap;
+use std::env;
 use std::fs;
 use std::str::FromStr;
 use ureq;
 
-// struct Context {
-//     vars: HashMap<String, String>,
-// }
-
-// impl Context {
-//     pub fn new() -> Context {
-//         Context {
-//             vars: HashMap::new(),
-//         }
-//     }
-
-//     pub fn get_var(&self, name: String) -> Option<String> {
-//         self.vars
-//             .get(&name)
-//             .map(|val| val.clone())
-//             .or_else(|| env::var(name).ok())
-//     }
-// }
+struct Context {
+    vars: HashMap<String, String>,
+}
+
+impl Context {
+    pub fn new() -> Context {
+        Context {
+            vars: HashMap::new(),
+        }
+    }
+
+    pub fn get_var(&self, name: String) -> Option<String> {
+        self.vars
+            .get(&name)
+            .map(|val| val.clone())
+            .or_else(|| env::var(name).ok())
+    }
+
+    pub fn execute(&self, bfile: BarbFile) -> String {
+        let req = ureq::request(bfile.method_as_string().as_str(), &bfile.url());
+
+        let resp = match bfile.method().takes_body() {
+            true => match bfile.body() {
+                Some(body) => req.send_string(body.as_str()),
+                None => req.call(),
+            },
+            false => req.call(),
+        };
+
+        resp.unwrap().into_string().unwrap()
+    }
+}
+
+#[derive(Parser, Debug)]
+#[clap(version)]
+struct Args {
+    #[clap(short, long)]
+    headers: bool,
+    #[clap(short, long)]
+    body: bool,
+    #[clap(short, long)]
+    raw: bool,
+    files: Vec<String>,
+}
 
 fn main() {
-    // let mut context = Context::new();
-    let bfile = barbfile::BarbFile::from_str(
+    let args = Args::parse();
+
+    let mut context = Context::new();
+    let bfile = BarbFile::from_str(
         fs::read_to_string("test-post.barb")
             .expect("Failed to read file")
             .as_str(),
     )
     .expect("Failed to parse file");
-     
-    let req = ureq::request(bfile.method_as_string().as_str(), &bfile.url());
-
-    let resp = match bfile.method().takes_body() {
-        true => match bfile.body() {
-            Some(body) => req.send_string(body.as_str()),
-            None => req.call()
-        },
-        false => req.call(),
-    };
-
-    let result = resp.unwrap()
-        .into_string()
-        .unwrap();
+    let result = context.execute(bfile);
 
     println!("{}", format_json(result.as_str(), Indentation::Default));
 }
-