From 26894c7fadb4de06b0782fbbf45d23f60f555aea Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Sun, 25 Oct 2020 14:53:24 -0400 Subject: [PATCH 1/4] add support for reading version data from cargo --- Cargo.lock | 38 +++++++++++++++++++++++------- Cargo.toml | 2 ++ src/version/cargo.rs | 29 +++++++++++++++++++++++ src/{version.rs => version/mod.rs} | 8 +++++-- tests/cut.rs | 2 +- 5 files changed, 68 insertions(+), 11 deletions(-) create mode 100644 src/version/cargo.rs rename src/{version.rs => version/mod.rs} (68%) diff --git a/Cargo.lock b/Cargo.lock index 7598d7c..cc55451 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -98,6 +98,17 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" +[[package]] +name = "cargo_toml" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "513d17226888c7b8283ac02a1c1b0d8a9d4cbf6db65dfadb79f598f5d7966fe9" +dependencies = [ + "serde", + "serde_derive", + "toml", +] + [[package]] name = "cc" version = "1.0.54" @@ -351,6 +362,7 @@ name = "gitea-release" version = "0.5.2" dependencies = [ "anyhow", + "cargo_toml", "comrak", "elfs", "git2", @@ -365,6 +377,7 @@ dependencies = [ "structopt", "tempfile", "tokio", + "toml", "url", ] @@ -881,9 +894,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.17" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1502d12e458c49a4c9cbff560d0fe0060c252bc29799ed94ca2ed4bb665a0101" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" dependencies = [ "unicode-xid", ] @@ -1100,18 +1113,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.111" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d" +checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.111" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250" +checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" dependencies = [ "proc-macro2", "quote", @@ -1209,9 +1222,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.29" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb37da98a55b1d08529362d9cbb863be17556873df2585904ab9d2bc951291d0" +checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" dependencies = [ "proc-macro2", "quote", @@ -1353,6 +1366,15 @@ dependencies = [ "tokio", ] +[[package]] +name = "toml" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645" +dependencies = [ + "serde", +] + [[package]] name = "tower-service" version = "0.3.0" diff --git a/Cargo.toml b/Cargo.toml index 4fed248..4f66602 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,6 +8,7 @@ edition = "2018" [dependencies] anyhow = "1.0" +cargo_toml = "0.8.1" comrak = "0.7" git2 = "0.13" http = "0.2" @@ -19,6 +20,7 @@ serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } structopt = { version = "0.3", default-features = false } tokio = { version = "0.2", features = ["macros"] } +toml = "0.5.7" url = "2" gitea = { path = "./gitea" } diff --git a/src/version/cargo.rs b/src/version/cargo.rs new file mode 100644 index 0000000..24a7a2b --- /dev/null +++ b/src/version/cargo.rs @@ -0,0 +1,29 @@ +use anyhow::Result; +use cargo_toml::Manifest; +use std::fs::{self, File}; +use std::io::Read; + +fn get_file_as_byte_vec(filename: &str) -> Option> { + let f = File::open(&filename); + if f.is_err() { + return None; + } + let mut f = f.unwrap(); + let metadata = fs::metadata(&filename).expect("unable to read metadata"); + let mut buffer = vec![0; metadata.len() as usize]; + f.read(&mut buffer).expect("buffer overflow"); + + Some(buffer) +} + +pub fn read() -> Result> { + let bytes = get_file_as_byte_vec("Cargo.toml"); + + match bytes { + Some(bytes) => { + let pkg: Manifest = toml::from_slice(&bytes)?; + Ok(Some(pkg.package.unwrap().version)) + } + None => Ok(None) + } +} diff --git a/src/version.rs b/src/version/mod.rs similarity index 68% rename from src/version.rs rename to src/version/mod.rs index eb1ff10..ad5c36e 100644 --- a/src/version.rs +++ b/src/version/mod.rs @@ -1,9 +1,13 @@ use anyhow::Result; use std::{fs, path::PathBuf}; +mod cargo; + pub(crate) fn read_version(fname: PathBuf) -> Result { - let version = fs::read_to_string(fname)?; - Ok(version.trim().into()) + let version = cargo::read() + .unwrap() + .unwrap_or(fs::read_to_string(fname)?.trim().into()); + Ok(version) } #[cfg(test)] diff --git a/tests/cut.rs b/tests/cut.rs index 7ed6008..915b60e 100644 --- a/tests/cut.rs +++ b/tests/cut.rs @@ -10,7 +10,7 @@ const TAG: &'static str = "0.1.0"; async fn cut() -> Result<()> { let _ = pretty_env_logger::try_init(); let name = elfs::next(); - let token = std::env::var("DOMO_GITEA_TOKEN")?; + let token = std::env::var("DOMO_GITEA_TOKEN").expect("wanted envvar DOMO_GITEA_TOKEN"); let cli = gitea::Client::new("https://tulpa.dev".into(), token.clone(), APP_USER_AGENT)?; debug!("created gitea client"); From 7317c2425e3fd07efdc92eee9f7557c48a6ec7d1 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Sun, 25 Oct 2020 15:04:04 -0400 Subject: [PATCH 2/4] a few fixes for readablilty --- src/cmd/cut.rs | 2 +- src/version/cargo.rs | 9 +++++++++ src/version/mod.rs | 10 +++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/cmd/cut.rs b/src/cmd/cut.rs index 2b21f8c..26e9967 100644 --- a/src/cmd/cut.rs +++ b/src/cmd/cut.rs @@ -9,7 +9,7 @@ pub async fn run( rm: ReleaseMeta, ) -> Result<()> { let repo = git2::Repository::open(".")?; - let tag = tag.unwrap_or(version::read_version("VERSION".into())?); + let tag = tag.unwrap_or(version::read("VERSION".into())?); let vtag = format!("v{}", tag); if git::has_tag(&repo, vtag.clone())? { diff --git a/src/version/cargo.rs b/src/version/cargo.rs index 24a7a2b..6f16407 100644 --- a/src/version/cargo.rs +++ b/src/version/cargo.rs @@ -27,3 +27,12 @@ pub fn read() -> Result> { None => Ok(None) } } + +#[cfg(test)] +mod tests { + #[test] + fn read() { + use super::read; + read().unwrap().unwrap(); + } +} diff --git a/src/version/mod.rs b/src/version/mod.rs index ad5c36e..65deeec 100644 --- a/src/version/mod.rs +++ b/src/version/mod.rs @@ -3,18 +3,22 @@ use std::{fs, path::PathBuf}; mod cargo; -pub(crate) fn read_version(fname: PathBuf) -> Result { +pub(crate) fn read(fname: PathBuf) -> Result { let version = cargo::read() .unwrap() - .unwrap_or(fs::read_to_string(fname)?.trim().into()); + .unwrap_or(read_fs(fname)?); Ok(version) } +fn read_fs(fname: PathBuf) -> Result { + Ok(fs::read_to_string(fname)?.trim().into()) +} + #[cfg(test)] mod tests { #[test] fn read_version() { - let version = super::read_version("./testdata/VERSION".into()).unwrap(); + let version = super::read_fs("./testdata/VERSION".into()).unwrap(); assert_eq!(version, "0.1.0"); } } From a49864c419b91b8970b23ee6476f78feb41a252c Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Sun, 25 Oct 2020 15:05:07 -0400 Subject: [PATCH 3/4] remove VERSION file --- VERSION | 1 - 1 file changed, 1 deletion(-) delete mode 100644 VERSION diff --git a/VERSION b/VERSION deleted file mode 100644 index ee6cdce..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.6.1 From 9ad6a78579a63b8ff456c9beaf97cf3fce2162c1 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Sun, 25 Oct 2020 15:06:11 -0400 Subject: [PATCH 4/4] version bump --- CHANGELOG.md | 4 ++++ Cargo.lock | 2 +- Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68bfd08..3bf571e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +## 0.7.0 + +Support reading version data from `Cargo.toml` + ## 0.6.1 Fixed a logic error in release cutting. diff --git a/Cargo.lock b/Cargo.lock index cc55451..17b6a1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -359,7 +359,7 @@ dependencies = [ [[package]] name = "gitea-release" -version = "0.5.2" +version = "0.7.0" dependencies = [ "anyhow", "cargo_toml", diff --git a/Cargo.toml b/Cargo.toml index 4f66602..f8a42f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "gitea-release" -version = "0.5.2" +version = "0.7.0" authors = ["Christine Dodrill "] edition = "2018"