From c022e066fd3fecb38343a17e53aced6a7692d025 Mon Sep 17 00:00:00 2001 From: Mikhail Katychev Date: Tue, 26 Mar 2024 13:24:06 -0500 Subject: [PATCH] init commit --- Cargo.toml | 48 +++++++++++++++++--------------------- cli/Cargo.toml | 37 +++++++++++++++++++++++++++++ {src => cli/src}/grpc.rs | 0 {src => cli/src}/http.rs | 0 {src => cli/src}/lib.rs | 0 {src => cli/src}/main.rs | 0 {src => cli/src}/man.rs | 0 {src => cli/src}/params.rs | 0 {src => cli/src}/record.rs | 0 {src => cli/src}/take.rs | 0 filmreel/Cargo.toml | 38 ++++++++++++++---------------- 11 files changed, 75 insertions(+), 48 deletions(-) create mode 100644 cli/Cargo.toml rename {src => cli/src}/grpc.rs (100%) rename {src => cli/src}/http.rs (100%) rename {src => cli/src}/lib.rs (100%) rename {src => cli/src}/main.rs (100%) rename {src => cli/src}/man.rs (100%) rename {src => cli/src}/params.rs (100%) rename {src => cli/src}/record.rs (100%) rename {src => cli/src}/take.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 703deb1..002c90b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,26 +1,20 @@ -[package] -name = "darkroom" +[workspace.package] +edition = "2021" version = "0.8.0" -description = "A contract testing tool built in Rust" + authors = ["Mikhail Katychev "] -edition = "2021" license = "GPL-3.0" readme = "README.md" - -documentation = "https://docs.rs/crate/darkroom/" -homepage = "https://crates.io/crates/darkroom" -repository = "https://github.com/mkatychev/darkroom/" - -[[bin]] -name = "dark" -path = "src/main.rs" +repository = "https://github.com/mkatychev/darkroom" [workspace] members = [ - "filmreel" + "cli", + "filmreel", ] +resolver = "2" -[dependencies] +[workspace.dependencies] anyhow = "1.0.71" argh = "0.1.10" chrono = "0.4.26" @@ -28,25 +22,25 @@ colored = "2.0.0" colored-diff = "0.2.3" colored_json = "2.1.0" filmreel = { version = "0.7.0", path = "filmreel" } +glob = "0.3.1" http = "0.2.9" lazy_static = "1.4.0" log = { version = "0.4.18", features = ["std"] } +mdcat = "0.30.3" +# overflow broken for latest minus +minus = { version = "3.4.0", features = ["static_output"] } +paste = "1.0.12" +pest = "2.6.0" +pest_derive = "2.6.0" +pretty_assertions = "0.7.2" prettytable-rs = "0.10.0" +pulldown-cmark ="0.9.3" +regex = "1.8.3" reqwest = { version = "0.11.18", features = ["blocking", "json"] } +rstest = "0.16.0" serde = { version = "1.0.163", features = ["derive"] } +serde-hashkey = { version = "0.4.5", features = ["ordered-float"] } serde_json = "1.0.96" +syntect = "5.0.0" url = "2.3.1" which = "4.4.0" - -mdcat = { version = "0.30.3", optional = true } -syntect = { version = "5.0.0", optional = true } -pulldown-cmark = { version = "0.9.3", optional = true } -# overflow broken for latest minus -minus = { version = "3.4.0", optional = true, features = ["static_output"] } - -[dev-dependencies] -rstest = "0.16.0" - -[features] -default = ["man"] -man = ["mdcat", "syntect", "pulldown-cmark", "minus"] diff --git a/cli/Cargo.toml b/cli/Cargo.toml new file mode 100644 index 0000000..5c1a123 --- /dev/null +++ b/cli/Cargo.toml @@ -0,0 +1,37 @@ +[package] +name = "darkroom" +version = "0.8.0" +description = "A contract testing tool built in Rust" + +readme.workspace = true +license.workspace = true +authors.workspace = true +repository.workspace = true + +[[bin]] +name = "dark" +path = "src/main.rs" + +[dependencies] +anyhow.workspace = true +argh.workspace = true +chrono.workspace = true +colored-diff.workspace = true +colored.workspace = true +colored_json.workspace = true +filmreel.workspace = true +http.workspace = true +lazy_static.workspace = true +log.workspace = true +prettytable-rs.workspace = true +reqwest.workspace = true +serde.workspace = true +serde_json.workspace = true +url.workspace = true +which.workspace = true + +mdcat = { workspace = true, optional = true } +syntect = { workspace = true, optional = true } +pulldown-cmark = { version = "0.9.3", optional = true } +# overflow broken for latest minus +minus = { workspace = true, optional = true } diff --git a/src/grpc.rs b/cli/src/grpc.rs similarity index 100% rename from src/grpc.rs rename to cli/src/grpc.rs diff --git a/src/http.rs b/cli/src/http.rs similarity index 100% rename from src/http.rs rename to cli/src/http.rs diff --git a/src/lib.rs b/cli/src/lib.rs similarity index 100% rename from src/lib.rs rename to cli/src/lib.rs diff --git a/src/main.rs b/cli/src/main.rs similarity index 100% rename from src/main.rs rename to cli/src/main.rs diff --git a/src/man.rs b/cli/src/man.rs similarity index 100% rename from src/man.rs rename to cli/src/man.rs diff --git a/src/params.rs b/cli/src/params.rs similarity index 100% rename from src/params.rs rename to cli/src/params.rs diff --git a/src/record.rs b/cli/src/record.rs similarity index 100% rename from src/record.rs rename to cli/src/record.rs diff --git a/src/take.rs b/cli/src/take.rs similarity index 100% rename from src/take.rs rename to cli/src/take.rs diff --git a/filmreel/Cargo.toml b/filmreel/Cargo.toml index cfbb779..62c716c 100644 --- a/filmreel/Cargo.toml +++ b/filmreel/Cargo.toml @@ -1,32 +1,28 @@ [package] name = "filmreel" version = "0.7.0" + description = "filmReel parser for Rust" -authors = ["Mikhail Katychev "] -edition = "2018" -license = "GPL-3.0" readme = "README.md" - documentation = "https://docs.rs/crate/filmreel/" homepage = "https://crates.io/crates/filmreel" -repository = "https://github.com/mkatychev/darkroom" -[lib] -name = "filmreel" -path = "src/lib.rs" +license.workspace = true +authors.workspace = true +repository.workspace = true [dependencies] -colored = "2.0.0" -glob = "0.3.1" -lazy_static = "1.4.0" -paste = "1.0.12" -pest = "2.6.0" -pest_derive = "2.6.0" -pretty_assertions = "0.7.2" -regex = "1.8.3" -serde = { version = "1.0.163", features = ["derive"] } -serde_json = "1.0.96" -serde-hashkey = { version = "0.4.5", features = ["ordered-float"] } +colored.workspace = true +glob.workspace = true +lazy_static.workspace = true +paste.workspace = true +pest.workspace = true +pest_derive.workspace = true +pretty_assertions.workspace = true +regex.workspace = true +serde.workspace = true +serde_json.workspace = true +serde-hashkey.workspace = true jql = { version = "3.3.0", optional = true } @@ -35,5 +31,5 @@ default = [] full_jql = ["jql"] [dev-dependencies] -rstest = "0.11.0" -paste = "1.0.12" +rstest.workspace = true +paste.workspace = true