wire the main REPL to commands that interact with the ApiClient

Author: dylemma

Cargo.lock

@@ -4,11 +4,9 @@ version = "0.1.0"
 authors = ["Dylan Halperin <dylan@dylemma.io>"]
 
 [dependencies]
-chrono = "0.4"
 clap = "2.26.2"
 colored = "1.5.3"
 hyper = "0.11"
-maplit = "0.1.4"
 url = "1.5.1"
 serde = "1.0"
 serde_json = "1.0"

Cargo.toml

@@ -17,40 +17,14 @@ use std::time::Duration;
 #[derive(Debug, Serialize)]
 pub struct ApiProjectFilter<'a> {
     #[serde(skip_serializing_if = "Option::is_none")]
-    name: Option<&'a str>,
+    pub name: Option<&'a str>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    metadata: Option<HashMap<&'a str, &'a str>>
-}
-impl <'a> ApiProjectFilter<'a> {
-    pub fn new(name: &'a str, metadata: HashMap<&'a str, &'a str>) -> ApiProjectFilter<'a> {
-        ApiProjectFilter{
-            name: Some(name),
-            metadata: Some(metadata)
-        }
-    }
-    #[allow(dead_code)]
-    pub fn empty() -> ApiProjectFilter<'static> {
-        ApiProjectFilter{ name: None, metadata: None }
-    }
-    #[allow(dead_code)]
-    pub fn with_name(&self, name: &'a str) -> ApiProjectFilter<'a> {
-        ApiProjectFilter {
-            name: Some(name),
-            metadata: self.metadata.clone()
-        }
-    }
-    #[allow(dead_code)]
-    pub fn with_metadata(&self, metadata: HashMap<&'a str, &'a str>) -> ApiProjectFilter<'a> {
-        ApiProjectFilter {
-            name: self.name,
-            metadata: Some(metadata)
-        }
-    }
+    pub metadata: Option<HashMap<&'a str, &'a str>>
 }
 
 /// A project provided by the Code Dx API.
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Serialize)]
 pub struct ApiProject {
     pub id: u32,
     pub name: String,
@@ -179,7 +153,7 @@ pub trait PollingStrategy<T> {
 /// Simple polling strategy that always waits a fixed amount of time between iterations.
 impl <T: Debug> PollingStrategy<T> for Duration {
     fn next_wait(&self, iteration_number: usize, state: &T) -> Option<Duration> {
-        println!("in poll (iteration {}, state: {:?})", iteration_number, state);
+        println!("# Polling job completion, iteration {}: status = {:?}", iteration_number, state);
         Some(*self)
     }
 }
@@ -242,6 +216,10 @@ impl ApiClient {
         ApiClient { config, client }
     }
 
+    pub fn get_config(&self) -> &ClientConfig {
+        self.config.as_ref()
+    }
+
     pub fn get_job_status(&self, job_id: &str) -> ApiResult<JobStatus> {
         self.api_get(&["api", "jobs", job_id])
             .expect_success()

src/client.rs

@@ -1,13 +1,21 @@
+extern crate clap;
+extern crate reqwest;
+extern crate url;
+
+/// gets us the header! macro
+//#[macro_use] extern crate hyper;
+
 use clap::{Arg, ArgMatches, App};
 use reqwest::{RequestBuilder};
 use url::Url;
 
 /// Connection information for Code Dx.
 #[derive(Debug)]
 pub struct ClientConfig {
-    base_url: Url,
-    auth_info: ClientAuth,
-    insecure: bool
+    pub base_url: Url,
+    pub auth_info: ClientAuth,
+    pub insecure: bool,
+    pub no_prompt: bool
 }
 
 /// declares the `ApiKey` type which implements the Header trait
@@ -89,6 +97,11 @@ impl ClientConfig {
                 .long("insecure")
                 .takes_value(false)
                 .help("ignore https certificate validation")
+            )
+            .arg(Arg::with_name("no-prompt")
+                .long("no-prompt")
+                .takes_value(false)
+                .help("don't output REPL prompts to STDOUT")
             );
         let matches = get_matches(app);
 
@@ -112,13 +125,15 @@ impl ClientConfig {
         };
 
         let insecure = matches.is_present("insecure");
+        let no_prompt = matches.is_present("no-prompt");
 
         base_uri.and_then(|uri| {
             client_auth_info.map(|auth| {
                 ClientConfig {
                     base_url: uri,
                     auth_info: auth,
-                    insecure
+                    insecure,
+                    no_prompt,
                 }
             })
         })