wbrawner/rustlings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

standardize exercise running via an external toml file

Browse source
This commit is contained in:
lyn 2019-03-06 21:47:00 +01:00
parent 7d6e2812fb
commit 70e59cca3c
5 changed files with 270 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -10,3 +10,4 @@ indicatif = "0.9.0"
console = "0.6.2"
syntect = "3.0.2"
notify = "4.0.0"
toml = "0.4.10"

199
info.toml Normal file
View file

@ -0,0 +1,199 @@
# VARIABLES
[[exercises]]
path = "exercises/variables/variables1.rs"
mode = "compile"
[[exercises]]
path = "exercises/variables/variables2.rs"
mode = "compile"
[[exercises]]
path = "exercises/variables/variables3.rs"
mode = "compile"
[[exercises]]
path = "exercises/variables/variables4.rs"
mode = "compile"
# IF
[[exercises]]
path = "exercises/if/if1.rs"
mode = "test"
# FUNCTIONS
[[exercises]]
path = "exercises/functions/functions1.rs"
mode = "compile"
[[exercises]]
path = "exercises/functions/functions2.rs"
mode = "compile"
[[exercises]]
path = "exercises/functions/functions3.rs"
mode = "compile"
[[exercises]]
path = "exercises/functions/functions4.rs"
mode = "compile"
[[exercises]]
path = "exercises/functions/functions5.rs"
mode = "compile"
# TEST 1
[[exercises]]
path = "exercises/test1.rs"
mode = "test"
# PRIMITIVE TYPES
[[exercises]]
path = "exercises/primitive_types/primitive_types1.rs"
mode = "compile"
[[exercises]]
path = "exercises/primitive_types/primitive_types2.rs"
mode = "compile"
[[exercises]]
path = "exercises/primitive_types/primitive_types3.rs"
mode = "compile"
[[exercises]]
path = "exercises/primitive_types/primitive_types4.rs"
mode = "compile"
[[exercises]]
path = "exercises/primitive_types/primitive_types5.rs"
mode = "compile"
[[exercises]]
path = "exercises/primitive_types/primitive_types6.rs"
mode = "compile"
# TESTS
[[exercises]]
path = "exercises/tests/tests1.rs"
mode = "test"
[[exercises]]
path = "exercises/tests/tests2.rs"
mode = "test"
[[exercises]]
path = "exercises/tests/tests3.rs"
mode = "test"
# TEST 2
[[exercises]]
path = "exercises/test2.rs"
mode = "test"
# STRINGS
[[exercises]]
path = "exercises/strings/strings1.rs"
mode = "compile"
[[exercises]]
path = "exercises/strings/strings2.rs"
mode = "compile"
# TEST 3
[[exercises]]
path = "exercises/test3.rs"
mode = "compile"
# MODULES
[[exercises]]
path = "exercises/modules/modules1.rs"
mode = "compile"
[[exercises]]
path = "exercises/modules/modules2.rs"
mode = "compile"
# MACROS
[[exercises]]
path = "exercises/macros/macros1.rs"
mode = "compile"
[[exercises]]
path = "exercises/macros/macros2.rs"
mode = "compile"
[[exercises]]
path = "exercises/macros/macros3.rs"
mode = "compile"
[[exercises]]
path = "exercises/macros/macros4.rs"
mode = "compile"
# TEST 4
[[exercises]]
path = "exercises/test4.rs"
mode = "compile"
# MOVE SEMANTICS
[[exercises]]
path = "exercises/move_semantics/move_semantics1.rs"
mode = "compile"
[[exercises]]
path = "exercises/move_semantics/move_semantics2.rs"
mode = "compile"
[[exercises]]
path = "exercises/move_semantics/move_semantics3.rs"
mode = "compile"
[[exercises]]
path = "exercises/move_semantics/move_semantics4.rs"
mode = "compile"
# ERROR HANDLING
[[exercises]]
path = "exercises/error_handling/errors1.rs"
mode = "test"
[[exercises]]
path = "exercises/error_handling/errors2.rs"
mode = "test"
[[exercises]]
path = "exercises/error_handling/errors3.rs"
mode = "test"
[[exercises]]
path = "exercises/error_handling/errorsn.rs"
mode = "test"
# OPTIONS / RESULTS
[[exercises]]
path = "exercises/error_handling/option1.rs"
mode = "compile"
[[exercises]]
path = "exercises/error_handling/result1.rs"
mode = "test"
# THREADS
[[exercises]]
path = "exercises/threads/threads1.rs"
mode = "compile"

2
src/main.rs
View file

@ -48,7 +48,7 @@ fn main() {
}
if let Some(matches) = matches.subcommand_matches("run") {
run(matches.clone());
run(matches.clone()).unwrap();
}
if let Some(_) = matches.subcommand_matches("verify") {

99
src/run.rs
View file

@ -2,54 +2,71 @@ use crate::util::clean;
use crate::verify::test;
use console::{style, Emoji};
use indicatif::ProgressBar;
use std::fs;
use std::process::Command;
use toml::Value;
pub fn run(matches: clap::ArgMatches) {
pub fn run(matches: clap::ArgMatches) -> Result<(), ()> {
if let Some(filename) = matches.value_of("file") {
if matches.is_present("test") {
match test(filename) {
Ok(_) => (),
Err(_) => (),
}
std::process::exit(0);
let toml: Value = fs::read_to_string("info.toml").unwrap().parse().unwrap();
let tomlvec: &Vec<Value> = toml.get("exercises").unwrap().as_array().unwrap();
let mut exercises = tomlvec.clone();
exercises.retain(|i| i.get("path").unwrap().as_str().unwrap() == filename);
if exercises.is_empty() {
println!("No exercise found for your filename!");
std::process::exit(1);
}
let bar = ProgressBar::new_spinner();
bar.set_message(format!("Compiling {}...", filename).as_str());
bar.enable_steady_tick(100);
let compilecmd = Command::new("rustc")
.args(&[filename, "-o", "temp", "--color", "always"])
.output()
.expect("fail");
bar.set_message(format!("Running {}...", filename).as_str());
if compilecmd.status.success() {
let runcmd = Command::new("./temp").output().expect("fail");
bar.finish_and_clear();
if runcmd.status.success() {
println!("{}", String::from_utf8_lossy(&runcmd.stdout));
let formatstr = format!("{} Successfully ran {}", Emoji("✅", "✓"), filename);
println!("{}", style(formatstr).green());
clean();
} else {
println!("{}", String::from_utf8_lossy(&runcmd.stdout));
println!("{}", String::from_utf8_lossy(&runcmd.stderr));
let formatstr = format!("{} Ran {} with errors", Emoji("⚠️ ", "!"), filename);
println!("{}", style(formatstr).red());
clean();
}
} else {
bar.finish_and_clear();
let formatstr = format!(
"{} Compilation of {} failed! Compiler error message:\n",
Emoji("⚠️ ", "!"),
filename
);
println!("{}", style(formatstr).red());
println!("{}", String::from_utf8_lossy(&compilecmd.stderr));
clean();
let exercise: &Value = &exercises[0];
match exercise.get("mode").unwrap().as_str().unwrap() {
"test" => test(exercise.get("path").unwrap().as_str().unwrap())?,
"compile" => compile_and_run(exercise.get("path").unwrap().as_str().unwrap())?,
_ => (),
}
Ok(())
} else {
panic!("Please supply a filename!");
}
}
pub fn compile_and_run(filename: &str) -> Result<(), ()> {
let bar = ProgressBar::new_spinner();
bar.set_message(format!("Compiling {}...", filename).as_str());
bar.enable_steady_tick(100);
let compilecmd = Command::new("rustc")
.args(&[filename, "-o", "temp", "--color", "always"])
.output()
.expect("fail");
bar.set_message(format!("Running {}...", filename).as_str());
if compilecmd.status.success() {
let runcmd = Command::new("./temp").output().expect("fail");
bar.finish_and_clear();
if runcmd.status.success() {
println!("{}", String::from_utf8_lossy(&runcmd.stdout));
let formatstr = format!("{} Successfully ran {}", Emoji("✅", "✓"), filename);
println!("{}", style(formatstr).green());
clean();
Ok(())
} else {
println!("{}", String::from_utf8_lossy(&runcmd.stdout));
println!("{}", String::from_utf8_lossy(&runcmd.stderr));
let formatstr = format!("{} Ran {} with errors", Emoji("⚠️ ", "!"), filename);
println!("{}", style(formatstr).red());
clean();
Err(())
}
} else {
bar.finish_and_clear();
let formatstr = format!(
"{} Compilation of {} failed! Compiler error message:\n",
Emoji("⚠️ ", "!"),
filename
);
println!("{}", style(formatstr).red());
println!("{}", String::from_utf8_lossy(&compilecmd.stderr));
clean();
Err(())
}
}

53
src/verify.rs
View file

@ -1,51 +1,20 @@
use crate::util::clean;
use console::{style, Emoji};
use indicatif::ProgressBar;
use std::fs;
use std::process::Command;
use toml::Value;
pub fn verify() -> Result<(), ()> {
compile_only("exercises/variables/variables1.rs")?;
compile_only("exercises/variables/variables2.rs")?;
compile_only("exercises/variables/variables3.rs")?;
compile_only("exercises/variables/variables4.rs")?;
test("exercises/if/if1.rs")?;
compile_only("exercises/functions/functions1.rs")?;
compile_only("exercises/functions/functions2.rs")?;
compile_only("exercises/functions/functions3.rs")?;
compile_only("exercises/functions/functions4.rs")?;
compile_only("exercises/functions/functions5.rs")?;
test("exercises/test1.rs")?;
compile_only("exercises/primitive_types/primitive_types1.rs")?;
compile_only("exercises/primitive_types/primitive_types2.rs")?;
compile_only("exercises/primitive_types/primitive_types3.rs")?;
compile_only("exercises/primitive_types/primitive_types4.rs")?;
compile_only("exercises/primitive_types/primitive_types5.rs")?;
compile_only("exercises/primitive_types/primitive_types6.rs")?;
test("exercises/tests/tests1.rs")?;
test("exercises/tests/tests2.rs")?;
test("exercises/tests/tests3.rs")?;
test("exercises/test2.rs")?;
compile_only("exercises/strings/strings1.rs")?;
compile_only("exercises/strings/strings2.rs")?;
compile_only("exercises/test3.rs")?;
compile_only("exercises/modules/modules1.rs")?;
compile_only("exercises/modules/modules2.rs")?;
compile_only("exercises/macros/macros1.rs")?;
compile_only("exercises/macros/macros2.rs")?;
compile_only("exercises/macros/macros3.rs")?;
compile_only("exercises/macros/macros4.rs")?;
compile_only("exercises/test4.rs")?;
compile_only("exercises/move_semantics/move_semantics1.rs")?;
compile_only("exercises/move_semantics/move_semantics2.rs")?;
compile_only("exercises/move_semantics/move_semantics3.rs")?;
compile_only("exercises/move_semantics/move_semantics4.rs")?;
test("exercises/error_handling/errors1.rs")?;
test("exercises/error_handling/errors2.rs")?;
test("exercises/error_handling/errors3.rs")?;
test("exercises/error_handling/errorsn.rs")?;
compile_only("exercises/error_handling/option1.rs")?;
test("exercises/error_handling/result1.rs")?;
compile_only("exercises/threads/threads1.rs")?;
let toml: Value = fs::read_to_string("info.toml").unwrap().parse().unwrap();
let tomlvec: &Vec<Value> = toml.get("exercises").unwrap().as_array().unwrap();
for i in tomlvec {
match i.get("mode").unwrap().as_str().unwrap() {
"test" => test(i.get("path").unwrap().as_str().unwrap())?,
"compile" => compile_only(i.get("path").unwrap().as_str().unwrap())?,
_ => (),
}
}
Ok(())
}