Compare commits

..

2 commits

Author SHA1 Message Date
a3c52c7761 feat(config): rename propery url as hostname
Some checks failed
ci/woodpecker/push/build Pipeline failed
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/push/todo-check Pipeline was successful
ci/woodpecker/push/docker Pipeline failed
2024-04-07 16:14:05 +01:00
cb0a7f7cd7 feat(config): rename property type as forge_type 2024-04-07 16:11:23 +01:00
2 changed files with 12 additions and 12 deletions

View file

@ -1,6 +1,6 @@
[forge.default] [forge.default]
type = "forgejo" forge_type = "forgejo"
url = "https://git.example.net" hostname = "git.example.net"
user = "git-next" # the user to perform actions as user = "git-next" # the user to perform actions as
# API token for user? # API token for user?
# path to private SSH key for user? # path to private SSH key for user?

View file

@ -5,8 +5,8 @@ use crate::filesystem::FileSystem;
#[derive(Debug, PartialEq, Eq, Deserialize)] #[derive(Debug, PartialEq, Eq, Deserialize)]
pub struct Config { pub struct Config {
r#type: ForgeType, forge_type: ForgeType,
url: String, hostname: String,
user: String, user: String,
// API Token // API Token
// Private SSH Key Path // Private SSH Key Path
@ -26,11 +26,11 @@ impl Config {
let str = fs.read_file("git-next-server.toml").map_err(OneOf::new)?; let str = fs.read_file("git-next-server.toml").map_err(OneOf::new)?;
toml::from_str(&str).map_err(OneOf::new) toml::from_str(&str).map_err(OneOf::new)
} }
pub const fn r#type(&self) -> &ForgeType { pub const fn forge_type(&self) -> &ForgeType {
&self.r#type &self.forge_type
} }
pub fn url(&self) -> &str { pub fn hostname(&self) -> &str {
self.url.as_str() self.hostname.as_str()
} }
pub fn user(&self) -> &str { pub fn user(&self) -> &str {
self.user.as_str() self.user.as_str()
@ -49,15 +49,15 @@ mod tests {
fs.write_file( fs.write_file(
"git-next-server.toml", "git-next-server.toml",
r#" r#"
type = "ForgeJo" forge_type = "ForgeJo"
url = "https://forge.jo" hostname = "git.example.net"
user = "Bob" user = "Bob"
"#, "#,
) )
.map_err(OneOf::new)?; .map_err(OneOf::new)?;
let config = Config::load(&fs)?; let config = Config::load(&fs)?;
assert_eq!(config.r#type(), &ForgeType::ForgeJo); assert_eq!(config.forge_type(), &ForgeType::ForgeJo);
assert_eq!(config.url(), "https://forge.jo".to_string()); assert_eq!(config.hostname(), "git.example.net".to_string());
assert_eq!(config.user(), "Bob".to_string()); assert_eq!(config.user(), "Bob".to_string());
Ok(()) Ok(())