Skip to content
Merged
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
33 changes: 33 additions & 0 deletions crates/bashkit-cli/src/interactive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use rustyline::hint::{Hint, Hinter};
use rustyline::validate::Validator;
use rustyline::{Config, Context, Editor, Helper};
use std::borrow::Cow;
use std::io::Write;
use std::path::Path;
use std::sync::Arc;
use std::sync::atomic::{AtomicBool, Ordering};
Expand Down Expand Up @@ -505,9 +506,11 @@ pub async fn run(mut bash: bashkit::Bash) -> Result<i32> {
Box::new(|stdout, stderr| {
if !stdout.is_empty() {
print!("{stdout}");
let _ = std::io::stdout().flush();
}
if !stderr.is_empty() {
eprint!("{stderr}");
let _ = std::io::stderr().flush();
}
}),
)
Expand Down Expand Up @@ -734,6 +737,36 @@ mod tests {
assert_eq!(result.stdout, "yes\n");
}

#[tokio::test]
async fn clear_command_streams_ansi_escape_codes() {
let mut bash = test_bash();
let chunks: Arc<std::sync::Mutex<Vec<String>>> =
Arc::new(std::sync::Mutex::new(Vec::new()));
let chunks_cb = chunks.clone();
let result = bash
.exec_streaming(
"clear",
Box::new(move |stdout, _stderr| {
if !stdout.is_empty() {
chunks_cb.lock().unwrap().push(stdout.to_string());
}
}),
)
.await
.unwrap();
assert_eq!(result.exit_code, 0);
let collected = chunks.lock().unwrap();
let output: String = collected.iter().cloned().collect();
assert!(
output.contains("\x1b[2J"),
"clear should emit ESC[2J: {output:?}"
);
assert!(
output.contains("\x1b[H"),
"clear should emit ESC[H: {output:?}"
);
}

#[tokio::test]
async fn streaming_output_callback_invoked() {
let mut bash = test_bash();
Expand Down
Loading