Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 80 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,6 @@ which = "6.0.1"
inherits = "release"
debug = true
split-debuginfo = "packed"

[dev-dependencies]
tempfile = "3.24.0"
99 changes: 90 additions & 9 deletions src/config/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,41 +97,45 @@ impl BoxxyConfig {
))
.build()?;

let rules = config.try_deserialize::<BoxxyRules>()?;
let mut rules = config.try_deserialize::<BoxxyRules>()?;

for rule in &mut rules.rules {
rule.rewrite = shellexpand::env(&rule.rewrite)?.to_string();
}

Ok(rules)
}

pub fn load_rules_from_cli_flag(rules: &[String]) -> Result<BoxxyRules> {
let rules = rules
.iter()
.map(|s| {
.map(|s| -> Result<Rule> {
let parts: Vec<&str> = s.split(':').collect();
match parts.as_slice() {
[src, dest] => Rule {
[src, dest] => Ok(Rule {
name: format!("cli-loaded rule: {src} -> {dest}"),
target: src.to_string(),
rewrite: dest.to_string(),
rewrite: shellexpand::env(dest)?.to_string(),
mode: crate::enclosure::rule::RuleMode::File,
context: vec![],
only: vec![],
env: HashMap::new(),
},
}),

[src, dest, mode] => Rule {
[src, dest, mode] => Ok(Rule {
name: format!("cli-loaded rule: {src} -> {dest} ({mode})"),
target: src.to_string(),
rewrite: dest.to_string(),
rewrite: shellexpand::env(dest)?.to_string(),
mode: mode.parse().unwrap(),
context: vec![],
only: vec![],
env: HashMap::new(),
},
}),

_ => panic!("invalid format for cli rule: {s}"),
}
})
.collect();
.collect::<Result<Vec<Rule>>>()?;
Ok(BoxxyRules { rules })
}

Expand Down Expand Up @@ -191,3 +195,80 @@ impl BoxxyConfig {
})
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_simple_cli() {
let rules = BoxxyConfig::load_rules_from_cli_flag(&["/src:/dest".to_string()]).unwrap();

assert_eq!(rules.rules[0].rewrite, "/dest");
}

#[test]
fn test_simple_file() -> Result<()> {
let config_content = r#"
rules:
- name: test
target: /src
rewrite: /dest
"#;
let mut config_file = tempfile::NamedTempFile::new()?;
std::io::Write::write_all(&mut config_file, config_content.as_bytes())?;

let rules = BoxxyConfig::load_rules_from_path(config_file.path())?;
assert_eq!(rules.rules[0].rewrite, "/dest");
Ok(())
}

#[test]
fn test_tilde_cli() {
let rules = BoxxyConfig::load_rules_from_cli_flag(&["/src:~/dest".to_string()]).unwrap();

assert_eq!(rules.rules[0].rewrite, "~/dest");
}

#[test]
fn test_tilde_file() -> Result<()> {
let config_content = r#"
rules:
- name: test
target: /src
rewrite: ~/dest
"#;
let mut config_file = tempfile::NamedTempFile::new()?;
std::io::Write::write_all(&mut config_file, config_content.as_bytes())?;

let rules = BoxxyConfig::load_rules_from_path(config_file.path())?;
assert_eq!(rules.rules[0].rewrite, "~/dest");
Ok(())
}

#[test]
fn test_expand_rewrite_cli() {
std::env::set_var("TEST_VAR_CLI", "/expanded/path/cli");
let rules = BoxxyConfig::load_rules_from_cli_flag(&["/src:$TEST_VAR_CLI/dest".to_string()])
.unwrap();

assert_eq!(rules.rules[0].rewrite, "/expanded/path/cli/dest");
}

#[test]
fn test_expand_rewrite_file() -> Result<()> {
std::env::set_var("TEST_VAR_FILE", "/expanded/path/file");
let config_content = r#"
rules:
- name: test
target: /src
rewrite: $TEST_VAR_FILE/dest
"#;
let mut config_file = tempfile::NamedTempFile::new()?;
std::io::Write::write_all(&mut config_file, config_content.as_bytes())?;

let rules = BoxxyConfig::load_rules_from_path(config_file.path())?;
assert_eq!(rules.rules[0].rewrite, "/expanded/path/file/dest");
Ok(())
}
}
Loading