Allow configuring server to post to

src/cli.rs

@@ -2,12 +2,12 @@ use clap::ArgMatches;
 use std::fs;
 use std::io;
 
-use crate::client::create_gist;
+use crate::client::{create_gist, OutgoingGist, ServerConfig};
 
-pub fn new_gist(matches: &ArgMatches) -> io::Result<()> {
-    let title = matches.value_of("title").unwrap();
+fn get_gist_from_matches(matches: &ArgMatches) -> io::Result<OutgoingGist> {
+    let title = matches.value_of("name").unwrap();
     let input = matches.value_of("file");
-    let filetype = matches.value_of("filetype");
+    let filetype = matches.value_of("filetype").unwrap();
 
     let mut rdr: Box<io::Read> = match input {
         Some(file) => Box::new(fs::File::open(file)?),
@@ -17,10 +17,33 @@ pub fn new_gist(matches: &ArgMatches) -> io::Result<()> {
     let mut body = String::new();
     rdr.read_to_string(&mut body)?;
 
-    match create_gist(title, &body, filetype) {
+    Ok(OutgoingGist {
+        title: title.to_string(),
+        body,
+        filetype: filetype.to_string(),
+        formatted_body: String::from(""),
+    })
+}
+
+fn get_server_config_from_matches(matches: &ArgMatches) -> ServerConfig {
+    let protocol = matches.value_of("protocol").unwrap();
+    let hostname = matches.value_of("hostname").unwrap();
+    let port = matches.value_of("port").unwrap();
+    ServerConfig {
+        protocol: protocol.to_string(),
+        hostname: hostname.to_string(),
+        port: port.parse::<i32>().expect("Port should be numeric"),
+    }
+}
+
+pub fn new_gist(matches: &ArgMatches) -> io::Result<()> {
+    let gist = get_gist_from_matches(matches)?;
+    let config = get_server_config_from_matches(matches);
+
+    match create_gist(gist, &config) {
         Ok(resp) => println!(
-            "Success! Your new gist is available at http://localhost:8000/gists/{}",
-            resp.id
+            "Success! Your new gist is available at {}://{}:{}/gists/{}",
+            config.protocol, config.hostname, config.port, resp.id
         ),
         Err(err) => println!("{}", err),
     }

src/client.rs

@@ -6,7 +6,7 @@ pub struct OutgoingGist {
     pub title: String,
     pub body: String,
     pub formatted_body: String,
-    pub filetype: Option<String>,
+    pub filetype: String,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -17,21 +17,23 @@ pub struct IncomingGist {
     pub created_at: NaiveDateTime,
 }
 
+#[derive(Debug)]
+pub struct ServerConfig {
+    pub hostname: String,
+    pub protocol: String,
+    pub port: i32,
+}
+
 pub fn create_gist(
-    title: &str,
-    body: &str,
-    filetype: Option<&str>,
+    gist: OutgoingGist,
+    config: &ServerConfig,
 ) -> Result<IncomingGist, Box<std::error::Error>> {
     let client = reqwest::Client::new();
-    let gist = OutgoingGist {
-        title: title.to_string(),
-        body: body.to_string(),
-        formatted_body: String::from(""),
-        filetype: filetype.map(|ft| ft.to_string()),
-    };
-
     let resp: IncomingGist = client
-        .post("http://localhost:8000/api/gists")
+        .post(&format!(
+            "{}://{}:{}/api/gists",
+            config.protocol, config.hostname, config.port,
+        ))
         .json(&gist)
         .send()?
         .json()?;

src/main.rs

@@ -17,12 +17,12 @@ fn main() -> io::Result<()> {
             SubCommand::with_name("new")
                 .about("Creates a new gist")
                 .arg(
-                    Arg::with_name("title")
-                        .long("title")
-                        .short("t")
+                    Arg::with_name("name")
+                        .long("name")
+                        .short("n")
                         .takes_value(true)
                         .required(true)
-                        .help("The title of the gist"),
+                        .help("The name of the gist"),
                 )
                 .arg(
                     Arg::with_name("file")
@@ -34,9 +34,35 @@ fn main() -> io::Result<()> {
                 .arg(
                     Arg::with_name("filetype")
                         .long("filetype")
-                        .short("p")
+                        .short("t")
                         .takes_value(true)
+                        .default_value("")
                         .help("The filetype to use for syntax highlighting"),
+                )
+                .arg(
+                    Arg::with_name("hostname")
+                        .long("hostname")
+                        .short("s")
+                        .takes_value(true)
+                        .default_value("bngl.ws")
+                        .help("The hostname of the server to post your gist to"),
+                )
+                .arg(
+                    Arg::with_name("protocol")
+                        .long("protocol")
+                        .short("c")
+                        .takes_value(true)
+                        .possible_values(&["http", "https"])
+                        .default_value("https")
+                        .help("The transport protocol to use"),
+                )
+                .arg(
+                    Arg::with_name("port")
+                        .long("port")
+                        .short("p")
+                        .takes_value(true)
+                        .default_value("80")
+                        .help("The transport protocol to use"),
                 ),
         )
         .get_matches();