From 288a5f97dd71215c388bae2d9f2638a3d7bc78b4 Mon Sep 17 00:00:00 2001 From: Joscha Date: Wed, 19 Apr 2023 23:43:03 +0200 Subject: [PATCH] Set up workspace --- Cargo.toml | 60 ++-------------------- cove/Cargo.toml | 57 ++++++++++++++++++++ {src => cove/src}/config.rs | 0 {src => cove/src}/euph.rs | 0 {src => cove/src}/euph/room.rs | 0 {src => cove/src}/euph/small_message.rs | 0 {src => cove/src}/euph/util.rs | 0 {src => cove/src}/export.rs | 0 {src => cove/src}/export/json.rs | 0 {src => cove/src}/export/text.rs | 0 {src => cove/src}/logger.rs | 0 {src => cove/src}/macros.rs | 0 {src => cove/src}/main.rs | 0 {src => cove/src}/store.rs | 0 {src => cove/src}/ui.rs | 0 {src => cove/src}/ui/chat.rs | 0 {src => cove/src}/ui/chat/blocks.rs | 0 {src => cove/src}/ui/chat/cursor.rs | 0 {src => cove/src}/ui/chat/renderer.rs | 0 {src => cove/src}/ui/chat/tree.rs | 0 {src => cove/src}/ui/chat/tree/renderer.rs | 0 {src => cove/src}/ui/chat/tree/scroll.rs | 0 {src => cove/src}/ui/chat/tree/widgets.rs | 0 {src => cove/src}/ui/chat/widgets.rs | 0 {src => cove/src}/ui/euph.rs | 0 {src => cove/src}/ui/euph/account.rs | 0 {src => cove/src}/ui/euph/auth.rs | 0 {src => cove/src}/ui/euph/inspect.rs | 0 {src => cove/src}/ui/euph/links.rs | 0 {src => cove/src}/ui/euph/nick.rs | 0 {src => cove/src}/ui/euph/nick_list.rs | 0 {src => cove/src}/ui/euph/popup.rs | 0 {src => cove/src}/ui/euph/room.rs | 0 {src => cove/src}/ui/input.rs | 0 {src => cove/src}/ui/rooms.rs | 0 {src => cove/src}/ui/util.rs | 0 {src => cove/src}/ui/widgets.rs | 0 {src => cove/src}/ui/widgets/list.rs | 0 {src => cove/src}/ui/widgets/popup.rs | 0 {src => cove/src}/util.rs | 0 {src => cove/src}/vault.rs | 0 {src => cove/src}/vault/euph.rs | 0 {src => cove/src}/vault/migrate.rs | 0 {src => cove/src}/vault/prepare.rs | 0 flake.nix | 7 ++- 45 files changed, 68 insertions(+), 56 deletions(-) create mode 100644 cove/Cargo.toml rename {src => cove/src}/config.rs (100%) rename {src => cove/src}/euph.rs (100%) rename {src => cove/src}/euph/room.rs (100%) rename {src => cove/src}/euph/small_message.rs (100%) rename {src => cove/src}/euph/util.rs (100%) rename {src => cove/src}/export.rs (100%) rename {src => cove/src}/export/json.rs (100%) rename {src => cove/src}/export/text.rs (100%) rename {src => cove/src}/logger.rs (100%) rename {src => cove/src}/macros.rs (100%) rename {src => cove/src}/main.rs (100%) rename {src => cove/src}/store.rs (100%) rename {src => cove/src}/ui.rs (100%) rename {src => cove/src}/ui/chat.rs (100%) rename {src => cove/src}/ui/chat/blocks.rs (100%) rename {src => cove/src}/ui/chat/cursor.rs (100%) rename {src => cove/src}/ui/chat/renderer.rs (100%) rename {src => cove/src}/ui/chat/tree.rs (100%) rename {src => cove/src}/ui/chat/tree/renderer.rs (100%) rename {src => cove/src}/ui/chat/tree/scroll.rs (100%) rename {src => cove/src}/ui/chat/tree/widgets.rs (100%) rename {src => cove/src}/ui/chat/widgets.rs (100%) rename {src => cove/src}/ui/euph.rs (100%) rename {src => cove/src}/ui/euph/account.rs (100%) rename {src => cove/src}/ui/euph/auth.rs (100%) rename {src => cove/src}/ui/euph/inspect.rs (100%) rename {src => cove/src}/ui/euph/links.rs (100%) rename {src => cove/src}/ui/euph/nick.rs (100%) rename {src => cove/src}/ui/euph/nick_list.rs (100%) rename {src => cove/src}/ui/euph/popup.rs (100%) rename {src => cove/src}/ui/euph/room.rs (100%) rename {src => cove/src}/ui/input.rs (100%) rename {src => cove/src}/ui/rooms.rs (100%) rename {src => cove/src}/ui/util.rs (100%) rename {src => cove/src}/ui/widgets.rs (100%) rename {src => cove/src}/ui/widgets/list.rs (100%) rename {src => cove/src}/ui/widgets/popup.rs (100%) rename {src => cove/src}/util.rs (100%) rename {src => cove/src}/vault.rs (100%) rename {src => cove/src}/vault/euph.rs (100%) rename {src => cove/src}/vault/migrate.rs (100%) rename {src => cove/src}/vault/prepare.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 61abd7f..e47762f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,60 +1,10 @@ -[package] -name = "cove" +[workspace] +resolver = "2" +members = ["cove"] + +[workspace.package] version = "0.6.1" edition = "2021" -[dependencies] -anyhow = "1.0.70" -async-trait = "0.1.68" -clap = { version = "4.2.1", features = ["derive", "deprecated"] } -cookie = "0.17.0" -crossterm = "0.26.1" -directories = "5.0.0" -edit = "0.1.4" -linkify = "0.9.0" -log = { version = "0.4.17", features = ["std"] } -once_cell = "1.17.1" -open = "4.0.1" -parking_lot = "0.12.1" -rusqlite = { version = "0.29.0", features = ["bundled", "time"] } -serde = { version = "1.0.159", features = ["derive"] } -serde_json = "1.0.95" -thiserror = "1.0.40" -tokio = { version = "1.27.0", features = ["full"] } -toml = "0.7.3" -unicode-segmentation = "1.10.1" -unicode-width = "0.1.10" - -[dependencies.time] -version = "0.3.20" -features = ["macros", "formatting", "parsing", "serde"] - -[dependencies.tokio-tungstenite] -version = "0.18.0" -features = ["rustls-tls-native-roots"] - -[dependencies.euphoxide] -git = "https://github.com/Garmelon/euphoxide.git" -rev = "0f217a6279181b0731216760219e8ff0fa01e449" -features = ["bot"] - -# [patch."https://github.com/Garmelon/euphoxide.git"] -# euphoxide = { path = "../euphoxide/" } - -[dependencies.toss] -git = "https://github.com/Garmelon/toss.git" -rev = "f414db40d526295c74cbcae6c3d194088da8f1d9" - -# [patch."https://github.com/Garmelon/toss.git"] -# toss = { path = "../toss/" } - -[dependencies.vault] -git = "https://github.com/Garmelon/vault.git" -rev = "b4cf23b7279770226725c895e482c8eda88c43a7" -features = ["tokio"] - -# [patch."https://github.com/Garmelon/vault.git"] -# vault = { path = "../vault/" } - [profile.dev.package."*"] opt-level = 3 diff --git a/cove/Cargo.toml b/cove/Cargo.toml new file mode 100644 index 0000000..5821137 --- /dev/null +++ b/cove/Cargo.toml @@ -0,0 +1,57 @@ +[package] +name = "cove" +version = { workspace = true } +edition = { workspace = true } + +[dependencies] +anyhow = "1.0.70" +async-trait = "0.1.68" +clap = { version = "4.2.1", features = ["derive", "deprecated"] } +cookie = "0.17.0" +crossterm = "0.26.1" +directories = "5.0.0" +edit = "0.1.4" +linkify = "0.9.0" +log = { version = "0.4.17", features = ["std"] } +once_cell = "1.17.1" +open = "4.0.1" +parking_lot = "0.12.1" +rusqlite = { version = "0.29.0", features = ["bundled", "time"] } +serde = { version = "1.0.159", features = ["derive"] } +serde_json = "1.0.95" +thiserror = "1.0.40" +tokio = { version = "1.27.0", features = ["full"] } +toml = "0.7.3" +unicode-segmentation = "1.10.1" +unicode-width = "0.1.10" + +[dependencies.time] +version = "0.3.20" +features = ["macros", "formatting", "parsing", "serde"] + +[dependencies.tokio-tungstenite] +version = "0.18.0" +features = ["rustls-tls-native-roots"] + +[dependencies.euphoxide] +git = "https://github.com/Garmelon/euphoxide.git" +rev = "0f217a6279181b0731216760219e8ff0fa01e449" +features = ["bot"] + +# [patch."https://github.com/Garmelon/euphoxide.git"] +# euphoxide = { path = "../euphoxide/" } + +[dependencies.toss] +git = "https://github.com/Garmelon/toss.git" +rev = "f414db40d526295c74cbcae6c3d194088da8f1d9" + +# [patch."https://github.com/Garmelon/toss.git"] +# toss = { path = "../toss/" } + +[dependencies.vault] +git = "https://github.com/Garmelon/vault.git" +rev = "b4cf23b7279770226725c895e482c8eda88c43a7" +features = ["tokio"] + +# [patch."https://github.com/Garmelon/vault.git"] +# vault = { path = "../vault/" } diff --git a/src/config.rs b/cove/src/config.rs similarity index 100% rename from src/config.rs rename to cove/src/config.rs diff --git a/src/euph.rs b/cove/src/euph.rs similarity index 100% rename from src/euph.rs rename to cove/src/euph.rs diff --git a/src/euph/room.rs b/cove/src/euph/room.rs similarity index 100% rename from src/euph/room.rs rename to cove/src/euph/room.rs diff --git a/src/euph/small_message.rs b/cove/src/euph/small_message.rs similarity index 100% rename from src/euph/small_message.rs rename to cove/src/euph/small_message.rs diff --git a/src/euph/util.rs b/cove/src/euph/util.rs similarity index 100% rename from src/euph/util.rs rename to cove/src/euph/util.rs diff --git a/src/export.rs b/cove/src/export.rs similarity index 100% rename from src/export.rs rename to cove/src/export.rs diff --git a/src/export/json.rs b/cove/src/export/json.rs similarity index 100% rename from src/export/json.rs rename to cove/src/export/json.rs diff --git a/src/export/text.rs b/cove/src/export/text.rs similarity index 100% rename from src/export/text.rs rename to cove/src/export/text.rs diff --git a/src/logger.rs b/cove/src/logger.rs similarity index 100% rename from src/logger.rs rename to cove/src/logger.rs diff --git a/src/macros.rs b/cove/src/macros.rs similarity index 100% rename from src/macros.rs rename to cove/src/macros.rs diff --git a/src/main.rs b/cove/src/main.rs similarity index 100% rename from src/main.rs rename to cove/src/main.rs diff --git a/src/store.rs b/cove/src/store.rs similarity index 100% rename from src/store.rs rename to cove/src/store.rs diff --git a/src/ui.rs b/cove/src/ui.rs similarity index 100% rename from src/ui.rs rename to cove/src/ui.rs diff --git a/src/ui/chat.rs b/cove/src/ui/chat.rs similarity index 100% rename from src/ui/chat.rs rename to cove/src/ui/chat.rs diff --git a/src/ui/chat/blocks.rs b/cove/src/ui/chat/blocks.rs similarity index 100% rename from src/ui/chat/blocks.rs rename to cove/src/ui/chat/blocks.rs diff --git a/src/ui/chat/cursor.rs b/cove/src/ui/chat/cursor.rs similarity index 100% rename from src/ui/chat/cursor.rs rename to cove/src/ui/chat/cursor.rs diff --git a/src/ui/chat/renderer.rs b/cove/src/ui/chat/renderer.rs similarity index 100% rename from src/ui/chat/renderer.rs rename to cove/src/ui/chat/renderer.rs diff --git a/src/ui/chat/tree.rs b/cove/src/ui/chat/tree.rs similarity index 100% rename from src/ui/chat/tree.rs rename to cove/src/ui/chat/tree.rs diff --git a/src/ui/chat/tree/renderer.rs b/cove/src/ui/chat/tree/renderer.rs similarity index 100% rename from src/ui/chat/tree/renderer.rs rename to cove/src/ui/chat/tree/renderer.rs diff --git a/src/ui/chat/tree/scroll.rs b/cove/src/ui/chat/tree/scroll.rs similarity index 100% rename from src/ui/chat/tree/scroll.rs rename to cove/src/ui/chat/tree/scroll.rs diff --git a/src/ui/chat/tree/widgets.rs b/cove/src/ui/chat/tree/widgets.rs similarity index 100% rename from src/ui/chat/tree/widgets.rs rename to cove/src/ui/chat/tree/widgets.rs diff --git a/src/ui/chat/widgets.rs b/cove/src/ui/chat/widgets.rs similarity index 100% rename from src/ui/chat/widgets.rs rename to cove/src/ui/chat/widgets.rs diff --git a/src/ui/euph.rs b/cove/src/ui/euph.rs similarity index 100% rename from src/ui/euph.rs rename to cove/src/ui/euph.rs diff --git a/src/ui/euph/account.rs b/cove/src/ui/euph/account.rs similarity index 100% rename from src/ui/euph/account.rs rename to cove/src/ui/euph/account.rs diff --git a/src/ui/euph/auth.rs b/cove/src/ui/euph/auth.rs similarity index 100% rename from src/ui/euph/auth.rs rename to cove/src/ui/euph/auth.rs diff --git a/src/ui/euph/inspect.rs b/cove/src/ui/euph/inspect.rs similarity index 100% rename from src/ui/euph/inspect.rs rename to cove/src/ui/euph/inspect.rs diff --git a/src/ui/euph/links.rs b/cove/src/ui/euph/links.rs similarity index 100% rename from src/ui/euph/links.rs rename to cove/src/ui/euph/links.rs diff --git a/src/ui/euph/nick.rs b/cove/src/ui/euph/nick.rs similarity index 100% rename from src/ui/euph/nick.rs rename to cove/src/ui/euph/nick.rs diff --git a/src/ui/euph/nick_list.rs b/cove/src/ui/euph/nick_list.rs similarity index 100% rename from src/ui/euph/nick_list.rs rename to cove/src/ui/euph/nick_list.rs diff --git a/src/ui/euph/popup.rs b/cove/src/ui/euph/popup.rs similarity index 100% rename from src/ui/euph/popup.rs rename to cove/src/ui/euph/popup.rs diff --git a/src/ui/euph/room.rs b/cove/src/ui/euph/room.rs similarity index 100% rename from src/ui/euph/room.rs rename to cove/src/ui/euph/room.rs diff --git a/src/ui/input.rs b/cove/src/ui/input.rs similarity index 100% rename from src/ui/input.rs rename to cove/src/ui/input.rs diff --git a/src/ui/rooms.rs b/cove/src/ui/rooms.rs similarity index 100% rename from src/ui/rooms.rs rename to cove/src/ui/rooms.rs diff --git a/src/ui/util.rs b/cove/src/ui/util.rs similarity index 100% rename from src/ui/util.rs rename to cove/src/ui/util.rs diff --git a/src/ui/widgets.rs b/cove/src/ui/widgets.rs similarity index 100% rename from src/ui/widgets.rs rename to cove/src/ui/widgets.rs diff --git a/src/ui/widgets/list.rs b/cove/src/ui/widgets/list.rs similarity index 100% rename from src/ui/widgets/list.rs rename to cove/src/ui/widgets/list.rs diff --git a/src/ui/widgets/popup.rs b/cove/src/ui/widgets/popup.rs similarity index 100% rename from src/ui/widgets/popup.rs rename to cove/src/ui/widgets/popup.rs diff --git a/src/util.rs b/cove/src/util.rs similarity index 100% rename from src/util.rs rename to cove/src/util.rs diff --git a/src/vault.rs b/cove/src/vault.rs similarity index 100% rename from src/vault.rs rename to cove/src/vault.rs diff --git a/src/vault/euph.rs b/cove/src/vault/euph.rs similarity index 100% rename from src/vault/euph.rs rename to cove/src/vault/euph.rs diff --git a/src/vault/migrate.rs b/cove/src/vault/migrate.rs similarity index 100% rename from src/vault/migrate.rs rename to cove/src/vault/migrate.rs diff --git a/src/vault/prepare.rs b/cove/src/vault/prepare.rs similarity index 100% rename from src/vault/prepare.rs rename to cove/src/vault/prepare.rs diff --git a/flake.nix b/flake.nix index 68a8c1a..707e335 100644 --- a/flake.nix +++ b/flake.nix @@ -15,9 +15,14 @@ let pkgs = import nixpkgs { inherit system; }; naersk' = pkgs.callPackage naersk { }; + cargoToml = pkgs.lib.importTOML ./Cargo.toml; in { - default = naersk'.buildPackage { src = ./.; }; + default = naersk'.buildPackage { + name = "cove"; + version = cargoToml.workspace.package.version; + root = ./.; + }; } ); };