feat!: add semantic versioing support and configurable repositories

theseus-rs · Jun 28, 2024 · 964a420 · 964a420
1 parent cfc0679
commit 964a420
Show file tree

Hide file tree

Showing 28 changed files with 1,207 additions and 754 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,15 @@
 [workspace]
-default-members = ["postgresql_archive", "postgresql_commands", "postgresql_embedded"]
-members = ["examples/*", "postgresql_archive", "postgresql_commands", "postgresql_embedded"]
+default-members = [
+    "postgresql_archive",
+    "postgresql_commands",
+    "postgresql_embedded",
+]
+members = [
+    "examples/*",
+    "postgresql_archive",
+    "postgresql_commands",
+    "postgresql_embedded",
+]
 resolver = "2"
 
 [workspace.package]
@@ -28,8 +37,9 @@ rand = "0.8.5"
 regex = "1.10.5"
 reqwest = { version = "0.12.5", default-features = false }
 reqwest-middleware = "0.3.1"
-reqwest-retry = "0.5.0"
+reqwest-retry = "0.6.0"
 reqwest-tracing = "0.5.0"
+semver = "1.0.23"
 serde = "1.0.203"
 serde_json = "1.0.118"
 sha2 = "0.10.8"

diff --git a/examples/archive_async/src/main.rs b/examples/archive_async/src/main.rs
@@ -1,11 +1,12 @@
 #![forbid(unsafe_code)]
 #![deny(clippy::pedantic)]
 
-use postgresql_archive::{extract, get_archive, Result, DEFAULT_RELEASES_URL, LATEST};
+use postgresql_archive::{extract, get_archive, Result, VersionReq, DEFAULT_POSTGRESQL_URL};
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    let (archive_version, archive) = get_archive(DEFAULT_RELEASES_URL, &LATEST).await?;
+    let version_req = VersionReq::STAR;
+    let (archive_version, archive) = get_archive(DEFAULT_POSTGRESQL_URL, &version_req).await?;
     let out_dir = tempfile::tempdir()?.into_path();
     extract(&archive, &out_dir).await?;
     println!(

diff --git a/examples/archive_sync/src/main.rs b/examples/archive_sync/src/main.rs
@@ -2,10 +2,11 @@
 #![deny(clippy::pedantic)]
 
 use postgresql_archive::blocking::{extract, get_archive};
-use postgresql_archive::{Result, DEFAULT_RELEASES_URL, LATEST};
+use postgresql_archive::{Result, VersionReq, DEFAULT_POSTGRESQL_URL};
 
 fn main() -> Result<()> {
-    let (archive_version, archive) = get_archive(DEFAULT_RELEASES_URL, &LATEST)?;
+    let version_req = VersionReq::STAR;
+    let (archive_version, archive) = get_archive(DEFAULT_POSTGRESQL_URL, &version_req)?;
     let out_dir = tempfile::tempdir()?.into_path();
     extract(&archive, &out_dir)?;
     println!(

diff --git a/postgresql_archive/Cargo.toml b/postgresql_archive/Cargo.toml
@@ -24,6 +24,7 @@ reqwest = { workspace = true, default-features = false, features = ["json"] }
 reqwest-middleware = { workspace = true }
 reqwest-retry = { workspace = true }
 reqwest-tracing = { workspace = true }
+semver = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 sha2 = { workspace = true }
@@ -33,6 +34,7 @@ tempfile = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"], optional = true }
 tracing = { workspace = true, features = ["log"] }
+url = "2.5.2"
 
 [dev-dependencies]
 criterion = { workspace = true }

diff --git a/postgresql_archive/README.md b/postgresql_archive/README.md
@@ -98,12 +98,6 @@ Licensed under either of
 
 at your option.
 
-PostgreSQL is covered under [The PostgreSQL License](https://opensource.org/licenses/postgresql).
-
-## Notes
-
-Uses PostgreSQL binaries from [theseus-rs/postgresql-binaries](https://github.com/theseus-rs/postgresql-binaries).
-
 ## Contribution
 
 Unless you explicitly state otherwise, any contribution intentionally submitted

diff --git a/postgresql_archive/benches/archive.rs b/postgresql_archive/benches/archive.rs
@@ -1,7 +1,7 @@
 use bytes::Bytes;
 use criterion::{criterion_group, criterion_main, Criterion};
 use postgresql_archive::blocking::{extract, get_archive};
-use postgresql_archive::{Result, DEFAULT_RELEASES_URL, LATEST};
+use postgresql_archive::{Result, VersionReq, DEFAULT_POSTGRESQL_URL};
 use std::fs::{create_dir_all, remove_dir_all};
 use std::time::Duration;
 
@@ -10,8 +10,8 @@ fn benchmarks(criterion: &mut Criterion) {
 }
 
 fn bench_extract(criterion: &mut Criterion) -> Result<()> {
-    let version = &LATEST;
-    let (_archive_version, archive) = get_archive(DEFAULT_RELEASES_URL, version)?;
+    let version_req = VersionReq::STAR;
+    let (_archive_version, archive) = get_archive(DEFAULT_POSTGRESQL_URL, &version_req)?;
 
     criterion.bench_function("extract", |bencher| {
         bencher.iter(|| {