Compare commits
19 Commits
debian/2.1
...
debian/2.2
| Author | SHA1 | Date | |
|---|---|---|---|
| f9673b715f | |||
| 820a9daaed | |||
| 8d71b81271 | |||
| 17bde93259 | |||
| cdb312fe61 | |||
| cfaa0ceb3f | |||
| c0a0181074 | |||
| 119831481e | |||
| 7246c7afb6 | |||
| 84eaaa1dbd | |||
| c9dda5760c | |||
| 336f1453b9 | |||
| f068e8233e | |||
| d4ef21e243 | |||
| d94c350cde | |||
| 8120cb0489 | |||
| b82cfdb822 | |||
| ea046c929f | |||
| 135acf09b7 |
@@ -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"] }
|
||||
|
||||
26
debian/changelog
vendored
26
debian/changelog
vendored
@@ -1,3 +1,29 @@
|
||||
gt-tool (2.2.0-2) unstable; urgency=medium
|
||||
|
||||
* Fix: "Source:" URL in debian/copyright
|
||||
* Fix typo in copyright comment
|
||||
|
||||
-- Robert Garrett <robertgarrett404@gmail.com> Sun, 13 Jul 2025 16:59:25 -0500
|
||||
|
||||
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`
|
||||
|
||||
2
debian/control
vendored
2
debian/control
vendored
@@ -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,
|
||||
|
||||
4
debian/copyright
vendored
4
debian/copyright
vendored
@@ -1,7 +1,7 @@
|
||||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Name: gt-tools
|
||||
Upstream-Contact: Robert Garrett <robertgarrett404@gmail.com>
|
||||
Source: https://source.mnt.re/reform/mnt-reform-setup-wizard
|
||||
Source: https://git.gelvin.dev/robert/gt-tool
|
||||
|
||||
Files: *
|
||||
Copyright: 2025 Robert Garrett <robertgarrett404@gmail.com>
|
||||
@@ -17,7 +17,7 @@ Copyright:
|
||||
2025 Robert Garrett <robertgarrett404@gmail.com>
|
||||
License: GPL-3+
|
||||
Comment:
|
||||
The debian/rules file is liften directly from the tuigreet package. It was
|
||||
The debian/rules file is lifted directly from the tuigreet package. It was
|
||||
linked in the Debian Rust Team Book as a pretty simple example package. The
|
||||
only change I've made is to remove the documentation generation target.
|
||||
.
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
39
debian/patches/0002-Lift-the-empty-body-string-outside-the-let-if.patch
vendored
Normal file
39
debian/patches/0002-Lift-the-empty-body-string-outside-the-let-if.patch
vendored
Normal file
@@ -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!(
|
||||
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@@ -1 +1,2 @@
|
||||
0001-Rust-edition-downgrade-to-2021.patch
|
||||
0002-Lift-the-empty-body-string-outside-the-let-if.patch
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
|
||||
use crate::{
|
||||
Result,
|
||||
structs::{
|
||||
release::{CreateReleaseOption, Release},
|
||||
},
|
||||
structs::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> {
|
||||
@@ -20,7 +17,7 @@ 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)?;
|
||||
if response.status().is_success() {
|
||||
let release_list = response
|
||||
.json::<Vec<Release>>()
|
||||
@@ -50,22 +47,22 @@ pub async fn create_release(
|
||||
.json(&submission)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| crate::Error::from(e))?;
|
||||
.map_err(crate::Error::from)?;
|
||||
if response.status().is_success() {
|
||||
let new_release = response
|
||||
.json::<Release>()
|
||||
.await
|
||||
.map_err(|e| crate::Error::from(e))?;
|
||||
.map_err(crate::Error::from)?;
|
||||
return Ok(new_release);
|
||||
} else if response.status().is_client_error() {
|
||||
let mesg = crate::decode_client_error(response).await?;
|
||||
return Err(crate::Error::ApiErrorMessage(mesg))
|
||||
return Err(crate::Error::ApiErrorMessage(mesg));
|
||||
}
|
||||
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!();
|
||||
}
|
||||
|
||||
@@ -22,8 +22,10 @@ pub async fn create_release_attachment(
|
||||
Ok(false) => return Err(crate::Error::NoSuchFile),
|
||||
Err(e) => {
|
||||
eprintln!("Uh oh! The file-exists check couldn't be done: {e}");
|
||||
panic!("TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)");
|
||||
},
|
||||
panic!(
|
||||
"TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
println!("Uploading file {}", &file);
|
||||
@@ -44,7 +46,7 @@ pub async fn create_release_attachment(
|
||||
let attachment_desc = response
|
||||
.json::<Attachment>()
|
||||
.await
|
||||
.map_err(|e| crate::Error::from(e))?;
|
||||
.map_err(crate::Error::from)?;
|
||||
return Ok(attachment_desc);
|
||||
} else if response.status().is_client_error() {
|
||||
let mesg = crate::decode_client_error(response).await?;
|
||||
|
||||
@@ -14,9 +14,7 @@ pub (crate) async fn decode_client_error(response: reqwest::Response) -> Result<
|
||||
response
|
||||
.json::<ApiError>()
|
||||
.await
|
||||
.map_err(|reqwest_err| {
|
||||
crate::Error::WrappedReqwestErr(reqwest_err)
|
||||
})
|
||||
.map_err(crate::Error::WrappedReqwestErr)
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
|
||||
33
src/main.rs
33
src/main.rs
@@ -1,4 +1,3 @@
|
||||
|
||||
use std::path;
|
||||
|
||||
use gt_tool::cli::Args;
|
||||
@@ -22,10 +21,7 @@ async fn main() -> Result<(), gt_tool::Error> {
|
||||
headers.append("Authorization", token.parse().unwrap());
|
||||
}
|
||||
let client = reqwest::Client::builder()
|
||||
.user_agent(format!(
|
||||
"gt-tools-agent-{}",
|
||||
env!("CARGO_PKG_VERSION")
|
||||
))
|
||||
.user_agent(format!("gt-tools-agent-{}", env!("CARGO_PKG_VERSION")))
|
||||
.default_headers(headers)
|
||||
.build()?;
|
||||
|
||||
@@ -33,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 {
|
||||
println!("{:?}", release);
|
||||
}
|
||||
// Print in reverse order so the newest items are closest to the
|
||||
// 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,
|
||||
@@ -52,12 +54,7 @@ async fn main() -> Result<(), gt_tool::Error> {
|
||||
tag_name,
|
||||
target_commitish,
|
||||
};
|
||||
gt_tool::api::release::create_release(
|
||||
&client,
|
||||
&args.gitea_url,
|
||||
&args.repo,
|
||||
submission,
|
||||
)
|
||||
gt_tool::api::release::create_release(&client, &args.gitea_url, &args.repo, submission)
|
||||
.await?;
|
||||
}
|
||||
gt_tool::cli::Commands::UploadRelease {
|
||||
@@ -88,8 +85,10 @@ async fn main() -> Result<(), gt_tool::Error> {
|
||||
Ok(false) => return Err(gt_tool::Error::NoSuchFile),
|
||||
Err(e) => {
|
||||
eprintln!("Uh oh! The file-exists check couldn't be done: {e}");
|
||||
panic!("TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)");
|
||||
},
|
||||
panic!(
|
||||
"TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
for file in files {
|
||||
@@ -143,5 +142,5 @@ fn match_release_by_tag(tag: &String, releases: Vec<Release>) -> Option<Release>
|
||||
}
|
||||
}
|
||||
}
|
||||
return release;
|
||||
release
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user