Skip to content

Commit

Permalink
fix(direnv): replace nonexistent "orange" color with "bright-yellow" (#…
Browse files Browse the repository at this point in the history 
…5969)

* Fix direnv config: change style from nonexistent "bold orange" to "bold bright-yellow"

* generate config-schema.json

* fix tests
  • Loading branch information
@DerRockWolf
DerRockWolf committed Jun 2, 2024
1 parent 5c2a4af commit 478d5cc
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 52 deletions.
4 changes: 2 additions & 2 deletions .github/config-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
"format": "[$symbol$loaded/$allowed]($style) ",
"loaded_msg": "loaded",
"not_allowed_msg": "not allowed",
"style": "bold orange",
"style": "bold bright-yellow",
"symbol": "direnv ",
"unloaded_msg": "not loaded"
},
Expand Down Expand Up @@ -2821,7 +2821,7 @@
"type": "string"
},
"style": {
"default": "bold orange",
"default": "bold bright-yellow",
"type": "string"
},
"disabled": {
Expand Down
2 changes: 1 addition & 1 deletion src/configs/direnv.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ impl<'a> Default for DirenvConfig<'a> {
Self {
format: "[$symbol$loaded/$allowed]($style) ",
symbol: "direnv ",
style: "bold orange",
style: "bold bright-yellow",
disabled: true,
detect_extensions: vec![],
detect_files: vec![".envrc"],
Expand Down
106 changes: 57 additions & 49 deletions src/modules/direnv.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ mod tests {

use crate::test::ModuleRenderer;
use crate::utils::CommandOutput;
use nu_ansi_term::Color;
use std::io;
use std::path::Path;
#[test]
Expand Down Expand Up @@ -227,7 +228,7 @@ mod tests {

std::fs::File::create(rc_path)?.sync_all()?;

let renderer = ModuleRenderer::new("direnv")
let actual = ModuleRenderer::new("direnv")
.config(toml::toml! {
[direnv]
disabled = false
Expand All @@ -239,13 +240,14 @@ mod tests {
stdout: status_cmd_output_with_rc(dir.path(), false, "0", true),
stderr: String::default(),
}),
);

assert_eq!(
Some("direnv not loaded/allowed ".to_string()),
renderer.collect()
);
)
.collect();
let expected = Some(format!(
"{} ",
Color::LightYellow.bold().paint("direnv not loaded/allowed")
));

assert_eq!(expected, actual);
dir.close()
}
#[test]
Expand All @@ -255,7 +257,7 @@ mod tests {

std::fs::File::create(rc_path)?.sync_all()?;

let renderer = ModuleRenderer::new("direnv")
let actual = ModuleRenderer::new("direnv")
.config(toml::toml! {
[direnv]
disabled = false
Expand All @@ -267,13 +269,14 @@ mod tests {
stdout: status_cmd_output_with_rc_json(dir.path(), 1, 0),
stderr: String::default(),
}),
);

assert_eq!(
Some("direnv not loaded/allowed ".to_string()),
renderer.collect()
);
)
.collect();
let expected = Some(format!(
"{} ",
Color::LightYellow.bold().paint("direnv not loaded/allowed")
));

assert_eq!(expected, actual);
dir.close()
}
#[test]
Expand All @@ -283,7 +286,7 @@ mod tests {

std::fs::File::create(rc_path)?.sync_all()?;

let renderer = ModuleRenderer::new("direnv")
let actual = ModuleRenderer::new("direnv")
.config(toml::toml! {
[direnv]
disabled = false
Expand All @@ -295,13 +298,14 @@ mod tests {
stdout: status_cmd_output_with_rc(dir.path(), true, "0", true),
stderr: String::default(),
}),
);

assert_eq!(
Some("direnv loaded/allowed ".to_string()),
renderer.collect()
);
)
.collect();
let expected = Some(format!(
"{} ",
Color::LightYellow.bold().paint("direnv loaded/allowed")
));

assert_eq!(expected, actual);
dir.close()
}
#[test]
Expand All @@ -311,7 +315,7 @@ mod tests {

std::fs::File::create(rc_path)?.sync_all()?;

let renderer = ModuleRenderer::new("direnv")
let actual = ModuleRenderer::new("direnv")
.config(toml::toml! {
[direnv]
disabled = false
Expand All @@ -323,13 +327,14 @@ mod tests {
stdout: status_cmd_output_with_rc_json(dir.path(), 0, 0),
stderr: String::default(),
}),
);

assert_eq!(
Some("direnv loaded/allowed ".to_string()),
renderer.collect()
);
)
.collect();
let expected = Some(format!(
"{} ",
Color::LightYellow.bold().paint("direnv loaded/allowed")
));

assert_eq!(expected, actual);
dir.close()
}
#[test]
Expand All @@ -339,7 +344,7 @@ mod tests {

std::fs::File::create(rc_path)?.sync_all()?;

let renderer = ModuleRenderer::new("direnv")
let actual = ModuleRenderer::new("direnv")
.config(toml::toml! {
[direnv]
disabled = false
Expand All @@ -351,13 +356,14 @@ mod tests {
stdout: status_cmd_output_with_rc(dir.path(), true, "2", true),
stderr: String::default(),
}),
);

assert_eq!(
Some("direnv loaded/denied ".to_string()),
renderer.collect()
);
)
.collect();
let expected = Some(format!(
"{} ",
Color::LightYellow.bold().paint("direnv loaded/denied")
));

assert_eq!(expected, actual);
dir.close()
}
#[test]
Expand All @@ -367,7 +373,7 @@ mod tests {

std::fs::File::create(rc_path)?.sync_all()?;

let renderer = ModuleRenderer::new("direnv")
let actual = ModuleRenderer::new("direnv")
.config(toml::toml! {
[direnv]
disabled = false
Expand All @@ -379,13 +385,14 @@ mod tests {
stdout: status_cmd_output_with_rc_json(dir.path(), 0, 1),
stderr: String::default(),
}),
);

assert_eq!(
Some("direnv loaded/not allowed ".to_string()),
renderer.collect()
);
)
.collect();
let expected = Some(format!(
"{} ",
Color::LightYellow.bold().paint("direnv loaded/not allowed")
));

assert_eq!(expected, actual);
dir.close()
}
#[test]
Expand All @@ -395,7 +402,7 @@ mod tests {

std::fs::File::create(rc_path)?.sync_all()?;

let renderer = ModuleRenderer::new("direnv")
let actual = ModuleRenderer::new("direnv")
.config(toml::toml! {
[direnv]
disabled = false
Expand All @@ -407,13 +414,14 @@ mod tests {
stdout: status_cmd_output_with_rc_json(dir.path(), 0, 2),
stderr: String::default(),
}),
);

assert_eq!(
Some("direnv loaded/denied ".to_string()),
renderer.collect()
);
)
.collect();
let expected = Some(format!(
"{} ",
Color::LightYellow.bold().paint("direnv loaded/denied")
));

assert_eq!(expected, actual);
dir.close()
}
fn status_cmd_output_without_rc() -> String {
Expand Down

0 comments on commit 478d5cc

Please sign in to comment.