Merge branch 'master' into ssh_agent_support

desktop/src/main/java/net/monarchpass/piecannon/App.java

@@ -4,8 +4,6 @@ import java.net.URI;
 
 import java.io.File;
 import java.util.List;
-import java.util.ArrayList;
-
 import org.freedesktop.BaseDirectory;
 
 import lombok.extern.java.Log;
@@ -35,16 +33,22 @@ public class App {
             log.log(Level.SEVERE, "No servers defined, please define at least one in {0}", serversJson);
             System.exit(1);
         }
-        
-        final Server server = cannon.selectServer();
-        log.log(Level.INFO, "Randomly selected server: {0}", server.getLabel());
-        
+
         if (args.length == 0) {
             log.log(Level.SEVERE, "No filename provided");
             System.exit(1);
         }
         
-        final File source = new File(args[0]);
+        final Server server = cannon.selectServer();
+        log.log(Level.INFO, "Randomly selected server: {0}", server.getLabel());
+        
+        final String arg = args[0];
+        if (arg.equals("--test")) {
+            testServers(servers);
+            return;
+        }
+        
+        final File source = new File(arg);
         if (!source.exists()) {
             log.log(Level.SEVERE, "No such file: {0}", source);
             System.exit(1);
@@ -54,6 +58,15 @@ public class App {
         System.out.println(result);
     }
  
+    public static void testServers (final List<Server> servers) {
+        log.log(Level.INFO, "Testing all defined servers");
+        for (final Server server : servers) {
+            log.log(Level.INFO, "{0} {1}: {2}", new Object[] {
+                server.getClass().getSimpleName(), server.getLabel(), PieCannon.testServer(server)
+            });
+        }
+    }
+ 
     public static File getServersJson () {
         return new File(getDataDirectory(), "servers.json");
     }