Fix task reporting up-to-date if only submodule commit changed

Author: stephan-gh

build.gradle

@@ -12,7 +12,7 @@ plugins {
 }
 
 group = 'net.minecrell'
-version = '0.6'
+version = '0.7'
 description = 'A Gradle plugin to manage patches for Git repositories'
 
 sourceCompatibility = 1.6

src/main/groovy/net/minecrell/gitpatcher/Git.groovy

@@ -39,7 +39,7 @@ class Git {
     }
 
     String getRef() {
-        return show_ref('-s', 'HEAD') as String
+        return (rev_parse('HEAD') as String).readLines().first().trim()
     }
 
     Command run(String name, Object input) {

src/main/groovy/net/minecrell/gitpatcher/GitPatcher.groovy

@@ -54,6 +54,8 @@ class GitPatcher implements Plugin<Project> {
                     patchDir = extension.patches
                 }
 
+                tasks.applyPatches.updateTask = tasks.updateSubmodules
+
                 tasks.updateSubmodules.with {
                     repo = extension.root
                     submodule = extension.submodule

src/main/groovy/net/minecrell/gitpatcher/task/UpdateSubmodulesTask.groovy

@@ -28,10 +28,15 @@ import org.gradle.api.tasks.TaskAction
 
 class UpdateSubmodulesTask extends SubmoduleTask {
 
+    private String ref
+
     @TaskAction
     void updateSubmodules() {
         def git = new Git(repo)
         def result = git.submodule('status', '--', submodule) as String
+
+        this.ref = result[1 .. result.indexOf(' ', 1) - 1]
+
         if (result.startsWith(' ')) {
             didWork = false
             return
@@ -40,4 +45,8 @@ class UpdateSubmodulesTask extends SubmoduleTask {
         git.submodule('update', '--init', '--recursive') >> out
     }
 
+    String getRef() {
+        ref
+    }
+
 }

src/main/groovy/net/minecrell/gitpatcher/task/patch/ApplyPatchesTask.groovy

@@ -24,13 +24,16 @@ package net.minecrell.gitpatcher.task.patch
 import static java.lang.System.out
 
 import net.minecrell.gitpatcher.Git
+import net.minecrell.gitpatcher.task.UpdateSubmodulesTask
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 
 class ApplyPatchesTask extends PatchTask {
 
+    UpdateSubmodulesTask updateTask
+
     @Override @InputFiles
     File[] getPatches() {
         return super.getPatches()
@@ -53,7 +56,7 @@ class ApplyPatchesTask extends PatchTask {
             }
 
             def git = new Git(repo)
-            return git.status.empty && cachedRef == git.ref
+            return git.status.empty && cachedRef == git.ref && cachedSubmoduleRef == updateTask.ref
         }
     }
 
@@ -87,7 +90,7 @@ class ApplyPatchesTask extends PatchTask {
             logger.lifecycle 'Successfully applied patches from {} to {}', patchDir, repo
         }
 
-        refCache.text = git.ref
+        refCache.text = git.ref + '\n' + updateTask.ref
     }
 
 }

src/main/groovy/net/minecrell/gitpatcher/task/patch/PatchTask.groovy

@@ -21,6 +21,7 @@
  */
 package net.minecrell.gitpatcher.task.patch
 
+import com.google.common.collect.ImmutableList
 import net.minecrell.gitpatcher.task.SubmoduleTask
 
 abstract class PatchTask extends SubmoduleTask {
@@ -45,8 +46,30 @@ abstract class PatchTask extends SubmoduleTask {
         return new File(gitDir, '.gitpatcher_ref')
     }
 
+    private List<String> cachedRefs
+
+    private void readCache() {
+        if (cachedRefs == null) {
+            File refCache = this.refCache
+            if (refCache.file) {
+                this.cachedRefs = ImmutableList.copyOf refCache.readLines().findResults {
+                    def trimmed = it.trim()
+                    !trimmed.empty && !trimmed.startsWith('#') ? trimmed : null
+                }
+            } else {
+                this.cachedRefs = ImmutableList.of()
+            }
+        }
+    }
+
     String getCachedRef() {
-        return refCache.file ? refCache.text : null
+        readCache()
+        return cachedRefs[0]
+    }
+
+    String getCachedSubmoduleRef() {
+        readCache()
+        return cachedRefs[1]
     }
 
 }