test: Add test for RunServer task

Author: osipxd

src/main/groovy/ru/endlesscode/bukkitgradle/DevServerPlugin.groovy

@@ -31,7 +31,7 @@ class DevServerPlugin implements Plugin<Project> {
         } as TaskProvider<PrepareServer>
 
         project.tasks.register('runServer', RunServer) {
-            scriptFile.set(generateRunningScript.map { it.scriptFile.get() })
+            scriptFile.set(generateRunningScript.map { it.scriptFile.get().asFile })
             dependsOn(prepareServer)
         }
 

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

@@ -1,26 +1,32 @@
 package ru.endlesscode.bukkitgradle.server.task
 
+import groovy.transform.Internal
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.RegularFile
 import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
+import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.TaskAction
 import org.gradle.jvm.tasks.Jar
 import ru.endlesscode.bukkitgradle.server.ServerCore
 import ru.endlesscode.bukkitgradle.server.extension.RunConfiguration
 
 class PrepareServer extends DefaultTask {
-    @Input
+    @Internal
     ServerCore core
 
     @InputDirectory
     final DirectoryProperty serverDir = project.objects.directoryProperty()
 
-    @Input
+    @Internal
     final Property<Jar> jarTask = project.objects.property(Jar)
 
-    @Input
+    @InputFile
+    final Provider<RegularFile> jarFile = jarTask.map {it.archiveFile.get() }
+
+    @Internal
     RunConfiguration run
 
     PrepareServer() {

src/main/kotlin/server/script/BashScriptStrategy.kt

@@ -15,7 +15,7 @@ internal object BashScriptStrategy : RunningScriptStrategy() {
           """.trimIndent()
     }
 
-    override fun getCommand(title: String): List<String> {
+    override fun getCommand(fileName: String, title: String): List<String> {
         return listOf("bash", "-c", "chmod +x $fileName && ./$fileName")
     }
 }

src/main/kotlin/server/script/RunningScriptStrategy.kt

@@ -24,7 +24,7 @@ internal abstract class RunningScriptStrategy {
     }
 
     /** Returns command for ProcessBuilder. */
-    abstract fun getCommand(title: String): List<String>
+    abstract fun getCommand(fileName: String, title: String): List<String>
 
     companion object {
 

src/main/kotlin/server/script/WindowsScriptStrategy.kt

@@ -14,7 +14,7 @@ internal object WindowsScriptStrategy : RunningScriptStrategy() {
             """.trimIndent()
     }
 
-    override fun getCommand(title: String): List<String> {
+    override fun getCommand(fileName: String, title: String): List<String> {
         return listOf("cmd", "/c", "start", "\"${title}\"", fileName)
     }
 }

src/main/kotlin/server/task/GenerateRunningScript.kt

@@ -13,6 +13,7 @@ import org.gradle.api.tasks.TaskAction
 import org.gradle.internal.os.OperatingSystem
 import org.gradle.kotlin.dsl.property
 import ru.endlesscode.bukkitgradle.TASKS_GROUP_BUKKIT
+import ru.endlesscode.bukkitgradle.server.ServerConstants
 import ru.endlesscode.bukkitgradle.server.script.RunningScriptStrategy
 import javax.inject.Inject
 

src/main/kotlin/server/task/RunServer.kt

@@ -1,7 +1,6 @@
 package ru.endlesscode.bukkitgradle.server.task
 
 import org.gradle.api.DefaultTask
-import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
@@ -11,6 +10,7 @@ import org.gradle.internal.os.OperatingSystem
 import org.gradle.kotlin.dsl.property
 import ru.endlesscode.bukkitgradle.TASKS_GROUP_BUKKIT
 import ru.endlesscode.bukkitgradle.server.script.RunningScriptStrategy
+import java.io.File
 import javax.inject.Inject
 
 /** Run dev server from script. */
@@ -20,7 +20,7 @@ public open class RunServer @Inject constructor(objects: ObjectFactory) : Defaul
     public val title: Property<String> = objects.property()
 
     @Input
-    public val scriptFile: RegularFileProperty = objects.fileProperty()
+    public val scriptFile: Property<File> = objects.property()
 
     @Internal
     public var osName: String = System.getProperty("os.name")
@@ -32,14 +32,16 @@ public open class RunServer @Inject constructor(objects: ObjectFactory) : Defaul
         description = "Run dev server from script."
 
         title.convention("Dev Server")
+        outputs.upToDateWhen { false }
     }
 
     @TaskAction
     internal fun runServer() {
         logger.lifecycle("Starting Server...")
-        ProcessBuilder(scriptStrategy.getCommand(title.get()))
+        val scriptFile = scriptFile.get()
+        ProcessBuilder(scriptStrategy.getCommand(scriptFile.name, title.get()))
             .redirectErrorStream(true)
-            .directory(scriptFile.get().asFile.parentFile)
+            .directory(scriptFile.parentFile)
             .start()
         logger.lifecycle("Server started successfully!")
     }

src/test/groovy/ru/endlesscode/bukkitgradle/server/task/RunServerSpec.groovy

@@ -10,13 +10,14 @@ class RunServerSpec extends PluginSpecification {
 
     def "when run runServer - should also task dependencies"() {
         when: "run server"
-        def result = runServer()
+        def result = runServer('-x', 'prepareServer')
 
         then: "task should be successful"
+        result.task(':generateRunningScript').outcome == TaskOutcome.SUCCESS
         result.task(TASK_NAME).outcome == TaskOutcome.SUCCESS
     }
 
-    private BuildResult runServer() {
-        return runner.withArguments(TASK_NAME, "--stacktrace").build()
+    private BuildResult runServer(String... args) {
+        return runner.withArguments([TASK_NAME] + args.toList()).build()
     }
 }