Added runServer task

osipxd · osipxd · commit 2390ac315cad · 2017-04-18T13:06:55.000+03:00
Also:
- Fixed tests hierarchy
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ apply from: 'jacoco.gradle'
 
 group "ru.endlesscode"
 description "Bukkit Gradle integration plugins"
-version "0.3.5"
+version "0.4.0"
 
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
 
diff --git a/src/main/groovy/ru/endlesscode/bukkitgradle/extension/Bukkit.groovy b/src/main/groovy/ru/endlesscode/bukkitgradle/extension/Bukkit.groovy
@@ -6,17 +6,18 @@ import ru.endlesscode.bukkitgradle.meta.PluginMeta
 class Bukkit {
     public static final String NAME = "bukkit"
     public static final String DYNAMIC_LATEST = "+"
-
-    private static final String REVISION_SUFFIX = "-R0.1-SNAPSHOT"
+    public static final String REVISION_SUFFIX = "-R0.1-SNAPSHOT"
 
     private final Project project
 
     String version
     final PluginMeta meta
+    final RunConfiguration run
 
     Bukkit(Project project) {
         this.project = project
         this.meta = new PluginMeta(project)
+        this.run = new RunConfiguration(project)
     }
 
     /**
@@ -33,4 +34,8 @@ class Bukkit {
     void meta(@DelegatesTo(PluginMeta) Closure<?> closure) {
         project.configure(meta, closure)
     }
+
+    void run(@DelegatesTo(RunConfiguration) Closure<?> closure) {
+        project.configure(run, closure)
+    }
 }
diff --git a/src/main/groovy/ru/endlesscode/bukkitgradle/extension/RunConfiguration.groovy b/src/main/groovy/ru/endlesscode/bukkitgradle/extension/RunConfiguration.groovy
@@ -0,0 +1,11 @@
+package ru.endlesscode.bukkitgradle.extension
+
+import org.gradle.api.Project
+
+class RunConfiguration {
+    private Project project
+
+    RunConfiguration(Project project) {
+        this.project = project
+    }
+}
diff --git a/src/main/groovy/ru/endlesscode/bukkitgradle/server/RunServer.groovy b/src/main/groovy/ru/endlesscode/bukkitgradle/server/RunServer.groovy
@@ -0,0 +1,25 @@
+package ru.endlesscode.bukkitgradle.server
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.TaskAction
+
+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()))
+
+        logger.lifecycle("Starting Server...")
+        final Process serverProcess = processBuilder.start()
+        StreamSpy.spy(serverProcess.in, logger)
+        StreamSpy.spy(System.in, serverProcess.out)
+
+        serverProcess.waitFor()
+        logger.lifecycle("Server stopped")
+    }
+}
diff --git a/src/main/groovy/ru/endlesscode/bukkitgradle/server/ServerCore.groovy b/src/main/groovy/ru/endlesscode/bukkitgradle/server/ServerCore.groovy
@@ -6,6 +6,7 @@ import ru.endlesscode.bukkitgradle.extension.Bukkit
 
 import java.nio.file.Files
 import java.nio.file.Path
+import java.nio.file.StandardCopyOption
 
 class ServerCore {
     private static final String MAVEN_METADATA = "maven-metadata.xml"
@@ -44,7 +45,6 @@ class ServerCore {
      */
     void registerUpdateMetaTask() {
         def task = project.task("updateServerCoreMetadata")
-        task.onlyIf { !project.gradle.startParameter.isOffline() }
         task.extensions.create("download", DownloadExtension, project)
 
         task.doLast {
@@ -61,7 +61,6 @@ class ServerCore {
      */
     void registerDownloadingTask() {
         def task = project.task("downloadServerCore", dependsOn: "updateServerCoreMetadata")
-        task.onlyIf { !project.gradle.startParameter.isOffline() }
         task.extensions.create("download", DownloadExtension, project)
 
         task.doLast {
@@ -78,16 +77,12 @@ class ServerCore {
      */
     void registerCoreCopyTask() {
         project.with {
-            task("copyServerCore", dependsOn: "downloadServerCore") {
-                doLast {
-                    Path source = downloadDir.resolve(getCoreName())
-                    Path destination = buildDir.toPath().resolve(CORE_NAME)
-
-                    copy {
-                        from source
-                        into destination
-                    }
-                }
+            task("prepareServerCore", dependsOn: "downloadServerCore").doLast {
+                Path source = downloadDir.resolve(getCoreName())
+                Path destinationDir = buildDir.toPath().resolve(getShortVersion())
+                Files.createDirectories(destinationDir)
+
+                Files.copy(source, destinationDir.resolve(CORE_NAME), StandardCopyOption.REPLACE_EXISTING)
             }
         }
     }
@@ -101,6 +96,15 @@ class ServerCore {
         return "spigot-${getRealVersion()}.jar"
     }
 
+    /**
+     * Returns version without revision suffix
+     *
+     * @return Short version
+     */
+    String getShortVersion() {
+        getRealVersion().replace(Bukkit.REVISION_SUFFIX, "")
+    }
+
     /**
      * Resolves and returns dynamic version
      *
@@ -114,7 +118,6 @@ class ServerCore {
 
         Path metaFile = downloadDir.resolve(MAVEN_METADATA)
         def metadata = new XmlSlurper().parse(metaFile.toFile())
-
-        return metadata.versioning.latest.toString()
+        metadata.versioning.latest.toString()
     }
 }
diff --git a/src/main/groovy/ru/endlesscode/bukkitgradle/server/ServerLauncher.groovy b/src/main/groovy/ru/endlesscode/bukkitgradle/server/ServerLauncher.groovy
diff --git a/src/main/groovy/ru/endlesscode/bukkitgradle/server/StreamSpy.groovy b/src/main/groovy/ru/endlesscode/bukkitgradle/server/StreamSpy.groovy
@@ -0,0 +1,23 @@
+package ru.endlesscode.bukkitgradle.server
+
+import org.gradle.api.logging.Logger
+
+class StreamSpy extends Thread {
+    static void spy(InputStream input, Logger logger) {
+        startDaemon {
+            input.eachLine { line ->
+                logger.lifecycle line
+            }
+        }
+    }
+
+    static void spy(InputStream input, OutputStream output) {
+        startDaemon {
+            def writer = output.newWriter()
+            input.eachLine { line ->
+                writer.write "${line}\n"
+                writer.flush()
+            }
+        }
+    }
+}
diff --git a/src/main/groovy/ru/endlesscode/bukkitgradle/server/TestServerPlugin.groovy b/src/main/groovy/ru/endlesscode/bukkitgradle/server/TestServerPlugin.groovy
@@ -7,6 +7,8 @@ class TestServerPlugin implements Plugin<Project> {
 
     @Override
     void apply(Project project) {
-        new ServerCore(project)
+        project.task("runServer", type: RunServer, dependsOn: "prepareServerCore") {
+            core new ServerCore(project)
+        }
     }
 }
diff --git a/src/test/groovy/ru/endlesscode/bukkitgradle/BukkitGradlePluginTest.groovy b/src/test/groovy/ru/endlesscode/bukkitgradle/BukkitGradlePluginTest.groovy
@@ -1,8 +1,7 @@
-package ru.endlesscode.bukkitgradle.bukkit
+package ru.endlesscode.bukkitgradle
 
 import org.gradle.api.artifacts.Dependency
 import org.junit.Test
-import ru.endlesscode.bukkitgradle.BukkitGradlePlugin
 
 import static org.junit.Assert.assertTrue
 
diff --git a/src/test/groovy/ru/endlesscode/bukkitgradle/BukkitTest.groovy b/src/test/groovy/ru/endlesscode/bukkitgradle/BukkitTest.groovy
@@ -1,4 +1,4 @@
-package ru.endlesscode.bukkitgradle.bukkit
+package ru.endlesscode.bukkitgradle
 
 import org.junit.Test
 import ru.endlesscode.bukkitgradle.meta.PluginMeta
diff --git a/src/test/groovy/ru/endlesscode/bukkitgradle/TestBase.groovy b/src/test/groovy/ru/endlesscode/bukkitgradle/TestBase.groovy
@@ -1,21 +1,21 @@
-package ru.endlesscode.bukkitgradle.bukkit
+package ru.endlesscode.bukkitgradle
 
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.testfixtures.ProjectBuilder
 import org.junit.Before
-import ru.endlesscode.bukkitgradle.BukkitGradlePlugin
 import ru.endlesscode.bukkitgradle.meta.MetaFile
 
 import java.nio.file.Files
 import java.nio.file.Path
-import java.util.logging.ConsoleHandler
-import java.util.logging.Logger
-import java.util.logging.SimpleFormatter
 
 class TestBase {
     protected Project project
 
+    TestBase() {
+        setUp()
+    }
+
     @Before
     void setUp() throws Exception {
         this.project = ProjectBuilder.builder()
@@ -29,25 +29,7 @@ class TestBase {
             description = "Test project description"
             version = "1.0"
             ext.url = "https://www.example.ru/"
-
-            test {
-                testLogging.showStandardStreams = true
-            }
-        }
-    }
-
-    void configureLogger() {
-        Logger logger = Logger.getLogger("TestLogger")
-        ConsoleHandler consoleHandler = new ConsoleHandler()
-        consoleHandler.setFormatter(new SimpleFormatter())
-        logger.useParentHandlers = false
-        logger.handlers.each { handler ->
-            logger.removeHandler(handler)
         }
-
-        logger.addHandler(consoleHandler)
-
-        project.logger = logger
     }
 
     protected void initBukkitMeta() {
diff --git a/src/test/groovy/ru/endlesscode/bukkitgradle/meta/GenerateMetaTest.groovy b/src/test/groovy/ru/endlesscode/bukkitgradle/meta/GenerateMetaTest.groovy
@@ -1,8 +1,7 @@
-package ru.endlesscode.bukkitgradle.bukkit.meta
+package ru.endlesscode.bukkitgradle.meta
 
 import org.junit.Test
-import ru.endlesscode.bukkitgradle.bukkit.TestBase
-import ru.endlesscode.bukkitgradle.meta.GenerateMeta
+import ru.endlesscode.bukkitgradle.TestBase
 
 import static org.junit.Assert.assertTrue
 
diff --git a/src/test/groovy/ru/endlesscode/bukkitgradle/meta/MetaFileTest.groovy b/src/test/groovy/ru/endlesscode/bukkitgradle/meta/MetaFileTest.groovy
@@ -1,10 +1,9 @@
-package ru.endlesscode.bukkitgradle.bukkit.meta
+package ru.endlesscode.bukkitgradle.meta
 
 import org.gradle.api.GradleException
 import org.junit.Before
 import org.junit.Test
-import ru.endlesscode.bukkitgradle.bukkit.TestBase
-import ru.endlesscode.bukkitgradle.meta.MetaFile
+import ru.endlesscode.bukkitgradle.TestBase
 
 import java.nio.file.Path
 
diff --git a/src/test/groovy/ru/endlesscode/bukkitgradle/server/ServerCoreTest.groovy b/src/test/groovy/ru/endlesscode/bukkitgradle/server/ServerCoreTest.groovy
@@ -1,9 +1,8 @@
-package ru.endlesscode.bukkitgradle.bukkit.server
+package ru.endlesscode.bukkitgradle.server
 
 import org.gradle.api.DefaultTask
-import org.gradle.api.Task
 import org.junit.Test
-import ru.endlesscode.bukkitgradle.bukkit.TestBase
+import ru.endlesscode.bukkitgradle.TestBase
 
 import static org.junit.Assert.assertTrue
 
@@ -14,7 +13,7 @@ class ServerCoreTest extends TestBase {
     }
 
     @Test
-    void downloadingServerCoreMustBeSuccessful() throws Exception {
-        executeTask(project.downloadServerCore as Task)
+    void testAllTasks() throws Exception {
+        project.prepareServerCore.execute()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ class TestServerPlugin implements Plugin<Project> {`
`7`	`7`
`8`	`8`	`@Override`
`9`	`9`	`void apply(Project project) {`
`10`		`- new ServerCore(project)`
	`10`	`+ project.task("runServer", type: RunServer, dependsOn: "prepareServerCore") {`
	`11`	`+ core new ServerCore(project)`
	`12`	`+ }`
`11`	`13`	`}`
`12`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package ru.endlesscode.bukkitgradle.bukkit`
	`1`	`+package ru.endlesscode.bukkitgradle`
`2`	`2`
`3`	`3`	`import org.junit.Test`
`4`	`4`	`import ru.endlesscode.bukkitgradle.meta.PluginMeta`