Merge branch 'master' into cache-test-results-jclc

Author: jclc

README.md

@@ -48,12 +48,9 @@ Once installation is complete, you can log in using `tmc login`. This saves your
 ~ $ tmc login
 username: my-username
 password:
+server address:
 Login successful.
 ```
-By default, tmc-cli connects to University of Helsinki MOOC server. To log in to another server, specify the server with the `-s` or `--server` switch:
-```
-~ $ tmc login -s [SERVER_ADDRESS]
-```
 
 ##Listing courses
 

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.1</version>
+    <version>0.5.2</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -29,6 +29,8 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -105,7 +107,7 @@ private String[] parseArgs(String[] args) {
             return null;
         }
 
-        List<String> subArgs = line.getArgList();
+        List<String> subArgs = new ArrayList<>(Arrays.asList(line.getArgs()));
         if (subArgs.size() > 0) {
             commandName = subArgs.remove(0);
         } else {

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

@@ -11,32 +11,25 @@
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.List;
 
 /**
  * Command for listing all available courses to user.
  */
 @Command(name = "courses", desc = "List the available courses")
 public class ListCoursesCommand extends AbstractCommand {
-    private static final Logger logger = LoggerFactory.getLogger(ListCoursesCommand.class);
 
     @Override
     public void getOptions(Options options) {
     }
 
     @Override
     public void run(CommandLine args, Io io) {
-        List<Course> courses;
-        TmcCore core;
-
-        core = getApp().getTmcCore();
+        TmcCore core = getApp().getTmcCore();
         if (core == null) {
             return;
         }
-        courses = TmcUtil.listCourses(core);
+        List<Course> courses = TmcUtil.listCourses(core);
         if (courses.isEmpty()) {
             io.println("No courses found on this server.");
             return;

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

@@ -33,32 +33,34 @@ public void getOptions(Options options) {
     @Override
     public void run(CommandLine args, Io io) {
         this.io = io;
-        String courseName;
-
-        // Get course name
-        String[] stringArgs = args.getArgs();
-        if (stringArgs.length == 0) {
-            courseName = getCourseNameFromCurrentDirectory();
-            if (courseName == null) {
-                return;
-            }
-        } else {
-            courseName = stringArgs[0];
+        
+        String courseName = getCourseName(args);
+        if (courseName == null) {
+            return;
         }
 
-        // Get course exercises
-        List<Exercise> exercises;
-        if (args.hasOption("i")) {
-            exercises = getExercisesFromServer(courseName);
-        } else {
-            exercises = getLocalExercises(courseName);
-        }
+        List<Exercise> exercises = getExercises(args, courseName);
         if (exercises == null) {
             return;
         }
 
         printExercises(courseName, exercises, !args.hasOption("n"));
     }
+    
+    private String getCourseName(CommandLine args) {
+        String[] stringArgs = args.getArgs();
+        if (stringArgs.length != 0) {
+            return stringArgs[0];
+        }
+        return getCourseNameFromCurrentDirectory();
+    }
+    
+    private List<Exercise> getExercises(CommandLine args, String courseName) {
+        if (args.hasOption("i")) {
+            return getExercisesFromServer(courseName);
+        }
+        return getLocalExercises(courseName);
+    }
 
     private String getCourseNameFromCurrentDirectory() {
         CourseInfo info = getCourseInfoFromCurrentDirectory();
@@ -92,7 +94,7 @@ private List<Exercise> getExercisesFromServer(String courseName) {
         }
 
         List<Exercise> exercises = course.getExercises();
-        if (exercises.isEmpty()) {
+        if (exercises == null || exercises.isEmpty()) {
             this.io.println("Course '" + courseName + "' doesn't have any exercises.");
             return null;
         }
@@ -116,6 +118,15 @@ private List<Exercise> getLocalExercises(String courseName) {
     }
 
     private void printExercises(String courseName, List<Exercise> exercises, Boolean pager) {
+        String str = getExercisesAsString(courseName, exercises);
+        if (pager) {
+            ExternalsUtil.showStringInPager(str, "exercise-list");
+        } else {
+            io.print(str);
+        }
+    }
+    
+    private String getExercisesAsString(String courseName, List<Exercise> exercises) {
         StringBuilder sb = new StringBuilder("Course name: " + courseName);
         String prevDeadline = "";
 
@@ -127,12 +138,7 @@ private void printExercises(String courseName, List<Exercise> exercises, Boolean
             }
             sb.append(getExerciseStatus(exercise));
         }
-
-        if (pager) {
-            ExternalsUtil.showStringInPager(sb.toString(), "exercise-list");
-        } else {
-            io.print(sb.toString());
-        }
+        return sb.toString();
     }
 
     private String getDeadline(Exercise exercise) {

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

@@ -36,39 +36,24 @@ public void getOptions(Options options) {
     @Override
     public void run(CommandLine args, Io io) {
         this.io = io;
-        String username = getUsername(args);
-        String password = getPassword(args);
-        String serverAddress = getServerAddress(args);
+        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.");
         }
     }
 
-    private String getUsername(CommandLine line) {
-        String username = line.getOptionValue("u");
-        if (username == null) {
-            username = io.readLine("username: ");
+    private String getLoginInfo(CommandLine line, String option, String prompt) {
+        String info = line.getOptionValue(option);
+        if (info == null && option.equals("p")) {
+            info = io.readPassword(prompt);
+        } else if (info == null) {
+            info = io.readLine(prompt);
         }
-        return username;
-    }
-
-    private String getPassword(CommandLine line) {
-        String password = line.getOptionValue("p");
-        if (password == null) {
-            password = io.readPassword("password: ");
-        }
-        return password;
-    }
-
-    private String getServerAddress(CommandLine line) {
-        String serverAddress = line.getOptionValue("s");
-        if (serverAddress == null) {
-            // todo: don't hardcode the default value, get it from somewhere
-            serverAddress = "https://tmc.mooc.fi/mooc";
-        }
-        return serverAddress;
+        return info;
     }
 
     private boolean saveLoginSettings(Settings settings) {
@@ -104,7 +89,7 @@ private boolean loginPossible(Settings settings) {
                     return false;
                 }
             }
-            
+
             logger.error("Unable to connect to server", e);
             io.println("Unable to connect to server "
                     + settings.getServerAddress());

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

@@ -44,7 +44,7 @@ public void run(CommandLine args, Io io) {
             return;
         }
         WorkDir workdir = app.getWorkDir();
-        List<String> argsList = args.getArgList();
+        String[] stringArgs = args.getArgs();
 
 //        if (argsList.size() > 1) {
 //            io.println(
@@ -53,13 +53,13 @@ public void run(CommandLine args, Io io) {
 //            return;
 //        }
         Boolean valid;
-        if (argsList.isEmpty()) {
+        if (stringArgs.length == 0) {
             valid = workdir.addPath();
-        } else if (argsList.size() == 1) {
-            valid = workdir.addPath(argsList.get(0));
+        } else if (stringArgs.length == 1) {
+            valid = workdir.addPath(stringArgs[0]);
         } else {
             io.println(
-                    "Error: Too many arguments. Expected 1, got " + argsList.size());
+                    "Error: Too many arguments. Expected 1, got " + stringArgs.length);
             return;
         }
         if (!valid) {

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

@@ -31,20 +31,20 @@ public void getOptions(Options options) {
     public void run(CommandLine args, Io io) {
         this.io = io;
         Boolean unset = args.hasOption("u");
-        List<String> arguments = args.getArgList();
+        String[] arguments = args.getArgs();
         HashMap<String, String> props = getApp().getProperties();
-        if (arguments.isEmpty()) {
+        if (arguments.length == 0) {
             printAllProps(props);
             return;
         }
 
-        if (arguments.size() % 2 == 1 && !unset) {
+        if (arguments.length % 2 == 1 && !unset) {
             io.println("Invalid argument count. Usage: tmc prop KEY VALUE ...");
             return;
         }
 
         if (unset) {
-            if (arguments.size() > 1) {
+            if (arguments.length > 1) {
                 io.print("Unsetting property keys:");
                 for (String arg : arguments) {
                     io.print(" " + arg);
@@ -58,25 +58,23 @@ public void run(CommandLine args, Io io) {
                 io.println("Unset key " + key + ", was " + props.remove(key));
             }
             getApp().saveProperties();
-            return;
         } else {
-            if (arguments.size() > 2) {
+            if (arguments.length > 2) {
                 io.print("Setting property keys:");
-                for (int i = 0; i < arguments.size(); i = i + 2) {
-                    io.print(" " + arguments.get(i) + "=>" + arguments.get(i + 1));
+                for (int i = 0; i < arguments.length; i = i + 2) {
+                    io.print(" " + arguments[i] + "=>" + arguments[i + 1]);
                 }
                 io.println("");
                 if (!io.readConfirmation("Are you sure?", true)) {
                     return;
                 }
             }
-            for (int i = 0; i < arguments.size(); i = i + 2) {
-                String last = props.put(arguments.get(i), arguments.get(i + 1));
-                io.println("Set " + arguments.get(i) + "=>" + arguments.get(i + 1)
+            for (int i = 0; i < arguments.length; i = i + 2) {
+                String last = props.put(arguments[i], arguments[i + 1]);
+                io.println("Set " + arguments[i] + "=>" + arguments[i + 1]
                         + ", was " + last);
             }
             getApp().saveProperties();
-            return;
         }
     }
 

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

@@ -45,7 +45,7 @@ public void getOptions(Options options) {
     public void run(CommandLine args, Io io) {
 //        this.io = io;
 
-        List<String> exercisesFromArgs = parseArgs(args);
+        String[] exercisesFromArgs = parseArgs(args);
         if (exercisesFromArgs == null) {
             return;
         }
@@ -124,9 +124,9 @@ private String getCourseName(WorkDir dirUtil) {
         return null;
     }
 
-    private List<String> parseArgs(CommandLine args) {
+    private String[] parseArgs(CommandLine args) {
         this.showPassed = args.hasOption("a");
         this.showDetails = args.hasOption("d");
-        return args.getArgList();
+        return args.getArgs();
     }
 }

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

@@ -42,7 +42,7 @@ public void getOptions(Options options) {
     public void run(CommandLine args, Io io) {
         this.io = io;
 
-        List<String> exercisesFromArgs = parseArgs(args);
+        String[] exercisesFromArgs = parseArgs(args);
         if (exercisesFromArgs == null) {
             return;
         }
@@ -132,9 +132,9 @@ public void checkForExerciseUpdates(TmcCore core, Course course) {
         io.println(Color.colorString(msg, Color.AnsiColor.ANSI_YELLOW));
     }
 
-    private List<String> parseArgs(CommandLine args) {
+    private String[] parseArgs(CommandLine args) {
         this.showAll = args.hasOption("a");
         this.showDetails = args.hasOption("d");
-        return args.getArgList();
+        return args.getArgs();
     }
 }