Add more up-to-date checks

Author: stephan-gh

build.gradle

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

src/main/groovy/net/minecrell/gitpatcher/git/Patcher.groovy

@@ -27,7 +27,6 @@ import static org.eclipse.jgit.revwalk.RevSort.TOPO
 import groovy.transform.stc.ClosureParams
 import groovy.transform.stc.FirstParam
 import groovy.transform.stc.SimpleType
-import org.apache.commons.lang.StringUtils
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.diff.DiffFormatter
 import org.eclipse.jgit.revwalk.RevCommit
@@ -60,12 +59,6 @@ final class Patcher {
         return walk
     }
 
-    static File[] findPatches(File patchDir) {
-        return patchDir.listFiles({ dir, name ->
-            name.endsWith('.patch') && StringUtils.isNumeric(name.substring(0, 4))
-        } as FilenameFilter).sort()
-    }
-
     static String suggestFileName(RevCommit commit, int num) {
         def result = new StringBuilder(String.format("%04d-", num))
         for (char c : commit.shortMessage.chars) {

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

@@ -27,4 +27,8 @@ abstract class GitTask extends DefaultTask {
 
     File repo
 
+    protected File getIndexFile() {
+        return new File(new File(repo, '.git'), 'index')
+    }
+
 }

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

@@ -27,12 +27,29 @@ import static org.eclipse.jgit.api.ResetCommand.ResetType.HARD
 import static org.eclipse.jgit.submodule.SubmoduleWalk.getSubmoduleRepository
 
 import net.minecrell.gitpatcher.git.MailPatch
-import net.minecrell.gitpatcher.git.Patcher
 import org.eclipse.jgit.api.Git
+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 {
 
+    @Override @InputFiles
+    File[] getPatches() {
+        return super.getPatches()
+    }
+
+    @Override @OutputDirectory
+    File getRepo() {
+        return super.getRepo()
+    }
+
+    @Override @OutputFile
+    File getIndexFile() {
+        return super.getIndexFile()
+    }
+
     @TaskAction
     void applyPatches() {
         File source = null
@@ -73,7 +90,7 @@ class ApplyPatchesTask extends PatchTask {
             if (patchDir.isDirectory()) {
                 logger.lifecycle 'Applying patches from {} to {}', patchDir, repo
 
-                for (def file : Patcher.findPatches(patchDir)) {
+                for (def file : patches) {
                     logger.lifecycle 'Applying: {}', file.name
 
                     def data = new ByteArrayInputStream(file.bytes)

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

@@ -28,21 +28,41 @@ import net.minecrell.gitpatcher.git.MailPatch
 import net.minecrell.gitpatcher.git.Patcher
 import org.eclipse.jgit.diff.DiffFormatter
 import org.eclipse.jgit.patch.Patch
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 
 class MakePatchesTask extends PatchTask {
 
+    @Override @InputDirectory
+    File getRepo() {
+        return super.getRepo()
+    }
+
+    @Override @InputFile
+    File getIndexFile() {
+        return super.getIndexFile()
+    }
+
+    @Override @OutputDirectory
+    File getPatchDir() {
+        return super.getPatchDir()
+    }
+
     @TaskAction
     void makePatches() {
         File[] patches
         if (patchDir.isDirectory()) {
-            patches = Patcher.findPatches(patchDir)
+            patches = this.patches
         } else {
             assert patchDir.mkdirs(), 'Failed to create patch directory'
             patches = null
         }
 
         openGit(repo) {
+            didWork = false
+
             def i = 0
             for (def commit : log(it, 'origin/upstream')) {
                 def out = new File(patchDir, Patcher.suggestFileName(commit, i+1))
@@ -90,6 +110,7 @@ class MakePatchesTask extends PatchTask {
 
 
                 logger.lifecycle 'Generating patch: {}', out.name
+                didWork = true
 
                 out.createNewFile()
                 out.withOutputStream {

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

@@ -22,13 +22,18 @@
 package net.minecrell.gitpatcher.task.patch
 
 import net.minecrell.gitpatcher.task.SubmoduleTask
-import org.gradle.api.tasks.InputDirectory
+import org.apache.commons.lang.StringUtils
 
 abstract class PatchTask extends SubmoduleTask {
 
     File root
 
-    @InputDirectory
     File patchDir
 
+    protected File[] getPatches() {
+        return patchDir.listFiles({ dir, name ->
+            name.endsWith('.patch') && StringUtils.isNumeric(name.substring(0, 4))
+        } as FilenameFilter).sort()
+    }
+
 }