working on changes for gradle build tooling

bertramdev · Apr 20, 2016 · 1863243 · 1863243
1 parent d92a266
commit 1863243
Show file tree

Hide file tree

Showing 16 changed files with 75 additions and 148 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ build/
 .DS_Store
 .gradle
 *.iml
+*.ipr
 .idea/
 gradle.properties
 .jruby-container

diff --git a/asset-pipeline-core/build.gradle b/asset-pipeline-core/build.gradle
@@ -14,6 +14,7 @@ plugins {
 apply plugin: 'groovy'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
+apply plugin: 'idea'
 
 group = 'com.bertramlabs.plugins'
 sourceCompatibility = '1.7'

diff --git a/asset-pipeline-core/src/main/groovy/asset/pipeline/JsAssetFile.groovy b/asset-pipeline-core/src/main/groovy/asset/pipeline/JsAssetFile.groovy
@@ -16,6 +16,8 @@
 
 package asset.pipeline
 
+import asset.pipeline.processors.JsRequireProcessor
+
 import java.util.regex.Pattern
 import groovy.transform.CompileStatic
 /**
@@ -29,7 +31,7 @@ class JsAssetFile extends AbstractAssetFile {
     static final List<String> contentType = ['application/javascript', 'application/x-javascript','text/javascript']
     static List<String> extensions = ['js']
     static String compiledExtension = 'js'
-    static processors = []
+    static processors = [JsRequireProcessor]
     Pattern directivePattern = ~/(?m)^\/\/=(.*)/
 
 }
diff --git a/asset-pipeline-core/src/main/groovy/asset/pipeline/processors/JsRequireProcessor.groovy b/asset-pipeline-core/src/main/groovy/asset/pipeline/processors/JsRequireProcessor.groovy
@@ -0,0 +1,19 @@
+package asset.pipeline.processors
+
+import asset.pipeline.AbstractProcessor
+import asset.pipeline.AssetCompiler
+import asset.pipeline.AssetFile
+import groovy.transform.CompileStatic
+
+@CompileStatic
+public class JsRequireProcessor extends AbstractProcessor {
+	JsRequireProcessor(final AssetCompiler precompiler) {
+		super(precompiler)
+	}
+
+
+	String process(final String inputText, final AssetFile assetFile) {
+
+		return inputText
+	}
+}
diff --git a/asset-pipeline-gradle/build.gradle b/asset-pipeline-gradle/build.gradle
@@ -19,6 +19,7 @@ apply plugin: 'com.gradle.plugin-publish'
 apply plugin: 'groovy'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
+apply plugin: 'idea'
 
 group = 'com.bertramlabs.plugins'
 sourceCompatibility = '1.7'

diff --git a/asset-pipeline-gradle/src/main/groovy/asset/pipeline/gradle/AssetCompile.groovy b/asset-pipeline-gradle/src/main/groovy/asset/pipeline/gradle/AssetCompile.groovy
@@ -67,10 +67,21 @@ class AssetCompile extends DefaultTask {
         pipelineExtension.enableDigests
     }
 
+
     void setEnableDigests(boolean enableDigests) {
         pipelineExtension.enableDigests = enableDigests
     }
 
+	@Input
+	@Optional
+	String getJarTaskName() {
+		pipelineExtension.jarTaskName
+	}
+
+	void setJarTaskName(String jarTaskName) {
+		pipelineExtension.jarTaskName = jarTaskName
+	}
+
     @Input
     @Optional
     boolean getEnableGzip() {

diff --git a/asset-pipeline-gradle/src/main/groovy/asset/pipeline/gradle/AssetPipelineExtension.groovy b/asset-pipeline-gradle/src/main/groovy/asset/pipeline/gradle/AssetPipelineExtension.groovy
@@ -31,6 +31,7 @@ class AssetPipelineExtension {
     boolean enableGzip = true
     String compileDir = 'build/assets'
     String assetsPath = 'src/assets'
+	String jarTaskName
     Map minifyOptions
     Map configOptions
 

diff --git a/asset-pipeline-gradle/src/main/groovy/asset/pipeline/gradle/AssetPipelinePlugin.groovy b/asset-pipeline-gradle/src/main/groovy/asset/pipeline/gradle/AssetPipelinePlugin.groovy
@@ -83,57 +83,42 @@ class AssetPipelinePlugin implements Plugin<Project> {
                 enableGzip = assetPipeline.enableGzip
             }
 
-            project.tasks.withType(Jar) { Jar bundleTask ->
-                bundleTask.dependsOn assetPrecompileTask
-                bundleTask.from assetPipeline.compileDir, {
-                    into "assets"
-                }
-            }
+//            project.tasks.withType(Jar) { Jar bundleTask ->
+//                bundleTask.dependsOn assetPrecompileTask
+//                bundleTask.from assetPipeline.compileDir, {
+//                    into "assets"
+//                }
+//            }
+
+			if(assetPipeline.jarTaskName) {
+				Jar jarTask = project.tasks.findByName('jarTaskName')
+				if(jarTask) {
+					jarTask.dependsOn assetPrecompileTask
+					jarTask.from assetPipeline.compileDir, {
+						into "assets"
+					}
+				}
+			} else { //no jar task name specified we need to try and infer
+				def assetTasks = ['war','shadowJar','jar']
+
+				assetTasks?.each { taskName ->
+					Jar jarTask = project.tasks.findByName(taskName)
+					if(jarTask) {
+						jarTask.dependsOn assetPrecompileTask
+						jarTask.from assetPipeline.compileDir, {
+							into "assets"
+						}
+					}
+				}
+
+
+			}
+
 
         }
 
-		// def assembleTask = project.tasks.findByName('assemble')
-		// if(assembleTask) {
-		// 	assembleTask.dependsOn( assetPrecompileTask )
-		// }
-
-  //       def cleanTask = project.tasks.findByName('clean')
-  //       if(cleanTask) {
-  //           cleanTask.dependsOn( assetCleanTask )
-  //       }
-
-  //       def jarTask = project.tasks.findByName('jar')
-  //       if(jarTask) {
-  //           jarTask.dependsOn(assetPrecompileTask)
-  //       }
-
-  //       def shadowJarTask = project.tasks.findByName('shadowJar')
-  //       if(shadowJarTask) {
-  //           shadowJarTask.dependsOn(assetPrecompileTask)
-  //       }
-
-  //       def warTask = project.tasks.findByName('war')
-  //       if(warTask) {
-  //           warTask.dependsOn(assetPrecompileTask)
-  //       }
-
-  //       def installAppTask = project.tasks.findByName('installApp')
-  //       if(installAppTask) {
-  //           installAppTask.dependsOn(assetPrecompileTask)
-  //       }
-
-  //       def installDistTask = project.tasks.findByName('installDist')
-  //       if(installDistTask) {
-  //           installDistTask.dependsOn(assetPrecompileTask)
-  //       }
 
-
-        // def resourcesTask = project.tasks.findByName('classes')
 
-
-		// project.task('asset-watch') << {
-		// 	//TODO: Implement live watcher to auto recompile assets as they change
-		// }
 	}
 
     private void createGradleConfiguration(Project project) {

diff --git a/asset-pipeline-servlet/build.gradle b/asset-pipeline-servlet/build.gradle
@@ -16,6 +16,7 @@ apply plugin: 'groovy'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
 apply plugin: 'com.jfrog.bintray'
+apply plugin: 'idea'
 
 group = 'com.bertramlabs.plugins'
 sourceCompatibility = '1.7'

diff --git a/asset-pipeline.ipr b/asset-pipeline.ipr
diff --git a/coffee-asset-pipeline/build.gradle b/coffee-asset-pipeline/build.gradle
@@ -15,6 +15,7 @@ apply plugin: 'groovy'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
 apply plugin: 'com.jfrog.bintray'
+apply plugin: 'idea'
 
 group = 'com.bertramlabs.plugins'
 ext.isReleaseVersion = !version.endsWith("SNAPSHOT")

diff --git a/ember-asset-pipeline/build.gradle b/ember-asset-pipeline/build.gradle
@@ -17,6 +17,7 @@ apply plugin: 'groovy'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
 apply plugin: 'com.jfrog.bintray'
+apply plugin: 'idea'
 
 group = 'com.bertramlabs.plugins'
 ext.isReleaseVersion = !version.endsWith("SNAPSHOT")

diff --git a/handlebars-asset-pipeline/build.gradle b/handlebars-asset-pipeline/build.gradle
@@ -14,6 +14,7 @@ apply plugin: 'groovy'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
 apply plugin: 'com.jfrog.bintray'
+apply plugin: 'idea'
 
 group = 'com.bertramlabs.plugins'
 ext.isReleaseVersion = !version.endsWith("SNAPSHOT")

diff --git a/less-asset-pipeline/build.gradle b/less-asset-pipeline/build.gradle
@@ -15,6 +15,7 @@ apply plugin: 'groovy'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
 apply plugin: 'com.jfrog.bintray'
+apply plugin: 'idea'
 
 group = 'com.bertramlabs.plugins'
 ext.isReleaseVersion = !version.endsWith("SNAPSHOT")

diff --git a/ratpack-asset-pipeline/build.gradle b/ratpack-asset-pipeline/build.gradle
@@ -14,6 +14,7 @@ apply plugin: 'groovy'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
 apply plugin: 'com.jfrog.bintray'
+apply plugin: 'idea'
 
 group = 'com.bertramlabs.plugins'
 

diff --git a/sass-asset-pipeline/build.gradle b/sass-asset-pipeline/build.gradle
@@ -15,6 +15,7 @@ apply plugin: 'groovy'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
 apply plugin: 'com.jfrog.bintray'
+apply plugin: 'idea'
 group = 'com.bertramlabs.plugins'
 ext.isReleaseVersion = !version.endsWith("SNAPSHOT")