Merge pull request #307 from tmc-cli/exerciseinfoupdating-matike

exercise info now looks better and has option -a

Author: mikkomaa

src/main/java/fi/helsinki/cs/tmc/cli/command/CourseInfoCommand.java

@@ -1,7 +1,12 @@
 package fi.helsinki.cs.tmc.cli.command;
 
+import static fi.helsinki.cs.tmc.cli.io.Color.AnsiColor.ANSI_BLUE;
+import static fi.helsinki.cs.tmc.cli.io.Color.AnsiColor.ANSI_GREEN;
+import static fi.helsinki.cs.tmc.cli.io.Color.AnsiColor.ANSI_RED;
+
 import fi.helsinki.cs.tmc.cli.command.core.AbstractCommand;
 import fi.helsinki.cs.tmc.cli.command.core.Command;
+import fi.helsinki.cs.tmc.cli.io.Color;
 import fi.helsinki.cs.tmc.cli.io.Io;
 import fi.helsinki.cs.tmc.cli.tmcstuff.CourseInfo;
 import fi.helsinki.cs.tmc.cli.tmcstuff.CourseInfoIo;
@@ -53,13 +58,13 @@ public void run(CommandLine args, Io io) {
             if (workDir.getExerciseNames().size() == 1 && stringArgs.length == 0) {
                 String currentExercise = workDir.getExerciseNames().get(0);
                 exercise = info.getExercise(currentExercise);
-                printExerciseDetails();
+                printOneExercise(args.hasOption("a"));
                 return;
 
             } else if (stringArgs.length != 0) {
                 if (info.getExercise(stringArgs[0]) != null) {
                     exercise = info.getExercise(stringArgs[0]);
-                    printExerciseDetails();
+                    printOneExercise(args.hasOption("a"));
                     return;
 
                 } else {
@@ -109,11 +114,32 @@ private void printCourseDetails() {
         io.println("CometUrl: " + course.getCometUrl());
     }
 
-    private void printExerciseDetails() {
-        io.println(exercise.getName());
-        io.println("Completed: " + exercise.isCompleted());
-        io.println("Attempted: " + exercise.isAttempted());
-        io.println("Deadline: " + exercise.getDeadline());
+    private void printOneExercise(boolean showAll) {
+        if (showAll) {
+            printExercise(exercise);
+        } else {
+            printExerciseShort();
+        }
+    }
+
+    private void printExerciseShort() {
+        io.println("Exercise: " + exercise.getName());
+        io.println("Deadline: " + getDeadline(exercise));
+        io.println(formatString("completed", exercise.isCompleted()));
+        if (!exercise.isCompleted() && exercise.isAttempted()) {
+            io.println(Color.colorString("attempted", ANSI_BLUE));
+        }
+        if (exercise.requiresReview()) {
+            io.println(formatString("reviewed", exercise.isReviewed()));
+        }
+    }
+
+    private String formatString(String string, boolean color) {
+        if (color) {
+            return Color.colorString(string, ANSI_GREEN);
+        } else {
+            return Color.colorString("not " + string, ANSI_RED);
+        }
     }
 
     private void printExercises(boolean showAll) {
@@ -169,4 +195,13 @@ private void printExercise(Exercise exercise) {
         io.println("    Checksum: " + exercise.getChecksum());
         io.println("");
     }
+
+    private String getDeadline(Exercise exercise) {
+        String deadline = exercise.getDeadline();
+        if (deadline == null) {
+            return "not available";
+        }
+        deadline = deadline.substring(0, 19);
+        return deadline.replace("T", " at ");
+    }
 }

src/test/java/fi/helsinki/cs/tmc/cli/command/CourseInfoCommandTest.java

@@ -149,7 +149,7 @@ public void printExerciseIfInExerciseDirectoryWithoutParameters() {
         String[] args = {"info"};
         app.run(args);
         assertTrue(io.out().contains(EXERCISE1_NAME));
-        assertTrue(io.out().contains("Completed: "));
+        assertTrue(io.out().contains("Exercise"));
     }
 
     @Test
@@ -159,7 +159,7 @@ public void printExerciseIfInCourseDirectoryAndGivenExerciseName() {
         String[] args = {"info", EXERCISE1_NAME};
         app.run(args);
         assertTrue(io.out().contains(EXERCISE1_NAME));
-        assertTrue(io.out().contains("Completed: "));
+        assertTrue(io.out().contains("Exercise"));
     }
 
     @Test
@@ -207,4 +207,15 @@ public void printsErrorIfInCourseDirectoryAndGivenCourseNameThatDoesntExist() {
         app.run(args);
         assertTrue(io.out().contains("exercise"));
     }
+
+    @Test
+    public void printsLongExerciseInfoWithOption() {
+        workDir = new WorkDir(pathToDummyExercise);
+        app.setWorkdir(workDir);
+        String[] args = {"info", "-a"};
+        app.run(args);
+
+        assertTrue(io.out().contains("Exercise name"));
+        assertTrue(io.out().contains("Is returnable"));
+    }
 }