Merge pull request #422 from AbdouSeck/show-tests-prints

info.toml

@@ -804,7 +804,7 @@ name = "try_from_into"
 path = "exercises/conversions/try_from_into.rs"
 mode = "test"
 hint = """
-Follow the steps provided right before the `From` implementation.
+Follow the steps provided right before the `TryFrom` implementation.
 You can also use the example at https://doc.rust-lang.org/std/convert/trait.TryFrom.html"""
 
 [[exercises]]
@@ -821,4 +821,4 @@ mode = "test"
 hint = """
 The implementation of FromStr should return an Ok with a Person object,
 or an Err with a string if the string is not valid.
-This is a some like an `try_from_into` exercise."""
+This is almost like the `try_from_into` exercise."""

install.sh

@@ -102,12 +102,30 @@ Path=${1:-rustlings/}
 echo "Cloning Rustlings at $Path..."
 git clone -q https://github.com/rust-lang/rustlings $Path
 
+cd $Path
+
 Version=$(curl -s https://api.github.com/repos/rust-lang/rustlings/releases/latest | ${PY} -c "import json,sys;obj=json.load(sys.stdin);print(obj['tag_name']);")
 CargoBin="${CARGO_HOME:-$HOME/.cargo}/bin"
 
+if [[ -z ${Version} ]]
+then
+    echo "The latest tag version could not be fetched remotely."
+    echo "Using the local git repository..."
+    Version=$(ls -tr .git/refs/tags/ | tail -1)
+    if [[ -z ${Version}  ]]
+    then
+        echo "No valid tag version found"
+        echo "Rustlings will be installed using the master branch"
+        Version="master"
+    else
+        Version="tags/${Version}"
+    fi
+else
+    Version="tags/${Version}"
+fi
+
 echo "Checking out version $Version..."
-cd $Path
-git checkout -q tags/$Version
+git checkout -q ${Version}
 
 echo "Installing the 'rustlings' executable..."
 cargo install --force --path .

src/exercise.rs

@@ -11,15 +11,21 @@ const I_AM_DONE_REGEX: &str = r"(?m)^\s*///?\s*I\s+AM\s+NOT\s+DONE";
 const CONTEXT: usize = 2;
 const CLIPPY_CARGO_TOML_PATH: &str = "./exercises/clippy/Cargo.toml";
 
+// Get a temporary file name that is hopefully unique to this process
+#[inline]
 fn temp_file() -> String {
     format!("./temp_{}", process::id())
 }
 
+// The mode of the exercise.
 #[derive(Deserialize, Copy, Clone)]
 #[serde(rename_all = "lowercase")]
 pub enum Mode {
+    // Indicates that the exercise should be compiled as a binary
     Compile,
+    // Indicates that the exercise should be compiled as a test harness
     Test,
+    // Indicates that the exercise should be linted with clippy
     Clippy,
 }
 
@@ -28,41 +34,60 @@ pub struct ExerciseList {
     pub exercises: Vec<Exercise>,
 }
 
+// A representation of a rustlings exercise.
+// This is deserialized from the accompanying info.toml file
 #[derive(Deserialize)]
 pub struct Exercise {
+    // Name of the exercise
     pub name: String,
+    // The path to the file containing the exercise's source code
     pub path: PathBuf,
+    // The mode of the exercise (Test, Compile, or Clippy)
     pub mode: Mode,
+    // The hint text associated with the exercise
     pub hint: String,
 }
 
+// An enum to track of the state of an Exercise.
+// An Exercise can be either Done or Pending
 #[derive(PartialEq, Debug)]
 pub enum State {
+    // The state of the exercise once it's been completed
     Done,
+    // The state of the exercise while it's not completed yet
     Pending(Vec<ContextLine>),
 }
 
+// The context information of a pending exercise
 #[derive(PartialEq, Debug)]
 pub struct ContextLine {
+    // The source code that is still pending completion
     pub line: String,
+    // The line number of the source code still pending completion
     pub number: usize,
+    // Whether or not this is important
     pub important: bool,
 }
 
+// The result of compiling an exercise
 pub struct CompiledExercise<'a> {
     exercise: &'a Exercise,
     _handle: FileHandle,
 }
 
 impl<'a> CompiledExercise<'a> {
+    // Run the compiled exercise
     pub fn run(&self) -> Result<ExerciseOutput, ExerciseOutput> {
         self.exercise.run()
     }
 }
 
+// A representation of an already executed binary
 #[derive(Debug)]
 pub struct ExerciseOutput {
+    // The textual contents of the standard output of the binary
     pub stdout: String,
+    // The textual contents of the standard error of the binary
     pub stderr: String,
 }
 
@@ -140,7 +165,11 @@ path = "{}.rs""#,
     }
 
     fn run(&self) -> Result<ExerciseOutput, ExerciseOutput> {
-        let cmd = Command::new(&temp_file())
+        let arg = match self.mode {
+            Mode::Test => "--show-output",
+            _ => ""
+        };
+        let cmd = Command::new(&temp_file()).arg(arg)
             .output()
             .expect("Failed to run 'run' command");
 
@@ -205,6 +234,7 @@ impl Display for Exercise {
     }
 }
 
+#[inline]
 fn clean() {
     let _ignored = remove_file(&temp_file());
 }
@@ -280,4 +310,16 @@ mod test {
 
         assert_eq!(exercise.state(), State::Done);
     }
+
+    #[test]
+    fn test_exercise_with_output() {
+        let exercise = Exercise {
+            name: "finished_exercise".into(),
+            path: PathBuf::from("tests/fixture/success/testSuccess.rs"),
+            mode: Mode::Test,
+            hint: String::new(),
+        };
+        let out = exercise.compile().unwrap().run().unwrap();
+        assert!(out.stdout.contains("THIS TEST TOO SHALL PASS"));
+    }
 }

src/main.rs

@@ -27,8 +27,21 @@ fn main() {
         .version(crate_version!())
         .author("Olivia Hugger, Carol Nichols")
         .about("Rustlings is a collection of small exercises to get you used to writing and reading Rust code")
-        .subcommand(SubCommand::with_name("verify").alias("v").about("Verifies all exercises according to the recommended order"))
-        .subcommand(SubCommand::with_name("watch").alias("w").about("Reruns `verify` when files were edited"))
+        .arg(
+            Arg::with_name("nocapture")
+                .long("nocapture")
+                .help("Show outputs from the test exercises")
+        )
+        .subcommand(
+            SubCommand::with_name("verify")
+                .alias("v")
+                .about("Verifies all exercises according to the recommended order")
+        )
+        .subcommand(
+            SubCommand::with_name("watch")
+                .alias("w")
+                .about("Reruns `verify` when files were edited")
+        )
         .subcommand(
             SubCommand::with_name("run")
                 .alias("r")
@@ -43,7 +56,7 @@ fn main() {
         )
         .get_matches();
 
-    if None == matches.subcommand_name() {
+    if matches.subcommand_name().is_none() {
         println!();
         println!(r#"       welcome to...                      "#);
         println!(r#"                 _   _ _                  "#);
@@ -73,6 +86,7 @@ fn main() {
 
     let toml_str = &fs::read_to_string("info.toml").unwrap();
     let exercises = toml::from_str::<ExerciseList>(toml_str).unwrap().exercises;
+    let verbose = matches.is_present("nocapture");
 
     if let Some(ref matches) = matches.subcommand_matches("run") {
         let name = matches.value_of("name").unwrap();
@@ -84,7 +98,7 @@ fn main() {
             std::process::exit(1)
         });
 
-        run(&exercise).unwrap_or_else(|_| std::process::exit(1));
+        run(&exercise, verbose).unwrap_or_else(|_| std::process::exit(1));
     }
 
     if let Some(ref matches) = matches.subcommand_matches("hint") {
@@ -102,25 +116,23 @@ fn main() {
     }
 
     if matches.subcommand_matches("verify").is_some() {
-        verify(&exercises).unwrap_or_else(|_| std::process::exit(1));
+        verify(&exercises, verbose).unwrap_or_else(|_| std::process::exit(1));
     }
 
-    if matches.subcommand_matches("watch").is_some() {
-        if watch(&exercises).is_ok() {
-            println!(
-                "{emoji} All exercises completed! {emoji}",
-                emoji = Emoji("🎉", "★")
-            );
-            println!("");
-            println!("We hope you enjoyed learning about the various aspects of Rust!");
-            println!(
-                "If you noticed any issues, please don't hesitate to report them to our repo."
-            );
-            println!("You can also contribute your own exercises to help the greater community!");
-            println!("");
-            println!("Before reporting an issue or contributing, please read our guidelines:");
-            println!("https://github.com/rust-lang/rustlings/blob/master/CONTRIBUTING.md");
-        }
+    if matches.subcommand_matches("watch").is_some() && watch(&exercises, verbose).is_ok() {
+        println!(
+            "{emoji} All exercises completed! {emoji}",
+            emoji = Emoji("🎉", "★")
+        );
+        println!();
+        println!("We hope you enjoyed learning about the various aspects of Rust!");
+        println!(
+            "If you noticed any issues, please don't hesitate to report them to our repo."
+        );
+        println!("You can also contribute your own exercises to help the greater community!");
+        println!();
+        println!("Before reporting an issue or contributing, please read our guidelines:");
+        println!("https://github.com/rust-lang/rustlings/blob/master/CONTRIBUTING.md");
     }
 
     if matches.subcommand_name().is_none() {
@@ -149,7 +161,7 @@ fn spawn_watch_shell(failed_exercise_hint: &Arc<Mutex<Option<String>>>) {
     });
 }
 
-fn watch(exercises: &[Exercise]) -> notify::Result<()> {
+fn watch(exercises: &[Exercise], verbose: bool) -> notify::Result<()> {
     /* Clears the terminal with an ANSI escape code.
     Works in UNIX and newer Windows terminals. */
     fn clear_screen() {
@@ -164,7 +176,7 @@ fn watch(exercises: &[Exercise]) -> notify::Result<()> {
     clear_screen();
 
     let to_owned_hint = |t: &Exercise| t.hint.to_owned();
-    let failed_exercise_hint = match verify(exercises.iter()) {
+    let failed_exercise_hint = match verify(exercises.iter(), verbose) {
         Ok(_) => return Ok(()),
         Err(exercise) => Arc::new(Mutex::new(Some(to_owned_hint(exercise)))),
     };
@@ -179,7 +191,7 @@ fn watch(exercises: &[Exercise]) -> notify::Result<()> {
                             .iter()
                             .skip_while(|e| !filepath.ends_with(&e.path));
                         clear_screen();
-                        match verify(pending_exercises) {
+                        match verify(pending_exercises, verbose) {
                             Ok(_) => return Ok(()),
                             Err(exercise) => {
                                 let mut failed_exercise_hint = failed_exercise_hint.lock().unwrap();

src/run.rs

@@ -2,15 +2,22 @@ use crate::exercise::{Exercise, Mode};
 use crate::verify::test;
 use indicatif::ProgressBar;
 
-pub fn run(exercise: &Exercise) -> Result<(), ()> {
+// Invoke the rust compiler on the path of the given exercise,
+// and run the ensuing binary.
+// The verbose argument helps determine whether or not to show
+// the output from the test harnesses (if the mode of the exercise is test)
+pub fn run(exercise: &Exercise, verbose: bool) -> Result<(), ()> {
     match exercise.mode {
-        Mode::Test => test(exercise)?,
+        Mode::Test => test(exercise, verbose)?,
         Mode::Compile => compile_and_run(exercise)?,
         Mode::Clippy => compile_and_run(exercise)?,
     }
     Ok(())
 }
 
+// Invoke the rust compiler on the path of the given exercise
+// and run the ensuing binary.
+// This is strictly for non-test binaries, so output is displayed
 fn compile_and_run(exercise: &Exercise) -> Result<(), ()> {
     let progress_bar = ProgressBar::new_spinner();
     progress_bar.set_message(format!("Compiling {}...", exercise).as_str());