Compare commits
12 Commits
debian/2.1
...
v2.2.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 119831481e | |||
| 7246c7afb6 | |||
| 84eaaa1dbd | |||
| c9dda5760c | |||
| 336f1453b9 | |||
| f068e8233e | |||
| d4ef21e243 | |||
| d94c350cde | |||
| 8120cb0489 | |||
| b82cfdb822 | |||
| ea046c929f | |||
| 135acf09b7 |
@@ -1,10 +1,12 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "gt-tool"
|
name = "gt-tool"
|
||||||
version = "1.0.0"
|
version = "2.2.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
clap = { version = "4.0.7", features = ["derive", "env"] }
|
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"] }
|
reqwest = { version = "0.11.13", features = ["json", "stream", "multipart"] }
|
||||||
serde = { version = "1.0.152", features = ["derive"] }
|
serde = { version = "1.0.152", features = ["derive"] }
|
||||||
tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] }
|
tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread"] }
|
||||||
|
|||||||
29
debian/changelog
vendored
29
debian/changelog
vendored
@@ -1,29 +0,0 @@
|
|||||||
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.
|
|
||||||
|
|
||||||
-- Robert Garrett <robertgarrett404@gmail.com> Sun, 1 Jun 2025 16:05:00 -0500
|
|
||||||
30
debian/control
vendored
30
debian/control
vendored
@@ -1,30 +0,0 @@
|
|||||||
Source: gt-tool
|
|
||||||
Maintainer: Robert Garrett <robertgarrett404@gmail.com>
|
|
||||||
Section: misc
|
|
||||||
Priority: optional
|
|
||||||
Standards-Version: 4.6.2
|
|
||||||
Build-Depends:
|
|
||||||
debhelper-compat (= 13),
|
|
||||||
dh-cargo,
|
|
||||||
librust-clap-dev,
|
|
||||||
librust-reqwest-dev,
|
|
||||||
librust-tokio-dev,
|
|
||||||
librust-serde-dev,
|
|
||||||
Homepage: https://git.gelvin.dev/robert/gt-tool
|
|
||||||
Vcs-Git: https://git.gelvin.dev/robert/gt-tool
|
|
||||||
Vcs-Browser: https://git.gelvin.dev/robert/gt-tool
|
|
||||||
Rules-Requires-Root: no
|
|
||||||
|
|
||||||
Package: gt-tool
|
|
||||||
Architecture: any
|
|
||||||
Depends:
|
|
||||||
${misc:Depends},
|
|
||||||
${shlibs:Depends},
|
|
||||||
Description: CLI tools for interacting with the Gitea API.
|
|
||||||
Use interactively to talk to your Gitea instance, or automatically via a CI/CD
|
|
||||||
pipeline. Currently supports:
|
|
||||||
.
|
|
||||||
- showing the Releases for a project
|
|
||||||
- creating a new Release for a project
|
|
||||||
- attaching files to a release
|
|
||||||
|
|
||||||
43
debian/copyright
vendored
43
debian/copyright
vendored
@@ -1,43 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
Files: *
|
|
||||||
Copyright: 2025 Robert Garrett <robertgarrett404@gmail.com>
|
|
||||||
License: GPL-3+
|
|
||||||
|
|
||||||
Files: debian/*
|
|
||||||
Copyright: 2025 Robert Garrett <robertgarrett404@gmail.com>
|
|
||||||
License: GPL-3+
|
|
||||||
|
|
||||||
Files: debian/rules
|
|
||||||
Copyright:
|
|
||||||
Johannes Schauer Marin Rodrigues <josch@debian.org>
|
|
||||||
2025 Robert Garrett <robertgarrett404@gmail.com>
|
|
||||||
License: GPL-3+
|
|
||||||
Comment:
|
|
||||||
The debian/rules file is liften 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.
|
|
||||||
.
|
|
||||||
https://salsa.debian.org/debian/tuigreet/-/blob/master/debian/rules?ref_type=heads
|
|
||||||
|
|
||||||
|
|
||||||
License: GPL-3+
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
.
|
|
||||||
It is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
||||||
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
|
||||||
License for more details.
|
|
||||||
.
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with it. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
.
|
|
||||||
On Debian systems, the full text of the GNU General Public License version 3
|
|
||||||
can be found in the file /usr/share/common-licenses/GPL-3.
|
|
||||||
|
|
||||||
6
debian/gbp.conf
vendored
6
debian/gbp.conf
vendored
@@ -1,6 +0,0 @@
|
|||||||
[DEFAULT]
|
|
||||||
compression = xz
|
|
||||||
compression-level = 9
|
|
||||||
upstream-tag = v%(version)s
|
|
||||||
debian-branch = deb/bookworm
|
|
||||||
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
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
|
|
||||||
edition.
|
|
||||||
---
|
|
||||||
Cargo.toml | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/Cargo.toml b/Cargo.toml
|
|
||||||
index febccc4..cf52754 100644
|
|
||||||
--- a/Cargo.toml
|
|
||||||
+++ b/Cargo.toml
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
[package]
|
|
||||||
name = "gt-tool"
|
|
||||||
version = "1.0.0"
|
|
||||||
-edition = "2024"
|
|
||||||
+edition = "2021"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
clap = { version = "4.0.7", features = ["derive", "env"] }
|
|
||||||
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@@ -1 +0,0 @@
|
|||||||
0001-Rust-edition-downgrade-to-2021.patch
|
|
||||||
26
debian/rules
vendored
26
debian/rules
vendored
@@ -1,26 +0,0 @@
|
|||||||
#!/usr/bin/make -f
|
|
||||||
|
|
||||||
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
|
||||||
DPKG_EXPORT_BUILDFLAGS = 1
|
|
||||||
include /usr/share/dpkg/default.mk
|
|
||||||
include /usr/share/rustc/architecture.mk
|
|
||||||
export DEB_HOST_RUST_TYPE
|
|
||||||
export PATH:=/usr/share/cargo/bin:$(PATH)
|
|
||||||
export CARGO=/usr/share/cargo/bin/cargo
|
|
||||||
export CARGO_HOME=$(CURDIR)/debian/cargo_home
|
|
||||||
export CARGO_REGISTRY=$(CURDIR)/debian/cargo_registry
|
|
||||||
export DEB_CARGO_CRATE=$(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM)
|
|
||||||
|
|
||||||
%:
|
|
||||||
dh $@ --buildsystem=cargo
|
|
||||||
|
|
||||||
execute_after_dh_auto_clean:
|
|
||||||
$(CARGO) clean
|
|
||||||
rm -rf $(CARGO_HOME)
|
|
||||||
rm -rf $(CARGO_REGISTRY)
|
|
||||||
rm -f debian/cargo-checksum.json
|
|
||||||
|
|
||||||
execute_before_dh_auto_configure:
|
|
||||||
$(CARGO) prepare-debian $(CARGO_REGISTRY) --link-from-system
|
|
||||||
rm -f Cargo.lock
|
|
||||||
touch debian/cargo-checksum.json
|
|
||||||
1
debian/source/format
vendored
1
debian/source/format
vendored
@@ -1 +0,0 @@
|
|||||||
3.0 (quilt)
|
|
||||||
@@ -1,12 +1,9 @@
|
|||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
Result,
|
Result,
|
||||||
structs::{
|
structs::release::{CreateReleaseOption, Release},
|
||||||
release::{CreateReleaseOption, Release},
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
pub fn get_release(id: u64) -> Result<Release> {
|
pub fn get_release(_id: u64) -> Result<Release> {
|
||||||
todo!();
|
todo!();
|
||||||
}
|
}
|
||||||
pub fn get_latest_release() -> Result<Release> {
|
pub fn get_latest_release() -> Result<Release> {
|
||||||
@@ -20,7 +17,7 @@ pub async fn list_releases(
|
|||||||
) -> Result<Vec<Release>> {
|
) -> Result<Vec<Release>> {
|
||||||
let request_url = format!("{gitea_url}/api/v1/repos/{repo}/releases/");
|
let request_url = format!("{gitea_url}/api/v1/repos/{repo}/releases/");
|
||||||
let req = client.get(request_url).send().await;
|
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() {
|
if response.status().is_success() {
|
||||||
let release_list = response
|
let release_list = response
|
||||||
.json::<Vec<Release>>()
|
.json::<Vec<Release>>()
|
||||||
@@ -50,22 +47,22 @@ pub async fn create_release(
|
|||||||
.json(&submission)
|
.json(&submission)
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
.map_err(|e| crate::Error::from(e))?;
|
.map_err(crate::Error::from)?;
|
||||||
if response.status().is_success() {
|
if response.status().is_success() {
|
||||||
let new_release = response
|
let new_release = response
|
||||||
.json::<Release>()
|
.json::<Release>()
|
||||||
.await
|
.await
|
||||||
.map_err(|e| crate::Error::from(e))?;
|
.map_err(crate::Error::from)?;
|
||||||
return Ok(new_release);
|
return Ok(new_release);
|
||||||
} else if response.status().is_client_error() {
|
} else if response.status().is_client_error() {
|
||||||
let mesg = crate::decode_client_error(response).await?;
|
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");
|
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!();
|
todo!();
|
||||||
}
|
}
|
||||||
pub fn delete_release(id: u64) -> Result<()> {
|
pub fn delete_release(_id: u64) -> Result<()> {
|
||||||
todo!();
|
todo!();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,8 +22,10 @@ pub async fn create_release_attachment(
|
|||||||
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!("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);
|
println!("Uploading file {}", &file);
|
||||||
@@ -44,7 +46,7 @@ pub async fn create_release_attachment(
|
|||||||
let attachment_desc = response
|
let attachment_desc = response
|
||||||
.json::<Attachment>()
|
.json::<Attachment>()
|
||||||
.await
|
.await
|
||||||
.map_err(|e| crate::Error::from(e))?;
|
.map_err(crate::Error::from)?;
|
||||||
return Ok(attachment_desc);
|
return Ok(attachment_desc);
|
||||||
} else if response.status().is_client_error() {
|
} else if response.status().is_client_error() {
|
||||||
let mesg = crate::decode_client_error(response).await?;
|
let mesg = crate::decode_client_error(response).await?;
|
||||||
|
|||||||
@@ -14,9 +14,7 @@ pub (crate) async fn decode_client_error(response: reqwest::Response) -> Result<
|
|||||||
response
|
response
|
||||||
.json::<ApiError>()
|
.json::<ApiError>()
|
||||||
.await
|
.await
|
||||||
.map_err(|reqwest_err| {
|
.map_err(crate::Error::WrappedReqwestErr)
|
||||||
crate::Error::WrappedReqwestErr(reqwest_err)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
|||||||
33
src/main.rs
33
src/main.rs
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
use std::path;
|
use std::path;
|
||||||
|
|
||||||
use gt_tool::cli::Args;
|
use gt_tool::cli::Args;
|
||||||
@@ -22,10 +21,7 @@ async fn main() -> Result<(), gt_tool::Error> {
|
|||||||
headers.append("Authorization", token.parse().unwrap());
|
headers.append("Authorization", token.parse().unwrap());
|
||||||
}
|
}
|
||||||
let client = reqwest::Client::builder()
|
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)
|
.default_headers(headers)
|
||||||
.build()?;
|
.build()?;
|
||||||
|
|
||||||
@@ -33,9 +29,15 @@ async fn main() -> Result<(), gt_tool::Error> {
|
|||||||
gt_tool::cli::Commands::ListReleases => {
|
gt_tool::cli::Commands::ListReleases => {
|
||||||
let releases =
|
let releases =
|
||||||
gt_tool::api::release::list_releases(&client, &args.gitea_url, &args.repo).await?;
|
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 {
|
gt_tool::cli::Commands::CreateRelease {
|
||||||
name,
|
name,
|
||||||
@@ -52,12 +54,7 @@ async fn main() -> Result<(), gt_tool::Error> {
|
|||||||
tag_name,
|
tag_name,
|
||||||
target_commitish,
|
target_commitish,
|
||||||
};
|
};
|
||||||
gt_tool::api::release::create_release(
|
gt_tool::api::release::create_release(&client, &args.gitea_url, &args.repo, submission)
|
||||||
&client,
|
|
||||||
&args.gitea_url,
|
|
||||||
&args.repo,
|
|
||||||
submission,
|
|
||||||
)
|
|
||||||
.await?;
|
.await?;
|
||||||
}
|
}
|
||||||
gt_tool::cli::Commands::UploadRelease {
|
gt_tool::cli::Commands::UploadRelease {
|
||||||
@@ -88,8 +85,10 @@ async fn main() -> Result<(), gt_tool::Error> {
|
|||||||
Ok(false) => return Err(gt_tool::Error::NoSuchFile),
|
Ok(false) => return Err(gt_tool::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!("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 {
|
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};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
#[derive(Debug, Deserialize, Serialize)]
|
||||||
@@ -19,6 +20,36 @@ pub struct Release {
|
|||||||
author: Author,
|
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)]
|
#[derive(Debug, Deserialize, Serialize)]
|
||||||
pub struct Author {
|
pub struct Author {
|
||||||
id: usize,
|
id: usize,
|
||||||
|
|||||||
Reference in New Issue
Block a user