Skip to content

Commit

Permalink
Feat(main+config): Integrate env
Browse files Browse the repository at this point in the history 
Signed-off-by: Paul Mabileau <paulmabileau@hotmail.fr>
  • Loading branch information
@PaulDance
PaulDance committed Aug 15, 2024
1 parent 5456a25 commit 0cdcbdf
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 18 deletions.
47 changes: 29 additions & 18 deletions src/config/effective_config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ pub struct EffectiveConfig {

impl EffectiveConfig {
/// Merges all given sources and exports the result as public fields.
pub fn new(user_config: UserConfig, ship_args: ShipArgs) -> Self {
let ship_args = EffectiveShipArgs::new(&user_config, ship_args);
pub fn new(user_config: UserConfig, env_args: ShipArgs, cli_args: ShipArgs) -> Self {
let ship_args = EffectiveShipArgs::new(&user_config, env_args, cli_args);
Self {
packages: user_config
.self_update(!ship_args.no_self)
Expand Down Expand Up @@ -50,27 +50,32 @@ pub struct EffectiveShipArgs {

impl EffectiveShipArgs {
#[allow(clippy::needless_pass_by_value)]
fn new(user_config: &UserConfig, ship_args: ShipArgs) -> Self {
fn new(user_config: &UserConfig, env_args: ShipArgs, cli_args: ShipArgs) -> Self {
let cfg_defs = user_config.defaults.as_ref();
Self {
no_self: ship_args
no_self: cli_args
.no_self
.or(env_args.no_self)
.or_else(|| cfg_defs.and_then(|defs| defs.ship_cmd.no_self.as_ref().copied()))
.unwrap_or_default(),
only_self: ship_args
only_self: cli_args
.only_self
.or(env_args.only_self)
.or_else(|| cfg_defs.and_then(|defs| defs.ship_cmd.only_self.as_ref().copied()))
.unwrap_or_default(),
skip_check: ship_args
skip_check: cli_args
.skip_check
.or(env_args.skip_check)
.or_else(|| cfg_defs.and_then(|defs| defs.ship_cmd.skip_check.as_ref().copied()))
.unwrap_or_default(),
no_fail_fast: ship_args
no_fail_fast: cli_args
.no_fail_fast
.or(env_args.no_fail_fast)
.or_else(|| cfg_defs.and_then(|defs| defs.ship_cmd.no_fail_fast.as_ref().copied()))
.unwrap_or_default(),
force: ship_args
force: cli_args
.force
.or(env_args.force)
.or_else(|| cfg_defs.and_then(|defs| defs.ship_cmd.force.as_ref().copied()))
.unwrap_or_default(),
}
Expand Down Expand Up @@ -113,7 +118,8 @@ mod tests {
packages: BTreeMap::new(),
defaults: None,
},
ShipArgs::default()
ShipArgs::default(),
ShipArgs::default(),
),
EffectiveShipArgs::default(),
);
Expand All @@ -129,14 +135,15 @@ mod tests {
ship_cmd: ShipArgs::default()
}),
},
ShipArgs::default()
ShipArgs::default(),
ShipArgs::default(),
),
EffectiveShipArgs::default(),
);
}

#[test]
fn test_effectiveshipargs_configset_noargs_isconfig() {
fn test_effectiveshipargs_configset_noenv_noargs_isconfig() {
assert_eq!(
EffectiveShipArgs::new(
&UserConfig {
Expand All @@ -149,7 +156,8 @@ mod tests {
}
}),
},
ShipArgs::default()
ShipArgs::default(),
ShipArgs::default(),
),
EffectiveShipArgs {
force: false,
Expand All @@ -160,7 +168,7 @@ mod tests {
}

#[test]
fn test_effectiveshipargs_noconfig_argsset_isargs() {
fn test_effectiveshipargs_noconfig_noenv_argsset_isargs() {
assert_eq!(
EffectiveShipArgs::new(
&UserConfig {
Expand All @@ -169,11 +177,12 @@ mod tests {
ship_cmd: ShipArgs::default()
}),
},
ShipArgs::default(),
ShipArgs {
no_fail_fast: Some(true),
skip_check: Some(false),
..Default::default()
}
},
),
EffectiveShipArgs {
no_fail_fast: true,
Expand All @@ -184,7 +193,7 @@ mod tests {
}

#[test]
fn test_effectiveshipargs_configset_argsset_nointersection_isunion() {
fn test_effectiveshipargs_configset_noenv_argsset_nointersection_isunion() {
assert_eq!(
EffectiveShipArgs::new(
&UserConfig {
Expand All @@ -197,11 +206,12 @@ mod tests {
}
}),
},
ShipArgs::default(),
ShipArgs {
no_fail_fast: Some(true),
skip_check: Some(false),
..Default::default()
}
},
),
EffectiveShipArgs {
force: true,
Expand All @@ -214,7 +224,7 @@ mod tests {
}

#[test]
fn test_effectiveshipargs_configset_argsset_withintersection_argshaveprecedence() {
fn test_effectiveshipargs_configset_noenv_argsset_withintersection_argshaveprecedence() {
assert_eq!(
EffectiveShipArgs::new(
&UserConfig {
Expand All @@ -229,13 +239,14 @@ mod tests {
}
}),
},
ShipArgs::default(),
ShipArgs {
force: Some(false),
no_self: Some(true),
no_fail_fast: Some(true),
skip_check: Some(false),
..Default::default()
}
},
),
EffectiveShipArgs {
force: false,
Expand Down
1 change: 1 addition & 0 deletions src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ fn try_main(args: &LinerArgs) -> Result<()> {
};
let config = EffectiveConfig::new(
UserConfig::parse_file().wrap_err("Failed to parse the user configuration.")?,
config::env::ship_env_args()?,
if let Some(LinerCommands::Ship(ship_args)) = cmd {
ship_args.clone().into_inner()
} else {
Expand Down

0 comments on commit 0cdcbdf

Please sign in to comment.