erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-27 00:38:11 -07:00
Code Releases Activity

Introducing IRunContributor.

Browse source
This commit is contained in:
Cedric Beust 2015-11-23 21:52:11 -08:00
parent 1ae3559f70
commit 55e6cff0f5
4 changed files with 92 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/main/kotlin/com/beust/kobalt/api/IRunContributor.kt Normal file
View file

@ -0,0 +1,25 @@
package com.beust.kobalt.api
import com.beust.kobalt.TaskResult
/**
* Plugins that can implement the "task" run should implement this interface.
*/
interface IRunContributor : IContributor {
companion object {
const val DEFAULT_POSITIVE_AFFINITY = 100
}
/**
* @return an integer indicating your affinity for running the current project. The runner with
* the highest affinity is selected to run it.
*/
fun runAffinity(project: Project, context: KobaltContext) : Int
/**
* Run the project.
*/
fun run(project: Project, context: KobaltContext) : TaskResult
}

7
src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt
View file

@ -61,6 +61,9 @@ class KobaltPluginXml {
@XmlElement(name = "build-directory-interceptors") @JvmField
var buildDirectoryInterceptors: ClassNameXml? = null
@XmlElement(name = "run-contributors") @JvmField
var runContributors: ClassNameXml? = null
}
class ContributorXml {
@ -88,6 +91,7 @@ class PluginInfo(val xml: KobaltPluginXml, val classLoader: ClassLoader?) {
val compilerInterceptors = arrayListOf<ICompilerInterceptor>()
val sourceDirectoriesInterceptors = arrayListOf<ISourceDirectoriesIncerceptor>()
val buildDirectoryInterceptors = arrayListOf<IBuildDirectoryIncerceptor>()
val runContributors = arrayListOf<IRunContributor>()
// Future contributors:
// source files
@ -161,6 +165,9 @@ class PluginInfo(val xml: KobaltPluginXml, val classLoader: ClassLoader?) {
xml.buildDirectoryInterceptors?.className?.forEach {
buildDirectoryInterceptors.add(factory.instanceOf(forName(it)) as IBuildDirectoryIncerceptor)
}
xml.runContributors?.className?.forEach {
runContributors.add(factory.instanceOf(forName(it)) as IRunContributor)
}
}
fun addPluginInfo(pluginInfo: PluginInfo) {

95
src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt
View file

@ -1,16 +1,14 @@
package com.beust.kobalt.plugin.application
import com.beust.kobalt.*
import com.beust.kobalt.api.ConfigPlugin
import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project
import com.beust.kobalt.api.ProjectDescription
import com.beust.kobalt.api.*
import com.beust.kobalt.api.annotation.Directive
import com.beust.kobalt.api.annotation.Task
import com.beust.kobalt.internal.JvmCompilerPlugin
import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.RunCommand
import com.beust.kobalt.misc.warn
import com.beust.kobalt.plugin.packaging.PackageConfig
import com.beust.kobalt.plugin.packaging.PackagingPlugin
import com.google.inject.Inject
@ -35,7 +33,7 @@ fun Project.application(init: ApplicationConfig.() -> Unit) {
@Singleton
class ApplicationPlugin @Inject constructor(val executors: KobaltExecutors,
val dependencyManager: DependencyManager) : ConfigPlugin<ApplicationConfig>() {
val dependencyManager: DependencyManager) : ConfigPlugin<ApplicationConfig>(), IRunContributor {
companion object {
const val NAME = "application"
@ -50,40 +48,13 @@ class ApplicationPlugin @Inject constructor(val executors: KobaltExecutors,
@Task(name = "run", description = "Run the main class", runAfter = arrayOf("assemble"))
fun taskRun(project: Project): TaskResult {
var result = TaskResult()
configurationFor(project)?.let { config ->
val java = JavaInfo.create(File(SystemProperties.javaBase)).javaExecutable!!
if (config.mainClass != null) {
val jarName = project.projectProperties.get(PackagingPlugin.JAR_NAME) as String
val packages = project.projectProperties.get(PackagingPlugin.PACKAGES) as List<PackageConfig>
val allDeps = arrayListOf(jarName)
if (! isFatJar(packages, jarName)) {
val projDeps = project.projectProperties.get(JvmCompilerPlugin.DEPENDENT_PROJECTS)
as List<ProjectDescription>
// If the jar file is not fat, we need to add the transitive closure of all dependencies
// on the classpath
val allTheDependencies =
dependencyManager.calculateDependencies(project, context, projDeps,
allDependencies = project.compileDependencies).map { it.jarFile.get().path }
allDeps.addAll(allTheDependencies)
}
val allDepsJoined = allDeps.joinToString(File.pathSeparator)
val args = listOf("-classpath", allDepsJoined) + config.jvmArgs + config.mainClass!!
val exitCode = RunCommand(java.absolutePath).run(args,
successCallback = { output: List<String> ->
println(output.joinToString("\n"))
},
errorCallback = { output: List<String> ->
println("ERROR")
println(output.joinToString("\n"))
}
)
result = TaskResult(exitCode == 0)
} else {
throw KobaltException("No \"mainClass\" specified in the application{} part of project ${project.name}")
}
val runContributor = context.pluginInfo.runContributors.maxBy { it.runAffinity(project, context)}
if (runContributor != null && runContributor.runAffinity(project, context) > 0) {
return runContributor.run(project, context)
} else {
warn("Couldn't find a runner for project ${project.name}")
return TaskResult()
}
return result
}
private fun isFatJar(packages: List<PackageConfig>, jarName: String): Boolean {
@ -96,5 +67,53 @@ class ApplicationPlugin @Inject constructor(val executors: KobaltExecutors,
}
return false
}
// IRunContributor
override fun runAffinity(project: Project, context: KobaltContext): Int {
return if (configurationFor(project) != null) IRunContributor.DEFAULT_POSITIVE_AFFINITY else 0
}
override fun run(project: Project, context: KobaltContext): TaskResult {
var result = TaskResult()
configurationFor(project)?.let { config ->
if (config.mainClass != null) {
result = runJarFile(project, config)
} else {
throw KobaltException("No \"mainClass\" specified in the application{} part of project ${project.name}")
}
}
return result
}
private fun runJarFile(project: Project, config: ApplicationConfig) : TaskResult {
val jarName = project.projectProperties.get(PackagingPlugin.JAR_NAME) as String
val packages = project.projectProperties.get(PackagingPlugin.PACKAGES) as List<PackageConfig>
val allDeps = arrayListOf(jarName)
val java = JavaInfo.create(File(SystemProperties.javaBase)).javaExecutable!!
if (! isFatJar(packages, jarName)) {
val projDeps = project.projectProperties.get(JvmCompilerPlugin.DEPENDENT_PROJECTS)
as List<ProjectDescription>
// If the jar file is not fat, we need to add the transitive closure of all dependencies
// on the classpath
val allTheDependencies =
dependencyManager.calculateDependencies(project, context, projDeps,
allDependencies = project.compileDependencies).map { it.jarFile.get().path }
allDeps.addAll(allTheDependencies)
}
val allDepsJoined = allDeps.joinToString(File.pathSeparator)
val args = listOf("-classpath", allDepsJoined) + config.jvmArgs + config.mainClass!!
val exitCode = RunCommand(java.absolutePath).run(args,
successCallback = { output: List<String> ->
println(output.joinToString("\n"))
},
errorCallback = { output: List<String> ->
println("ERROR")
println(output.joinToString("\n"))
}
)
return TaskResult(exitCode == 0)
}
}

3
src/main/resources/META-INF/kobalt-plugin.xml
View file

@ -37,4 +37,7 @@
<compiler-interceptors>
<class-name>com.beust.kobalt.plugin.android.AndroidPlugin</class-name>
</compiler-interceptors>
<run-contributors>
<class-name>com.beust.kobalt.plugin.application.ApplicationPlugin</class-name>
</run-contributors>
</kobalt-plugin>