Skip to content

Commit

Permalink
Merge pull request #1 from fnetworks/cli
Browse files Browse the repository at this point in the history 
Merge CLI with master
  • Loading branch information
@fnetz
fnetz authored Apr 14, 2017
2 parents 437b674 + d0e009f commit 8add2ea
Show file tree
Hide file tree
Showing 4 changed files with 246 additions and 2 deletions.
25 changes: 23 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
<artifactId>mcrconapi</artifactId>
<version>1.0.1</version>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<junit.version>4.12</junit.version>
</properties>
<dependencies>
Expand All @@ -44,6 +42,29 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>org.fnet.mcrconapi.cli.CommandLineMain</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
<scm>
<connection>scm:git:https://github.com/fnetworks/mcrconapi.git</connection>
<developerConnection>scm:git:https://github.com/fnetworks/mcrconapi.git</developerConnection>
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/org/fnet/mcrconapi/RConClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ public class RConClient implements Closeable {
* The default port for RCON used by minecraft
*/
public static final int DEFAULT_RCON_PORT = 25575;

/**
*
*/
public static final String API_VERSION = "1.0.1";

private Socket socket;
private OutputStream outputStream;
Expand Down
168 changes: 168 additions & 0 deletions src/main/java/org/fnet/mcrconapi/cli/CommandLineMain.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
package org.fnet.mcrconapi.cli;

import java.io.Console;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Scanner;

import org.fnet.mcrconapi.AuthenticationException;
import org.fnet.mcrconapi.RConClient;

public class CommandLineMain {

public static void main(String[] args) {
Map<String, String> arguments = parseArguments(args);
if (arguments.containsKey("help") || arguments.containsKey("h")) {
printVersion();
printUsage();
return;
} else if (arguments.containsKey("version") || arguments.containsKey("-v")) {
printVersion();
return;
}
String host = arguments.containsKey("host") ? arguments.get("host") : arguments.get("a");
boolean interactive = !arguments.containsKey("noninteractive") && !arguments.containsKey("n");
String password = arguments.containsKey("login") ? arguments.get("login") : arguments.get("l");
String command = arguments.containsKey("command") ? arguments.get("command") : arguments.get("c");

try (Scanner sc = new Scanner(System.in)) {
if (host == null) {
if (interactive) {
System.out.println("Enter host address: ");
host = sc.nextLine();
} else {
System.err.println("Need host address");
System.exit(1);
}
}
if (password == null) {
if (interactive) {
System.out.println("Enter password: ");
Console console = System.console();
if (console != null) {
password = new String(console.readPassword());
} else {
password = sc.nextLine();
}
} else {
System.err.println("Need password");
System.exit(1);
}
}
if (command == null) {
if (interactive) {
System.out.println("Enter command to send: ");
command = sc.nextLine();
} else {
System.err.println("Need command");
System.exit(1);
}
}
}

RConClient client;
try {
client = new RConClient(host);
} catch (IOException e) {
System.err.println("An exception occured while connecting to the server: ");
e.printStackTrace(System.err);
System.exit(1);
return;
}
try {
client.authenticate(password);
} catch (IOException | AuthenticationException e) {
System.err.println("An exception occured while authenticating: ");
e.printStackTrace(System.err);
try {
client.close();
} catch (IOException ex) {
System.err.println("Additionaly, an exception occured while closing the client: ");
ex.printStackTrace(System.err);
System.exit(1);
return;
}
System.exit(1);
return;
}
try {
System.out.println(client.sendCommand(command));
} catch (AuthenticationException | IOException e) {
System.err.println("An exception occured while sending command: ");
e.printStackTrace(System.err);
try {
client.close();
} catch (IOException ex) {
System.err.println("Additionaly, an exception occured while closing the client: ");
ex.printStackTrace(System.err);
System.exit(1);
return;
}
System.exit(1);
return;
}
try {
client.close();
} catch (IOException e) {
System.err.println("An exception occured while closing the client: ");
e.printStackTrace(System.err);
System.exit(1);
}
}

public static Map<String, String> parseArguments(String[] args) {
final Map<String, String> map = new HashMap<>();
for (int i = 0; i < args.length; i++) {
if (args[i].startsWith("--")) {
if (args.length > i + 1 && !args[i + 1].startsWith("--")) {
map.put(args[i].substring(2), args[i + 1]);
} else {
map.put(args[i].substring(2), null);
}
} else if (args[i].startsWith("-")) {
if (args.length > i + 1 && !args[i + 1].startsWith("-")) {
String keyname = args[i].substring(1);
if (keyname.length() > 1) {
for (int j = 0; j < keyname.length() - 1; j++) {
map.put(keyname.substring(j, j + 1), null);
}
map.put(keyname.substring(keyname.length() - 1, keyname.length()), args[i + 1]);
} else {
map.put(keyname, args[i + 1]);
}
} else {
String keyname = args[i].substring(1);
if (keyname.length() > 1) {
for (int j = 0; j < keyname.length(); j++) {
map.put(keyname.substring(j, j + 1), null);
}
map.put(keyname.substring(keyname.length() - 1, keyname.length()), null);
} else {
map.put(keyname, null);
}
}
}
}
return map;
}

public static void printVersion() {
System.out.println("MCRCONAPI v" + RConClient.API_VERSION);
System.out.println("Copyright (c) 2017 fnetworks");
}

public static void printUsage() {
System.out.println("Parameters: ");
System.out.println(" --host | -a <address> : Specify the host address");
System.out.println(" --login | -l <password> : Login at the server with the given password");
System.out.println(" --help | -h : Show this help message");
System.out.println(" --version | -v : Prints version information");
System.out.println(" --noninteractive | -n : "
+ "Non-Interactive mode (exit instead of asking for missing information and commands, "
+ "default is interactive mode)");
System.out.println(" --command | -c <command> : "
+ "Command that should be sent to the server (noninteractive mode)");
}

}
50 changes: 50 additions & 0 deletions src/test/java/org/fnet/mcrconapi/CliTest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package org.fnet.mcrconapi;

import java.util.Map;

import org.fnet.mcrconapi.cli.CommandLineMain;
import org.junit.Test;

import static org.junit.Assert.*;

public class CliTest {

@Test
public void testParseArguments() {
final String cmdstring = "42", loginstring = "testpassword";

Map<String, String> args = CommandLineMain
.parseArguments(new String[] { "--help", "--login", loginstring, "-cmd", cmdstring });

assertTrue("Arguments don't contain key 'help'", args.containsKey("help"));
assertTrue("Arguments don't contain key 'c'", args.containsKey("c"));
assertTrue("Arguments don't contain key 'm'", args.containsKey("m"));
assertTrue("Arguments don't contain key 'd'", args.containsKey("d"));
assertTrue("Arguments don't contain key 'login'", args.containsKey("login"));

assertFalse("Arguments contain key '" + loginstring + "' which should be a value", args.containsKey(loginstring));
assertTrue("Arguments don't contain value " + loginstring, args.containsValue(loginstring));
assertFalse("Arguments contain key '" + cmdstring + "' which should be a value", args.containsKey(cmdstring));
assertTrue("Arguments don't contain value " + cmdstring, args.containsValue(cmdstring));

assertEquals("Key 'd' is not mapped to " + cmdstring, cmdstring, args.get("d"));
assertEquals("Key 'login' is not mapped to " + loginstring, loginstring, args.get("login"));
}

@Test
public void testParseArguments2() {
Map<String, String> args = CommandLineMain.parseArguments(new String[] { "--show", "b", "--test", "-xyz" });

assertTrue("Arguments don't contain key 'show'", args.containsKey("show"));
assertTrue("Arguments don't contain key 'test'", args.containsKey("test"));
assertTrue("Arguments don't contain key 'x'", args.containsKey("x"));
assertTrue("Arguments don't contain key 'y'", args.containsKey("y"));
assertTrue("Arguments don't contain key 'z'", args.containsKey("z"));

assertFalse("Arguments contain key 'b' which should be a value", args.containsKey("b"));
assertTrue("Arguments don't contain value 'b'", args.containsValue("b"));

assertEquals("Key 'show' is not mapped to 'b'", "b", args.get("show"));
}

}

0 comments on commit 8add2ea

Please sign in to comment.