Merge pull request #278 from jrvidal/output-mode

feature: adds "output" mode, resolves #270
This commit is contained in:
fmoko 2020-04-07 11:26:48 +02:00 committed by GitHub
commit 71d31256a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 67 additions and 36 deletions

View File

@ -8,7 +8,4 @@
fn slice_out_of_array() {
let a = [1, 2, 3, 4, 5];
let nice_slice = ???
assert_eq!([2, 3, 4], nice_slice)
}

View File

@ -1,4 +1,4 @@
use crate::exercise::{Exercise, Mode, State};
use crate::exercise::{CompiledExercise, Exercise, Mode, State};
use console::style;
use indicatif::ProgressBar;
@ -6,7 +6,7 @@ pub fn verify<'a>(start_at: impl IntoIterator<Item = &'a Exercise>) -> Result<()
for exercise in start_at {
let compile_result = match exercise.mode {
Mode::Test => compile_and_test(&exercise, RunMode::Interactive),
Mode::Compile => compile_only(&exercise),
Mode::Compile => compile_and_run_interactively(&exercise),
Mode::Clippy => compile_only(&exercise),
};
if !compile_result.unwrap_or(false) {
@ -30,23 +30,37 @@ fn compile_only(exercise: &Exercise) -> Result<bool, ()> {
let progress_bar = ProgressBar::new_spinner();
progress_bar.set_message(format!("Compiling {}...", exercise).as_str());
progress_bar.enable_steady_tick(100);
let compilation_result = exercise.compile();
let _ = compile(&exercise, &progress_bar)?;
progress_bar.finish_and_clear();
match compilation_result {
Ok(_) => {
success!("Successfully compiled {}!", exercise);
Ok(prompt_for_completion(&exercise))
}
success!("Successfully compiled {}!", exercise);
Ok(prompt_for_completion(&exercise, None))
}
fn compile_and_run_interactively(exercise: &Exercise) -> Result<bool, ()> {
let progress_bar = ProgressBar::new_spinner();
progress_bar.set_message(format!("Compiling {}...", exercise).as_str());
progress_bar.enable_steady_tick(100);
let compilation = compile(&exercise, &progress_bar)?;
progress_bar.set_message(format!("Running {}...", exercise).as_str());
let result = compilation.run();
progress_bar.finish_and_clear();
let output = match result {
Ok(output) => output,
Err(output) => {
warn!(
"Compilation of {} failed! Compiler error message:\n",
exercise
);
println!("{}", output.stderr);
Err(())
warn!("Ran {} with errors", exercise);
println!("{}", output.stdout);
return Err(());
}
}
};
success!("Successfully ran {}!", exercise);
Ok(prompt_for_completion(&exercise, Some(output.stdout)))
}
fn compile_and_test(exercise: &Exercise, run_mode: RunMode) -> Result<bool, ()> {
@ -54,28 +68,15 @@ fn compile_and_test(exercise: &Exercise, run_mode: RunMode) -> Result<bool, ()>
progress_bar.set_message(format!("Testing {}...", exercise).as_str());
progress_bar.enable_steady_tick(100);
let compilation_result = exercise.compile();
let compilation = match compilation_result {
Ok(compilation) => compilation,
Err(output) => {
progress_bar.finish_and_clear();
warn!(
"Compiling of {} failed! Please try again. Here's the output:",
exercise
);
println!("{}", output.stderr);
return Err(());
}
};
let compilation = compile(exercise, &progress_bar)?;
let result = compilation.run();
progress_bar.finish_and_clear();
match result {
Ok(_) => {
success!("Successfully tested {}", &exercise);
if let RunMode::Interactive = run_mode {
Ok(prompt_for_completion(&exercise))
Ok(prompt_for_completion(&exercise, None))
} else {
Ok(true)
}
@ -91,7 +92,27 @@ fn compile_and_test(exercise: &Exercise, run_mode: RunMode) -> Result<bool, ()>
}
}
fn prompt_for_completion(exercise: &Exercise) -> bool {
fn compile<'a, 'b>(
exercise: &'a Exercise,
progress_bar: &'b ProgressBar,
) -> Result<CompiledExercise<'a>, ()> {
let compilation_result = exercise.compile();
match compilation_result {
Ok(compilation) => Ok(compilation),
Err(output) => {
progress_bar.finish_and_clear();
warn!(
"Compiling of {} failed! Please try again. Here's the output:",
exercise
);
println!("{}", output.stderr);
Err(())
}
}
}
fn prompt_for_completion(exercise: &Exercise, prompt_output: Option<String>) -> bool {
let context = match exercise.state() {
State::Done => return true,
State::Pending(context) => context,
@ -106,6 +127,15 @@ fn prompt_for_completion(exercise: &Exercise) -> bool {
println!("");
println!("🎉 🎉 {} 🎉 🎉", success_msg);
println!("");
if let Some(output) = prompt_output {
println!("Output:");
println!("{}", separator());
println!("{}", output);
println!("{}", separator());
println!("");
}
println!("You can keep working on this exercise,");
println!(
"or jump into the next one by removing the {} comment:",
@ -129,3 +159,7 @@ fn prompt_for_completion(exercise: &Exercise) -> bool {
false
}
fn separator() -> console::StyledObject<&'static str> {
style("====================").bold()
}

View File

@ -31,7 +31,7 @@ fn verify_all_success() {
}
#[test]
fn verify_all_failure() {
fn verify_fails_if_some_fails() {
Command::cargo_bin("rustlings")
.unwrap()
.arg("v")