feat: with git username and email in config

Signed-off-by: kjuulh <contact@kjuulh.io>
This commit is contained in:
2023-08-01 22:38:58 +02:00
parent 1e15e41354
commit 5229d30758
7 changed files with 81 additions and 11 deletions

View File

@@ -52,6 +52,24 @@ pub struct ConfigArgs {
help_heading = "Config"
)]
pub branch: Option<String>,
/// which git username to use for commits
#[arg(
env = "CUDDLE_PLEASE_GIT_USERNAME",
long,
global = true,
help_heading = "Config"
)]
pub git_username: Option<String>,
/// which git email to use for commits
#[arg(
env = "CUDDLE_PLEASE_GIT_EMAIL",
long,
global = true,
help_heading = "Config"
)]
pub git_email: Option<String>,
}
impl From<ConfigArgs> for PleaseConfigBuilder {
@@ -65,6 +83,8 @@ impl From<ConfigArgs> for PleaseConfigBuilder {
}),
settings: Some(PleaseSettingsConfigBuilder {
api_url: value.api_url,
git_username: value.git_username,
git_email: value.git_email,
}),
}
}

View File

@@ -19,6 +19,8 @@ pub struct PleaseProjectConfig {
#[derive(Debug, Clone)]
pub struct PleaseSettingsConfig {
pub api_url: String,
pub git_username: Option<String>,
pub git_email: Option<String>,
}
#[derive(Debug, Clone)]
@@ -43,6 +45,12 @@ impl PleaseConfig {
pub fn get_api_url(&self) -> &str {
&self.settings.api_url
}
pub fn get_git_username(&self) -> Option<String> {
self.settings.git_username.clone()
}
pub fn get_git_email(&self) -> Option<String> {
self.settings.git_email.clone()
}
}
impl Display for PleaseConfig {
@@ -52,6 +60,12 @@ impl Display for PleaseConfig {
writeln!(f, " repository: {}", self.get_repository())?;
writeln!(f, " branch: {}", self.get_branch())?;
writeln!(f, " api_url: {}", self.get_api_url())?;
if let Some(git_username) = self.get_git_username() {
writeln!(f, " git_username: {}", git_username)?;
}
if let Some(git_email) = self.get_git_email() {
writeln!(f, " git_email: {}", git_email)?;
}
Ok(())
}

View File

@@ -15,6 +15,8 @@ pub struct PleaseProjectConfigBuilder {
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
pub struct PleaseSettingsConfigBuilder {
pub api_url: Option<String>,
pub git_username: Option<String>,
pub git_email: Option<String>,
}
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
@@ -56,6 +58,13 @@ impl PleaseConfigBuilder {
fsettings.api_url = Some(api_url);
}
if let Some(git_username) = settings.git_username {
fsettings.git_username = Some(git_username);
}
if let Some(git_email) = settings.git_email {
fsettings.git_email = Some(git_email);
}
self.settings = Some(fsettings);
}
@@ -99,6 +108,8 @@ impl TryFrom<PleaseSettingsConfigBuilder> for PleaseSettingsConfig {
fn try_from(value: PleaseSettingsConfigBuilder) -> Result<Self, Self::Error> {
Ok(Self {
api_url: value.api_url.ok_or(value_is_missing("api_url"))?,
git_username: value.git_username.clone(),
git_email: value.git_username.clone(),
})
}
}