Compare commits
2 Commits
8eacb510a2
...
minimal-ve
| Author | SHA1 | Date | |
|---|---|---|---|
| 3e557665c9 | |||
| faa5ce8549 |
@@ -8,11 +8,6 @@ jobs:
|
|||||||
name: Compile and upload a release build
|
name: Compile and upload a release build
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Get Cargo version
|
|
||||||
run: echo "cargo_version=v$(grep "^version" Cargo.toml | cut -d \" -f2)" >> $GITHUB_ENV
|
|
||||||
- name: Abort if Cargo.toml & Git Tag versions don't match
|
|
||||||
if: ${{ env.cargo_version != github.ref_name }}
|
|
||||||
run: exit 1
|
|
||||||
- name: Install Rust Stable
|
- name: Install Rust Stable
|
||||||
uses: dtolnay/rust-toolchain@stable
|
uses: dtolnay/rust-toolchain@stable
|
||||||
- name: Build binary crate
|
- name: Build binary crate
|
||||||
|
|||||||
19
Cargo.toml
19
Cargo.toml
@@ -1,16 +1,29 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "gt-tool"
|
name = "gt-tool"
|
||||||
version = "2.2.0"
|
version = "1.0.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"] }
|
||||||
|
|
||||||
|
# Grand-dependency Pins ----
|
||||||
|
# Fixes: Reqwest uses too-old version of crate `log`
|
||||||
|
log = "0.4.6"
|
||||||
|
|
||||||
|
# Debian 12 uses OpenSSL 3.x and older libssl-sys crates are angry about that
|
||||||
|
|
||||||
|
# Fixes: native lib lookup.
|
||||||
|
# Causes: missing item in crate `ffi`
|
||||||
|
openssl-sys = "0.9.64"
|
||||||
|
|
||||||
|
# Fixes: missing item in crate `ffi` (from openssl-sys)
|
||||||
|
openssl = "0.10.35"
|
||||||
|
|
||||||
|
# End Grand-dependency Pins ----
|
||||||
|
|
||||||
# Packages available in Debian (Sid)
|
# Packages available in Debian (Sid)
|
||||||
# clap = "4.5.23"
|
# clap = "4.5.23"
|
||||||
# reqwest = "0.12.15"
|
# reqwest = "0.12.15"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# gt-tool
|
# gt-tools
|
||||||
|
|
||||||
CLI tools for interacting with the Gitea API. Use interactively to talk to your Gitea instance, or automatically via a CI/CD pipeline.
|
CLI tools for interacting with the Gitea API. Use interactively to talk to your Gitea instance, or automatically via a CI/CD pipeline.
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
Result,
|
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!();
|
todo!();
|
||||||
}
|
}
|
||||||
pub fn get_latest_release() -> Result<Release> {
|
pub fn get_latest_release() -> Result<Release> {
|
||||||
@@ -17,7 +20,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(crate::Error::WrappedReqwestErr)?;
|
let response = req.map_err(|reqwest_err| crate::Error::WrappedReqwestErr(reqwest_err))?;
|
||||||
if response.status().is_success() {
|
if response.status().is_success() {
|
||||||
let release_list = response
|
let release_list = response
|
||||||
.json::<Vec<Release>>()
|
.json::<Vec<Release>>()
|
||||||
@@ -47,22 +50,22 @@ pub async fn create_release(
|
|||||||
.json(&submission)
|
.json(&submission)
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
.map_err(crate::Error::from)?;
|
.map_err(|e| crate::Error::from(e))?;
|
||||||
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(crate::Error::from)?;
|
.map_err(|e| crate::Error::from(e))?;
|
||||||
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,10 +22,8 @@ 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!(
|
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)"
|
},
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
println!("Uploading file {}", &file);
|
println!("Uploading file {}", &file);
|
||||||
@@ -46,7 +44,7 @@ pub async fn create_release_attachment(
|
|||||||
let attachment_desc = response
|
let attachment_desc = response
|
||||||
.json::<Attachment>()
|
.json::<Attachment>()
|
||||||
.await
|
.await
|
||||||
.map_err(crate::Error::from)?;
|
.map_err(|e| crate::Error::from(e))?;
|
||||||
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?;
|
||||||
|
|||||||
@@ -10,11 +10,13 @@ pub struct ApiError {
|
|||||||
url: String,
|
url: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn decode_client_error(response: reqwest::Response) -> Result<ApiError> {
|
pub (crate) async fn decode_client_error(response: reqwest::Response) -> Result<ApiError> {
|
||||||
response
|
response
|
||||||
.json::<ApiError>()
|
.json::<ApiError>()
|
||||||
.await
|
.await
|
||||||
.map_err(crate::Error::WrappedReqwestErr)
|
.map_err(|reqwest_err| {
|
||||||
|
crate::Error::WrappedReqwestErr(reqwest_err)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
|||||||
35
src/main.rs
35
src/main.rs
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
use std::path;
|
use std::path;
|
||||||
|
|
||||||
use gt_tool::cli::Args;
|
use gt_tool::cli::Args;
|
||||||
@@ -21,7 +22,10 @@ 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!("gt-tools-agent-{}", env!("CARGO_PKG_VERSION")))
|
.user_agent(format!(
|
||||||
|
"gt-tools-agent-{}",
|
||||||
|
env!("CARGO_PKG_VERSION")
|
||||||
|
))
|
||||||
.default_headers(headers)
|
.default_headers(headers)
|
||||||
.build()?;
|
.build()?;
|
||||||
|
|
||||||
@@ -29,15 +33,9 @@ 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?;
|
||||||
// Print in reverse order so the newest items are closest to the
|
for release in releases {
|
||||||
// user's command prompt. Otherwise the newest item scrolls off the
|
println!("{:?}", release);
|
||||||
// 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,
|
||||||
@@ -54,8 +52,13 @@ async fn main() -> Result<(), gt_tool::Error> {
|
|||||||
tag_name,
|
tag_name,
|
||||||
target_commitish,
|
target_commitish,
|
||||||
};
|
};
|
||||||
gt_tool::api::release::create_release(&client, &args.gitea_url, &args.repo, submission)
|
gt_tool::api::release::create_release(
|
||||||
.await?;
|
&client,
|
||||||
|
&args.gitea_url,
|
||||||
|
&args.repo,
|
||||||
|
submission,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
}
|
}
|
||||||
gt_tool::cli::Commands::UploadRelease {
|
gt_tool::cli::Commands::UploadRelease {
|
||||||
tag_name,
|
tag_name,
|
||||||
@@ -85,10 +88,8 @@ 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!(
|
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 {
|
for file in files {
|
||||||
@@ -142,5 +143,5 @@ fn match_release_by_tag(tag: &String, releases: Vec<Release>) -> Option<Release>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
release
|
return release;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
use colored::Colorize;
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
#[derive(Debug, Deserialize, Serialize)]
|
||||||
@@ -20,36 +19,6 @@ 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