Disable GPG signing in gitpatcher repositories

Author: stephan-gh

build.gradle

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

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

@@ -36,11 +36,11 @@ class Git {
     }
 
     String getStatus() {
-        return run('status', ['-z']) as String
+        return run('status', ['-z']).text
     }
 
     String getRef() {
-        return (rev_parse('HEAD') as String).readLines().first().trim()
+        return rev_parse('HEAD').text.readLines().first().trim()
     }
 
     Command run(String name, Object input) {
@@ -92,12 +92,15 @@ class Git {
         def rightShift = this.&writeTo
         def rightShiftUnsigned = this.&forceWriteTo
 
-        Object asType(Class type) {
-            if (type == String) {
-                setup(null, System.err)
-                execute()
-                return process.inputStream.text
-            }
+        String getText() {
+            setup(null, System.err)
+            execute()
+            return process.inputStream.text.trim()
+        }
+
+        String readText() {
+            setup(null, System.err)
+            return run() == 0 ? process.inputStream.text.trim() : null;
         }
 
     }

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

@@ -22,8 +22,8 @@
 
 package net.minecrell.gitpatcher
 
-import net.minecrell.gitpatcher.task.UpdateSubmodulesTask
 import net.minecrell.gitpatcher.task.FindGitTask
+import net.minecrell.gitpatcher.task.UpdateSubmodulesTask
 import net.minecrell.gitpatcher.task.patch.ApplyPatchesTask
 import net.minecrell.gitpatcher.task.patch.MakePatchesTask
 import org.gradle.api.Plugin

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

@@ -34,7 +34,7 @@ class FindGitTask extends DefaultTask {
     void findGit() {
         def git = new Git(project.rootDir)
         try {
-            def version = (git.version() as String).readLines().join(', ')
+            def version = git.version().text.readLines().join(', ')
             logger.lifecycle("Using $version for patching submodule $submodule.")
         } catch (Throwable e) {
             throw new UnsupportedOperationException(

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

@@ -34,7 +34,7 @@ class UpdateSubmodulesTask extends SubmoduleTask {
     @TaskAction
     void updateSubmodules() {
         def git = new Git(repo)
-        def result = git.submodule('status', '--', submodule) as String
+        def result = git.submodule('status', '--', submodule).text
 
         this.ref = result[1 .. result.indexOf(' ', 1) - 1]
 

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

@@ -86,6 +86,11 @@ class ApplyPatchesTask extends PatchTask {
             assert patchDir.mkdirs(), 'Failed to create patch directory'
         }
 
+        if ('true'.equalsIgnoreCase(git.config('commit.gpgsign').readText())) {
+            logger.warn("Disabling GPG signing for the gitpatcher repository")
+            git.config('commit.gpgsign', 'false') >> out
+        }
+
         def patches = this.patches
         if (patches.length > 0) {
             logger.lifecycle 'Applying patches from {} to {}', patchDir, repo

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

@@ -79,7 +79,7 @@ class MakePatchesTask extends PatchTask {
 
         didWork = false
         for (def patch : patches) {
-            def diff = (git.diff('--no-color', '-U1', '--staged', patch.absolutePath) as String).readLines()
+            def diff = git.diff('--no-color', '-U1', '--staged', patch.absolutePath).text.readLines()
 
             boolean upToDate = false
 

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

@@ -22,7 +22,6 @@
 
 package net.minecrell.gitpatcher.task.patch
 
-import com.google.common.collect.ImmutableList
 import net.minecrell.gitpatcher.task.SubmoduleTask
 
 abstract class PatchTask extends SubmoduleTask {