Skip to content

Commit

Permalink
feat(task): log task script (denoland#13922)
Browse files Browse the repository at this point in the history
Logs task name and associated script with additional args.
This is disabled if "--quiet/-q" flag is present.
  • Loading branch information
bartlomieju committed Mar 12, 2022
1 parent 1a76479 commit 9d9e60b
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
17 changes: 13 additions & 4 deletions cli/tests/integration/task_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::itest;
// These tests are intended to only test integration.

itest!(task_no_args {
args: "task --config task/deno.json",
args: "task -q --config task/deno.json",
output: "task/task_no_args.out",
envs: vec![("NO_COLOR".to_string(), "1".to_string())],
exit_code: 1,
Expand All @@ -20,7 +20,7 @@ itest!(task_non_existent {
});

itest!(task_boolean_logic {
args: "task --config task/deno.json boolean_logic",
args: "task -q --config task/deno.json boolean_logic",
output: "task/task_boolean_logic.out",
envs: vec![("NO_COLOR".to_string(), "1".to_string())],
});
Expand All @@ -33,20 +33,28 @@ itest!(task_exit_code_1 {
});

itest!(task_additional_args {
args: "task --config task/deno.json echo 2",
args: "task -q --config task/deno.json echo 2",
output: "task/task_additional_args.out",
envs: vec![("NO_COLOR".to_string(), "1".to_string())],
});

itest!(task_additional_args_no_shell_expansion {
args_vec: vec!["task", "--config", "task/deno.json", "echo", "$(echo 5)"],
args_vec: vec![
"task",
"-q",
"--config",
"task/deno.json",
"echo",
"$(echo 5)"
],
output: "task/task_additional_args_no_shell_expansion.out",
envs: vec![("NO_COLOR".to_string(), "1".to_string())],
});

itest!(task_additional_args_nested_strings {
args_vec: vec![
"task",
"-q",
"--config",
"task/deno.json",
"echo",
Expand All @@ -59,6 +67,7 @@ itest!(task_additional_args_nested_strings {
itest!(task_additional_args_no_logic {
args_vec: vec![
"task",
"-q",
"--config",
"task/deno.json",
"echo",
Expand Down
1 change: 1 addition & 0 deletions cli/tests/testdata/task/task_exit_code_5.out
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Task exit_code_5 echo $(echo 10 ; exit 2) && exit 5
10
6 changes: 6 additions & 0 deletions cli/tools/task.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ pub async fn execute_script(
.collect::<Vec<_>>()
.join(" ");
let script = format!("{} {}", script, additional_args);
log::info!(
"{} {} {}",
colors::green("Task"),
colors::cyan(&task_name),
script
);
let seq_list = deno_task_shell::parser::parse(&script)
.with_context(|| format!("Error parsing script '{}'.", task_name))?;
let env_vars = std::env::vars().collect::<HashMap<String, String>>();
Expand Down

0 comments on commit 9d9e60b

Please sign in to comment.