Improved the error messages and added coverage of bad property config…

…uration for key particulars.

subprojects/signing/src/main/groovy/org/gradle/plugins/signing/signatory/pgp/PgpSignatoryFactory.groovy

@@ -72,11 +72,22 @@ class PgpSignatoryFactory {
     }
 
     PGPSecretKey readSecretKey(String keyId, File file) {
+        if (!file.exists()) {
+            throw new InvalidUserDataException("Unable to retrieve secret key from key ring file '$file' as it does not exist")
+        }
+
         file.withInputStream { readSecretKey(it, keyId, "file: $file.absolutePath") }
     }
 
     protected PGPSecretKey readSecretKey(InputStream input, String keyId, String sourceDescription) {
-        readSecretKey(new PGPSecretKeyRingCollection(input), normalizeKeyId(keyId), sourceDescription)
+        def keyRingCollection
+        try {
+            keyRingCollection = new PGPSecretKeyRingCollection(input)
+        } catch (Exception e) {
+            throw new InvalidUserDataException("Unable to read secret key from $sourceDescription (it may not be a PGP secret key ring)", e)
+        }
+
+        readSecretKey(keyRingCollection, normalizeKeyId(keyId), sourceDescription)
     }
 
     protected PGPSecretKey readSecretKey(PGPSecretKeyRingCollection keyRings, PgpKeyId keyId, String sourceDescription) {

subprojects/signing/src/test/groovy/org/gradle/plugins/signing/SignatoriesConfigurationSpec.groovy

@@ -15,6 +15,8 @@
  */
 package org.gradle.plugins.signing
 
+import org.gradle.api.InvalidUserDataException
+
 class SignatoriesConfigurationSpec extends SigningProjectSpec {
 
     def setup() {
@@ -65,5 +67,31 @@ class SignatoriesConfigurationSpec extends SigningProjectSpec {
         signing.signatories.custom != null
         signing.signatories.custom.keyId.asHex == properties.keyId
     }
+
+    def "trying to read non existent file produces reasonable error message"() {
+        when:
+        setProperty("signing.keyId", "aaaaaaaa")
+        setProperty("signing.secretKeyRingFile", "i/dont/exist")
+        setProperty("signing.password", "anything")
+
+        and:
+        signing.signatory
+
+        then:
+        def e = thrown(InvalidUserDataException)
+        e.message.contains "it does not exist"
+    }
+
+    def "trying to use an invalid key ring file produces a reasonable error message"() {
+        given:
+        addSigningProperties(set: "invalid-key-ring")
+
+        when:
+        signing.signatory
+
+        then:
+        def e = thrown(InvalidUserDataException)
+        e.message.contains "Unable to read secret key from"
+    }
 
 }

subprojects/signing/src/test/resources/keys/invalid-key-ring/keyId.txt

@@ -0,0 +1 @@
+24875D73

subprojects/signing/src/test/resources/keys/invalid-key-ring/password.txt

@@ -0,0 +1 @@
+gradle

subprojects/signing/src/test/resources/keys/invalid-key-ring/secring.gpg

@@ -0,0 +1 @@
+not a valid key ring file