feat: API for nested settings reading (#290)

* feat: API for nested settings reading * docs: correct Kotlin example Co-authored-by: Michal Augustýn <[email protected]>
avast · Apr 8, 2021 · 03e12df · 03e12df
1 parent 5cafffe
commit 03e12df
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -162,13 +162,13 @@ dockerCompose {
 ```kotlin
 dockerCompose {
     // settings as usual
-    createNested("myNested").apply {
+    nested("myNested").apply {
         useComposeFiles = listOf("docker-compose-for-integration-tests.yml")
         isRequiredBy(project.tasks.named("myTask").get())
     }
 }
-```
-    
+```    
+
 </details>
 
 
@@ -177,12 +177,23 @@ dockerCompose {
 * Configuration of the nested settings defaults to the main `dockerCompose` settings (declared before the nested settings), except following properties: `projectName`, `startedServices`, `useComposeFiles`, `scale`, `captureContainersOutputToFile`, `captureContainersOutputToFiles`, `composeLogToFile`, `containerLogToDir`, `pushServices`
 
 When exposing service info from `myNestedComposeUp` task into your task you should use following syntax:
-```
+```groovy
 test.doFirst {
-    dockerCompose.myNested.exposeAsEnvironment(test)  
+    dockerCompose.myNested.exposeAsEnvironment(test)
 }
 ```
 
+<details>
+<summary>Kotlin</summary>
+
+```kotlin
+test.doFirst {
+    dockerCompose.nested("myNested").exposeAsEnvironment(project.tasks.named("test").get())
+}
+```    
+
+</details>
+
 It's also possible to use this simplified syntax:
 ```gradle
 dockerCompose {

diff --git a/src/main/groovy/com/avast/gradle/dockercompose/ComposeExtension.groovy b/src/main/groovy/com/avast/gradle/dockercompose/ComposeExtension.groovy
@@ -11,7 +11,15 @@ class ComposeExtension extends ComposeSettings {
     private HashMap<String, ComposeSettings> settings = [:]
 
     private ComposeSettings getOrCreateNested(String name) {
-        settings.computeIfAbsent(name, { createNested(name) })
+        settings.computeIfAbsent(name, { cloneAsNested(name) })
+    }
+
+    ComposeSettings createNested(String name) {
+        getOrCreateNested(name)
+    }
+
+    ComposeSettings nested(String name) {
+        getOrCreateNested(name)
     }
 
     def propertyMissing(String name) {

diff --git a/src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy b/src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy
@@ -135,7 +135,7 @@ class ComposeSettings {
         "${fullPathMd5}_${project.name}"
     }
 
-    ComposeSettings createNested(String name) {
+    protected ComposeSettings cloneAsNested(String name) {
         def r = new ComposeSettings(project, name, this.nestedName)
         r.buildBeforeUp = this.buildBeforeUp
         r.buildBeforePull = this.buildBeforePull