Merge branch 'sdk-new-agent-constructor' into 'master'

[FIX][SDK CommandLineAgents can now be run with complex command lines

See merge request codingame/game-engine!217

Author: CodinGameCommunity

runner/src/main/java/com/codingame/gameengine/runner/CommandLinePlayerAgent.java

@@ -13,21 +13,29 @@ public class CommandLinePlayerAgent extends Agent {
     private OutputStream processStdin;
     private InputStream processStdout;
     private InputStream processStderr;
-    private String commandLine;
+    private String[] commandArray;
     private Process process;
 
     /**
      * Creates an Agent for your game, will run the given commandLine at game start
      * 
      * @param commandLine
-     *            the commandLine to run
+     *            the command line to run
      */
     public CommandLinePlayerAgent(String commandLine) {
         super();
-        try {
-            this.commandLine = commandLine;
-        } catch (Exception e) {
-        }
+        this.commandArray = commandLine.split(" ");
+    }
+    
+    /**
+     * Creates an Agent for your game, will run the given commandLine at game start
+     * 
+     * @param commandArray
+     *            the command array to run
+     */
+    public CommandLinePlayerAgent(String[] commandArray) {
+        super();
+        this.commandArray = commandArray;
     }
 
     @Override
@@ -47,11 +55,10 @@ protected InputStream getErrorStream() {
 
     @Override
     public void initialize(Properties conf) {
-
         try {
-            this.process = Runtime.getRuntime().exec(commandLine);
+            this.process = Runtime.getRuntime().exec(commandArray);
         } catch (IOException e) {
-            throw new RuntimeException("Failed to launch " + commandLine, e);
+            throw new RuntimeException("Failed to launch " + String.join(" ", commandArray));
         }
         processStdin = process.getOutputStream();
         processStdout = process.getInputStream();

runner/src/main/java/com/codingame/gameengine/runner/MultiplayerGameRunner.java

@@ -20,15 +20,19 @@ public MultiplayerGameRunner() {
 
     /**
      * Sets the league level to run. The first league is 1.
-     * <p>The value can also be set by setting the environment variable <code>league.level</code>.</p>
-     * @param leagueLevel the league level. 1 is the lowest level and default value.
+     * <p>
+     * The value can also be set by setting the environment variable <code>league.level</code>.
+     * </p>
+     * 
+     * @param leagueLevel
+     *            the league level. 1 is the lowest level and default value.
      */
-  
+
     public void setLeagueLevel(int leagueLevel) {
-      if (leagueLevel < 1 || leagueLevel >= 20) {
-        throw new IllegalArgumentException("League level must be higher than 0 and lesser than 20");
-      }
-      System.setProperty("league.level", String.valueOf(leagueLevel));
+        if (leagueLevel < 1 || leagueLevel >= 20) {
+            throw new IllegalArgumentException("League level must be higher than 0 and lesser than 20");
+        }
+        System.setProperty("league.level", String.valueOf(leagueLevel));
     }
 
     /**
@@ -43,7 +47,8 @@ public void setLeagueLevel(int leagueLevel) {
      * If those parameters are present in the given input, the input values should override the generated values.
      * </p>
      * 
-     * @param seed this game's seed returned by the <code>GameManager</code> during execution
+     * @param seed
+     *            this game's seed returned by the <code>GameManager</code> during execution
      */
     public void setSeed(Long seed) {
         this.seed = seed;
@@ -119,7 +124,7 @@ public void addAgent(Class<?> playerClass, String nickname, String avatarUrl) {
     public void addAgent(String commandLine, String nickname, String avatarUrl) {
         addAgent(new CommandLinePlayerAgent(commandLine), nickname, avatarUrl);
     }
-    
+
     /**
      * Adds an AI to the next game to run, with the specified nickname.
      * 
@@ -157,4 +162,53 @@ protected void buildInitCommand(Command initCommand) {
             }
         }
     }
+
+    /**
+     * Adds an AI to the next game to run.
+     * <p>
+     * The given command array will be executed with <code>Runtime.getRuntime().exec()</code>.
+     * </p>
+     * Example: <code>new String[]{"bash", "-c", "echo command1 && echo command2"}</code>
+     * 
+     * @param commandArray
+     *            the system command array to run the AI.
+     * @param nickname
+     *            the player's nickname
+     * @param avatarUrl
+     *            the url of the player's avatar
+     */
+    public void addAgent(String[] commandArray, String nickname, String avatarUrl) {
+        addAgent(new CommandLinePlayerAgent(commandArray), nickname, avatarUrl);
+    }
+
+    /**
+     * Adds an AI to the next game to run.
+     * <p>
+     * The given command array will be executed with <code>Runtime.getRuntime().exec()</code>.
+     * </p>
+     * Example: <code>new String[]{"bash", "-c", "echo command1 && echo command2"}</code>
+     * 
+     * @param commandArray
+     *            the system command array to run the AI.
+     * @param nickname
+     *            the player's nickname
+     */
+    public void addAgent(String[] commandArray, String nickname) {
+        addAgent(commandArray, nickname, null);
+    }
+
+    /**
+     * Adds an AI to the next game to run.
+     * <p>
+     * The given command array will be executed with <code>Runtime.getRuntime().exec()</code>.
+     * </p>
+     * Example: <code>new String[]{"bash", "-c", "echo command1 && echo command2"}</code>
+     * 
+     * @param commandArray
+     *            the system command array to run the AI.
+     */
+    public void addAgent(String[] commandArray) {
+        addAgent(commandArray, null, null);
+    }
+
 }