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

More generification of createGrah() for testing.

Browse source
This commit is contained in:
Cedric Beust 2016-04-12 21:44:25 -07:00
parent 4ed2183dbd
commit abc45bb8c5
1 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt
View file

@ -87,7 +87,9 @@ public class TaskManager @Inject constructor(val args: Args, val incrementalMana
log(3, " $it: " + tasksByNames.get(it)) log(3, " $it: " + tasksByNames.get(it))
} }
val graph = createGraph(project, taskNames, tasksByNames) val graph = createGraph(project, taskNames, tasksByNames,
{ task: PluginTask -> task.name },
{ task: PluginTask, project: Project -> task.plugin.accept(project) })
// //
// Now that we have a full graph, run it // Now that we have a full graph, run it
@ -122,9 +124,11 @@ public class TaskManager @Inject constructor(val args: Args, val incrementalMana
return RunTargetResult(result, messages) return RunTargetResult(result, messages)
} }
private fun createGraph(project: Project, taskNames: List<String>, tasksByNames: Multimap<String, PluginTask>): private fun <T> createGraph(project: Project, taskNames: List<String>, tasksByNames: Multimap<String, T>,
DynamicGraph<PluginTask> { toName: (T) -> String,
val graph = DynamicGraph<PluginTask>() accept: (T, Project) -> Boolean):
DynamicGraph<T> {
val graph = DynamicGraph<T>()
taskNames.forEach { taskName -> taskNames.forEach { taskName ->
val ti = TaskInfo(taskName) val ti = TaskInfo(taskName)
if (!tasksByNames.keys().contains(ti.taskName)) { if (!tasksByNames.keys().contains(ti.taskName)) {
@ -133,7 +137,7 @@ public class TaskManager @Inject constructor(val args: Args, val incrementalMana
if (ti.matches(project.name)) { if (ti.matches(project.name)) {
tasksByNames[ti.taskName].forEach { task -> tasksByNames[ti.taskName].forEach { task ->
if (task != null && task.plugin.accept(project)) { if (task != null && accept(task, project)) {
val reverseAfter = hashMapOf<String, String>() val reverseAfter = hashMapOf<String, String>()
alwaysRunAfter.keys().forEach { from -> alwaysRunAfter.keys().forEach { from ->
val tasks = alwaysRunAfter.get(from) val tasks = alwaysRunAfter.get(from)
@ -147,7 +151,7 @@ public class TaskManager @Inject constructor(val args: Args, val incrementalMana
// //
val allFreeTasks = calculateFreeTasks(tasksByNames, reverseAfter) val allFreeTasks = calculateFreeTasks(tasksByNames, reverseAfter)
val currentFreeTask = allFreeTasks.filter { val currentFreeTask = allFreeTasks.filter {
TaskInfo(project.name, it.name).taskName == task.name TaskInfo(project.name, toName(it)).taskName == toName(task)
} }
if (currentFreeTask.size == 1) { if (currentFreeTask.size == 1) {
currentFreeTask[0].let { currentFreeTask[0].let {
@ -160,7 +164,7 @@ public class TaskManager @Inject constructor(val args: Args, val incrementalMana
// //
val transitiveClosure = calculateTransitiveClosure(project, tasksByNames, ti) val transitiveClosure = calculateTransitiveClosure(project, tasksByNames, ti)
transitiveClosure.forEach { pluginTask -> transitiveClosure.forEach { pluginTask ->
val rb = runBefore.get(pluginTask.name) val rb = runBefore.get(toName(pluginTask))
rb.forEach { rb.forEach {
val tos = tasksByNames[it] val tos = tasksByNames[it]
if (tos != null && tos.size > 0) { if (tos != null && tos.size > 0) {
@ -176,10 +180,10 @@ public class TaskManager @Inject constructor(val args: Args, val incrementalMana
// //
// If any of the nodes in the graph has an "alwaysRunAfter", add that edge too // If any of the nodes in the graph has an "alwaysRunAfter", add that edge too
// //
val allNodes = arrayListOf<PluginTask>() val allNodes = arrayListOf<T>()
allNodes.addAll(graph.nodes) allNodes.addAll(graph.nodes)
allNodes.forEach { node -> allNodes.forEach { node ->
val other = alwaysRunAfter.get(node.name) val other = alwaysRunAfter.get(toName(node))
other?.forEach { o -> other?.forEach { o ->
tasksByNames[o]?.forEach { tasksByNames[o]?.forEach {
graph.addEdge(it, node) graph.addEdge(it, node)
@ -197,9 +201,9 @@ public class TaskManager @Inject constructor(val args: Args, val incrementalMana
/** /**
* Find the free tasks of the graph. * Find the free tasks of the graph.
*/ */
private fun calculateFreeTasks(tasksByNames: Multimap<String, PluginTask>, reverseAfter: HashMap<String, String>) private fun <T> calculateFreeTasks(tasksByNames: Multimap<String, T>, reverseAfter: HashMap<String, String>)
: Collection<PluginTask> { : Collection<T> {
val freeTaskMap = hashMapOf<String, PluginTask>() val freeTaskMap = hashMapOf<String, T>()
tasksByNames.keys().forEach { tasksByNames.keys().forEach {
if (! runBefore.containsKey(it) && ! reverseAfter.containsKey(it)) { if (! runBefore.containsKey(it) && ! reverseAfter.containsKey(it)) {
tasksByNames[it].forEach { t -> tasksByNames[it].forEach { t ->
@ -214,11 +218,11 @@ public class TaskManager @Inject constructor(val args: Args, val incrementalMana
/** /**
* Find the transitive closure for the given TaskInfo * Find the transitive closure for the given TaskInfo
*/ */
private fun calculateTransitiveClosure(project: Project, tasksByNames: Multimap<String, PluginTask>, ti: TaskInfo): private fun <T> calculateTransitiveClosure(project: Project, tasksByNames: Multimap<String, T>, ti: TaskInfo):
HashSet<PluginTask> { HashSet<T> {
log(3, "Processing ${ti.taskName}") log(3, "Processing ${ti.taskName}")
val transitiveClosure = hashSetOf<PluginTask>() val transitiveClosure = hashSetOf<T>()
val seen = hashSetOf(ti.taskName) val seen = hashSetOf(ti.taskName)
val toProcess = hashSetOf(ti) val toProcess = hashSetOf(ti)
var done = false var done = false