Compare commits
32 Commits
debian/2.2
...
5b8a09e9ca
| Author | SHA1 | Date | |
|---|---|---|---|
| 5b8a09e9ca | |||
| 3453f64312 | |||
| 63d0a868ec | |||
| 4e9a5dd25b | |||
| ce480306e0 | |||
| 6ca279de49 | |||
| 64215cefcc | |||
| cf9b37fe99 | |||
| ed76fa67ff | |||
| 2e2c54d538 | |||
| 2b47460258 | |||
| b26a594cc8 | |||
| 246987fa68 | |||
| 551297f46b | |||
| 912a7283fd | |||
| 247c06dd9e | |||
| cb314a8b4c | |||
| 277f638c60 | |||
| 626973d2bc | |||
| 28539f54cc | |||
| 5ce20adf2e | |||
| fc1e20185e | |||
| 15593204e0 | |||
| 330985940f | |||
| 213e0b4f4a | |||
| d27bea2c43 | |||
| 30d8bcc6de | |||
| b2b9c8b9d9 | |||
| f6bab75644 | |||
| 075a2ee921 | |||
| 8eacb510a2 | |||
| a23bdf3e34 |
@@ -8,6 +8,11 @@ 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
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ 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"] }
|
||||||
|
toml = "0.5"
|
||||||
|
|
||||||
# Packages available in Debian (Sid)
|
# Packages available in Debian (Sid)
|
||||||
# clap = "4.5.23"
|
# clap = "4.5.23"
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# gt-tools
|
# gt-tool
|
||||||
|
|
||||||
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.
|
||||||
|
|
||||||
|
|||||||
55
debian/changelog
vendored
55
debian/changelog
vendored
@@ -1,55 +0,0 @@
|
|||||||
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`
|
|
||||||
|
|
||||||
-- 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
|
|
||||||
32
debian/control
vendored
32
debian/control
vendored
@@ -1,32 +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-colored-dev,
|
|
||||||
librust-itertools-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://git.gelvin.dev/robert/gt-tool
|
|
||||||
|
|
||||||
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 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.
|
|
||||||
.
|
|
||||||
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.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 4fd569c..8b67a52 100644
|
|
||||||
--- a/Cargo.toml
|
|
||||||
+++ b/Cargo.toml
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
[package]
|
|
||||||
name = "gt-tool"
|
|
||||||
version = "2.2.0"
|
|
||||||
-edition = "2024"
|
|
||||||
+edition = "2021"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
clap = { version = "4.0.7", features = ["derive", "env"] }
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
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!(
|
|
||||||
2
debian/patches/series
vendored
2
debian/patches/series
vendored
@@ -1,2 +0,0 @@
|
|||||||
0001-Rust-edition-downgrade-to-2021.patch
|
|
||||||
0002-Lift-the-empty-body-string-outside-the-let-if.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)
|
|
||||||
@@ -4,9 +4,9 @@ use clap::{Parser, Subcommand};
|
|||||||
#[command(version, about, long_about = None)]
|
#[command(version, about, long_about = None)]
|
||||||
pub struct Args {
|
pub struct Args {
|
||||||
#[arg(short = 'u', long = "url", env = "GTTOOL_GITEA_URL")]
|
#[arg(short = 'u', long = "url", env = "GTTOOL_GITEA_URL")]
|
||||||
pub gitea_url: String,
|
pub gitea_url: Option<String>,
|
||||||
#[arg(short = 'r', long = "repo", env = "GTTOOL_FQRN")]
|
#[arg(short = 'r', long = "repo", env = "GTTOOL_FQRN")]
|
||||||
pub repo: String,
|
pub repo: Option<String>,
|
||||||
|
|
||||||
#[command(subcommand)]
|
#[command(subcommand)]
|
||||||
pub command: Commands,
|
pub command: Commands,
|
||||||
|
|||||||
313
src/config.rs
Normal file
313
src/config.rs
Normal file
@@ -0,0 +1,313 @@
|
|||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
use toml::{Value, value::Table};
|
||||||
|
|
||||||
|
pub type Result<T> = core::result::Result<T, Error>;
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
#[cfg_attr(test, derive(PartialEq))]
|
||||||
|
pub enum Error {
|
||||||
|
BadFormat,
|
||||||
|
NoSuchProperty,
|
||||||
|
NoSuchTable,
|
||||||
|
CouldntReadFile,
|
||||||
|
TomlWrap(toml::de::Error),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<toml::de::Error> for Error {
|
||||||
|
fn from(value: toml::de::Error) -> Self {
|
||||||
|
Error::TomlWrap(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl core::fmt::Display for Error {
|
||||||
|
fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
// FIXME: Print a nice output, don't just reuse the Debug impl
|
||||||
|
write!(fmt, "{self:?}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::error::Error for Error {}
|
||||||
|
|
||||||
|
/// Creates an iterator of default (Linux) search paths. The iterator output
|
||||||
|
/// is a list of files named "gt-tool.toml" found in decreasingly specific
|
||||||
|
/// configuration folders.
|
||||||
|
///
|
||||||
|
/// - any dirs listed in env var `$XDG_CONFIG_DIRS`
|
||||||
|
/// - and the `/etc` dir
|
||||||
|
///
|
||||||
|
/// This is so that user-specific configs are used first, then machine-wide
|
||||||
|
/// ones.
|
||||||
|
pub fn default_paths() -> impl Iterator<Item = PathBuf> {
|
||||||
|
// Read env var `XDG_CONFIG_DIRS` and split on ":" to get highest-priority list
|
||||||
|
// TODO: Emit warning when paths aren't unicode
|
||||||
|
std::env::var("XDG_CONFIG_DIRS")
|
||||||
|
.unwrap_or(String::from(""))
|
||||||
|
.split(":")
|
||||||
|
// Set up the "/etc" list
|
||||||
|
// Which is pretty silly, in this case.
|
||||||
|
// Maybe a future version will scan nested folders and this will make
|
||||||
|
// more sense.
|
||||||
|
// glue on the "/etc" path
|
||||||
|
.chain(["/etc"])
|
||||||
|
.map(|path_str| {
|
||||||
|
let mut path = PathBuf::from(path_str);
|
||||||
|
path.push("gt-tool.toml");
|
||||||
|
path
|
||||||
|
})
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.into_iter()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Searches through the files, `search_files`, for configuration related to a
|
||||||
|
/// project, `project`.
|
||||||
|
///
|
||||||
|
/// The project string is used as a map key and should match the real path of a
|
||||||
|
/// project on disk. These are the table names for each config section.
|
||||||
|
///
|
||||||
|
/// The search files iterator must produce *files* not *folders.* For now,
|
||||||
|
/// there is no mechanism to ensure correct usage. Files that can't be opened
|
||||||
|
/// will quietly be skipped, so there will be no warning when one gives a
|
||||||
|
/// folder.
|
||||||
|
///
|
||||||
|
/// Use `fn default_paths()` to get a reasonable (Linux) default.
|
||||||
|
///
|
||||||
|
/// TODO: Check for, and warn or error when given a dir.
|
||||||
|
pub fn get_config(
|
||||||
|
project: &str,
|
||||||
|
search_files: impl Iterator<Item = PathBuf>,
|
||||||
|
) -> Result<PartialConfig> {
|
||||||
|
/*
|
||||||
|
1. Get conf search (from fn input)
|
||||||
|
2. Iterate config dirs
|
||||||
|
3. Try load toml::Value from file
|
||||||
|
4. Try-get proj-specific table
|
||||||
|
5. Try-get "[all]" table
|
||||||
|
6. (merge) Update `Option::None`s in proj-spec with `Some(_)`s from "[all]"
|
||||||
|
7. (merge, again) Fold the PartialConfigs into a finished one
|
||||||
|
*/
|
||||||
|
|
||||||
|
let file_iter = search_files;
|
||||||
|
|
||||||
|
let toml_iter = file_iter
|
||||||
|
.map(std::fs::read_to_string) // read text from file
|
||||||
|
.filter_map(|res| res.ok()) // remove any error messages
|
||||||
|
// TODO: Log warnings when files couldn't be read.
|
||||||
|
.map(|toml_text| toml_text.parse::<Value>()) // try convert to `toml::Value`
|
||||||
|
.filter_map(|res| res.ok()); // remove any failed parses
|
||||||
|
let config_iter = toml_iter
|
||||||
|
.map(|val| -> Result<PartialConfig> {
|
||||||
|
// Like `fn read_conf_str(...)`, but doesn't produce a `WholeFile`
|
||||||
|
|
||||||
|
// 1. Get the top-level table that is the config file
|
||||||
|
let cfg_table = val.as_table().ok_or(Error::BadFormat)?;
|
||||||
|
|
||||||
|
// 2. Get table
|
||||||
|
|
||||||
|
get_table(cfg_table, project)
|
||||||
|
// 3. convert to PartialConfig
|
||||||
|
.and_then(PartialConfig::try_from)
|
||||||
|
// 4. assemble a 2-tuple of PartialConfigs by...
|
||||||
|
.and_then(|proj| {
|
||||||
|
Ok((
|
||||||
|
// 4-1. Passing in the project-specific PartialConfig
|
||||||
|
proj.project_path(project),
|
||||||
|
// 4-2. Getting and converting to PartialConfig, or returning any Err() if one appears.
|
||||||
|
get_table(cfg_table, "all").and_then(PartialConfig::try_from)?,
|
||||||
|
))
|
||||||
|
})
|
||||||
|
.map(|pair| pair.0.merge(pair.1))
|
||||||
|
})
|
||||||
|
.filter_map(|res| res.ok())
|
||||||
|
.fold(PartialConfig::default(), |acc, inc| acc.merge(inc));
|
||||||
|
Ok(config_iter)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Default)]
|
||||||
|
#[cfg_attr(test, derive(PartialEq))]
|
||||||
|
pub struct PartialConfig {
|
||||||
|
project_path: Option<String>,
|
||||||
|
pub gitea_url: Option<String>,
|
||||||
|
pub owner: Option<String>,
|
||||||
|
pub repo: Option<String>,
|
||||||
|
pub token: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PartialConfig {
|
||||||
|
// One lonely builder-pattern function to set the project path.
|
||||||
|
// This is so I can do continuation style calls instead of a bunch of
|
||||||
|
// successive `let conf = ...` temporaries.
|
||||||
|
fn project_path(self, path: impl ToString) -> Self {
|
||||||
|
PartialConfig {
|
||||||
|
project_path: Some(path.to_string()),
|
||||||
|
..self
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Merges two `PartialConfig`'s together, producing a new one.
|
||||||
|
// Non-None values on the right-hand side are used to replace values
|
||||||
|
// in the left-hand side, even if they are Some(_).
|
||||||
|
fn merge(self, other: Self) -> Self {
|
||||||
|
Self {
|
||||||
|
project_path: other.project_path.or(self.project_path),
|
||||||
|
gitea_url: other.gitea_url.or(self.gitea_url),
|
||||||
|
owner: other.owner.or(self.owner),
|
||||||
|
repo: other.repo.or(self.repo),
|
||||||
|
token: other.token.or(self.token),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TryFrom<&Table> for PartialConfig {
|
||||||
|
type Error = crate::config::Error;
|
||||||
|
|
||||||
|
fn try_from(value: &Table) -> Result<Self> {
|
||||||
|
Ok(Self {
|
||||||
|
// can't get table name because that key is gone by this point.
|
||||||
|
project_path: None,
|
||||||
|
gitea_url: get_maybe_property(value, "gitea_url")?.cloned(),
|
||||||
|
owner: get_maybe_property(value, "owner")?.cloned(),
|
||||||
|
repo: get_maybe_property(value, "repo")?.cloned(),
|
||||||
|
token: get_maybe_property(value, "token")?.cloned(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The outer value must be a Table so we can get the sub-table from it.
|
||||||
|
fn get_table(outer: &Table, table_name: impl ToString) -> Result<&Table> {
|
||||||
|
outer
|
||||||
|
.get(&table_name.to_string())
|
||||||
|
.ok_or(Error::NoSuchTable)?
|
||||||
|
.as_table()
|
||||||
|
.ok_or(Error::BadFormat)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Similar to `get_property()` but maps the "Error::NoSuchProperty" result to
|
||||||
|
/// Option::None. Some properties aren't specified, and that's okay... sometimes.
|
||||||
|
fn get_maybe_property(outer: &Table, property: impl ToString) -> Result<Option<&String>> {
|
||||||
|
let maybe_prop = get_property(outer, property);
|
||||||
|
match maybe_prop {
|
||||||
|
Ok(value) => Ok(Some(value)),
|
||||||
|
Err(e) => {
|
||||||
|
if let Error::NoSuchProperty = e {
|
||||||
|
Ok(None)
|
||||||
|
} else {
|
||||||
|
Err(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The config properties are individual strings. This gets the named property,
|
||||||
|
/// or an error explaining why it couldn't be fetched.
|
||||||
|
fn get_property(outer: &Table, property: impl ToString) -> Result<&String> {
|
||||||
|
let maybe_prop = outer
|
||||||
|
.get(&property.to_string())
|
||||||
|
.ok_or(Error::NoSuchProperty)?;
|
||||||
|
if let Value::String(text) = maybe_prop {
|
||||||
|
Ok(text)
|
||||||
|
} else {
|
||||||
|
Err(Error::BadFormat)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use toml::map::Map;
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn read_single_prop() -> Result<()> {
|
||||||
|
let fx_input_str = "owner = \"dingus\"";
|
||||||
|
let fx_value = fx_input_str.parse::<Value>()?;
|
||||||
|
let fx_value = fx_value.as_table().ok_or(Error::NoSuchTable)?;
|
||||||
|
let expected = "dingus";
|
||||||
|
|
||||||
|
let res = get_property(&fx_value, String::from("owner"))?;
|
||||||
|
assert_eq!(res, expected);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// The property is given the value of empty-string `""`
|
||||||
|
#[test]
|
||||||
|
fn read_single_prop_empty_quotes() -> Result<()> {
|
||||||
|
let fx_input_str = "owner = \"\"";
|
||||||
|
let fx_value = fx_input_str.parse::<Value>()?;
|
||||||
|
let fx_value = fx_value.as_table().ok_or(Error::NoSuchTable)?;
|
||||||
|
let expected = "";
|
||||||
|
|
||||||
|
let res = get_property(&fx_value, String::from("owner"))?;
|
||||||
|
assert_eq!(res, expected);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn read_table() -> Result<()> {
|
||||||
|
let fx_input_str = "[tab]\nwith_a_garbage = \"value\"";
|
||||||
|
let fx_value = fx_input_str.parse::<Value>()?;
|
||||||
|
let fx_value = fx_value.as_table().ok_or(Error::BadFormat)?;
|
||||||
|
let mut expected: Map<String, Value> = Map::new();
|
||||||
|
expected.insert(
|
||||||
|
String::from("with_a_garbage"),
|
||||||
|
Value::String(String::from("value")),
|
||||||
|
);
|
||||||
|
|
||||||
|
let res = get_table(&fx_value, String::from("tab"))?;
|
||||||
|
assert_eq!(res, &expected);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_get_config_with_specific_match() -> Result<()> {
|
||||||
|
let search_paths = ["./test_data/sample_config.toml"]
|
||||||
|
.into_iter()
|
||||||
|
.map(PathBuf::from);
|
||||||
|
let load_result = get_config("/home/robert/projects/gt-tool", search_paths)?;
|
||||||
|
let expected = PartialConfig {
|
||||||
|
project_path: Some(String::from("/home/robert/projects/gt-tool")),
|
||||||
|
owner: Some(String::from("robert")),
|
||||||
|
repo: Some(String::from("gt-tool")),
|
||||||
|
gitea_url: Some(String::from("http://localhost:3000")),
|
||||||
|
token: Some(String::from("fake-token")),
|
||||||
|
};
|
||||||
|
|
||||||
|
assert_eq!(load_result, expected);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure the config comes back with something even when there is no
|
||||||
|
// matching project-specific table.
|
||||||
|
#[test]
|
||||||
|
fn test_get_config_no_specific_match() -> Result<()> {
|
||||||
|
let search_paths = ["./test_data/sample_config.toml"]
|
||||||
|
.into_iter()
|
||||||
|
.map(PathBuf::from);
|
||||||
|
let load_result = get_config("/no/such/project", search_paths)?;
|
||||||
|
let expected = PartialConfig {
|
||||||
|
project_path: None,
|
||||||
|
owner: None,
|
||||||
|
repo: None,
|
||||||
|
gitea_url: Some(String::from("http://localhost:3000")),
|
||||||
|
token: Some(String::from("fake-token")),
|
||||||
|
};
|
||||||
|
assert_eq!(load_result, expected);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure the config comes back with something even when there is no
|
||||||
|
// "[all]" table
|
||||||
|
#[test]
|
||||||
|
fn test_get_config_without_all() -> Result<()> {
|
||||||
|
let search_paths = ["./test_data/missing_all_table.toml"]
|
||||||
|
.into_iter()
|
||||||
|
.map(PathBuf::from);
|
||||||
|
let load_result = get_config("/some/other/path", search_paths)?;
|
||||||
|
let expected = PartialConfig {
|
||||||
|
gitea_url: Some(String::from("fake-url")),
|
||||||
|
..PartialConfig::default()
|
||||||
|
};
|
||||||
|
assert_eq!(load_result, expected);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
10
src/lib.rs
10
src/lib.rs
@@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize};
|
|||||||
|
|
||||||
pub mod api;
|
pub mod api;
|
||||||
pub mod cli;
|
pub mod cli;
|
||||||
|
pub mod config;
|
||||||
pub mod structs;
|
pub mod structs;
|
||||||
|
|
||||||
#[derive(Debug, Deserialize, Serialize)]
|
#[derive(Debug, Deserialize, Serialize)]
|
||||||
@@ -20,6 +21,9 @@ pub(crate) async fn decode_client_error(response: reqwest::Response) -> Result<A
|
|||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub enum Error {
|
pub enum Error {
|
||||||
Placeholder, // TODO: Enumerate error modes
|
Placeholder, // TODO: Enumerate error modes
|
||||||
|
MissingGiteaUrl, // the gitea URL wasn't specified on the CLI, env, or config file.
|
||||||
|
MissingRepoFRQN, // either the owner, repo, or both weren't specified in the loaded PartialConfig
|
||||||
|
WrappedConfigErr(config::Error),
|
||||||
WrappedReqwestErr(reqwest::Error),
|
WrappedReqwestErr(reqwest::Error),
|
||||||
MissingAuthToken,
|
MissingAuthToken,
|
||||||
NoSuchFile, // for release attachment 'file exists' pre-check.
|
NoSuchFile, // for release attachment 'file exists' pre-check.
|
||||||
@@ -33,4 +37,10 @@ impl From<reqwest::Error> for crate::Error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl From<crate::config::Error> for crate::Error {
|
||||||
|
fn from(value: crate::config::Error) -> Self {
|
||||||
|
Self::WrappedConfigErr(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
type Result<T> = core::result::Result<T, Error>;
|
type Result<T> = core::result::Result<T, Error>;
|
||||||
|
|||||||
38
src/main.rs
38
src/main.rs
@@ -12,6 +12,34 @@ use reqwest::header::ACCEPT;
|
|||||||
async fn main() -> Result<(), gt_tool::Error> {
|
async fn main() -> Result<(), gt_tool::Error> {
|
||||||
let args = Args::parse();
|
let args = Args::parse();
|
||||||
|
|
||||||
|
// TODO: Heuristics to guess project path
|
||||||
|
// See issue #8: https://git.gelvin.dev/robert/gt-tool/issues/8
|
||||||
|
let pwd = std::env::current_dir()
|
||||||
|
.map_err(|_e| gt_tool::Error::WrappedConfigErr(
|
||||||
|
gt_tool::config::Error::CouldntReadFile
|
||||||
|
))?;
|
||||||
|
let config = gt_tool::config::get_config(
|
||||||
|
pwd.to_str().expect("I assumed the path can be UTF-8, but that didn't work out..."),
|
||||||
|
gt_tool::config::default_paths()
|
||||||
|
)?;
|
||||||
|
println!("->> Loaded Config: {config:?}");
|
||||||
|
// arg parser also checks the environment. Prefer CLI/env, then config file.
|
||||||
|
let gitea_url = args.gitea_url.or(config.gitea_url).ok_or(gt_tool::Error::MissingGiteaUrl)?;
|
||||||
|
// Config files split the repo FQRN into "owner" and "repo" (confusing naming, sorry)
|
||||||
|
// These must be merged back together and passed along.
|
||||||
|
let conf_fqrn = config.owner
|
||||||
|
.ok_or(gt_tool::Error::MissingRepoFRQN)
|
||||||
|
.and_then(| mut own| {
|
||||||
|
let repo = config.repo.ok_or(gt_tool::Error::MissingRepoFRQN)?;
|
||||||
|
own.push_str("/");
|
||||||
|
own.push_str(&repo);
|
||||||
|
Ok(own)
|
||||||
|
});
|
||||||
|
let repo_fqrn = args.repo
|
||||||
|
.ok_or(gt_tool::Error::MissingRepoFRQN)
|
||||||
|
.or(conf_fqrn)?;
|
||||||
|
|
||||||
|
|
||||||
let mut headers = reqwest::header::HeaderMap::new();
|
let mut headers = reqwest::header::HeaderMap::new();
|
||||||
headers.append(ACCEPT, header::HeaderValue::from_static("application/json"));
|
headers.append(ACCEPT, header::HeaderValue::from_static("application/json"));
|
||||||
|
|
||||||
@@ -28,7 +56,7 @@ async fn main() -> Result<(), gt_tool::Error> {
|
|||||||
match args.command {
|
match args.command {
|
||||||
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, &gitea_url, &repo_fqrn).await?;
|
||||||
// Print in reverse order so the newest items are closest to the
|
// Print in reverse order so the newest items are closest to the
|
||||||
// user's command prompt. Otherwise the newest item scrolls off the
|
// user's command prompt. Otherwise the newest item scrolls off the
|
||||||
// screen and can't be seen.
|
// screen and can't be seen.
|
||||||
@@ -54,7 +82,7 @@ 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(&client, &gitea_url, &repo_fqrn, submission)
|
||||||
.await?;
|
.await?;
|
||||||
}
|
}
|
||||||
gt_tool::cli::Commands::UploadRelease {
|
gt_tool::cli::Commands::UploadRelease {
|
||||||
@@ -75,7 +103,7 @@ async fn main() -> Result<(), gt_tool::Error> {
|
|||||||
// Grab all, find the one that matches the input tag.
|
// Grab all, find the one that matches the input tag.
|
||||||
// Scream if there are multiple matches.
|
// Scream if there are multiple matches.
|
||||||
let release_candidates =
|
let release_candidates =
|
||||||
gt_tool::api::release::list_releases(&client, &args.gitea_url, &args.repo).await?;
|
gt_tool::api::release::list_releases(&client, &gitea_url, &repo_fqrn).await?;
|
||||||
|
|
||||||
if let Some(release) = match_release_by_tag(&tag_name, release_candidates) {
|
if let Some(release) = match_release_by_tag(&tag_name, release_candidates) {
|
||||||
for file in &files {
|
for file in &files {
|
||||||
@@ -94,8 +122,8 @@ async fn main() -> Result<(), gt_tool::Error> {
|
|||||||
for file in files {
|
for file in files {
|
||||||
let _attach_desc = gt_tool::api::release_attachment::create_release_attachment(
|
let _attach_desc = gt_tool::api::release_attachment::create_release_attachment(
|
||||||
&client,
|
&client,
|
||||||
&args.gitea_url,
|
&gitea_url,
|
||||||
&args.repo,
|
&repo_fqrn,
|
||||||
release.id,
|
release.id,
|
||||||
file,
|
file,
|
||||||
)
|
)
|
||||||
|
|||||||
5
test_data/missing_all_table.toml
Normal file
5
test_data/missing_all_table.toml
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
# There must be an "[all]" table or the loader will reject the config file.
|
||||||
|
|
||||||
|
["/some/other/path"]
|
||||||
|
gitea_url = "fake-url"
|
||||||
|
|
||||||
15
test_data/sample_config.toml
Normal file
15
test_data/sample_config.toml
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
[all]
|
||||||
|
gitea_url = "http://localhost:3000"
|
||||||
|
token = "fake-token"
|
||||||
|
|
||||||
|
["/home/robert/projects/gt-tool"]
|
||||||
|
owner = "robert"
|
||||||
|
repo = "gt-tool"
|
||||||
|
|
||||||
|
["/home/robert/projects/rcalc"]
|
||||||
|
owner = "jamis"
|
||||||
|
repo = "rcalc"
|
||||||
|
|
||||||
|
["/home/robert/projects/rcalc-builders"]
|
||||||
|
owner = "jamis"
|
||||||
|
repo = "rcalc"
|
||||||
Reference in New Issue
Block a user