Improvements and TODO list

Author: aepfli

lyberator-gradle/src/main/groovy/at/schrottner/lyberator/resolving/ResolverExtension.groovy

@@ -2,7 +2,8 @@ package at.schrottner.lyberator.resolving
 
 class ResolverExtension {
 	public static final String NAME = "commerceDependencies"
-	public static final String CONFIGURATION_EXTENSION = "commerceExtension"
-	public static final String CONFIGURATION_EXTENSION_POMS = "${CONFIGURATION_EXTENSION}Poms"
-	public static final String CONFIGURATION_EXTENSION_ZIPS = "${CONFIGURATION_EXTENSION}Zips"
+
+	def extensionGroups = ["commerce", "thirdParty"]
+
+
 }

lyberator-gradle/src/main/groovy/at/schrottner/lyberator/resolving/ResolverPlugin.groovy

@@ -21,11 +21,12 @@ class ResolverPlugin implements Plugin<Project> {
 	void apply(Project project) {
 		def extension = project.extensions.create(ResolverExtension.NAME, ResolverExtension)
 
+		extension.extensionGroups.each {
+			def config = project.configurations.maybeCreate("${it}Extension")
 
-		def config = project.configurations.maybeCreate(ResolverExtension.CONFIGURATION_EXTENSION)
 
-
-		def task = project.tasks.create("extractCommerce", ResolverTask, config, extension)
+			def task = project.tasks.create("extract${it.capitalize()}Extensions", ResolverTask, config, extension)
+		}
 
 	}
 }

lyberator-gradle/src/main/groovy/at/schrottner/lyberator/resolving/ResolverTask.groovy

@@ -23,7 +23,7 @@ class ResolverTask extends DefaultTask {
 	ResolverTask(config, extension) {
 		this.extension = extension
 		this.configuration = config
-		this.description = "extract all CommerceExtensions"
+		this.description = "extract all ${config.name}"
 		this.group = "Commerce Extensions"
 	}
 
@@ -38,15 +38,21 @@ class ResolverTask extends DefaultTask {
 			it.toString()
 		}
 	}
+
+	@Internal
+	def getExtensionName() {
+		configuration.name - "Extensions"
+	}
+
 	@OutputFile
 	def getDependencyStore() {
-		project.file("$project.buildDir/commerce/extensions.json")
+		project.file("$project.buildDir/commerce/${extensionName}.json")
 	}
 
 	@TaskAction
 	void performAction() {
-		def configPoms = project.configurations.maybeCreate(ResolverExtension.CONFIGURATION_EXTENSION_POMS)
-		def configZips = project.configurations.maybeCreate(ResolverExtension.CONFIGURATION_EXTENSION_ZIPS)
+		def configPoms = project.configurations.maybeCreate("${configuration.name}Poms")
+		def configZips = project.configurations.maybeCreate("${configuration.name}Zips")
 
 
 		configuration.resolvedConfiguration.lenientConfiguration.allModuleDependencies.each { dependency ->
@@ -98,7 +104,7 @@ class ResolverTask extends DefaultTask {
 		project.logger.info "Deleting unused extensions ${oldExt.entrySet().size()}"
 		// delete old dead extensions
 		oldExt.values().each {
-			project.delete("hybris/bin/${it.path?: "thirdParty"}")
+			project.delete("hybris/bin/${it.path?: "${extensionName}"}")
 			project.logger.info "Deleting $it.name ($it.path) as it is no more part of the dependencies"
 		}
 
@@ -110,7 +116,7 @@ class ResolverTask extends DefaultTask {
 		fileLookUp.entrySet().each { entry ->
 
 			def metaData = metaDataLookup.get(entry.key)
-			def target = project.mkdir("hybris/bin/${metaData.path?: "thirdParty"}")
+			def target = project.mkdir("hybris/bin/${metaData.path?: "${extensionName}"}")
 			project.copy {
 				from project.zipTree(entry.value)
 				into target

testing/usage/settings.gradle

@@ -13,3 +13,10 @@ pluginManagement {
 	}
 }
 rootProject.name = 'testing-usage'
+
+/* TODO:
+- Iterate over local extensions, and create sub projects
+- parse extensionInfo.xml and add the dependencies to the sub project (evaluate if we can add them globally)
+-- we could even use the extensioninfo to determine all kind of extensions needed (but, we might have issues with differentiaten between, 3rdParty and commerce)
+- Still a two step start, extract, and add deps, see if missing extraction could be a problem
+ */