Merging new cli options into testing to ensure cli opts are working in

pipelines
2020-08-06 20:02:48 -07:00 · 2020-08-06 20:02:48 -07:00 · e94668955e
commit e94668955e
parent 4679179abf fd7a56403b
7 changed files with 292 additions and 131 deletions
--- a/server/Cargo.lock
+++ b/server/Cargo.lock
@ -29,6 +29,14 @@ dependencies = [
 "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "ansi_term"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "arc-swap"
 version = "0.4.7"
@ -39,6 +47,16 @@ name = "arrayvec"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.0.0"
@ -51,7 +69,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "addr2line 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "miniz_oxide 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "object 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
@ -173,13 +191,27 @@ dependencies = [
 "time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "clap"
+version = "2.33.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -298,7 +330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 "synstructure 0.12.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -314,7 +346,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
 "miniz_oxide 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -344,12 +376,14 @@ dependencies = [
 "base64 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "bcrypt 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "chrono 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.33.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "dotenv 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "hyper 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "mysql_async 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.57 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
@ -422,7 +456,7 @@ dependencies = [
 "proc-macro-hack 0.5.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -471,7 +505,7 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -495,7 +529,7 @@ dependencies = [
 "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tracing 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tracing 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -511,7 +545,7 @@ name = "hermit-abi"
 version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -557,7 +591,7 @@ dependencies = [
 "time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
 "tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tracing 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tracing 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -585,7 +619,7 @@ name = "iovec"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -630,7 +664,7 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.73"
+version = "0.2.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -639,7 +673,7 @@ version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "vcpkg 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -693,7 +727,7 @@ dependencies = [
 "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
@ -718,7 +752,7 @@ version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -803,7 +837,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl 0.10.30 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -820,7 +854,7 @@ version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -857,7 +891,7 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -884,7 +918,7 @@ dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "openssl-sys 0.9.58 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -900,7 +934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "vcpkg 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -925,7 +959,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -980,7 +1014,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1109,7 +1143,7 @@ dependencies = [
 "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "security-framework-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1119,7 +1153,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1139,6 +1173,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "serde"
 version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
+]

 [[package]]
 name = "serde_derive"
@ -1147,7 +1184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1178,11 +1215,11 @@ dependencies = [

 [[package]]
 name = "signal-hook-registry"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "arc-swap 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1196,7 +1233,7 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -1224,7 +1261,7 @@ dependencies = [
 "stdweb-derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "stdweb-internal-macros 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "stdweb-internal-runtime 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1236,7 +1273,7 @@ dependencies = [
 "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1251,7 +1288,7 @@ dependencies = [
 "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.57 (registry+https://github.com/rust-lang/crates.io-index)",
 "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1259,9 +1296,14 @@ name = "stdweb-internal-runtime"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "syn"
-version = "1.0.36"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1276,7 +1318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1286,13 +1328,21 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)",
 "remove_dir_all 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.20"
@ -1308,7 +1358,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1332,7 +1382,7 @@ name = "time"
 version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@ -1342,7 +1392,7 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "standback 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "stdweb 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "time-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1368,7 +1418,7 @@ dependencies = [
 "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "standback 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1386,14 +1436,14 @@ dependencies = [
 "futures-core 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)",
 "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio-named-pipes 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio-uds 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "pin-project-lite 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "signal-hook-registry 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio-macros 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1406,7 +1456,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@ -1461,17 +1511,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "tracing"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tracing-core 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tracing-core 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "tracing-core"
-version = "0.1.11"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1516,6 +1566,11 @@ dependencies = [
 "tinyvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "unicode-width"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.1"
@ -1546,6 +1601,11 @@ name = "vcpkg"
 version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "version_check"
 version = "0.9.2"
@ -1567,16 +1627,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.65"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.65"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "bumpalo 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1584,34 +1644,34 @@ dependencies = [
 "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
 "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.65"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro-support 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro-support 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.65"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-backend 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.65"
+version = "0.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@ -1657,8 +1717,10 @@ dependencies = [
 "checksum adler 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
 "checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5"
 "checksum aho-corasick 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)" = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 "checksum arc-swap 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034"
 "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 "checksum backtrace 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)" = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
 "checksum base-x 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1"
@ -1677,6 +1739,7 @@ dependencies = [
 "checksum cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)" = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
 "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 "checksum chrono 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6"
+"checksum clap 2.33.2 (registry+https://github.com/rust-lang/crates.io-index)" = "10040cdf04294b565d9e0319955430099ec3813a64c952b86a41200ad714ae48"
 "checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
 "checksum core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
@ -1725,7 +1788,7 @@ dependencies = [
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum lexical 5.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a28ff8a57641758c89a37b2d28556a68978b3ea3f709f39953e153acea3dbacf"
 "checksum lexical-core 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
-"checksum libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)" = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"
+"checksum libc 0.2.74 (registry+https://github.com/rust-lang/crates.io-index)" = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"
 "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
 "checksum log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
@ -1788,7 +1851,7 @@ dependencies = [
 "checksum serde_json 1.0.57 (registry+https://github.com/rust-lang/crates.io-index)" = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 "checksum sha2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
-"checksum signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
+"checksum signal-hook-registry 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum socket2 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)" = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
 "checksum standback 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b0437cfb83762844799a60e1e3b489d5ceb6a650fbacb86437badc1b6d87b246"
@ -1797,9 +1860,11 @@ dependencies = [
 "checksum stdweb-derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 "checksum stdweb-internal-macros 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
 "checksum stdweb-internal-runtime 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
-"checksum syn 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250"
+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+"checksum syn 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4"
 "checksum synstructure 0.12.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 "checksum thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
 "checksum thiserror-impl 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
@ -1816,27 +1881,29 @@ dependencies = [
 "checksum tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
 "checksum tokio-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
 "checksum tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
-"checksum tracing 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "dbdf4ccd1652592b01286a5dbe1e2a77d78afaa34beadd9872a5f7396f92aaa9"
-"checksum tracing-core 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "94ae75f0d28ae10786f3b1895c55fe72e79928fd5ccdebb5438c75e93fec178f"
+"checksum tracing 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178"
+"checksum tracing-core 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "d593f98af59ebc017c0648f0117525db358745a8894a8d684e185ba3f45954f9"
 "checksum try-lock 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 "checksum twox-hash 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bfd5b7557925ce778ff9b9ef90e3ade34c524b5ff10e239c69a42d546d2af56"
 "checksum typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
 "checksum ucd-util 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c85f514e095d348c279b1e5cd76795082cf15bd59b93207832abe0b1d8fed236"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
+"checksum unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
 "checksum unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
 "checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
 "checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba"
 "checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
 "checksum vcpkg 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
+"checksum vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 "checksum version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
 "checksum want 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 "checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-"checksum wasm-bindgen 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "f3edbcc9536ab7eababcc6d2374a0b7bfe13a2b6d562c5e07f370456b1a8f33d"
-"checksum wasm-bindgen-backend 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "89ed2fb8c84bfad20ea66b26a3743f3e7ba8735a69fe7d95118c33ec8fc1244d"
-"checksum wasm-bindgen-macro 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "eb071268b031a64d92fc6cf691715ca5a40950694d8f683c5bb43db7c730929e"
-"checksum wasm-bindgen-macro-support 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "cf592c807080719d1ff2f245a687cbadb3ed28b2077ed7084b47aba8b691f2c6"
-"checksum wasm-bindgen-shared 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "72b6c0220ded549d63860c78c38f3bcc558d1ca3f4efa74942c536ddbbb55e87"
+"checksum wasm-bindgen 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)" = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c"
+"checksum wasm-bindgen-backend 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)" = "bc71e4c5efa60fb9e74160e89b93353bc24059999c0ae0fb03affc39770310b0"
+"checksum wasm-bindgen-macro 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)" = "97c57cefa5fa80e2ba15641578b44d36e7a64279bc5ed43c6dbaf329457a2ed2"
+"checksum wasm-bindgen-macro-support 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)" = "841a6d1c35c6f596ccea1f82504a192a60378f64b3bb0261904ad8f2f5657556"
+"checksum wasm-bindgen-shared 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)" = "93b162580e34310e5931c4b792560108b10fd14d64915d7fff8ff00180e70092"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@ -21,7 +21,10 @@ bcrypt = "0.6"
 base64 = "0.12.1"
 rand = "0.7.3"

+clap = "2.32.2"
+
 serde_json = "1.0"
+serde = { version = "1.0.114", features = [ "derive" ] }

 [dev-dependencies]
-tokio-test = "0.2.1"
+tokio-test = "0.2.1"
--- a/server/migrations/2020-07-05-215114_members/up.sql
+++ b/server/migrations/2020-07-05-215114_members/up.sql
@ -1,8 +1,9 @@
 -- TODO: add rate limiter in some form
+-- PERMISSIONS start at 0 and full perms => all F's
 CREATE TABLE IF NOT EXISTS `members`(
 	`id` bigint UNSIGNED NOT NULL auto_increment,
 	`secret` varchar(256) NOT NULL,
-	`name` varchar(255) NOT NULL,
+	`name` varchar(256) NOT NULL,
 	`joindate` bigint NOT NULL, 
 	`status` integer NOT NULL,
 	`permissions` bigint UNSIGNED NOT NULL,
--- a/server/src/auth.rs
+++ b/server/src/auth.rs
@ -4,6 +4,7 @@ use crate::db_types::{UBigInt, VarChar};

 use crate::routes;

+pub const BCRYPT_COST: u32  = 14;
 pub enum AuthReason {
    Good,   //passed regular check
    OpenAuth, // route does not require auth
@ -56,3 +57,15 @@ pub async fn wall_entry(path: &str, pool: &Pool, params: &mut serde_json::Value)
        }
    }
 }
+
+pub fn generate_secret() -> String {
+    /*
+     * Generates a url-safe-plaintext secret for our db
+     * */
+    use getrandom::getrandom;
+    use base64::{encode_config, URL_SAFE};
+
+    let mut buf: Vec<u8> = vec![0;64];
+    getrandom(&mut buf);
+    encode_config(buf,URL_SAFE) 
+}
--- a/server/src/main.rs
+++ b/server/src/main.rs
@ -1,11 +1,14 @@
 extern crate chrono;
+extern crate clap;
 extern crate dotenv;
 extern crate getrandom;
+extern crate bcrypt;
 extern crate base64;
+extern crate serde;

 use std::net::SocketAddr;
 use std::convert::Infallible; // our main dispatcher basically never fails hence why we use this
-use std::env;
+use std::env::{self, set_var};

 use tokio;
 use hyper::{
@ -16,7 +19,9 @@ use hyper::{
    service::{make_service_fn, service_fn}
 };
 use mysql_async::Pool;
+
 use dotenv::dotenv;
+use clap::{Arg, App};

 mod auth;
 use auth::AuthReason;
@ -24,12 +29,18 @@ use auth::AuthReason;
 mod routes;
 mod invites;
 mod channels;
+
 mod members;
+
 mod messages;
 mod http_params;
 mod perms;
 mod db_types;

+const NO_ERR: u16 = 0;
+const CONFIG_ERR: u16 = 1;
+const SHUTDOWN_ERR: u16 = 2;
+
 async fn route_dispatcher(pool: &Pool, resp: &mut Response<Body>, meth: &Method, path: &str, params: serde_json::Value) {
    // At some point we should have some way of hiding this obnoxious complexity
    use routes::resolve_dynamic_route;
@ -109,33 +120,96 @@ async fn shutdown_signal() {
        .await
        .expect("Failed to capture ctrl-c signal");
 }
+
+async fn start_server(ecode: u16) -> u16 {
+    println!("Servering on localhost:8888");
+    let addr = SocketAddr::from(([127,0,0,1], 8888));
+    let service = make_service_fn(|_conn| async {
+        Ok::<_, Infallible>(service_fn(main_responder))
+    });
+    let server = Server::bind(&addr).serve(service);
+    let graceful_shutdown = server.with_graceful_shutdown(shutdown_signal());
+
+    if let Err(e) = graceful_shutdown.await {
+        eprintln!("Server shutdown error: {}", e);
+        return ecode | SHUTDOWN_ERR;
+    }
+    else {
+        return ecode
+    }
+
+}
+
+
 #[tokio::main]
 async fn main() -> Result<(), u16>{
-    const NO_ERR: u16 = 0;
-    const CONFIG_ERR: u16 = 1;
-    const SHUTDOWN_ERR: u16 = 2;

    let mut main_ret: u16 = 0;
-    // setting up environment variables
    let d_result = dotenv();
+
+    // check for a database_url before the override we get from the cmd line
    if let Err(_d) = d_result {
-        // we may be on a pipeline/prod environment so .env may not be there
        if let Err(_e) = env::var("DATABASE_URL") {
            main_ret |= CONFIG_ERR;
        }
    }
-    if main_ret == NO_ERR {
-        println!("Servering on localhost:8888");
-        let addr = SocketAddr::from(([127,0,0,1], 8888));
-        let service = make_service_fn(|_conn| async {
-            Ok::<_, Infallible>(service_fn(main_responder))
-        });
-        let server = Server::bind(&addr).serve(service);
-        let graceful_shutdown = server.with_graceful_shutdown(shutdown_signal());

-        if let Err(e) = graceful_shutdown.await {
-            main_ret |= SHUTDOWN_ERR;
-            eprintln!("Server shutdown error: {}", e);
+    let args = App::new("Freechat Server")
+        .version("0.1")
+        .author("shockrah")
+        .about("Decentralized chat system")
+        .arg(Arg::with_name("db-url")
+             .short("d")
+             .long("db-url")
+             .value_name("DATABASE URL")
+             .help("Sets the DATABASE URL via an environment variable")
+             .takes_value(true))
+        .arg(Arg::with_name("create-owner")
+             .short("c")
+             .long("create-owner")
+             .value_name("Owner")
+             .help("Creates an account with full permissions in the SQL database."))
+        .arg(Arg::with_name("server")
+             .short("s")
+             .long("server")
+             .help("Starts the API server"))
+        .get_matches();
+
+
+    if args.args.len() == 0 {
+		println!("Freechat Server 0.1
+shockrah
+Decentralized chat system
+
+USAGE:
+    freechat-server [FLAGS] [OPTIONS]
+
+FLAGS:
+    -h, --help       Prints help information
+    -s, --server     Starts the API server
+    -V, --version    Prints version information
+
+OPTIONS:
+    -c, --create-owner <Owner>     Creates an account with full permissions in the SQL database.
+    -d, --db-url <DATABASE URL>    Sets the DATABASE URL via an environment variable");
+    }
+
+    if let Some(db_url) = args.value_of("db-url") {
+        set_var("DATABASE_URL", db_url);
+    }
+
+    if let Some(owner_name) = args.value_of("create-owner") {
+        let p = Pool::new(&env::var("DATABASE_URL").unwrap());
+        println!("Creating owner {{ {} }}...", owner_name);
+        if let Ok(owner) = members::insert_new_member(&p, owner_name.to_string(), std::u64::MAX).await {
+            println!("{}", serde_json::to_string(&owner).unwrap());
+        }
+        p.disconnect();
+    }
+
+    if args.is_present("server") {
+        if main_ret == NO_ERR {
+            main_ret = start_server(main_ret).await;
        }
    }

--- a/server/src/members.rs
+++ b/server/src/members.rs
@ -1,26 +1,21 @@
 use chrono::Utc;
 use hyper::{Body, Response, StatusCode};
 use hyper::header::{HeaderName, HeaderValue};
-use mysql_async::{Conn, Pool};
+use mysql_async::{Conn, Pool, error::Error as MySqlError};
 use mysql_async::prelude::{params, Queryable};
-use mysql_async::error::Error as SQLError;
 use serde_json::Value;
+use serde::Serialize;

 use crate::db_types::{UBigInt, BigInt, Integer, VarChar};

+#[derive(Serialize)]
 pub struct Member {
-    id: UBigInt,
-    secret: VarChar,
-    name: VarChar,
-    joindate: BigInt,
-    status: Integer,
-    permissions: UBigInt,
-}
-
-impl Member {
-    pub fn to_json(&self) -> String {
-        unimplemented!()
-    }
+    pub id: UBigInt,
+    pub secret: VarChar,
+    pub name: VarChar,
+    pub joindate: BigInt,
+    pub status: Integer,
+    pub permissions: UBigInt,
 }

 struct InsertableMember<'n> {
@ -40,32 +35,39 @@ impl<'n> InsertableMember<'n> {
    }
 }

-async fn insert_new_member<'nm>(conn: Conn, mem: InsertableMember<'nm>)
-    -> Result<Member, SQLError> {
-    // standard insertion with no checks, those should be done before we get here
-    // in theory only 500's should happen here assuming we did everything else right
-    let conn = conn.batch_exec(
-        "INSERT INTO `members` () ", 
+
+pub async fn insert_new_member(p: &Pool, name: VarChar, perms: u64) -> Result<Member, MySqlError> {
+    use crate::auth::generate_secret;
+
+    let conn:   Conn   = p.get_conn().await?;
+    let secret: String = generate_secret();
+    let now:    BigInt = Utc::now().timestamp();
+    
+    let conn = conn.drop_exec(
+        "INSERT INTO members(secret, name, joindate, status, permissions)
+        VALUES(:secret, :name, :joindate, :status, :permissions)", 
        mysql_async::params!{
-            "name" => mem.name,
-            "permissions" => mem.permissions,
-            /*"badges" => mem.permissions*/ // not used yet as we have no serializer
+            "secret" => secret.clone(),
+            "name" => name.clone(),
+            "joindate" => now,
+            "status" => 0,
+            "permissions" => perms
        }).await?;

-    type MemberRow = (UBigInt, VarChar, VarChar, BigInt, Integer, UBigInt);
-    let (conn, row): (Conn, Option<MemberRow>) = conn.first_exec(
-        "SELECT * from `members` WHERE `secret` = :secret ",
+    // now pull back the user from our db and return that row
+    let db_row_result: (Conn, Option<UBigInt>) = conn.first_exec(
+        "SELECT id FROM members WHERE secret = :secret", 
        params!{
-            "secret" => mem.name
+            "secret" => secret.clone()
        }).await?;

    Ok(Member {
-        id: 0,
-        secret: "secret".into(),
-        name:  "String".into(),
-        joindate: 123,
-        status:  69,
-        permissions: 0,
+        id: db_row_result.1.unwrap(), // if we made it this far this shouldn't fail (i hope)
+        secret: secret,
+        name: name,
+        joindate: now,
+        status: 0,
+        permissions: perms
    })
 }

@ -73,25 +75,24 @@ async fn general_new_user(p: &Pool, resp: &mut Response<Body>, params: Value) {
    /*
     * @name: string  => desired default name
    */
+    use crate::perms;
    let default_name = serde_json::json!("NewUser");
    let name = params.get("name")
        .unwrap_or(&default_name)
        .as_str().unwrap_or("NewUser");

    let pre_mem = InsertableMember::new(name);
-    if let Ok(conn) = p.get_conn().await {
-        match insert_new_member(conn, pre_mem).await {
-            Ok(new_member) => {
-                *resp.status_mut() = StatusCode::OK;
-                let json_hdr_name = HeaderName::from_static("Content-Type");
-                let json_hdr_val = HeaderValue::from_static("application/json");
-                resp.headers_mut().insert(json_hdr_name, json_hdr_val);
-                *resp.body_mut() = Body::from(new_member.to_json());
-            },
-            Err(_) =>  {
-                *resp.status_mut() = StatusCode::INTERNAL_SERVER_ERROR;
-                *resp.body_mut() = Body::from("Could not process input");
-            }
+    match insert_new_member(p, name.to_string(), perms::GENERAL_NEW).await {
+        Ok(new_member) => {
+            *resp.status_mut() = StatusCode::OK;
+            let json_hdr_name = HeaderName::from_static("Content-Type");
+            let json_hdr_val = HeaderValue::from_static("application/json");
+            resp.headers_mut().insert(json_hdr_name, json_hdr_val);
+            *resp.body_mut() = Body::from(serde_json::to_string(&new_member).unwrap());
+        },
+        Err(_) =>  {
+            *resp.status_mut() = StatusCode::INTERNAL_SERVER_ERROR;
+            *resp.body_mut() = Body::from("Could not process input");
        }
    }
 }   
--- a/server/src/perms.rs
+++ b/server/src/perms.rs
@ -1,2 +1,4 @@
 pub const JOIN_VOICE:u64 = 1;
-pub const SEND_MESSAGES:u64 = 2;
+pub const SEND_MESSAGES:u64 = 2;
+
+pub const GENERAL_NEW: u64 = JOIN_VOICE | SEND_MESSAGES;