refac: split into workspace

Teajey · Oct 5, 2024 · 460ece2 · 460ece2
1 parent 7d0f119
commit 460ece2
Show file tree

Hide file tree

Showing 20 changed files with 59 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 /target
-tests/markdown_files
+crates/json_http/tests/markdown_files/
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,27 +1,3 @@
-[package]
-name = "custard"
-version = "0.3.1"
-edition = "2021"
-license = "MIT"
-description = "A frontmatter-querying server"
-repository = "https://github.com/Teajey/custard"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-name = "custard_lib"
-
-[dependencies]
-anyhow = "1.0.75"
-axum = "0.6.20"
-camino = "1.1.6"
-chrono = { version = "0.4.31", features = ["serde"] }
-notify = "5.2.0"
-serde = { version = "1.0.188", features = ["serde_derive"] }
-serde_json = "1.0.107"
-serde_yaml = "0.9.25"
-thiserror = "1.0.49"
-tokio = { version = "1.32.0", features = ["full"] }
-
-[dev-dependencies]
-pretty_assertions = "1.4.0"
+[workspace]
+resolver = "2"
+members = ["crates/*"]
diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
-Serves plain-text files from a given directory using basic HTTP. More complex queries can be made for files that contain a Markdown-style frontmatter!
+Serves plain-text files from a given directory. More complex queries can be made for files that contain a Markdown-style frontmatter!
 
 Inspired by [Obsidian](https://obsidian.md/), I wanted to make a service to host markdown for my website in a similar manner :^)
diff --git a/crates/json_http/Cargo.toml b/crates/json_http/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "custard"
+version = "0.3.1"
+edition = "2021"
+license = "MIT"
+description = "A frontmatter-querying server"
+repository = "https://github.com/Teajey/custard"
+
+[dependencies]
+anyhow = "1.0.75"
+camino = "1.1.6"
+axum = "0.6.20"
+custard_lib = { version = "0.1.0", path = "../lib" }
+notify = "5.2.0"
+serde = { version = "1.0.188", features = ["serde_derive"] }
+serde_json = "1.0.107"
+tokio = { version = "1.32.0", features = ["full"] }
+
+[dev-dependencies]
+pretty_assertions = "1.4.0"
diff --git a/src/main.rs → crates/json_http/src/main.rs b/src/main.rs → crates/json_http/src/main.rs
diff --git a/src/route/collate_strings.rs → ...es/json_http/src/route/collate_strings.rs b/src/route/collate_strings.rs → ...es/json_http/src/route/collate_strings.rs
diff --git a/src/route/frontmatter_file.rs → ...s/json_http/src/route/frontmatter_file.rs b/src/route/frontmatter_file.rs → ...s/json_http/src/route/frontmatter_file.rs
diff --git a/src/route/frontmatter_list.rs → ...s/json_http/src/route/frontmatter_list.rs b/src/route/frontmatter_list.rs → ...s/json_http/src/route/frontmatter_list.rs
diff --git a/src/route/mod.rs → crates/json_http/src/route/mod.rs b/src/route/mod.rs → crates/json_http/src/route/mod.rs
diff --git a/crates/lib/Cargo.toml b/crates/lib/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "custard_lib"
+version = "0.1.0"
+edition = "2021"
+license = "MIT"
+description = "A core library for Custard"
+repository = "https://github.com/Teajey/custard"
+
+[dependencies]
+anyhow = "1.0.75"
+camino = "1.1.6"
+chrono = { version = "0.4.31", features = ["serde"] }
+notify = "5.2.0"
+serde = { version = "1.0.188", features = ["serde_derive"] }
+serde_json = "1.0.107"
+serde_yaml = "0.9.25"
+thiserror = "1.0.49"
+
+[dev-dependencies]
+pretty_assertions = "1.4.0"
diff --git a/src/collate.rs → crates/lib/src/collate.rs b/src/collate.rs → crates/lib/src/collate.rs
diff --git a/src/frontmatter_file.rs → crates/lib/src/frontmatter_file.rs b/src/frontmatter_file.rs → crates/lib/src/frontmatter_file.rs
diff --git a/src/frontmatter_file/keeper.rs → crates/lib/src/frontmatter_file/keeper.rs b/src/frontmatter_file/keeper.rs → crates/lib/src/frontmatter_file/keeper.rs
diff --git a/src/frontmatter_query.rs → crates/lib/src/frontmatter_query.rs b/src/frontmatter_query.rs → crates/lib/src/frontmatter_query.rs
diff --git a/src/fs.rs → crates/lib/src/fs.rs b/src/fs.rs → crates/lib/src/fs.rs
diff --git a/src/lib.rs → crates/lib/src/lib.rs b/src/lib.rs → crates/lib/src/lib.rs
diff --git a/src/list.rs → crates/lib/src/list.rs b/src/list.rs → crates/lib/src/list.rs
diff --git a/src/markup.rs → crates/lib/src/markup.rs b/src/markup.rs → crates/lib/src/markup.rs
diff --git a/src/single.rs → crates/lib/src/single.rs b/src/single.rs → crates/lib/src/single.rs