Merge branch 'master' into update-man-jclc

Author: jclc

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

@@ -63,13 +63,13 @@ public void run(CommandLine args, Io io) {
         }
 
         if (!ctx.hasLogin()) {
-            io.println("Loading course from internet requires login.");
+            io.println("Loading a course from a server requires login.");
             return;
         }
 
         course = TmcUtil.findCourse(ctx, stringArgs[0]);
         if (course == null) {
-            io.println("The course " + stringArgs[0] + " doesn't exist on this server.");
+            io.println("The course " + stringArgs[0] + " doesn't exist on the server.");
             return;
         }
         printCourse(args.hasOption("a"));

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

@@ -41,7 +41,7 @@ public void getOptions(Options options) {
     public void run(CommandLine args, Io io) {
         String[] stringArgs = args.getArgs();
         if (stringArgs.length == 0 || stringArgs.length > 1) {
-            io.println("You must give course name as an argument.");
+            io.println("You must give a course name as an argument.");
             io.println("Usage: tmc download COURSE");
             return;
         }
@@ -137,21 +137,24 @@ private void printStatistics(Course course, int requestCount, int downloadCount)
         if (course.getExercises().isEmpty()) {
             io.println("The '" + courseName + "' course doesn't have any exercises.");
         } else {
+            int totalCount = course.getExercises().size();
             io.println("The '" + courseName + "' course has "
-                    + course.getExercises().size() + " exercises");
+                    + totalCount + " exercises available");
 
             int failedCount = (requestCount - downloadCount);
             if (failedCount > 0) {
-                io.println("  from which " + (requestCount - failedCount)
+                io.println("  of which " + (requestCount - failedCount)
                         + " exercises were succesfully downloaded");
                 io.println(Color.colorString("  and of which " + failedCount + " failed.",
                         Color.AnsiColor.ANSI_RED));
                 //TODO we could print the names of the not downloaded exercises here
             } else {
-                io.println("  from which "
+                io.println("  of which "
                         + downloadCount + " exercises were downloaded.");
             }
-            io.println("Use -a/--all to download completed exercises as well.");
+            if (!showAll && totalCount != downloadCount) {
+                io.println("Use -a/--all to download completed exercises as well.");
+            }
         }
     }
 

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

@@ -188,7 +188,7 @@ public void printsErrorIfInCourseDirectoryAndGivenCourseNameThatDoesntExistOnThe
 
         String[] args = {"info", "notacourse", "-i"};
         app.run(args);
-        io.assertContains("doesn't exist on this server.");
+        io.assertContains("doesn't exist on the server.");
     }
 
     @Test

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

@@ -201,7 +201,7 @@ public void failsToLoadExercises() throws ParseException {
         app.run(args);
 
         io.assertContains("The 'course1' course has 3 exercises");
-        io.assertContains("from which 2 exercises were succesfully downloaded");
+        io.assertContains("of which 2 exercises were succesfully downloaded");
         io.assertContains("and of which 1 failed.");
     }