Merge pull request #152 from tmc-cli/print-results-cleanup-juha

Print results cleanup

Author: juvester

src/main/java/fi/helsinki/cs/tmc/cli/Application.java

@@ -81,7 +81,8 @@ private boolean parseArgs(String[] args) {
         try {
             line = this.parser.parse(this.options, args);
         } catch (ParseException e) {
-            io.println("Invalid command line arguments." + e);
+            io.println("Invalid command line arguments.");
+            io.println(e.getMessage());
             return false;
         }
 
@@ -178,9 +179,11 @@ public TmcCore getTmcCore() {
 
     public static void main(String[] args) {
         Io io = new TerminalIo();
-        Runtime.getRuntime().addShutdownHook(new ShutdownHandler(io));
+        ShutdownHandler shutdownHandler = new ShutdownHandler(io);
+        Runtime.getRuntime().addShutdownHook(shutdownHandler);
         Application app = new Application(io);
         app.run(args);
+        Runtime.getRuntime().removeShutdownHook(shutdownHandler);
     }
 
     public static String getVersion() {

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

@@ -3,6 +3,7 @@
 import fi.helsinki.cs.tmc.cli.Application;
 import fi.helsinki.cs.tmc.cli.command.core.Command;
 import fi.helsinki.cs.tmc.cli.command.core.CommandInterface;
+import fi.helsinki.cs.tmc.cli.io.Color;
 import fi.helsinki.cs.tmc.cli.io.Io;
 import fi.helsinki.cs.tmc.cli.io.ResultPrinter;
 import fi.helsinki.cs.tmc.cli.io.TmcCliProgressObserver;
@@ -72,12 +73,13 @@ public void run(String[] args, Io io) {
 
         try {
             for (String name : exerciseNames) {
-                io.println("Testing: " + name);
+                io.println(Color.colorString("Testing: " + name, Color.ANSI_YELLOW));
                 name = name.replace("-", File.separator);
                 Exercise exercise = new Exercise(name, courseName);
 
                 runResult = core.runTests(new TmcCliProgressObserver(), exercise).call();
                 resultPrinter.printRunResult(runResult);
+                io.println("");
             }
 
         } catch (Exception ex) {
@@ -102,7 +104,8 @@ private String[] parseArgs(String[] args) {
         try {
             line = parser.parse(options, args);
         } catch (ParseException e) {
-            logger.warn("Unable to parse arguments.", e);
+            io.println("Invalid command line arguments.");
+            io.println(e.getMessage());
             return null;
         }
         this.showPassed = line.hasOption("a");

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

@@ -3,6 +3,7 @@
 import fi.helsinki.cs.tmc.cli.Application;
 import fi.helsinki.cs.tmc.cli.command.core.Command;
 import fi.helsinki.cs.tmc.cli.command.core.CommandInterface;
+import fi.helsinki.cs.tmc.cli.io.Color;
 import fi.helsinki.cs.tmc.cli.io.Io;
 import fi.helsinki.cs.tmc.cli.io.ResultPrinter;
 import fi.helsinki.cs.tmc.cli.tmcstuff.CourseInfo;
@@ -45,6 +46,7 @@ public SubmitCommand(Application app) {
 
     @Override
     public void run(String[] args, Io io) {
+        this.io = io;
         TmcCore core;
         DirectoryUtil dirUtil;
 
@@ -53,7 +55,6 @@ public void run(String[] args, Io io) {
         if (exerciseNames == null) {
             return;
         }
-        this.io = io;
         dirUtil = new DirectoryUtil();
         core = this.app.getTmcCore();
         if (core == null) {
@@ -79,9 +80,10 @@ public void run(String[] args, Io io) {
         SubmissionResult result;
 
         for (String exerciseName : exercises) {
-            io.println("Submitting: " + exerciseName);
+            io.println(Color.colorString("Submitting: " + exerciseName, Color.ANSI_YELLOW));
             result = TmcUtil.submitExercise(core, course, exerciseName);
             resultPrinter.printSubmissionResult(result);
+            io.println("");
         }
     }
 
@@ -91,7 +93,8 @@ private String[] parseArgs(String[] args) {
         try {
             line = parser.parse(options, args);
         } catch (ParseException e) {
-            logger.warn("Unable to parse arguments.", e);
+            io.println("Invalid command line arguments.");
+            io.println(e.getMessage());
             return null;
         }
         this.showAll = line.hasOption("a");