From a21737e2b7f8d1e426726bdd7536033f299d476a Mon Sep 17 00:00:00 2001
From: Ellie Huxtable <e@elm.sh>
Date: Tue, 20 Apr 2021 21:53:07 +0100
Subject: 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
---
 Cargo.lock | 166 +++++++++++++++++++++++++++++--------------------------------
 1 file changed, 79 insertions(+), 87 deletions(-)

(limited to 'Cargo.lock')

diff --git a/Cargo.lock b/Cargo.lock
index 2f7d6d73..16e8e82d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,21 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "addr2line"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
 [[package]]
 name = "ahash"
 version = "0.4.7"
@@ -100,17 +85,46 @@ name = "atuin"
 version = "0.5.0"
 dependencies = [
  "async-trait",
+ "atuin-client",
+ "atuin-common",
+ "atuin-server",
  "base64",
  "chrono",
  "chrono-english",
  "cli-table",
- "config",
  "directories",
- "dotenv",
  "eyre",
  "fern",
  "fork",
- "human-panic",
+ "humantime",
+ "indicatif",
+ "itertools",
+ "log",
+ "reqwest",
+ "rusqlite",
+ "serde 1.0.125",
+ "serde_derive",
+ "serde_json",
+ "structopt",
+ "termion",
+ "tokio",
+ "tui",
+ "unicode-width",
+]
+
+[[package]]
+name = "atuin-client"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "atuin-common",
+ "base64",
+ "chrono",
+ "chrono-english",
+ "config",
+ "directories",
+ "eyre",
+ "fern",
  "humantime",
  "indicatif",
  "itertools",
@@ -126,11 +140,55 @@ dependencies = [
  "serde_json",
  "shellexpand",
  "sodiumoxide",
+ "tokio",
+ "urlencoding",
+ "uuid",
+ "whoami",
+]
+
+[[package]]
+name = "atuin-common"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "eyre",
+ "rmp-serde",
+ "rust-crypto",
+ "serde 1.0.125",
+ "serde_derive",
+ "serde_json",
+ "sodiumoxide",
+ "uuid",
+ "warp",
+]
+
+[[package]]
+name = "atuin-server"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "atuin-common",
+ "base64",
+ "chrono",
+ "chrono-english",
+ "config",
+ "directories",
+ "eyre",
+ "fern",
+ "fork",
+ "indicatif",
+ "log",
+ "parse_duration",
+ "rand 0.8.3",
+ "reqwest",
+ "rmp-serde",
+ "rust-crypto",
+ "serde 1.0.125",
+ "serde_derive",
+ "serde_json",
+ "sodiumoxide",
  "sqlx",
- "structopt",
- "termion",
  "tokio",
- "tui",
  "unicode-width",
  "urlencoding",
  "uuid",
@@ -144,20 +202,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
-[[package]]
-name = "backtrace"
-version = "0.3.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
 [[package]]
 name = "base64"
 version = "0.13.0"
@@ -771,12 +815,6 @@ dependencies = [
  "wasi 0.10.2+wasi-snapshot-preview1",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
-
 [[package]]
 name = "h2"
 version = "0.3.2"
@@ -907,21 +945,6 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
 
-[[package]]
-name = "human-panic"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f357a500abcbd7c5f967c1d45c8838585b36743823b9d43488f24850534e36"
-dependencies = [
- "backtrace",
- "os_type",
- "serde 1.0.125",
- "serde_derive",
- "termcolor",
- "toml",
- "uuid",
-]
-
 [[package]]
 name = "humantime"
 version = "2.1.0"
@@ -1168,16 +1191,6 @@ dependencies = [
  "unicase",
 ]
 
-[[package]]
-name = "miniz_oxide"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
-dependencies = [
- "adler",
- "autocfg",
-]
-
 [[package]]
 name = "mio"
 version = "0.7.11"
@@ -1377,12 +1390,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
 
-[[package]]
-name = "object"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
-
 [[package]]
 name = "once_cell"
 version = "1.5.2"
@@ -1428,15 +1435,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "os_type"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb"
-dependencies = [
- "regex",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.11.1"
@@ -1900,12 +1898,6 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
-
 [[package]]
 name = "rustc-serialize"
 version = "0.3.24"
-- 
cgit v1.3.1