Make doc pubisher more lenient and pass variables to template engine

Author: graemerocher

grails-docs/src/main/groovy/grails/doc/DocPublisher.groovy

@@ -283,7 +283,8 @@ class DocPublisher {
         def fullToc = new StringBuilder()
 
         def pathToRoot = ".."
-        def vars = [
+        Map vars = new LinkedHashMap(engineProperties)
+        vars.putAll(
             encoding: encoding,
             title: title,
             docTitle: title,
@@ -304,7 +305,7 @@ class DocPublisher {
             next: null,
             legacyLinks: legacyLinks,
             sourceRepo: sourceRepo,
-        ]
+        )
 
         if(engine instanceof AsciiDocEngine) {
             // pass attributes to asciidoc
@@ -445,6 +446,7 @@ class DocPublisher {
         context.set(DocEngine.CONTEXT_PATH, path)
 
         def varsCopy = [*:vars]
+        varsCopy.putAll(engineProperties)
         varsCopy.name = section.name
         varsCopy.title = section.title
         varsCopy.path = path

grails-docs/src/main/groovy/grails/doc/gradle/PublishGuide.groovy

@@ -25,11 +25,11 @@ import org.gradle.api.tasks.*
  */
 class PublishGuide extends DefaultTask {
     @InputDirectory File sourceDir = new File(project.projectDir, "src")
-    @OutputDirectory File targetDir = project.outputDir as File
-    @InputDirectory File resourcesDir = new File(project.projectDir, "resources")
-    @Input List propertiesFiles = []
-    @Input String language = ""
-    @Input boolean asciidoc = false
+    @OutputDirectory File targetDir = new File(project.buildDir, "docs")
+    @InputDirectory @Optional File resourcesDir = new File(project.projectDir, "resources")
+    @Input @Optional List propertiesFiles = []
+    @Input @Optional String language = ""
+    @Input @Optional boolean asciidoc = false
     @Input @Optional String sourceRepo
     @Input @Optional Properties properties = new Properties()
     Collection macros = []
@@ -38,8 +38,11 @@ class PublishGuide extends DefaultTask {
     @TaskAction
     def publishGuide() {
         def props = new Properties()
-        new File("${resourcesDir}/doc.properties").withInputStream {input ->
-            props.load(input)
+        def docProperties = new File("${resourcesDir}/doc.properties")
+        if(docProperties.exists()) {
+            docProperties.withInputStream { input ->
+                props.load(input)
+            }
         }
 
         // Add properties from any optional properties files too.
@@ -55,7 +58,7 @@ class PublishGuide extends DefaultTask {
         publisher.ant = project.ant
         publisher.asciidoc = asciidoc
         publisher.workDir = workDir
-        publisher.apiDir = "${project.outputDir}" as File
+        publisher.apiDir = targetDir
         publisher.language = language ?: ''
         publisher.sourceRepo = sourceRepo
         publisher.images = project.file("${resourcesDir}/img")