Merge branch 'master' into addTests

Author: osipxd

build.gradle

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

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

@@ -8,11 +8,17 @@ import org.gradle.api.artifacts.ResolvableDependencies
 import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.tasks.compile.JavaCompile
 import ru.endlesscode.bukkitgradle.meta.PluginMetaPlugin
-import ru.endlesscode.bukkitgradle.server.TestServerPlugin
+import ru.endlesscode.bukkitgradle.server.DevServerPlugin
 
 class BukkitGradlePlugin implements Plugin<Project> {
+    final static String GROUP = "Bukkit"
+
     Project project
 
+    static boolean isTesting() {
+        System.properties['test'] == 'true'
+    }
+
     @Override
     void apply(Project project) {
         this.project = project
@@ -39,7 +45,7 @@ class BukkitGradlePlugin implements Plugin<Project> {
                 apply("eclipse")
                 apply("idea")
                 apply(PluginMetaPlugin)
-                apply(TestServerPlugin)
+                apply(DevServerPlugin)
             }
 
             convention.getPlugin(JavaPluginConvention).with {

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

@@ -1,7 +1,11 @@
 package ru.endlesscode.bukkitgradle.extension
 
+import groovy.xml.MarkupBuilder
 import org.gradle.api.Project
+import ru.endlesscode.bukkitgradle.server.PrepareServer
+import ru.endlesscode.bukkitgradle.server.ServerCore
 
+import java.nio.file.Files
 import java.nio.file.Path
 
 class RunConfiguration {
@@ -56,4 +60,39 @@ class RunConfiguration {
     Path getDir() {
         project.projectDir.toPath().resolve(this.dir)
     }
+
+    /**
+     * Builds and writes to file run configuration in IDEA .xml format
+     *
+     * @param configurationDir The configurations dir
+     */
+    void buildIdeaConfiguration(Path configurationDir) {
+        if (Files.notExists(configurationDir)) {
+            return
+        }
+
+        def taskName = "Run Server"
+        def serverDir = (project.tasks.prepareServer as PrepareServer).serverDir.toRealPath()
+        def args = this.bukkitArgs
+
+        def realDebug = this.debug
+        this.debug = false
+        def props = this.getJavaArgs()
+        this.debug = realDebug
+
+        def runConfiguration = configurationDir.resolve("${taskName.replace(" ", "_")}.xml")
+        def xml = new MarkupBuilder(runConfiguration.newWriter())
+        xml.component(name: "ProjectRunConfigurationManager") {
+            configuration(default: 'false', name: taskName, type: "JarApplication", factoryName: "JAR Application", singleton: "true") {
+                option(name: 'JAR_PATH', value: "${serverDir.resolve(ServerCore.CORE_NAME)}")
+                option(name: 'VM_PARAMETERS', value: props)
+                option(name: 'PROGRAM_PARAMETERS', value: args)
+                option(name: 'WORKING_DIRECTORY', value: serverDir)
+                envs()
+                method {
+                    option(name: "Gradle.BeforeRunTask", enabled: "true", tasks: "prepareServer", externalProjectPath: '$PROJECT_DIR$', vmOptions: "", scriptParameters: "")
+                }
+            }
+        }
+    }
 }

src/main/groovy/ru/endlesscode/bukkitgradle/meta/PluginMetaPlugin.groovy

@@ -3,6 +3,7 @@ package ru.endlesscode.bukkitgradle.meta
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.file.CopySpec
+import ru.endlesscode.bukkitgradle.BukkitGradlePlugin
 import ru.endlesscode.bukkitgradle.extension.Bukkit
 
 class PluginMetaPlugin implements Plugin<Project> {
@@ -15,6 +16,11 @@ class PluginMetaPlugin implements Plugin<Project> {
                 metaFile new MetaFile(project)
             } as GenerateMeta
 
+            genMeta.configure {
+                group = BukkitGradlePlugin.GROUP
+                description = 'Generate plugin.yml file'
+            }
+
             tasks.processResources.dependsOn genMeta
             (tasks.processResources as CopySpec).from genMeta.target.toFile()
         }

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

@@ -0,0 +1,49 @@
+package ru.endlesscode.bukkitgradle.server
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.internal.impldep.org.apache.maven.lifecycle.LifecycleExecutionException
+import ru.endlesscode.bukkitgradle.BukkitGradlePlugin
+
+import java.nio.file.Files
+import java.nio.file.Path
+
+class DevServerPlugin implements Plugin<Project> {
+    Project project
+
+    @Override
+    void apply(Project project) {
+        this.project = project
+        ServerCore serverCore = new ServerCore(project)
+        project.task("runServer", type: RunServer, dependsOn: "prepareServer") {
+            core serverCore
+        }.configure {
+            group = BukkitGradlePlugin.GROUP
+            description = 'Run dev server'
+        }
+
+        PrepareServer prepareServer = project.task("prepareServer", type: PrepareServer, dependsOn: ["build", "copyServerCore"]) {
+            core serverCore
+        }.configure {
+            group = BukkitGradlePlugin.GROUP
+            description = 'Prepare server ro run. Configure server and copy compiled plugin to plugins dir'
+        } as PrepareServer
+
+        Path runConfigurationsDir = project.projectDir.toPath().resolve(".idea/runConfigurations")
+        project.task("buildIdeaRun", dependsOn: "prepareServer").doLast {
+            if (Files.notExists(runConfigurationsDir.parent)) {
+                throw new LifecycleExecutionException("This task only for IntelliJ IDEA.")
+            }
+
+            Files.createDirectories(runConfigurationsDir)
+            prepareServer.run.buildIdeaConfiguration(runConfigurationsDir)
+        }.configure {
+            group = BukkitGradlePlugin.GROUP
+            description = 'Configure IDEA server run configuration'
+        }
+
+        project.afterEvaluate {
+            prepareServer.run.buildIdeaConfiguration(runConfigurationsDir)
+        }
+    }
+}

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

@@ -13,28 +13,36 @@ class PrepareServer extends DefaultTask {
     @Input
     ServerCore core
 
-    private Path serverDir
-    private RunConfiguration run
+    Closure<Path> serverDir
+    RunConfiguration run
 
-    @TaskAction
-    void prepareServer() {
-        this.serverDir = core.serverDir
+    void setCore(ServerCore core) {
+        this.core = core
+        this.serverDir = { core.serverDir }
         this.run = project.bukkit.run
+    }
 
+    @TaskAction
+    void prepareServer() {
         resolveEula()
         resolveOnlineMode()
         copyPluginToServerDir()
     }
 
     void resolveEula() {
-        Path eulaFile = serverDir.resolve("eula.txt")
+        Path eulaFile = getServerDir().resolve("eula.txt")
+        if (!Files.exists(eulaFile)) {
+            Files.createFile(eulaFile)
+        }
 
-        boolean eula = this.run.eula
-        eulaFile.text = "eula=$eula"
+        Properties properties = new Properties()
+        properties.load(eulaFile.newReader())
+        properties.setProperty("eula", "${this.run.eula}")
+        properties.store(eulaFile.newWriter(), "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).")
     }
 
     void resolveOnlineMode() {
-        Path propsFile = serverDir.resolve("server.properties")
+        Path propsFile = getServerDir().resolve("server.properties")
         if (!Files.exists(propsFile)) {
             Files.createFile(propsFile)
         }
@@ -48,9 +56,16 @@ class PrepareServer extends DefaultTask {
     void copyPluginToServerDir() {
         String pluginName = "${project.bukkit.meta.name}.jar"
         Path jar = project.jar.archivePath.toPath()
-        Path pluginsDir = serverDir.resolve("plugins")
-        Files.createDirectories(pluginsDir)
+        if (!Files.exists(jar)) {
+            return
+        }
 
+        Path pluginsDir = getServerDir().resolve("plugins")
+        Files.createDirectories(pluginsDir)
         Files.copy(jar, pluginsDir.resolve(pluginName), StandardCopyOption.REPLACE_EXISTING)
     }
+
+    Path getServerDir() {
+        return serverDir.call()
+    }
 }

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

@@ -2,6 +2,8 @@ package ru.endlesscode.bukkitgradle.server
 
 import de.undercouch.gradle.tasks.download.DownloadExtension
 import org.gradle.api.Project
+import org.gradle.internal.impldep.org.apache.maven.lifecycle.LifecycleExecutionException
+import ru.endlesscode.bukkitgradle.BukkitGradlePlugin
 import ru.endlesscode.bukkitgradle.extension.Bukkit
 
 import java.nio.file.Files
@@ -36,40 +38,40 @@ class ServerCore {
      * Registers needed tasks
      */
     void registerTasks() {
-        registerUpdateMetaTask()
         registerDownloadingTask()
         registerCoreCopyTask()
     }
 
     /**
-     * Registers updating server core metadata task
+     * Registers core downloading task
      */
-    void registerUpdateMetaTask() {
-        def task = project.task("updateServerCoreMetadata")
-        task.extensions.create("download", DownloadExtension, project)
+    void registerDownloadingTask() {
+        project.task("downloadServerCore") {
+            def skip = project.gradle.startParameter.isOffline() || BukkitGradlePlugin.isTesting()
+            onlyIf { !skip }
+
+            if (skip) {
+                return
+            }
+
+            extensions.create("download", DownloadExtension, project)
 
-        task.doLast {
             download {
                 src "https://hub.spigotmc.org/nexus/content/repositories/snapshots/org/bukkit/bukkit/$MAVEN_METADATA"
                 dest downloadDir.toFile()
                 quiet true
             }
-        }
-    }
-
-    /**
-     * Registers core downloading task
-     */
-    void registerDownloadingTask() {
-        def task = project.task("downloadServerCore", dependsOn: "updateServerCoreMetadata")
-        task.extensions.create("download", DownloadExtension, project)
 
-        task.doLast {
-            download {
-                src { "https://yivesmirror.com/files/spigot/${getCoreName()}" }
-                dest downloadDir.toFile()
-                onlyIfNewer true
+            doLast {
+                download {
+                    src "https://yivesmirror.com/files/spigot/${getCoreName()}"
+                    dest downloadDir.toFile()
+                    onlyIfNewer true
+                }
             }
+        }.configure {
+            group = BukkitGradlePlugin.GROUP
+            description = 'Download Spigot server core'
         }
     }
 
@@ -83,6 +85,9 @@ class ServerCore {
                 Path destination = getServerDir().resolve(CORE_NAME)
 
                 Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING)
+            }.configure {
+                group = BukkitGradlePlugin.GROUP
+                description = 'Copy downloaded server core to server directory'
             }
         }
     }
@@ -117,6 +122,14 @@ class ServerCore {
         }
 
         Path metaFile = downloadDir.resolve(MAVEN_METADATA)
+        if (Files.notExists(metaFile)) {
+            if (BukkitGradlePlugin.isTesting()) {
+                return '1.11.0'
+            }
+
+            throw new LifecycleExecutionException("Server cores meta not downloaded, make sure that Gradle isn't running in offline mode.")
+        }
+
         def metadata = new XmlSlurper().parse(metaFile.toFile())
         metadata.versioning.latest.toString()
     }

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

@@ -14,6 +14,8 @@ class TestBase {
 
     @Before
     void setUp() throws Exception {
+        System.properties.setProperty('test', 'true')
+
         this.project = ProjectBuilder.builder()
                 .withName("TestProject")
                 .withProjectDir(new File("build/testProject"))
@@ -66,4 +68,16 @@ command:
 
         task.execute()
     }
+
+    protected void configureRun() {
+        this.project.bukkit.run.with {
+            eula = true
+            onlineMode = true
+            debug = false
+            dir = "devServer"
+            encoding = "CP866"
+            javaArgs = "-Xmx2G"
+            bukkitArgs = "-s 2"
+        }
+    }
 }

src/test/groovy/ru/endlesscode/bukkitgradle/TestBase.groovy

@@ -29,16 +29,4 @@ class RunConfigurationTest extends TestBase {
             assertEquals("-s 2", bukkitArgs)
         }
     }
-
-    void configureRun() {
-        this.project.bukkit.run.with {
-            eula = true
-            onlineMode = true
-            debug = false
-            dir = "devServer"
-            encoding = "CP866"
-            javaArgs = "-Xmx2G"
-            bukkitArgs = "-s 2"
-        }
-    }
 }