Merge pull request #1 from EndlessCodeGroup/feature/betterServerRunning

Better Server Running

Author: osipxd

build.gradle

@@ -10,7 +10,7 @@ apply from: 'jacoco.gradle'
 
 group "ru.endlesscode"
 description "Bukkit Gradle integration plugins"
-version "0.4.0"
+version "0.5.3"
 
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
 

src/main/groovy/ru/endlesscode/bukkitgradle/extension/RunConfiguration.groovy

@@ -2,10 +2,58 @@ package ru.endlesscode.bukkitgradle.extension
 
 import org.gradle.api.Project
 
+import java.nio.file.Path
+
 class RunConfiguration {
+    private static final String DEBUG_ARGS = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"
+
     private Project project
 
+    boolean eula
+    boolean onlineMode
+    boolean debug
+    String encoding
+    String dir
+    String javaArgs
+    String bukkitArgs
+
     RunConfiguration(Project project) {
         this.project = project
+
+        this.eula = false
+        this.onlineMode = false
+        this.debug = true
+        this.encoding = "UTF-8"
+        this.dir = "server"
+
+        this.javaArgs = "-Xmx1G"
+        this.bukkitArgs = ""
+    }
+
+    /**
+     * Returns arguments for java
+     *
+     * @return Java arguments
+     */
+    String getJavaArgs() {
+        return "${this.debug ? "$DEBUG_ARGS " : ""}-Dfile.encoding=$encoding ${this.javaArgs}"
+    }
+
+    /**
+     * Returns arguments for bukkit
+     *
+     * @return Bukkit arguments
+     */
+    String getBukkitArgs() {
+        return "-o $onlineMode${bukkitArgs ? " $bukkitArgs" : ""}"
+    }
+
+    /**
+     * Returns servers dir
+     *
+     * @return The directory
+     */
+    Path getDir() {
+        project.projectDir.toPath().resolve(this.dir)
     }
 }

src/main/groovy/ru/endlesscode/bukkitgradle/server/PrepareServer.groovy

@@ -0,0 +1,40 @@
+package ru.endlesscode.bukkitgradle.server
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.TaskAction
+
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.StandardCopyOption
+
+class PrepareServer extends DefaultTask {
+    @Input
+    ServerCore core
+
+    private Path serverDir
+
+    @TaskAction
+    void prepareServer() {
+        this.serverDir = core.serverDir
+
+        resolveEula()
+        copyPluginToServerDir()
+    }
+
+    void resolveEula() {
+        Path eulaFile = serverDir.resolve("eula.txt")
+
+        boolean eula = project.bukkit.run.eula
+        eulaFile.text = "eula=$eula"
+    }
+
+    void copyPluginToServerDir() {
+        String pluginName = "${project.bukkit.meta.name}.jar"
+        Path jar = project.jar.archivePath.toPath()
+        Path pluginsDir = serverDir.resolve("plugins").toRealPath()
+        Files.createDirectories(pluginsDir)
+
+        Files.copy(jar, pluginsDir.resolve(pluginName), StandardCopyOption.REPLACE_EXISTING)
+    }
+}

src/main/groovy/ru/endlesscode/bukkitgradle/server/RunServer.groovy

@@ -3,23 +3,34 @@ package ru.endlesscode.bukkitgradle.server
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.TaskAction
+import ru.endlesscode.bukkitgradle.extension.RunConfiguration
+import ru.endlesscode.bukkitgradle.server.script.SystemScript
 
 class RunServer extends DefaultTask {
     @Input
     ServerCore core
 
     @TaskAction
-    void launchServer() {
-        final ProcessBuilder processBuilder = new ProcessBuilder("java", "-Xmx1G", "-jar", "core.jar")
-        processBuilder.redirectErrorStream(true)
-        processBuilder.directory(new File(project.buildDir, core.getShortVersion()))
-
+    void runServer() {
+        SystemScript script = this.createStartScript()
+        logger.lifecycle("Running script built!")
         logger.lifecycle("Starting Server...")
-        final Process serverProcess = processBuilder.start()
-        StreamSpy.spy(serverProcess.in, logger)
-        StreamSpy.spy(System.in, serverProcess.out)
+        this.runScript(script)
+        logger.lifecycle("Server started successfully!")
+    }
+
+    SystemScript createStartScript() {
+        RunConfiguration configuration = project.bukkit.run
+        SystemScript script = SystemScript.getScript(configuration, core.simpleVersion)
+        script.buildOn(this.core.serverDir)
+
+        return script
+    }
 
-        serverProcess.waitFor()
-        logger.lifecycle("Server stopped")
+    void runScript(SystemScript script) {
+        new ProcessBuilder(script.command)
+                .redirectErrorStream(true)
+                .directory(core.serverDir.toFile())
+                .start()
     }
 }

src/main/groovy/ru/endlesscode/bukkitgradle/server/ServerCore.groovy

@@ -9,8 +9,9 @@ import java.nio.file.Path
 import java.nio.file.StandardCopyOption
 
 class ServerCore {
+    public static final String CORE_NAME = "core.jar"
+
     private static final String MAVEN_METADATA = "maven-metadata.xml"
-    private static final String CORE_NAME = "core.jar"
 
     private final Project project
 
@@ -27,7 +28,7 @@ class ServerCore {
      * Initializes downloading dir
      */
     void initDownloadDir() {
-        this.downloadDir = project.buildDir.toPath().resolve("server")
+        this.downloadDir = project.buildDir.toPath().resolve("serverCore")
         Files.createDirectories(downloadDir)
     }
 
@@ -77,12 +78,11 @@ class ServerCore {
      */
     void registerCoreCopyTask() {
         project.with {
-            task("prepareServerCore", dependsOn: "downloadServerCore").doLast {
+            task("copyServerCore", dependsOn: "downloadServerCore").doLast {
                 Path source = downloadDir.resolve(getCoreName())
-                Path destinationDir = buildDir.toPath().resolve(getShortVersion())
-                Files.createDirectories(destinationDir)
+                Path destination = getServerDir().resolve(CORE_NAME)
 
-                Files.copy(source, destinationDir.resolve(CORE_NAME), StandardCopyOption.REPLACE_EXISTING)
+                Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING)
             }
         }
     }
@@ -99,9 +99,9 @@ class ServerCore {
     /**
      * Returns version without revision suffix
      *
-     * @return Short version
+     * @return Simple version
      */
-    String getShortVersion() {
+    String getSimpleVersion() {
         getRealVersion().replace(Bukkit.REVISION_SUFFIX, "")
     }
 
@@ -120,4 +120,16 @@ class ServerCore {
         def metadata = new XmlSlurper().parse(metaFile.toFile())
         metadata.versioning.latest.toString()
     }
+
+    /**
+     * Returns server directory
+     *
+     * @return Server directory
+     */
+    Path getServerDir() {
+        Path serverDir = this.project.bukkit.run.dir.resolve(getSimpleVersion())
+        Files.createDirectories(serverDir)
+
+        return serverDir
+    }
 }

src/main/groovy/ru/endlesscode/bukkitgradle/server/StreamSpy.groovy

@@ -7,8 +7,13 @@ class TestServerPlugin implements Plugin<Project> {
 
     @Override
     void apply(Project project) {
-        project.task("runServer", type: RunServer, dependsOn: "prepareServerCore") {
-            core new ServerCore(project)
+        ServerCore serverCore = new ServerCore(project)
+        project.task("runServer", type: RunServer, dependsOn: "prepareServer") {
+            core serverCore
+        }
+
+        project.task("prepareServer", type: PrepareServer, dependsOn: ["build", "copyServerCore"]) {
+            core serverCore
         }
     }
 }

src/main/groovy/ru/endlesscode/bukkitgradle/server/TestServerPlugin.groovy

@@ -0,0 +1,27 @@
+package ru.endlesscode.bukkitgradle.server.script
+
+import ru.endlesscode.bukkitgradle.extension.RunConfiguration
+
+class LinuxScript extends SystemScript {
+    LinuxScript(RunConfiguration configuration, String version) {
+        super(configuration, version)
+    }
+
+    @Override
+    protected String getExt() {
+        return "sh"
+    }
+
+    @Override
+    protected String getScriptText() {
+        """#!/bin/sh
+
+${buildRunCommand()}"""
+    }
+
+    @Override
+    List<String> getCommand() {
+        String scriptName = getFileName()
+        return ["chmod +x $scriptName", "&&", "./$scriptName", "&"]
+    }
+}

src/main/groovy/ru/endlesscode/bukkitgradle/server/script/LinuxScript.groovy

@@ -0,0 +1,28 @@
+package ru.endlesscode.bukkitgradle.server.script
+
+import ru.endlesscode.bukkitgradle.extension.RunConfiguration
+
+class MacScript extends SystemScript {
+    MacScript(RunConfiguration configuration, String version) {
+        super(configuration, version)
+    }
+
+    @Override
+    protected String getExt() {
+        return "command"
+    }
+
+    @Override
+    protected String getScriptText() {
+        """#!/bin/sh
+
+cd "\$( dirname "\$0" )"
+${buildRunCommand()}"""
+    }
+
+    @Override
+    List<String> getCommand() {
+        String scriptName = getFileName()
+        return ["chmod +x $scriptName", "&&", "open", scriptName]
+    }
+}