reyes 0.2.1 → 0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjZiNjMyZjAyMzg2ZmViYWVkYTkwMWYzZjk4YzJmOWMwYzBhODBmOA==
+    ZTM1YmZiYjM5MzMyNWQ4N2MyZGFiZGQyMmFmNjBlYzA5ZWY0ZTUxOA==
   data.tar.gz: !binary |-
-    NTljMWY5NGY5MGFjYWI1YTIyN2JhOGExOGFmZTcyYTIzNmQ2YTZjNA==
+    NDk5ZmZlNTExMThjZDk3NDc0YTc3MWJiNzRkMTRkMDQ3YTk0NTczZA==
 SHA512:
   metadata.gz: !binary |-
-    Yjc2Nzg4YzczNDhlZDZiMjdkZmVhM2ZlN2ViMzY4OTU0Mzk3NmZmZmEwNjJm
-    MTUwMDQ2OWVjOTJjYjI1NjliZmRmZTFkMDg0NTU3YTRjZTcxODA0MDA5YjMz
-    MDBiNTBhOWEzNjI1YTA5NjcwNGE1OWNiNDYzNGFjZmM3NjdiZjM=
+    MzhiNzk5NTI2NDE3MGE4Y2ZkMTY2ZDRhZDNjMDY5ZGYxZDAzMzFlMGRiNmJj
+    ZDEzZmU5ZDhkMjk5MTdlNDc3NDhjYmYxMWQzMmQ5ZGJkNDc2ZTUzMzJiYmE4
+    MGRmYjZhYmU2MmIzYWE2MGJjYzNhZWVkYTc5ZmUyZjExNTU5ZTY=
   data.tar.gz: !binary |-
-    OGMwMmI5MThjNmUwNWJlZDFkNTBiNGUyYTc3MjA1NzYxOWM2ZTcwOWI1MzQ2
-    NTRiZGNkODE5OGI5ZmIxMTM0NzA4MDc4ZDdkNWEzYzYwMDc3YmExOWM5NTUw
-    NGRmMmUxNTFlOWNhYzYzMjYzN2I3ZmM4OWFjY2U4M2VkM2JlYjI=
+    NmM0NjJiMmNjY2JhMWQwZmNhYmMzZTRkZDlmNjcwMjAzNDQ0NDlkMzQwMDJm
+    MTMzMGI1MDY5MzkyYThmNWNhMDlmNmJmNzBhOTNlMzFlOGI5NTM4MTQ5NjZk
+    MzM0NTQ2MzMzM2QyOGFmNzI1Yzk1NzgzYjAyYTVjNDRhZWZmYjU=

data/lib/reyes/pgp_wrapper.rb

@@ -27,7 +27,7 @@ module Reyes
     #
     # @return [String] the stripped cleartext data
     #
-    def verify!(data)
+    def verify!(data, retries=1)
       log.info("Verifying #{data.length} bytes against key #{key_id}")
 
       gpg_cmd = %w{gpg --batch --decrypt --status-fd 2} + keyring_args + ['-']
@@ -42,7 +42,18 @@ module Reyes
             raise VerificationFailed.new("Bad key match") unless $1 == $2
             raise VerificationFailed.new("Bad Key ID") unless $1 == key_id
           else
-            raise VerificationFailed.new("Pattern does not match")
+            # There's a weird and very rare race condition where the stderr
+            # output returned by Subprocess can be truncated.
+            # Retry in this case.
+            if err.split("\n").length < 4 && retries > 0
+              log.error("Looks like we hit hit GPG/Subprocess race condition")
+              log.error("GPG stderr:")
+              log.error(err.inspect)
+              log.error("Retrying...")
+              return verify!(data, retries - 1)
+            else
+              raise VerificationFailed.new("Pattern does not match")
+            end
           end
         rescue VerificationFailed => exc
           log.error("GPG verification failed: #{exc.message}")
@@ -73,7 +84,11 @@ module Reyes
       log.error("GPG stderr:")
       log.error(err)
       log.error("GPG stdout:")
-      log.error(out)
+      if out.length > 80
+        log.error(out[0..80] + '...')
+      else
+        log.error(out)
+      end
 
       write_tmp_file("input data", data) unless data.empty?
     end

data/lib/reyes/version.rb

@@ -1,3 +1,3 @@
 module Reyes
-  VERSION = '0.2.1' unless defined?(self::VERSION)
+  VERSION = '0.2.2' unless defined?(self::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reyes
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andy Brody
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk