diff --git a/Cargo.lock b/Cargo.lock index b749dbd..598e909 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,7 +57,7 @@ name = "ariadne" version = "0.1.0" dependencies = [ "clap", - "monorepo-util", + "monorepo", "serde", "serde_json", ] @@ -137,7 +137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] -name = "monorepo-util" +name = "monorepo" version = "0.1.0" [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3ae4730..06ff695 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,12 +2,12 @@ members = [ "src/ariadne", "src/machoke", - "src/monorepo-util", + "src/monorepo", ] resolver = "3" [workspace.dependencies] clap = "4" -monorepo-util = { path = "src/monorepo-util" } +monorepo = { path = "src/monorepo" } serde = "1.0" serde_json = "1.0" diff --git a/src/ariadne/BUILD b/src/ariadne/BUILD index 7fef23a..e1f9832 100644 --- a/src/ariadne/BUILD +++ b/src/ariadne/BUILD @@ -20,7 +20,7 @@ rust_binary( srcs = ["ariadne_main.rs"], deps = [ ":ariadne_lib", - "//src/monorepo-util:monorepo_util", + "//src/monorepo:monorepo", "//third_party/crates:clap", ], ) diff --git a/src/ariadne/Cargo.toml b/src/ariadne/Cargo.toml index 2515d2b..faa94af 100644 --- a/src/ariadne/Cargo.toml +++ b/src/ariadne/Cargo.toml @@ -12,6 +12,6 @@ path = "ariadne_main.rs" [dependencies] clap = { workspace = true, features = ["derive"] } -monorepo-util = { workspace = true } +monorepo = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } diff --git a/src/ariadne/ariadne_main.rs b/src/ariadne/ariadne_main.rs index 1301b4d..cbed38e 100644 --- a/src/ariadne/ariadne_main.rs +++ b/src/ariadne/ariadne_main.rs @@ -17,7 +17,7 @@ struct Args { impl From for ariadne::Config { fn from(args: Args) -> Self { ariadne::Config { - output_dir: monorepo_util::resolve_workspace_path(args.output_dir), + output_dir: monorepo::workspace::resolve_workspace_path(args.output_dir), force: args.force, target_stage: args.target_stage, } diff --git a/src/monorepo-util/BUILD b/src/monorepo-util/BUILD deleted file mode 100644 index 48e4edb..0000000 --- a/src/monorepo-util/BUILD +++ /dev/null @@ -1,14 +0,0 @@ -load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test") - -rust_library( - name = "monorepo_util", - crate_name = "monorepo_util", - srcs = ["monorepo_util.rs"], - visibility = ["//visibility:public"], -) - -rust_test( - name = "monorepo_util_test", - srcs = ["monorepo_util_test.rs"], - deps = [":monorepo_util"], -) diff --git a/src/monorepo/BUILD b/src/monorepo/BUILD new file mode 100644 index 0000000..6170275 --- /dev/null +++ b/src/monorepo/BUILD @@ -0,0 +1,17 @@ +load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test") + +rust_library( + name = "monorepo", + crate_name = "monorepo", + srcs = [ + "monorepo.rs", + "workspace.rs", + ], + visibility = ["//visibility:public"], +) + +rust_test( + name = "workspace_test", + srcs = ["workspace_test.rs"], + deps = [":monorepo"], +) diff --git a/src/monorepo-util/Cargo.toml b/src/monorepo/Cargo.toml similarity index 58% rename from src/monorepo-util/Cargo.toml rename to src/monorepo/Cargo.toml index 09b7554..7e6cae6 100644 --- a/src/monorepo-util/Cargo.toml +++ b/src/monorepo/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "monorepo-util" +name = "monorepo" version = "0.1.0" edition = "2024" [lib] -path = "monorepo_util.rs" +path = "monorepo.rs" [dependencies] diff --git a/src/monorepo/monorepo.rs b/src/monorepo/monorepo.rs new file mode 100644 index 0000000..b91220b --- /dev/null +++ b/src/monorepo/monorepo.rs @@ -0,0 +1 @@ +pub mod workspace; diff --git a/src/monorepo-util/monorepo_util.rs b/src/monorepo/workspace.rs similarity index 100% rename from src/monorepo-util/monorepo_util.rs rename to src/monorepo/workspace.rs diff --git a/src/monorepo-util/monorepo_util_test.rs b/src/monorepo/workspace_test.rs similarity index 93% rename from src/monorepo-util/monorepo_util_test.rs rename to src/monorepo/workspace_test.rs index 5aef0e1..efd9686 100644 --- a/src/monorepo-util/monorepo_util_test.rs +++ b/src/monorepo/workspace_test.rs @@ -1,6 +1,6 @@ use std::path::PathBuf; -use monorepo_util::resolve_workspace_path_from; +use monorepo::workspace::resolve_workspace_path_from; #[test] fn absolute_path_returns_unchanged_path() {