Use cargo workspaces (#37)

* Switch to Cargo workspaces

Breaking things into "client", "server" and "common" makes managing the
codebase much easier!

client - anything running on a user's machine for adding history
server - handles storing/syncing history and running a HTTP server
common - request/response API definitions, common utils, etc

* Update dockerfile

9 files changed, 56 insertions, 50 deletions

diff --git a/src/command/history.rs b/src/command/history.rs
index 627efae4..2b691bac 100644
--- a/src/command/history.rs
+++ b/src/command/history.rs
@@ -4,10 +4,10 @@ use eyre::Result;
 use fork::{fork, Fork};
 use structopt::StructOpt;
 
-use crate::local::database::Database;
-use crate::local::history::History;
-use crate::local::sync;
-use crate::settings::Settings;
+use atuin_client::database::Database;
+use atuin_client::history::History;
+use atuin_client::settings::Settings;
+use atuin_client::sync;
 
 #[derive(StructOpt)]
 pub enum Cmd {
@@ -79,7 +79,7 @@ impl Cmd {
 
                 db.update(&h)?;
 
-                if settings.local.should_sync()? {
+                if settings.should_sync()? {
                     match fork() {
                         Ok(Fork::Parent(child)) => {
                             debug!("launched sync background process with PID {}", child);
diff --git a/src/command/import.rs b/src/command/import.rs
index ae927aaf..56fb30a7 100644
--- a/src/command/import.rs
+++ b/src/command/import.rs
@@ -5,9 +5,9 @@ use directories::UserDirs;
 use eyre::{eyre, Result};
 use structopt::StructOpt;
 
-use crate::local::database::Database;
-use crate::local::history::History;
-use crate::local::import::Zsh;
+use atuin_client::database::Database;
+use atuin_client::history::History;
+use atuin_client::import::Zsh;
 use indicatif::ProgressBar;
 
 #[derive(StructOpt)]
diff --git a/src/command/login.rs b/src/command/login.rs
index 636ac0d3..eaeb297f 100644
--- a/src/command/login.rs
+++ b/src/command/login.rs
@@ -5,7 +5,7 @@ use std::io::prelude::*;
 use eyre::{eyre, Result};
 use structopt::StructOpt;
 
-use crate::settings::Settings;
+use atuin_client::settings::Settings;
 
 #[derive(StructOpt)]
 #[structopt(setting(structopt::clap::AppSettings::DeriveDisplayOrder))]
@@ -26,7 +26,7 @@ impl Cmd {
         map.insert("username", self.username.clone());
         map.insert("password", self.password.clone());
 
-        let url = format!("{}/login", settings.local.sync_address);
+        let url = format!("{}/login", settings.sync_address);
         let client = reqwest::blocking::Client::new();
 
         let resp = client.post(url).json(&map).send()?;
@@ -38,11 +38,11 @@ impl Cmd {
         let session = resp.json::<HashMap<String, String>>()?;
         let session = session["session"].clone();
 
-        let session_path = settings.local.session_path.as_str();
+        let session_path = settings.session_path.as_str();
         let mut file = File::create(session_path)?;
         file.write_all(session.as_bytes())?;
 
-        let key_path = settings.local.key_path.as_str();
+        let key_path = settings.key_path.as_str();
         let mut file = File::create(key_path)?;
         file.write_all(&base64::decode(self.key.clone())?)?;
 
diff --git a/src/command/mod.rs b/src/command/mod.rs
index cd857e9f..6fd52613 100644
--- a/src/command/mod.rs
+++ b/src/command/mod.rs
@@ -1,9 +1,12 @@
+use std::path::PathBuf;
+
 use eyre::Result;
 use structopt::StructOpt;
-use uuid::Uuid;
 
-use crate::local::database::Database;
-use crate::settings::Settings;
+use atuin_client::database::Sqlite;
+use atuin_client::settings::Settings as ClientSettings;
+use atuin_common::utils::uuid_v4;
+use atuin_server::settings::Settings as ServerSettings;
 
 mod event;
 mod history;
@@ -58,30 +61,33 @@ pub enum AtuinCmd {
     Key,
 }
 
-pub fn uuid_v4() -> String {
-    Uuid::new_v4().to_simple().to_string()
-}
-
 impl AtuinCmd {
-    pub async fn run<T: Database + Send>(self, db: &mut T, settings: &Settings) -> Result<()> {
+    pub async fn run(self) -> Result<()> {
+        let client_settings = ClientSettings::new()?;
+        let server_settings = ServerSettings::new()?;
+
+        let db_path = PathBuf::from(client_settings.db_path.as_str());
+
+        let mut db = Sqlite::new(db_path)?;
+
         match self {
-            Self::History(history) => history.run(settings, db).await,
-            Self::Import(import) => import.run(db),
-            Self::Server(server) => server.run(settings).await,
-            Self::Stats(stats) => stats.run(db, settings),
+            Self::History(history) => history.run(&client_settings, &mut db).await,
+            Self::Import(import) => import.run(&mut db),
+            Self::Server(server) => server.run(&server_settings).await,
+            Self::Stats(stats) => stats.run(&mut db, &client_settings),
             Self::Init => init::init(),
-            Self::Search { query } => search::run(&query, db),
+            Self::Search { query } => search::run(&query, &mut db),
 
-            Self::Sync { force } => sync::run(settings, force, db).await,
-            Self::Login(l) => l.run(settings),
+            Self::Sync { force } => sync::run(&client_settings, force, &mut db).await,
+            Self::Login(l) => l.run(&client_settings),
             Self::Register(r) => register::run(
-                settings,
+                &client_settings,
                 r.username.as_str(),
                 r.email.as_str(),
                 r.password.as_str(),
             ),
             Self::Key => {
-                let key = std::fs::read(settings.local.key_path.as_str())?;
+                let key = std::fs::read(client_settings.key_path.as_str())?;
                 println!("{}", base64::encode(key));
                 Ok(())
             }
diff --git a/src/command/register.rs b/src/command/register.rs
index 62bbeaeb..1126645a 100644
--- a/src/command/register.rs
+++ b/src/command/register.rs
@@ -5,7 +5,7 @@ use std::io::prelude::*;
 use eyre::{eyre, Result};
 use structopt::StructOpt;
 
-use crate::settings::Settings;
+use atuin_client::settings::Settings;
 
 #[derive(StructOpt)]
 #[structopt(setting(structopt::clap::AppSettings::DeriveDisplayOrder))]
@@ -26,7 +26,7 @@ pub fn run(settings: &Settings, username: &str, email: &str, password: &str) ->
     map.insert("email", email);
     map.insert("password", password);
 
-    let url = format!("{}/user/{}", settings.local.sync_address, username);
+    let url = format!("{}/user/{}", settings.sync_address, username);
     let resp = reqwest::blocking::get(url)?;
 
     if resp.status().is_success() {
@@ -34,7 +34,7 @@ pub fn run(settings: &Settings, username: &str, email: &str, password: &str) ->
         return Ok(());
     }
 
-    let url = format!("{}/register", settings.local.sync_address);
+    let url = format!("{}/register", settings.sync_address);
     let client = reqwest::blocking::Client::new();
     let resp = client.post(url).json(&map).send()?;
 
@@ -46,7 +46,7 @@ pub fn run(settings: &Settings, username: &str, email: &str, password: &str) ->
     let session = resp.json::<HashMap<String, String>>()?;
     let session = session["session"].clone();
 
-    let path = settings.local.session_path.as_str();
+    let path = settings.session_path.as_str();
     let mut file = File::create(path)?;
     file.write_all(session.as_bytes())?;
 
diff --git a/src/command/search.rs b/src/command/search.rs
index d7b477da..773c112f 100644
--- a/src/command/search.rs
+++ b/src/command/search.rs
@@ -14,9 +14,10 @@ use tui::{
 };
 use unicode_width::UnicodeWidthStr;
 
+use atuin_client::database::Database;
+use atuin_client::history::History;
+
 use crate::command::event::{Event, Events};
-use crate::local::database::Database;
-use crate::local::history::History;
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
diff --git a/src/command/server.rs b/src/command/server.rs
index a7835092..2fcf23d6 100644
--- a/src/command/server.rs
+++ b/src/command/server.rs
@@ -1,8 +1,8 @@
 use eyre::Result;
 use structopt::StructOpt;
 
-use crate::server;
-use crate::settings::Settings;
+use atuin_server::launch;
+use atuin_server::settings::Settings;
 
 #[derive(StructOpt)]
 pub enum Cmd {
@@ -23,13 +23,12 @@ impl Cmd {
     pub async fn run(&self, settings: &Settings) -> Result<()> {
         match self {
             Self::Start { host, port } => {
-                let host = host.as_ref().map_or(
-                    settings.server.host.clone(),
-                    std::string::ToString::to_string,
-                );
-                let port = port.map_or(settings.server.port, |p| p);
+                let host = host
+                    .as_ref()
+                    .map_or(settings.host.clone(), std::string::ToString::to_string);
+                let port = port.map_or(settings.port, |p| p);
 
-                server::launch(settings, host, port).await
+                launch(settings, host, port).await
             }
         }
     }
diff --git a/src/command/stats.rs b/src/command/stats.rs
index 694484bc..0da303d7 100644
--- a/src/command/stats.rs
+++ b/src/command/stats.rs
@@ -8,9 +8,9 @@ use cli_table::{format::Justify, print_stdout, Cell, Style, Table};
 use eyre::{eyre, Result};
 use structopt::StructOpt;
 
-use crate::local::database::Database;
-use crate::local::history::History;
-use crate::settings::Settings;
+use atuin_client::database::Database;
+use atuin_client::history::History;
+use atuin_client::settings::Settings;
 
 #[derive(StructOpt)]
 pub enum Cmd {
@@ -80,7 +80,7 @@ impl Cmd {
                     words.join(" ")
                 };
 
-                let start = match settings.local.dialect.to_lowercase().as_str() {
+                let start = match settings.dialect.to_lowercase().as_str() {
                     "uk" => parse_date_string(&words, Local::now(), Dialect::Uk)?,
                     _ => parse_date_string(&words, Local::now(), Dialect::Us)?,
                 };
diff --git a/src/command/sync.rs b/src/command/sync.rs
index 88217b3c..d70b554f 100644
--- a/src/command/sync.rs
+++ b/src/command/sync.rs
@@ -1,8 +1,8 @@
 use eyre::Result;
 
-use crate::local::database::Database;
-use crate::local::sync;
-use crate::settings::Settings;
+use atuin_client::database::Database;
+use atuin_client::settings::Settings;
+use atuin_client::sync;
 
 pub async fn run(settings: &Settings, force: bool, db: &mut (impl Database + Send)) -> Result<()> {
     sync::sync(settings, force, db).await?;