Actually allow generation of an entire directory worth of code.

Author: pdvrieze

RELEASENOTES

@@ -1,3 +1,6 @@
-0.5: Initial release
+0.5.5: Add an extension to the generate task that allows directory wide generation
+       of unspecified. files. This is mainly useful for annotation processing.
 
-0.5.1: Don't have a hard dependency on kotlin.
+0.5.1: Don't have a hard dependency on kotlin.
+
+0.5: Initial release

build.gradle

@@ -22,13 +22,16 @@
 buildscript {
 
     ext {
-        if (! rootProject.ext.has('kotlin_version') ) { kotlin_version = '1.0.1-2' }
+        if (!rootProject.ext.has('kotlin_version')) {
+            kotlin_version = '1.0.1-2'
+        }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 
     repositories {
+        mavenLocal()
         jcenter()
         maven {
             url "https://plugins.gradle.org/m2"
@@ -38,17 +41,18 @@ buildscript {
 
 
 plugins {
-    id "com.jfrog.bintray" version "1.6"
     id "com.gradle.plugin-publish" version "0.9.4"
+    id "com.jfrog.bintray" version "1.6"
+    id 'maven-publish'
 }
 
 apply plugin: 'kotlin'
-apply plugin: 'maven-publish'
+//apply plugin: 'maven-publish'
 
 sourceCompatibility = JavaVersion.VERSION_1_6
 targetCompatibility = JavaVersion.VERSION_1_6
 
-version = '0.5.1'
+version = '0.5.5'
 group = 'net.devrieze'
 
 bintray {
@@ -67,8 +71,8 @@ bintray {
             name = project.version
             desc = 'Fixed when not using kotlin. Kotlin is now optionally supported.'
             released = new Date()
-            vcsTag = 'v0.5.1'
-//            attributes = [ 'gradle-plugin': 'net.devrieze.gradlecodegen:' ]
+            vcsTag = "v$version"
+            attributes = [ 'gradle-plugin': 'net.devrieze:gradle-codegen:net.devrieze.gradlecodegen' ]
         }
     }
 }
@@ -79,7 +83,7 @@ publishing {
             from components.java
             groupId group
             artifactId 'gradle-codegen'
-            
+
             artifact sourceJar {
                 classifier "sources"
             }
@@ -91,16 +95,18 @@ pluginBundle {
     website = 'https://github.com/pdvrieze/gradle-codegen.git'
     vcsUrl = 'https://github.com/pdvrieze/gradle-codegen.git'
     description = "A plugin to aid with codeGeneration without using buildSrc. It provides an additional generate section to sourceSets. In this section individual files to be generated can be specified. Each sourceset has an accompanying ...generator sourceSet where the actual generator source can live."
-    tags = [ 'generate', 'codegen', 'code-generation' ]
+    tags = ['generate', 'codegen', 'code-generation']
+
     plugins {
         gradlecodegen {
             id = 'net.devrieze.gradlecodegen'
             displayName = 'Code generation plugin for gradle'
         }
     }
+
     mavenCoordinates {
         groupId = group
-	artifactId = "gradle-codegen"
+        artifactId = "gradle-codegen"
     }
 }
 
@@ -109,7 +115,7 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
-task sourceJar(type:Jar) {
+task sourceJar(type: Jar) {
     from sourceSets.main.allSource
 }
 

src/main/kotlin/net/devrieze/gradlecodegen/plugin.kt

@@ -61,6 +61,12 @@ open class GenerateTask: DefaultTask() {
 
   var classpath: FileCollection? = null
 
+  val dirGenerator = GenerateDirSpec()
+
+  fun dirGenerator(closure: Closure<Any?>?) {
+    ConfigureUtil.configure(closure, dirGenerator)
+  }
+
   @Input
   internal var container: NamedDomainObjectContainer<GenerateSpec>? = null
 
@@ -70,17 +76,44 @@ open class GenerateTask: DefaultTask() {
       container?.all { spec: GenerateSpec ->
         val specClasspath = spec.classpath
         if (specClasspath ==null || specClasspath.isEmpty) {
-          generateSpec(spec, joinedLoader)
+          generateFile(spec, joinedLoader)
         } else {
           URLClassLoader(combinedClasspath(spec.classpath)).use { classLoader ->
-            generateSpec(spec, classLoader)
+            generateFile(spec, classLoader)
+          }
+        }
+      }
+
+      if (dirGenerator.generator!=null) {
+        val outDir = if (dirGenerator.outputDir ==null) project.file(outputDir) else File(project.file(outputDir),dirGenerator.outputDir)
+        outDir.mkdirs() // ensure the output directory exists
+        if (dirGenerator.classpath!=null) {
+          URLClassLoader(combinedClasspath(dirGenerator.classpath)). use {
+            generateDir(outDir, it)
           }
+        } else {
+          generateDir(outDir, joinedLoader)
         }
       }
+
     }
   }
 
-  private fun generateSpec(spec: GenerateSpec, classLoader: ClassLoader) {
+  private fun generateDir(outDir: File, classLoader: ClassLoader) {
+    val generatorClass = classLoader.loadClass(dirGenerator.generator)
+    val m = generatorClass.getGenerateDirMethod(dirGenerator.input)
+
+    val generatorInst = if (Modifier.isStatic(m.modifiers)) null else generatorClass.newInstance()
+    if (m.parameterCount==1) {
+      m.invoke(generatorInst, outDir)
+    } else {
+      m.invoke(generatorInst, outDir, dirGenerator.input)
+    }
+
+  }
+
+
+  private fun generateFile(spec: GenerateSpec, classLoader: ClassLoader) {
     if (spec.output != null) {
       val outFile = File(project.file(outputDir), spec.output)
 
@@ -92,12 +125,13 @@ open class GenerateTask: DefaultTask() {
       if (spec.generator != null) {
         val gname = spec.generator
         val generatorClass = classLoader.loadClass(gname)
-        val generatorInst = generatorClass.newInstance()
         if (!outFile.isFile) {
           outFile.parentFile.mkdirs()
           outFile.createNewFile()
         }
+
         val m = generatorClass.getGenerateMethod(spec.input)
+        val generatorInst = if (Modifier.isStatic(m.modifiers)) null else generatorClass.newInstance()
         outFile.writer().use { writer ->
           if (m.parameterCount == 2) {
             m.invoke(generatorInst, writer, spec.input)
@@ -120,7 +154,29 @@ open class GenerateTask: DefaultTask() {
         .filter { Appendable::class.java.isAssignableFrom(it.parameterTypes[0]) && it.parameterTypes[0].isAssignableFrom(Writer::class.java) }
         .filter { if (it.parameterCount==1) true else  it.parameterTypes[1].isInstance(input) }
         .singleOrNull() ?: throw NoSuchMethodError("Generators must have a unique public method \"doGenerate(Appendable|Writer, " +
-                "[Object])\" where the second parameter is optional iff the input is null" )
+                "[Object])\" where the second parameter is optional iff the input is null. If not a static method," +
+                "the class must have a noArg constructor" )
+  }
+
+  private fun Class<*>.getGenerateDirMethod(input: Any?):Method {
+    return methods.asSequence()
+        .filter { it.name=="doGenerate" }
+        .filter { Modifier.isPublic(it.modifiers) }
+        .filter { if (input==null) it.parameterCount in 1..2 else it.parameterCount==2 }
+        .let {
+          val candidates = it.toList()
+          candidates.filter { (File::class.java==it.parameterTypes[0].apply { project.logger.debug("Rejecting $it as the first parameter is not a file") }) }
+              .filter { if (it.parameterCount==1) true else  it.parameterTypes[1].isInstance(input) }
+              .singleOrNull() ?: throw NoSuchMethodError("""
+              Generators must have a unique public method "doGenerate(File, [Object])"
+              where the second parameter is optional iff the input is null. If not a static
+              method, the class must have a noArg constructor.
+
+              Candidates were:
+                  ${candidates.joinToString("\n    ") { it.toString() }}
+              """.trimIndent() )
+
+        }
   }
 
   private fun combinedClasspath(others: FileCollection?): Array<out URL>? {
@@ -140,7 +196,7 @@ public const val OUTPUT_SOURCE_SET = "generatedSources"
 public const val DEFAULT_GEN_DIR = "gen"
 
 interface GenerateImpl {
-  fun doGenerate(output: Writer, input: Iterable<out File>?)
+  fun doGenerate(output: Writer, input: Iterable<File>?)
 }
 
 class GenerateSpec(val name: String) {
@@ -150,7 +206,14 @@ class GenerateSpec(val name: String) {
   var input: Any?=null
 }
 
-open class GenerateSourceSet(val name:String, val generate: NamedDomainObjectContainer<GenerateSpec>) {
+class GenerateDirSpec() {
+  var input: Any?=null
+  var generator: String?=null
+  var classpath: FileCollection? = null
+  var outputDir: String?=null
+}
+
+open class GenerateSourceSet(val generate: NamedDomainObjectContainer<GenerateSpec>) {
 
   fun generate(configureClosure: Closure<Any?>?): GenerateSourceSet {
     ConfigureUtil.configure(configureClosure, generate)
@@ -161,11 +224,10 @@ open class GenerateSourceSet(val name:String, val generate: NamedDomainObjectCon
 class CodegenPlugin : Plugin<Project> {
 
   override fun apply(project: Project) {
-    val javaBasePlugin = project.plugins.apply(JavaBasePlugin::class.java)
-    project.plugins.apply(JavaPlugin::class.java)
+    project.plugins.apply(JavaBasePlugin::class.java)
 
     val sourceSetsToSkip = mutableSetOf<String>("generators")
-    val sourceSets = project.sourceSets.all {sourceSet ->
+    project.sourceSets.all {sourceSet ->
       if (! sourceSetsToSkip.contains(sourceSet.name)) {
         if (sourceSet.name.endsWith("enerators")) {
           project.logger.error("Generators sourceSet (${sourceSet.name}) not registered in ${sourceSetsToSkip}")
@@ -196,7 +258,7 @@ class CodegenPlugin : Plugin<Project> {
 
     val generateExt = project.container(GenerateSpec::class.java)
     if (sourceSet is HasConvention) {
-      sourceSet.convention.plugins.put("net.devrieze.gradlecodegen", GenerateSourceSet("generate", generateExt))
+      sourceSet.convention.plugins.put("net.devrieze.gradlecodegen", GenerateSourceSet(generateExt))
     } else {
       project.extensions.add(generateTaskName, generateExt)
     }