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

Refactor.

Browse source
This commit is contained in:
Cedric Beust 2016-07-31 09:16:59 -07:00
parent 326c59f743
commit 5577c47185
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,7 +93,7 @@ class TaskManager @Inject constructor(val args: Args,
var taskInfos = calculateDependentTaskNames(passedTaskNames, allProjects) var taskInfos = calculateDependentTaskNames(passedTaskNames, allProjects)
// Remove not existing tasks (e.g. dynamic task defined for a single project) // Remove non existing tasks (e.g. dynamic task defined for a single project)
taskInfos = taskInfos.filter { hasTask(it) } taskInfos = taskInfos.filter { hasTask(it) }
val projectsToRun = findProjectsToRun(taskInfos, allProjects) val projectsToRun = findProjectsToRun(taskInfos, allProjects)
@ -104,7 +104,7 @@ class TaskManager @Inject constructor(val args: Args,
* Determine which projects to run based on the request tasks. Also make sure that all the requested projects * Determine which projects to run based on the request tasks. Also make sure that all the requested projects
* exist. * exist.
*/ */
fun findProjectsToRun(taskInfos: List<TaskInfo>, projects: List<Project>) : List<Project> { private fun findProjectsToRun(taskInfos: List<TaskInfo>, projects: List<Project>) : List<Project> {
// Validate projects // Validate projects
val result = LinkedHashSet<Project>() val result = LinkedHashSet<Project>()
@ -113,15 +113,12 @@ class TaskManager @Inject constructor(val args: Args,
} }
// Extract all the projects we need to run from the tasks // Extract all the projects we need to run from the tasks
// val orderedTaskInfos = calculateDependentTaskNames(taskInfos.map { it.id }, projects)
taskInfos.forEach { taskInfos.forEach {
val p = it.project val p = it.project
if (p != null) { if (p != null && ! projectMap.containsKey(p)) {
if (! projectMap.containsKey(p)) { throw KobaltException("Unknown project: ${it.project}")
throw KobaltException("Unknown project: ${it.project}")
}
result.add(projectMap[it.project]!!)
} }
result.add(projectMap[it.project]!!)
} }
// If at least one task didn't specify a project, run them all // If at least one task didn't specify a project, run them all
@ -215,7 +212,7 @@ class TaskManager @Inject constructor(val args: Args,
return taskNames.flatMap { calculateDependentTaskNames(it, projects) } return taskNames.flatMap { calculateDependentTaskNames(it, projects) }
} }
fun calculateDependentTaskNames(taskName: String, projects: List<Project>): List<TaskInfo> { private fun calculateDependentTaskNames(taskName: String, projects: List<Project>): List<TaskInfo> {
fun sortProjectsTopologically(projects: List<Project>) : List<Project> { fun sortProjectsTopologically(projects: List<Project>) : List<Project> {
val topological = Topological<Project>().apply { val topological = Topological<Project>().apply {
projects.forEach { project -> projects.forEach { project ->