Merge branch 'master' into cli-context-aleksi

Author: jclc

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

@@ -2,6 +2,7 @@
 
 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_PURPLE;
 import static fi.helsinki.cs.tmc.cli.io.Color.AnsiColor.ANSI_RED;
 
 import fi.helsinki.cs.tmc.cli.CliContext;
@@ -155,12 +156,18 @@ private void printOneExercise(boolean showAll) {
     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()));
+
+        if (exercise.hasDeadlinePassed() && !exercise.isCompleted()) {
+            io.println(Color.colorString("deadline passed", ANSI_PURPLE));
+        } else {
+            if (!exercise.isCompleted() && exercise.isAttempted()) {
+                io.println(Color.colorString("attempted", ANSI_BLUE));
+            } else {
+                io.println(formatString("completed", exercise.isCompleted()));
+            }
+            if (exercise.requiresReview()) {
+                io.println(formatString("reviewed", exercise.isReviewed()));
+            }
         }
     }
 

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

@@ -91,6 +91,11 @@ public void run(CommandLine args, Io io) {
         CourseInfo info = ctx.getCourseInfo();
         Exercise exercise = info.getExercise(exerciseName);
         URI uri = TmcUtil.sendPaste(ctx, exercise, message);
+        if (uri == null && exercise.hasDeadlinePassed()) {
+            io.println("Unable to send the paste."
+                    + " The deadline for submitting this exercise has passed");
+            return;
+        }
         if (uri == null) {
             io.println("Unable to send the paste");
             return;