Refactor the paste command.

Author: Aleksi Salmela

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

@@ -24,8 +24,18 @@
 public class PasteCommand extends AbstractCommand {
     private static final Logger logger = LoggerFactory.getLogger(SubmitCommand.class);
 
+    private CliContext ctx;
     private Io io;
 
+    String message;
+    boolean noMessage;
+    boolean openInBrowser;
+
+    @Override
+    public String[] getUsages() {
+        return new String[] {"tmc paste [-o] [-n] [-m MESSAGE] [EXERCISE]"};
+    }
+
     @Override
     public void getOptions(Options options) {
         options.addOption("n", "no-message", false, "Don't send a message with your paste");
@@ -35,40 +45,52 @@ public void getOptions(Options options) {
 
     @Override
     public void run(CliContext context, CommandLine args) {
-        CliContext ctx = context;
+        this.ctx = context;
         this.io = ctx.getIo();
-        if (!ctx.loadBackend()) {
-            return;
-        }
+
+        this.message = args.getOptionValue("m");
+        this.noMessage = args.hasOption("n");
+        this.openInBrowser = args.hasOption("o");
         WorkDir workdir = ctx.getWorkDir();
         String[] stringArgs = args.getArgs();
 
-        Boolean valid;
-        if (stringArgs.length == 0) {
-            valid = workdir.addPath();
-        } else if (stringArgs.length == 1) {
-            valid = workdir.addPath(stringArgs[0]);
-        } else {
-            io.errorln("Error: Too many arguments. Expected 1, got " + stringArgs.length);
+        if (noMessage && message != null) {
+            io.errorln("You can't have the no-message flag and message set at the same time.");
+            printUsage(context);
+            return;
+        }
+        if (stringArgs.length > 1) {
+            io.errorln("Error: Too many arguments.");
+            printUsage(context);
             return;
         }
-        if (!valid) {
-            io.errorln("The command can be used in an exercise directory without the exercise name"
-                    + " or in a course directory with the name as an argument.");
+
+        if (stringArgs.length == 1) {
+            if (!workdir.addPath(stringArgs[0])) {
+                io.errorln("The path '" + stringArgs[0] + "' is not valid exercise.");
+                return;
+            }
+        } else {
+            //TODO replace the following call with workdir.getCurrentExercise()
+            if (!workdir.addPath()) {
+                io.errorln("You are not in exercise directory.");
+                return;
+            }
+        }
+
+        if (!ctx.loadBackend()) {
             return;
         }
 
-        List<String> exercisenames = workdir.getExerciseNames();
-        if (exercisenames.size() != 1) {
+        List<String> exerciseNames = workdir.getExerciseNames();
+        if (exerciseNames.size() != 1) {
             io.errorln("Error: Matched too many exercises.");
+            printUsage(context);
             return;
         }
 
-        String message = "";
-        if (!args.hasOption("n")) {
-            if (args.hasOption("m")) {
-                message = args.getOptionValue("m");
-            } else if (io.readConfirmation("Attach a message to your paste?", true)) {
+        if (!noMessage && message == null) {
+            if (io.readConfirmation("Attach a message to your paste?", true)) {
                 message = ExternalsUtil.getUserEditedMessage(
                         "\n"
                                 + "#   Write a message for your paste in this file and save it.\n"
@@ -79,10 +101,17 @@ public void run(CliContext context, CommandLine args) {
                         true);
             }
         }
+        sendPaste(message, exerciseNames.get(0));
+    }
+
+    private void sendPaste(String message, String exerciseName) {
+        if (message == null) {
+            message = "";
+        }
 
-        String exerciseName = exercisenames.get(0);
         CourseInfo info = ctx.getCourseInfo();
         Exercise exercise = info.getExercise(exerciseName);
+
         URI uri = TmcUtil.sendPaste(ctx, exercise, message);
         if (uri == null && exercise.hasDeadlinePassed()) {
             io.errorln("Unable to send the paste."
@@ -96,7 +125,7 @@ public void run(CliContext context, CommandLine args) {
 
         io.println("Paste sent for exercise " + exercise.getName());
         io.println(uri.toString());
-        if (args.hasOption("o")) {
+        if (openInBrowser) {
             ExternalsUtil.openInBrowser(uri);
         }
     }

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

@@ -44,8 +44,8 @@ public void run(CliContext context, CommandLine args) {
         CliContext ctx = context;
         Io io = ctx.getIo();
 
-        String[] exercisesFromArgs = parseArgs(args);
-        if (exercisesFromArgs == null) {
+        String[] paths = parseArgs(args);
+        if (paths == null) {
             return;
         }
 
@@ -54,9 +54,9 @@ public void run(CliContext context, CommandLine args) {
         }
 
         WorkDir workDir = ctx.getWorkDir();
-        for (String exercise : exercisesFromArgs) {
-            if (!workDir.addPath(exercise)) {
-                io.errorln("The argument \"" + exercise + "\" is not a valid exercise.");
+        for (String path : paths) {
+            if (!workDir.addPath(path)) {
+                io.errorln("The path \"" + path + "\" is not a valid exercise.");
                 return;
             }
         }