add cli for server/client (#4)

This PR adds a CLI to main.rs that allows you to run the redis server and eventually the redis client.

Author: EverlastingBugstopper

Cargo.lock

@@ -1,13 +1,11 @@
 [package]
-name = "mini-redis"
-version = "0.1.0"
 authors = ["Carl Lerche <[email protected]>"]
 edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+name = "mini-redis"
+version = "0.1.0"
 
 [dependencies]
+atoi = "0.3.2"
 bytes = "0.5"
+clap = { git = "https://github.com/clap-rs/clap/" }
 tokio = { git = "https://github.com/tokio-rs/tokio", features = ["full"] }
-
-atoi = "0.3.2"

Cargo.toml

@@ -1 +1,4 @@
-
+#[tokio::main]
+async fn main() {
+    unimplemented!();
+}

examples/hello_world.rs

@@ -1 +1,4 @@
-
+#[tokio::main]
+async fn main() {
+    unimplemented!();
+}

examples/pub.rs

@@ -0,0 +1,40 @@
+use bytes::Bytes;
+use clap::Clap;
+use mini_redis::{client, DEFAULT_PORT};
+use std::{io, str};
+
+#[tokio::main]
+async fn main() -> io::Result<()> {
+    let cli = Cli::parse();
+    let port = cli.port.unwrap_or(DEFAULT_PORT.to_string());
+    let mut client = client::connect(&format!("127.0.0.1:{}", port)).await?;
+    match cli.command {
+        Client::Get { key } => {
+            let result = client.get(&key).await?;
+            if let Some(result) = result {
+                println!("\"{}\"", str::from_utf8(&result).unwrap());
+            } else {
+                println!("(nil)");
+            }
+            Ok(())
+        }
+        Client::Set { key, value } => client.set(&key, Bytes::from(value)).await,
+    }
+}
+
+#[derive(Clap, Debug)]
+#[clap(name = "mini-redis-client", version = env!("CARGO_PKG_VERSION"), author = env!("CARGO_PKG_AUTHORS"), about = "Opens a connection to a Redis server")]
+struct Cli {
+    #[clap(subcommand)]
+    command: Client,
+    #[clap(name = "port", long = "--port")]
+    port: Option<String>,
+}
+
+#[derive(Clap, Debug)]
+enum Client {
+    #[clap(about = "Gets a value associated with a key")]
+    Get { key: String },
+    #[clap(about = "Associates a value with a key")]
+    Set { key: String, value: String },
+}

src/bin/client.rs

@@ -0,0 +1,17 @@
+use clap::Clap;
+use mini_redis::{server, DEFAULT_PORT};
+use std::io;
+
+#[tokio::main]
+pub async fn main() -> io::Result<()> {
+    let cli = Cli::parse();
+    let port = cli.port.unwrap_or(DEFAULT_PORT.to_string());
+    server::run(&port).await
+}
+
+#[derive(Clap, Debug)]
+#[clap(name = "mini-redis-server", version = env!("CARGO_PKG_VERSION"), author = env!("CARGO_PKG_AUTHORS"), about = "A Redis server")]
+struct Cli {
+    #[clap(name = "port", long = "--port")]
+    port: Option<String>,
+}

src/bin/server.rs

@@ -1,4 +1,3 @@
-#![cfg(nope)]
 use crate::Connection;
 
 use bytes::Bytes;

src/client.rs

@@ -14,7 +14,7 @@ impl Get {
     }
 
     pub(crate) async fn apply(self, kv: &Kv, dst: &mut Connection) -> io::Result<()> {
-        let response = if let Some(value) = kv.get(&self.key[..]) {
+        let response = if let Some(value) = kv.get(&self.key) {
             Frame::Bulk(value)
         } else {
             Frame::Null

src/cmd/get.rs

@@ -27,14 +27,14 @@ impl Command {
     pub(crate) fn from_frame(frame: Frame) -> Result<Command, ParseError> {
         let mut parse = Parse::new(frame)?;
 
-        let command_name = parse.next_string()?;
+        let command_name = parse.next_string()?.to_lowercase();
 
         let command = match &command_name[..] {
-            "GET" => Command::Get(Get::parse(&mut parse)?),
-            "PUBLISH" => Command::Publish(Publish::parse(&mut parse)?),
-            "SET" => Command::Set(Set::parse(&mut parse)?),
-            "SUBSCRIBE" => Command::Subscribe(Subscribe::parse(&mut parse)?),
-            "UNSUBSCRIBE" => Command::Unsubscribe(Unsubscribe::parse(&mut parse)?),
+            "get" => Command::Get(Get::parse(&mut parse)?),
+            "publish" => Command::Publish(Publish::parse(&mut parse)?),
+            "set" => Command::Set(Set::parse(&mut parse)?),
+            "subscribe" => Command::Subscribe(Subscribe::parse(&mut parse)?),
+            "unsubscribe" => Command::Unsubscribe(Unsubscribe::parse(&mut parse)?),
             _ => return Err(ParseError::UnknownCommand(command_name)),
         };
 

src/cmd/mod.rs

@@ -1,3 +1,5 @@
+pub const DEFAULT_PORT: &str = "6379";
+
 pub mod client;
 
 mod cmd;