Update changelog for 2.2.0-1 release

Debian's package machinery also needs to know about these things, so
throw them into the control file.

Cargo.toml

@@ -1,10 +1,12 @@
 [package]
 name = "gt-tool"
-version = "1.0.0"
+version = "2.2.0"
 edition = "2024"
 
 [dependencies]
 clap = { version = "4.0.7", features = ["derive", "env"] }
+colored = "2.0.0"
+itertools = "0.10.0"
 reqwest = { version = "0.11.13", features = ["json", "stream", "multipart"] }
 serde = { version = "1.0.152", features = ["derive"] }
 tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] }

README.md

@@ -51,14 +51,3 @@ One of these, defaults to `help`:
 | upload-release | Uploads one-or-more files to an existing release, identified by it's tag name. |
 | help | prints the help text (the usage summary above). |
 
-## Unit Testing
-
-The unit test~~s~~ require a Gitea server to execute against. This information is supplied by environment variables rather than on the command line, but it is otherwise exactly the same usage.
-
-| Variable | Description |
-|-|-|
-| TEST_GITEA_SERVER | Server URL, match `-u`, `--url` |
-| TEST_GITEA_REPO | Owner + repo name, match `-u` `--repo` |
-| TEST_GITEA_KEY | API key, match `RELEASE_KEY_GITEA`. The use of a new variable for the API token is to help avoid accidentally touching a production environment during test execution. |
-| TEST_GITEA_RELEASE_TAG | Git tag used to identify the Release. Same as `upload-release`'s positional argument `<TAG_NAME>`. |
-

debian/changelog

@@ -1,4 +1,47 @@
-gt-tool (1.0.0-1) UNRELEASED; urgency=low
+gt-tool (2.2.0-1) unstable; urgency=medium
+
+  * Basic impl Display for the Release struct
+  * Print releases in reverse order for easier reading
+  * Colorize the output!
+  * Remove trailing newline in Release item printout
+  * Galaxy-brained newline intersperse function
+  * Change to free-fn intersperse for stdlib compat
+  * `Release.colorized()`, not std::fmt::Display
+  * Address most of the cargo-clippy lints
+  * Prefix unused variables to quiet the linter
+  * Autoformat
+  * Oops, missed one
+  * Bump to v2.2.0
+  * Lift the empty-body string outside the let-if
+  * Add the new dependencies to debian/control
+
+ -- Robert Garrett <robertgarrett404@gmail.com>  Fri, 04 Jul 2025 10:10:54 -0500
+
+gt-tool (2.1.0-1) unstable; urgency=medium
+
+  * Fix: incorrect field names for `Attachment`
+
+ -- Robert Garrett <robertgarrett404@gmail.com>  Thu, 12 Jun 2025 17:51:12 -0500
+
+gt-tool (2.0.0-1) unstable; urgency=medium
+
+  * Interrogate list_releases result more closely
+  * Interrogate create_release result more closely
+  * Drop unused imports
+  * "Fix" the test case
+  * Interrogate create_release_attachment result
+  * Fold client-error-decode into a util function
+  * Add `Attachment` struct, new iface for create-rel
+  * Update main.rs to use new attachment iface
+  * Delete the unit tests
+  * ... and the unit testing notes in README.md
+  * Drop unused import in api/release.rs
+  * Use pre Rust 1.81 compatible file-exists test
+  * Rediff patches
+
+ -- Robert Garrett <robertgarrett404@gmail.com>  Thu, 12 Jun 2025 16:28:18 -0500
+
+gt-tool (1.0.0-1) unstable; urgency=low
 
   * Experimental release.
 

debian/control

@@ -7,6 +7,8 @@ Build-Depends:
  debhelper-compat (= 13),
  dh-cargo,
  librust-clap-dev,
+ librust-colored-dev,
+ librust-itertools-dev,
  librust-reqwest-dev,
  librust-tokio-dev,
  librust-serde-dev,

debian/gbp.conf

@@ -2,5 +2,5 @@
 compression = xz
 compression-level = 9
 upstream-tag = v%(version)s
-debian-branch = deb
+debian-branch = deb/bookworm
 

debian/patches/0001-Rust-edition-downgrade-to-2021.patch

@@ -2,20 +2,20 @@ From: Robert Garrett <robertgarrett404@gmail.com>
 Date: Sun, 1 Jun 2025 17:59:20 -0500
 Subject: Rust edition downgrade to 2021
 
-Debian Bookworm uses Rust 1.64 which only supports up to the 2021
+Debian Bookworm uses Rust 1.63 which only supports up to the 2021
 edition.
 ---
  Cargo.toml | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index febccc4..cf52754 100644
+index 4fd569c..8b67a52 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
 @@ -1,7 +1,7 @@
  [package]
  name = "gt-tool"
- version = "1.0.0"
+ version = "2.2.0"
 -edition = "2024"
 +edition = "2021"
  

debian/patches/0002-Lift-the-empty-body-string-outside-the-let-if.patch

@@ -0,0 +1,39 @@
+From: Robert Garrett <robertgarrett404@gmail.com>
+Date: Fri, 4 Jul 2025 09:36:52 -0500
+Subject: Lift the empty-body string outside the let-if
+
+The if-else block that selects between the body of the Release or a
+placeholder is returning references to variables that only exist
+*inside* the body of the if-else blocks. Newer Rust versions seem to
+understand the intent and do The Right Thing anyway (or they have some
+other rule for how if-else block scopes work).
+
+Manually lifting the variable to an outer scope resolves the problem.
+---
+ src/structs/release.rs | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/structs/release.rs b/src/structs/release.rs
+index 9ed537e..3c4a434 100644
+--- a/src/structs/release.rs
++++ b/src/structs/release.rs
+@@ -1,3 +1,5 @@
++use std::io::empty;
++
+ use colored::Colorize;
+ use serde::{Deserialize, Serialize};
+ 
+@@ -27,10 +29,11 @@ impl Release {
+         let published = "Published:".bright_green();
+         let created = "Created:".green().dimmed();
+         let author = "Author:".blue();
++        let empty_body = String::from("(empty body)").dimmed();
+         let body = if !self.body.is_empty() {
+-            &self.body.white()
++            self.body.white()
+         } else {
+-            &String::from("(empty body)").dimmed()
++            empty_body
+         };
+ 
+         format!(

debian/patches/0002-Use-pre-Rust-1.81-compatible-file-exists-test.patch

@@ -1,31 +0,0 @@
-From: Robert Garrett <robertgarrett404@gmail.com>
-Date: Sun, 1 Jun 2025 18:01:21 -0500
-Subject: Use pre Rust 1.81 compatible file-exists test
-
-The function `std::fs::exists(...)` was stabilized in Rust 1.81, which
-means it can't be used in the Debian Bookworm build. This patch swaps to
-a compatible implementation leaning on the std::path::Path struct.
----
- src/api/release_attachment.rs | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/api/release_attachment.rs b/src/api/release_attachment.rs
-index 9af71bf..8a0c798 100644
---- a/src/api/release_attachment.rs
-+++ b/src/api/release_attachment.rs
-@@ -1,4 +1,4 @@
--use std::fs;
-+use std::{fs, path};
- 
- pub fn check_release_match_repo() {}
- pub fn get_release_attachment() {}
-@@ -16,7 +16,8 @@ pub async fn create_release_attachment(
- 
-     // Ensure all files exists before starting the uploads
-     for file in &files {
--        match fs::exists(file) {
-+        let path = path::Path::new(file);
-+        match path.try_exists() {
-             Ok(true) => continue,
-             Ok(false) => return Err(crate::Error::NoSuchFile),
-             Err(e) => {

debian/patches/series

@@ -1,2 +1,2 @@
 0001-Rust-edition-downgrade-to-2021.patch
-0002-Use-pre-Rust-1.81-compatible-file-exists-test.patch
+0002-Lift-the-empty-body-string-outside-the-let-if.patch

src/api/release.rs

@@ -1,14 +1,9 @@
-use serde::{Deserialize, Serialize};
-
 use crate::{
-    ApiError, Result,
+    Result,
-    structs::{
+    structs::release::{CreateReleaseOption, Release},
-        self,
-        release::{CreateReleaseOption, Release},
-    },
 };
 
-pub fn get_release(id: u64) -> Result<Release> {
+pub fn get_release(_id: u64) -> Result<Release> {
     todo!();
 }
 pub fn get_latest_release() -> Result<Release> {
@@ -22,24 +17,22 @@ pub async fn list_releases(
 ) -> Result<Vec<Release>> {
     let request_url = format!("{gitea_url}/api/v1/repos/{repo}/releases/");
     let req = client.get(request_url).send().await;
-    let response = req.map_err(|reqwest_err| crate::Error::WrappedReqwestErr(reqwest_err))?;
+    let response = req.map_err(crate::Error::WrappedReqwestErr)?;
-    let release_list = response
+    if response.status().is_success() {
-        .json::<Vec<Release>>()
+        let release_list = response
-        .await
+            .json::<Vec<Release>>()
-        .map_err(|reqwest_err| {
+            .await
-            // Convert reqwest errors to my own
+            .map_err(|reqwest_err| {
-            // TODO: Create all error variants (see lib.rs)
+                // Convert reqwest errors to my own
-            crate::Error::WrappedReqwestErr(reqwest_err)
+                // TODO: Create all error variants (see lib.rs)
-        })?;
+                crate::Error::WrappedReqwestErr(reqwest_err)
-    return Ok(release_list);
+            })?;
-}
+        return Ok(release_list);
-
+    } else if response.status().is_client_error() {
-#[derive(Debug, Deserialize, Serialize)]
+        let mesg = crate::decode_client_error(response).await?;
-#[serde(untagged)]
+        return Err(crate::Error::ApiErrorMessage(mesg));
-enum CreateResult {
+    }
-    Success(structs::release::Release),
+    panic!("Reached end of list_releases without matching a return pathway.");
-    ErrWithMessage(ApiError),
-    Empty,
 }
 
 pub async fn create_release(
@@ -49,31 +42,27 @@ pub async fn create_release(
     submission: CreateReleaseOption,
 ) -> Result<Release> {
     let request_url = format!("{gitea_url}/api/v1/repos/{repo}/releases");
-    let req = client
+    let response = client
         .post(request_url)
         .json(&submission)
         .send()
         .await
-        .map_err(|e| crate::Error::from(e))?;
+        .map_err(crate::Error::from)?;
-    let new_release = req
+    if response.status().is_success() {
-        .json::<CreateResult>()
+        let new_release = response
-        .await
+            .json::<Release>()
-        .map_err(|e| crate::Error::from(e))?;
+            .await
-    match new_release {
+            .map_err(crate::Error::from)?;
-        CreateResult::Success(release) => Ok(release),
+        return Ok(new_release);
-        CreateResult::ErrWithMessage(api_error) => {
+    } else if response.status().is_client_error() {
-            if api_error.message == "token is required" {
+        let mesg = crate::decode_client_error(response).await?;
-                Err(crate::Error::MissingAuthToken)
+        return Err(crate::Error::ApiErrorMessage(mesg));
-            } else {
-                Err(crate::Error::ApiErrorMessage(api_error))
-            }
-        }
-        CreateResult::Empty => panic!("How can we have 200 OK and no release info? No. Crash"),
     }
+    panic!("Reached end of create_release without matching a return path");
 }
-pub fn edit_release(id: u64) -> Result<Release> {
+pub fn edit_release(_id: u64) -> Result<Release> {
     todo!();
 }
-pub fn delete_release(id: u64) -> Result<()> {
+pub fn delete_release(_id: u64) -> Result<()> {
     todo!();
 }

src/api/release_attachment.rs

@@ -1,4 +1,6 @@
-use std::fs;
+use std::{fs, path};
+
+use crate::structs::Attachment;
 
 pub fn check_release_match_repo() {}
 pub fn get_release_attachment() {}
@@ -10,174 +12,47 @@ pub async fn create_release_attachment(
     gitea_url: &str,
     repo: &str,
     release_id: usize,
-    files: Vec<String>,
+    file: String,
-) -> crate::Result<()> {
+) -> crate::Result<Attachment> {
     let request_url = format!("{gitea_url}/api/v1/repos/{repo}/releases/{release_id}/assets");
 
-    // Ensure all files exists before starting the uploads
+    let path = path::Path::new(&file);
-    for file in &files {
+    match path.try_exists() {
-        match fs::exists(file) {
+        Ok(true) => (),
-            Ok(true) => continue,
+        Ok(false) => return Err(crate::Error::NoSuchFile),
-            Ok(false) => return Err(crate::Error::NoSuchFile),
+        Err(e) => {
-            Err(e) => {
+            eprintln!("Uh oh! The file-exists check couldn't be done: {e}");
-                eprintln!("Uh oh! The file-exists check couldn't be done: {e}");
+            panic!(
-                panic!("TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)");
+                "TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)"
-            },
+            );
         }
     }
 
-    for file in files {
+    println!("Uploading file {}", &file);
-        println!("Uploading file {}", &file);
+    let data = reqwest::multipart::Part::stream(fs::read(&file).unwrap())
-        let data = reqwest::multipart::Part::stream(fs::read(&file).unwrap())
+        .file_name("attachment")
-            .file_name("attachment")
+        .mime_str("text/plain")?;
-            .mime_str("text/plain")?;
 
-        let form = reqwest::multipart::Form::new().part("attachment", data);
+    let form = reqwest::multipart::Form::new().part("attachment", data);
 
-        let request = client
+    let response = client
-            .post(&request_url)
+        .post(&request_url)
-            .multipart(form)
+        .multipart(form)
-            .query(&[("name", file.split("/").last())])
+        .query(&[("name", file.split("/").last())])
-            .send()
+        .send()
-            .await?;
+        .await?;
+    if response.status().is_success() {
+        // TODO: create a struct Attachment and return it to the caller.
+        let attachment_desc = response
+            .json::<Attachment>()
+            .await
+            .map_err(crate::Error::from)?;
+        return Ok(attachment_desc);
+    } else if response.status().is_client_error() {
+        let mesg = crate::decode_client_error(response).await?;
+        return Err(crate::Error::ApiErrorMessage(mesg));
     }
-    Ok(())
+    panic!("Reached end of release_attachment without matching a return path");
 }
 pub fn edit_release_attachment() {}
 pub fn delete_release_attachment() {}
-
-#[cfg(test)]
-mod tests {
-    use reqwest::header::{self, ACCEPT};
-
-    use crate::structs::release::Release;
-
-
-    #[tokio::test]
-    async fn attach_file_exists() {
-        let conf = TestConfig::new();
-        let release_candidates =
-            crate::api::release::list_releases(
-                &conf.client,
-                &conf.server,
-                &conf.repo
-            )
-            .await
-            .expect("Failed to get releases. Pre-conditions unmet, aborting test!");
-
-        let release = match_release_by_tag(&conf.release_tag, release_candidates)
-            .expect("Failed to select matching release. Pre-conditions unmet, aborting test!");
-        
-        let api_result = super::create_release_attachment(
-            &conf.client,
-            &conf.server,
-            &conf.repo,
-            release.id,
-            vec![String::from("Cargo.toml")],
-        )
-        .await;
-    }
-
-    #[tokio::test]
-    async fn attach_file_missing() {
-        let conf = TestConfig::new();
-        let release_candidates =
-            crate::api::release::list_releases(
-                &conf.client,
-                &conf.server,
-                &conf.repo
-            )
-            .await
-            .expect("Failed to get releases. Pre-conditions unmet, aborting test!");
-
-        let release = match_release_by_tag(&conf.release_tag, release_candidates)
-            .expect("Failed to select matching release. Pre-conditions unmet, aborting test!");
-        
-        let api_result = super::create_release_attachment(
-            &conf.client,
-            &conf.server,
-            &conf.repo,
-            release.id,
-            vec![String::from("./this-file-doesnt-exist")],
-        )
-        .await;
-        let api_err = api_result.expect_err("Received Ok(()) after uploading non-existent file. That's nonsense, the API Function is wrong.");
-        match api_err {
-            crate::Error::Placeholder => panic!("Received dummy response from the API function. Finish implementing it, stupid"),
-            crate::Error::WrappedReqwestErr(error) => panic!("Received a reqwest::Error from the API function: {error}"),
-            crate::Error::MissingAuthToken => unreachable!("Missing auth token... in a unit test that already panics without the auth token..."),
-            crate::Error::NoSuchFile => (), // test passes
-            crate::Error::ApiErrorMessage(api_error) => panic!("Received an error message from the API: {api_error:?}"),
-        }
-    }
-
-    struct TestConfig {
-        server: String,
-        repo: String,
-        release_tag: String,
-        client: reqwest::Client,
-    }
-
-    impl TestConfig {
-        fn new() -> Self {
-            let server = std::env::var("TEST_GITEA_SERVER")
-                .expect("Must set server address in env var \"TEST_GITEA_SERVER\"");
-            let repo = std::env::var("TEST_GITEA_REPO")
-                .expect("Must set <user>/<repo> name in env var \"TEST_GITEA_REPO\"");
-            let token = format!(
-                "token {}",
-                std::env::var("TEST_GITEA_KEY")
-                    .expect("Must set the API token in env var \"TEST_GITEA_KEY\"")
-            );
-            let release_tag = std::env::var("TEST_GITEA_RELEASE_TAG")
-                .expect("Must set the target release tag in env var \"TEST_GITEA_RELEASE_TAG\"");
-
-            let mut headers = reqwest::header::HeaderMap::new();
-            headers.append(ACCEPT, header::HeaderValue::from_static("application/json"));
-            headers.append("Authorization", token.parse().unwrap());
-
-            let client = reqwest::Client::builder()
-                .user_agent(format!(
-                    "gt-tools-autotest-agent{}",
-                    env!("CARGO_PKG_VERSION")
-                ))
-                .default_headers(headers)
-                .build()
-                .expect("Failed to build reqwest::Client.");
-
-            return Self {
-                server,
-                repo,
-                release_tag,
-                client
-            };
-        }
-    }
-
-    // Testing utils
-    fn match_release_by_tag(tag: &String, releases: Vec<Release>) -> Option<Release> {
-        let mut release: Option<Release> = None;
-        for rel in releases {
-            if rel.tag_name == *tag {
-                // Only store the value if one hasn't been stored already
-                if let Some(first_release) = &release {
-                    // if there was already a match, begin the error diagnostic creation.
-                    let first_id = first_release.id;
-                    let second_id = rel.id;
-                    assert!(
-                        first_id != second_id,
-                        "FAILURE: Found the same release ID twice while scanning for duplicate tags. How did we get the same one twice?"
-                    );
-                    eprintln!("ERROR: Two releases have been found for the tag \"{tag}\".");
-                    eprintln!("ERROR:    first ID: {first_id}");
-                    eprintln!("ERROR:    second ID: {second_id}");
-                    panic!("ERROR: Nonsense detected, I'm bailing out!");
-                } else {
-                    // else, store our first (and hopefully only) match
-                    release = Some(rel);
-                }
-            }
-        }
-        return release;
-    }
-}

src/lib.rs

@@ -10,6 +10,13 @@ pub struct ApiError {
     url: String,
 }
 
+pub(crate) async fn decode_client_error(response: reqwest::Response) -> Result<ApiError> {
+    response
+        .json::<ApiError>()
+        .await
+        .map_err(crate::Error::WrappedReqwestErr)
+}
+
 #[derive(Debug)]
 pub enum Error {
     Placeholder, // TODO: Enumerate error modes

src/main.rs

@@ -1,3 +1,5 @@
+use std::path;
+
 use gt_tool::cli::Args;
 use gt_tool::structs::release::{CreateReleaseOption, Release};
 
@@ -19,10 +21,7 @@ async fn main() -> Result<(), gt_tool::Error> {
         headers.append("Authorization", token.parse().unwrap());
     }
     let client = reqwest::Client::builder()
-        .user_agent(format!(
+        .user_agent(format!("gt-tools-agent-{}", env!("CARGO_PKG_VERSION")))
-            "gt-tools-agent-{}",
-            env!("CARGO_PKG_VERSION")
-        ))
         .default_headers(headers)
         .build()?;
 
@@ -30,9 +29,15 @@ async fn main() -> Result<(), gt_tool::Error> {
         gt_tool::cli::Commands::ListReleases => {
             let releases =
                 gt_tool::api::release::list_releases(&client, &args.gitea_url, &args.repo).await?;
-            for release in releases {
+            // Print in reverse order so the newest items are closest to the
-                println!("{:?}", release);
+            // user's command prompt. Otherwise the newest item scrolls off the
-            }
+            // screen and can't be seen.
+            itertools::Itertools::intersperse(
+                releases.iter().rev().map(|release| release.colorized()),
+                String::from(""),
+            )
+            .map(|release| println!("{}", release))
+            .fold((), |_, _| ());
         }
         gt_tool::cli::Commands::CreateRelease {
             name,
@@ -49,13 +54,8 @@ async fn main() -> Result<(), gt_tool::Error> {
                 tag_name,
                 target_commitish,
             };
-            gt_tool::api::release::create_release(
+            gt_tool::api::release::create_release(&client, &args.gitea_url, &args.repo, submission)
-                &client,
+                .await?;
-                &args.gitea_url,
-                &args.repo,
-                submission,
-            )
-            .await?;
         }
         gt_tool::cli::Commands::UploadRelease {
             tag_name,
@@ -78,14 +78,29 @@ async fn main() -> Result<(), gt_tool::Error> {
                 gt_tool::api::release::list_releases(&client, &args.gitea_url, &args.repo).await?;
 
             if let Some(release) = match_release_by_tag(&tag_name, release_candidates) {
-                gt_tool::api::release_attachment::create_release_attachment(
+                for file in &files {
-                    &client,
+                    let path = path::Path::new(&file);
-                    &args.gitea_url,
+                    match path.try_exists() {
-                    &args.repo,
+                        Ok(true) => continue,
-                    release.id,
+                        Ok(false) => return Err(gt_tool::Error::NoSuchFile),
-                    files,
+                        Err(e) => {
-                )
+                            eprintln!("Uh oh! The file-exists check couldn't be done: {e}");
-                .await?;
+                            panic!(
+                                "TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)"
+                            );
+                        }
+                    }
+                }
+                for file in files {
+                    let _attach_desc = gt_tool::api::release_attachment::create_release_attachment(
+                        &client,
+                        &args.gitea_url,
+                        &args.repo,
+                        release.id,
+                        file,
+                    )
+                    .await?;
+                }
             } else {
                 println!("ERR: Couldn't find a release matching the tag \"{tag_name}\".");
                 return Err(gt_tool::Error::NoSuchRelease);
@@ -127,5 +142,5 @@ fn match_release_by_tag(tag: &String, releases: Vec<Release>) -> Option<Release>
             }
         }
     }
-    return release;
+    release
 }

src/structs/mod.rs

@@ -1,2 +1,15 @@
+use serde::{Deserialize, Serialize};
+
 pub mod release;
 pub mod repo;
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct Attachment {
+    id: usize,
+    name: String,
+    size: i64,
+    download_count: i64,
+    created_at: String, // TODO: Date-time struct
+    uuid: String,
+    browser_download_url: String,
+}

src/structs/release.rs

@@ -1,3 +1,4 @@
+use colored::Colorize;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -19,6 +20,36 @@ pub struct Release {
     author: Author,
 }
 
+impl Release {
+    pub fn colorized(&self) -> String {
+        let tag = "Tag:".green().bold();
+        let name = "Name:".green();
+        let published = "Published:".bright_green();
+        let created = "Created:".green().dimmed();
+        let author = "Author:".blue();
+        let body = if !self.body.is_empty() {
+            &self.body.white()
+        } else {
+            &String::from("(empty body)").dimmed()
+        };
+
+        format!(
+            "{tag} {}
+{name} {}
+  {}
+{published} {} ({created} {})
+{author} {} ({})",
+            self.tag_name.bold(),
+            self.name,
+            body,
+            self.published_at,
+            self.created_at.dimmed(),
+            self.author.login,
+            self.author.email,
+        )
+    }
+}
+
 #[derive(Debug, Deserialize, Serialize)]
 pub struct Author {
     id: usize,