Skip to content

Commit ba0d2d6

Browse files
author
Krystian Panek
committed
More interactive
1 parent 2f76b1f commit ba0d2d6

File tree

1 file changed

+23
-11
lines changed

1 file changed

+23
-11
lines changed

src/main/kotlin/com/cognifide/gradle/environment/docker/ContainerManager.kt

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,30 +51,42 @@ class ContainerManager(private val docker: Docker) {
5151
val up: Boolean get() = defined.all { it.up }
5252

5353
fun resolve() {
54-
common.progress {
55-
message = "Resolving container(s): ${defined.names}"
56-
common.parallel.each(defined) { it.resolve() }
54+
common.progress(defined.size) {
55+
step = "Resolving container(s)"
56+
common.parallel.each(defined) { container ->
57+
increment(container.name) { container.resolve() }
58+
}
5759
}
5860
}
5961

6062
fun up() {
61-
common.progress {
62-
message = "Configuring container(s): ${defined.names}"
63+
common.progress(defined.size) {
64+
step = "Configuring container(s)"
65+
6366
if (dependent.get()) {
64-
defined.forEach { it.up() }
67+
defined.forEach { container ->
68+
increment(container.name) { container.up() }
69+
}
6570
} else {
66-
common.parallel.each(defined) { it.up() }
71+
common.parallel.each(defined) { container ->
72+
increment(container.name) { container.up() }
73+
}
6774
}
6875
}
6976
}
7077

7178
fun reload() {
72-
common.progress {
73-
message = "Reloading container(s): ${defined.names}"
79+
common.progress(defined.size) {
80+
step = "Reloading container(s)"
81+
7482
if (dependent.get()) {
75-
defined.forEach { it.reload() }
83+
defined.forEach { container ->
84+
increment(container.name) { container.reload() }
85+
}
7686
} else {
77-
common.parallel.each(defined) { it.reload() }
87+
common.parallel.each(defined) { container ->
88+
increment(container.name) { container.reload() }
89+
}
7890
}
7991
}
8092
}

0 commit comments

Comments
 (0)