Print list of persons

Author: tbsklg

cli-client/src/configuration.rs

@@ -6,9 +6,11 @@ pub struct Settings {
 
 pub fn get_configuration(path: std::path::PathBuf) -> Result<Settings, config::ConfigError> {
     let settings = config::Config::builder()
-        .add_source(
-            config::File::new(path.to_str().unwrap(), config::FileFormat::Yaml)
-        ).build()?;
+        .add_source(config::File::new(
+            path.to_str().unwrap(),
+            config::FileFormat::Yaml,
+        ))
+        .build()?;
 
     settings.try_deserialize::<Settings>()
 }
@@ -18,10 +20,10 @@ mod tests {
     use super::*;
     use std::path::PathBuf;
 
-
     #[test]
     fn parse_valid_config() {
-        let configuration = get_configuration(PathBuf::from("tests/fixtures/valid_config.yaml")).unwrap();
+        let configuration =
+            get_configuration(PathBuf::from("tests/fixtures/valid_config.yaml")).unwrap();
         assert_eq!(configuration.api_key, "abc");
         assert_eq!(configuration.base_url, "https://example.com");
     }

cli-client/src/lib.rs

@@ -1,3 +1,3 @@
 pub mod configuration;
-pub mod remote_client;
 pub mod local_client;
+pub mod remote_client;

cli-client/src/local_client.rs

@@ -1,20 +1,18 @@
 use serde_json::Value;
 
 pub fn add_strike(name: &str, db_path: &std::path::PathBuf) -> Value {
-    let db = std::fs::read_to_string(db_path).unwrap_or_else(|_| {
-        "{}".to_string()
-    });
+    let db = std::fs::read_to_string(db_path).unwrap_or_else(|_| "{}".to_string());
     let updated_db = update_strikes(name, serde_json::from_str(&db).unwrap());
     std::fs::write(db_path, serde_json::to_string_pretty(&updated_db).unwrap()).unwrap();
-    
+
     updated_db
 }
 
-fn update_strikes(name: &str, db: Value)-> Value {
+fn update_strikes(name: &str, db: Value) -> Value {
     let mut db = db.as_object().unwrap().clone();
     let count = db.get(name).unwrap_or(&Value::Null).as_u64().unwrap_or(0);
     db.insert(name.to_string(), Value::from(count + 1));
-    
+
     Value::Object(db)
 }
 
@@ -45,15 +43,15 @@ mod unit_tests {
 #[cfg(test)]
 mod integration_tests {
     use super::*;
-    use std::path::PathBuf;
     use serde_json::json;
+    use std::path::PathBuf;
 
     #[test]
     fn it_adds_a_strike() {
         let db_path = PathBuf::from("tests/fixtures/db.json");
-        
+
         let db = add_strike("guenther", &db_path);
-        
+
         std::fs::remove_file(db_path).unwrap();
 
         assert_eq!(db, json!({"guenther": 1}));
@@ -64,9 +62,9 @@ mod integration_tests {
         let db_path = PathBuf::from("tests/fixtures/db_0.json");
         add_strike("guenther", &db_path);
         add_strike("heinz", &db_path);
-        
+
         let db = add_strike("guenther", &db_path);
-        
+
         std::fs::remove_file(db_path).unwrap();
 
         assert_eq!(db, json!({"guenther": 2, "heinz": 1}));

cli-client/src/main.rs

@@ -1,24 +1,54 @@
-use clap::Parser;
+use clap::{Parser, Subcommand};
 use std::path::PathBuf;
 use strikes::{
     configuration::get_configuration, local_client::add_strike, remote_client::check_health,
 };
 
+#[derive(Subcommand, Clone, Debug)]
+enum Command {
+    #[command(about = "Adds a strike to the specified person.")]
+    Strike { name: String },
+    #[command(about = "Lists all the persons and the number of strikes they have")]
+    Ls,
+}
+
 #[derive(Debug, Parser)]
+#[command(
+    name = "Strikes CLI",
+    version = "0.1",
+    about = "Manage strikes for people",
+    long_about = "This is a command-line tool for blaming people."
+)]
 struct Cli {
-    name: String,
+    #[arg(
+        short,
+        long,
+        help = "Specify the path to the configuration file where the strikes are stored."
+    )]
     config_path: Option<std::path::PathBuf>,
+    #[command(subcommand)]
+    command: Option<Command>,
 }
 
 #[tokio::main]
 async fn main() {
     let args = Cli::parse();
+
     let home = &std::env::var("HOME").unwrap();
     let config_path = PathBuf::from(home).join(".strikes/configuration.yaml");
-    let config = get_configuration(args.config_path.unwrap_or(config_path))
+    let _config = get_configuration(args.config_path.unwrap_or(config_path))
         .expect("Faild to read configuration.");
 
-    check_health(config.base_url, config.api_key).await;
+    // check_health(config.base_url, config.api_key).await;
     let db_path = PathBuf::from(home).join(".strikes/db.json");
-    add_strike(&args.name, &db_path);
+
+    match args.command.unwrap() {
+        Command::Strike { name } => {
+            add_strike(&name, &db_path);
+        }
+        Command::Ls => {
+            let db = std::fs::read_to_string(&db_path).unwrap_or_else(|_| "{}".to_string());
+            println!("{}", db);
+        }
+    }
 }

cli-client/src/remote_client.rs

@@ -9,5 +9,8 @@ pub async fn check_health(base_url: String, api_key: String) {
         .await
         .expect("Failed to execute request");
 
-    println!("Try to reach remote location: {:?}", response.text().await.unwrap());
+    println!(
+        "Try to reach remote location: {:?}",
+        response.text().await.unwrap()
+    );
 }