Merge branch 'master' into annotation-processing-tests-aleksi

mikkomaa · web-flow · commit 45b18a2b1439 · 2016-06-23T10:35:00.000+03:00
diff --git a/README.md b/README.md
@@ -46,9 +46,9 @@ Now that you've installed tmc-cli, you can view all available commands by runnin
 Once installation is complete, you can log in using `tmc login`. This saves your TMC login information to a configuration file in ~/.config/tmc-cli/ (or %LOCALAPPDATA% on Windows) - you will only have to log in once.
 ```
 ~ $ tmc login
-username: my-username
-password:
 server address:
+username:
+password:
 Login successful.
 ```
 
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.helsinki.cs.tmc.cli</groupId>
     <artifactId>tmc-cli</artifactId>
-    <version>0.5.2</version>
+    <version>0.6.0</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/Application.java b/src/main/java/fi/helsinki/cs/tmc/cli/Application.java
@@ -246,6 +246,10 @@ public void setWorkdir(WorkDir workDir) {
         this.workDir = workDir;
     }
 
+    public void setTmcProjectDirectory(Path path) {
+        this.settings.setTmcProjectDirectory(path);
+    }
+
     public HashMap<String, String> getProperties() {
         // Loads properties from the global configuration file in .config/tmc-cli/
         return this.properties;
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/command/CourseInfoCommand.java b/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 ");
+    }
 }
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/command/LoginCommand.java b/src/main/java/fi/helsinki/cs/tmc/cli/command/LoginCommand.java
@@ -36,10 +36,10 @@ public void getOptions(Options options) {
     @Override
     public void run(CommandLine args, Io io) {
         this.io = io;
+        String serverAddress = getLoginInfo(args, "s", "server address: ");
         String username = getLoginInfo(args, "u", "username: ");
         String password = getLoginInfo(args, "p", "password: ");
-        String serverAddress = getLoginInfo(args, "s", "server address: ");
-
+        
         Settings settings = new Settings(serverAddress, username, password);
         if (loginPossible(settings) && saveLoginSettings(settings)) {
             io.println("Login successful.");
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/command/RunTestsCommand.java b/src/main/java/fi/helsinki/cs/tmc/cli/command/RunTestsCommand.java
@@ -1,12 +1,15 @@
 package fi.helsinki.cs.tmc.cli.command;
 
+import static fi.helsinki.cs.tmc.langs.domain.RunResult.Status.PASSED;
+
 import fi.helsinki.cs.tmc.cli.Application;
 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.io.ResultPrinter;
 import fi.helsinki.cs.tmc.cli.io.TmcCliProgressObserver;
+import fi.helsinki.cs.tmc.cli.tmcstuff.CourseInfo;
 import fi.helsinki.cs.tmc.cli.tmcstuff.CourseInfoIo;
 import fi.helsinki.cs.tmc.cli.tmcstuff.Settings;
 import fi.helsinki.cs.tmc.cli.tmcstuff.WorkDir;
@@ -25,6 +28,7 @@
 import java.nio.file.Path;
 import java.util.List;
 
+
 @Command(name = "test", desc = "Run local exercise tests")
 public class RunTestsCommand extends AbstractCommand {
 
@@ -58,13 +62,13 @@ public void run(CommandLine args, Io io) {
                 return;
             }
         }
-        String courseName = getCourseName(workDir);
         List<String> exerciseNames = workDir.getExerciseNames();
 
         if (exerciseNames.isEmpty()) {
             io.println("You have to be in a course directory to run tests");
             return;
         }
+        CourseInfo info = CourseInfoIo.load(workDir.getConfigFile());
 
         // Local tests don't require login so make sure tmcCore is never null.
         app.createTmcCore(new Settings());
@@ -90,16 +94,30 @@ public void run(CommandLine args, Io io) {
 
                 io.println(Color.colorString("Testing: " + name, Color.AnsiColor.ANSI_YELLOW));
                 //name = name.replace("-", File.separator);
-                Exercise exercise = new Exercise(name, courseName);
+                Exercise exercise = info.getExercise(name);
+//                Exercise exercise = new Exercise(name, courseName);
 
                 // TmcCliProgressObserver progobs = new TmcCliProgressObserver(io);
                 runResult = core.runTests(ProgressObserver.NULL_OBSERVER, exercise).call();
                 // progobs.end(0);
 
-                resultPrinter.printRunResult(runResult, isOnlyExercise, color1, color2);
+                resultPrinter.printRunResult(runResult, exercise.isCompleted(),
+                        isOnlyExercise, color1, color2);
                 total += runResult.testResults.size();
                 passed += ResultPrinter.passedTests(runResult.testResults);
+                exercise.setAttempted(true);
+                if (runResult.status == PASSED && !exercise.isCompleted()) {
+                    // add exercise to locally tested exercises
+                    if (!info.getLocalCompletedExercises().contains(exercise.getName())) {
+                        info.getLocalCompletedExercises().add(exercise.getName());
+                    }
+                } else {
+                    if (info.getLocalCompletedExercises().contains(exercise.getName())) {
+                        info.getLocalCompletedExercises().remove(exercise.getName());
+                    }
+                }
             }
+            CourseInfoIo.save(info, workDir.getConfigFile());
             if (total > 0 && !isOnlyExercise) {
                 // Print a progress bar showing how the ratio of passed exercises
                 // But only if more than one exercise was tested
@@ -115,15 +133,6 @@ public void run(CommandLine args, Io io) {
         }
     }
 
-    private String getCourseName(WorkDir dirUtil) {
-        Path courseDir = dirUtil.getCourseDirectory();
-        try {
-            return courseDir.getName(courseDir.getNameCount() - 1).toString();
-        } catch (Exception e) {
-        }
-        return null;
-    }
-
     private String[] parseArgs(CommandLine args) {
         this.showPassed = args.hasOption("a");
         this.showDetails = args.hasOption("d");
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/command/SubmitCommand.java b/src/main/java/fi/helsinki/cs/tmc/cli/command/SubmitCommand.java
@@ -1,5 +1,7 @@
 package fi.helsinki.cs.tmc.cli.command;
 
+import static fi.helsinki.cs.tmc.core.domain.submission.SubmissionResult.TestResultStatus.NONE_FAILED;
+
 import fi.helsinki.cs.tmc.cli.Application;
 import fi.helsinki.cs.tmc.cli.command.core.AbstractCommand;
 import fi.helsinki.cs.tmc.cli.command.core.Command;
@@ -38,6 +40,8 @@ public class SubmitCommand extends AbstractCommand {
     public void getOptions(Options options) {
         options.addOption("a", "all", false, "Show all test results");
         options.addOption("d", "details", false, "Show detailed error message");
+        options.addOption("c", "completed", false,
+                "Filter out exercises that haven't been locally tested");
     }
 
     @Override
@@ -58,14 +62,25 @@ public void run(CommandLine args, Io io) {
         WorkDir workDir = app.getWorkDir();
         for (String exercise : exercisesFromArgs) {
             if (!workDir.addPath(exercise)) {
-                io.println("Error: '" + exercise + "' is not a valid exercise.");
+                io.println("Error: " + exercise + " is not a valid exercise.");
                 return;
             }
         }
 
-        List<String> exerciseNames = workDir.getExerciseNames();
+        List<String> exerciseNames;
+        if (args.hasOption("c")) {
+            workDir.addPath(workDir.getCourseDirectory());
+            exerciseNames = workDir.getExerciseNames(true, true, false);
+        } else {
+            exerciseNames = workDir.getExerciseNames();
+        }
+
         if (exerciseNames.isEmpty()) {
-            io.println("You have to be in a course directory to submit");
+            if (args.hasOption("c") && workDir.getCourseDirectory() != null) {
+                io.println("No locally tested exercises.");
+                return;
+            }
+            io.println("No exercises specified.");
             return;
         }
 
@@ -95,8 +110,17 @@ public void run(CommandLine args, Io io) {
                 resultPrinter.printSubmissionResult(result, isOnlyExercise, color1, color2);
                 total += result.getTestCases().size();
                 passed += ResultPrinter.passedTests(result.getTestCases());
+
+                exercise.setAttempted(true);
+                if (result.getTestResultStatus() == NONE_FAILED) {
+                    if (info.getLocalCompletedExercises().contains(exercise.getName())) {
+                        info.getLocalCompletedExercises().remove(exercise.getName());
+                    }
+                    exercise.setCompleted(true);
+                }
             }
         }
+        CourseInfoIo.save(info, workDir.getConfigFile());
         if (total > 0 && !isOnlyExercise) {
             // Print a progress bar showing how the ratio of passed exercises
             io.println("");
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/command/UpdateCommand.java b/src/main/java/fi/helsinki/cs/tmc/cli/command/UpdateCommand.java
@@ -2,6 +2,7 @@
 
 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.io.TmcCliProgressObserver;
 import fi.helsinki.cs.tmc.cli.tmcstuff.CourseInfo;
@@ -65,8 +66,10 @@ public void updateExercises(TmcCore core, CourseInfo info, Path configFile) {
         printExercises(exerciseUpdater.getUpdatedExercises(), "Modified exercises:");
         io.println("");
 
+        Color.AnsiColor color1 = getApp().getColor("progressbar-left");
+        Color.AnsiColor color2 = getApp().getColor("progressbar-right");
         List<Exercise> downloaded = exerciseUpdater.downloadUpdates(
-                new TmcCliProgressObserver(io));
+                new TmcCliProgressObserver(io, color1, color2));
         if (downloaded.isEmpty()) {
             io.println("Failed to download exercises");
             return;
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/io/ResultPrinter.java b/src/main/java/fi/helsinki/cs/tmc/cli/io/ResultPrinter.java
@@ -107,7 +107,7 @@ public void printSubmissionResult(SubmissionResult result, Boolean printProgress
         }
     }
 
-    public void printRunResult(RunResult result, Boolean printProgressBar,
+    public void printRunResult(RunResult result, Boolean submitted, Boolean printProgressBar,
                                Color.AnsiColor color1, Color.AnsiColor color2) {
         printTestResults(result.testResults);
         this.total = result.testResults.size();
@@ -120,9 +120,10 @@ public void printRunResult(RunResult result, Boolean printProgressBar,
         String msg = null;
         switch (result.status) {
             case PASSED:
-                msg = "All tests passed!";
-                msg = Color.colorString(msg, Color.AnsiColor.ANSI_GREEN)
-                        + " Submit to server with 'tmc submit'";
+                msg = Color.colorString("All tests passed!", Color.AnsiColor.ANSI_GREEN);
+                if (!submitted) {
+                    msg += " Submit to server with 'tmc submit'";
+                }
                 break;
             case TESTS_FAILED:
                 msg = "Please review your answer before submitting";
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/tmcstuff/CourseInfo.java b/src/main/java/fi/helsinki/cs/tmc/cli/tmcstuff/CourseInfo.java
@@ -46,11 +46,10 @@ public Course getCourse() {
     public List<String> getLocalCompletedExercises() {
         // Check for null pointer in case of old .tmc.json files
         // Remove this when we are sure nobody's using 0.5.1 anymore
-        if (this.localCompletedExercises != null) {
-            return this.localCompletedExercises;
-        } else {
-            return new ArrayList<String>();
+        if (this.localCompletedExercises == null) {
+            this.localCompletedExercises = new ArrayList<String>();
         }
+        return this.localCompletedExercises;
     }
 
     public List<Exercise> getExercises() {
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/tmcstuff/WorkDir.java b/src/main/java/fi/helsinki/cs/tmc/cli/tmcstuff/WorkDir.java
@@ -127,12 +127,11 @@ private Boolean filterExercise(Exercise exercise, String exDir, List<String> tes
      * return the current working directory.
      */
     public Path getWorkingDirectory() {
-        if (this.directoryCount() == 1) {
-            return this.directories.get(0);
-        } else if (this.directoryCount() == 0) {
+        if (this.courseDirectory != null) {
+            return this.courseDirectory;
+        } else {
             return workdir;
         }
-        return null;
     }
 
     public List<Path> getDirectories() {
diff --git a/src/test/java/fi/helsinki/cs/tmc/cli/command/CourseInfoCommandTest.java b/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"));
+    }
 }
diff --git a/src/test/java/fi/helsinki/cs/tmc/cli/command/RunTestsCommandTest.java b/src/test/java/fi/helsinki/cs/tmc/cli/command/RunTestsCommandTest.java
@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -133,5 +132,4 @@ public void worksInCourseDirectoryIfExerciseIsGiven() {
         app.run(args);
         assertTrue(io.out().contains("Testing: " + EXERCISE1_NAME));
     }
-
 }
diff --git a/src/test/java/fi/helsinki/cs/tmc/cli/command/SubmitCommandTest.java b/src/test/java/fi/helsinki/cs/tmc/cli/command/SubmitCommandTest.java
diff --git a/src/test/java/fi/helsinki/cs/tmc/cli/io/ResultPrinterTest.java b/src/test/java/fi/helsinki/cs/tmc/cli/io/ResultPrinterTest.java

Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,10 @@ public Course getCourse() {`
`46`	`46`	`public List<String> getLocalCompletedExercises() {`
`47`	`47`	`// Check for null pointer in case of old .tmc.json files`
`48`	`48`	`// Remove this when we are sure nobody's using 0.5.1 anymore`
`49`		`- if (this.localCompletedExercises != null) {`
`50`		`- return this.localCompletedExercises;`
`51`		`- } else {`
`52`		`- return new ArrayList<String>();`
	`49`	`+ if (this.localCompletedExercises == null) {`
	`50`	`+ this.localCompletedExercises = new ArrayList<String>();`
`53`	`51`	`}`
	`52`	`+ return this.localCompletedExercises;`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`public List<Exercise> getExercises() {`