argh

.drone.yml

@@ -3,7 +3,7 @@ name: tests/release
 
 steps:
   - name: rust tests
-    image: "rust:1"
+    image: "reg.tulpa.dev/rust:1"
     pull: always
     commands:
       - cargo test --all

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 0.7.1
+
+Fix a minor parsing bug
+
 ## 0.7.0
 
 Support reading version data from `Cargo.toml`

Cargo.lock

@@ -359,7 +359,7 @@ dependencies = [
 
 [[package]]
 name = "gitea-release"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "anyhow",
  "cargo_toml",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gitea-release"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["Christine Dodrill <me@christine.website>"]
 edition = "2018"
 

src/version/cargo.rs

@@ -6,6 +6,7 @@ use std::io::Read;
 fn get_file_as_byte_vec(filename: &str) -> Option<Vec<u8>> {
     let f = File::open(&filename);
     if f.is_err() {
+        log::debug!("can't read from Cargo.toml: {:?}", f.unwrap_err());
         return None;
     }
     let mut f = f.unwrap();
@@ -17,12 +18,25 @@ fn get_file_as_byte_vec(filename: &str) -> Option<Vec<u8>> {
 }
 
 pub fn read() -> Result<Option<String>> {
+    log::debug!("reading version from Cargo.toml");
     let bytes = get_file_as_byte_vec("Cargo.toml");
+    log::debug!("{:?}", bytes);
 
     match bytes {
         Some(bytes) => {
-            let pkg: Manifest = toml::from_slice(&bytes)?;
-            Ok(Some(pkg.package.unwrap().version))
+            log::trace!("reading toml");
+            let pkg : Result<Manifest, _> = toml::from_slice(&bytes);
+            match pkg {
+                Err(why) => {
+                    log::error!("error parsing Cargo.toml: {:?}", why);
+                    Err(why.into())
+                }
+                Ok(pkg) => {
+                    let version = pkg.package.unwrap().version;
+                    log::trace!("got version {}", version);
+                    Ok(Some(version))
+                }
+            }
         }
         None => Ok(None)
     }
@@ -33,6 +47,7 @@ mod tests {
     #[test]
     fn read() {
         use super::read;
+        let _ = pretty_env_logger::try_init();
         read().unwrap().unwrap();
     }
 }

src/version/mod.rs

@@ -4,13 +4,18 @@ use std::{fs, path::PathBuf};
 mod cargo;
 
 pub(crate) fn read(fname: PathBuf) -> Result<String> {
-    let version = cargo::read()
-        .unwrap()
-        .unwrap_or(read_fs(fname)?);
+    let version = match read_fs(fname.clone()) {
+        Ok(version) => version,
+        Err(why) => {
+            log::debug!("can't read {:?}: {:?}", fname, why);
+            cargo::read().unwrap().unwrap()
+        }
+    };
     Ok(version)
 }
 
 fn read_fs(fname: PathBuf) -> Result<String> {
+    log::debug!("reading version data from {:?}", fname);
     Ok(fs::read_to_string(fname)?.trim().into())
 }
 
@@ -18,6 +23,7 @@ fn read_fs(fname: PathBuf) -> Result<String> {
 mod tests {
     #[test]
     fn read_version() {
+        let _ = pretty_env_logger::try_init();
         let version = super::read_fs("./testdata/VERSION".into()).unwrap();
         assert_eq!(version, "0.1.0");
     }