hiera-eyaml-gpg 0.2 → 0.3

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org/'
 
-gem 'hiera-eyaml', ">=1.3.4"
+gem 'hiera-eyaml', ">=1.3.8"
 gem 'gpgme', ">=2.0.0"
 
 group :development do

data/hiera-eyaml-gpg.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency('hiera-eyaml', '>=1.3.4')
+  gem.add_dependency('hiera-eyaml', '>=1.3.8')
   gem.add_dependency('gpgme', '>=2.0.0')
 end

data/lib/hiera/backend/eyaml/encryptors/gpg.rb

@@ -101,9 +101,14 @@ class Hiera
             recipients = self.find_recipients
             debug("Recipents are #{recipients}")
 
-            raise ArgumentError, 'No recipients provided, don\'t know who to encrypt to' if recipients.empty?
+            raise RecoverableError, 'No recipients provided, don\'t know who to encrypt to' if recipients.empty?
 
-            keys = recipients.map {|r| ctx.keys(r).first }
+            keys = recipients.map {|r| 
+              key_to_use = ctx.keys(r).first 
+              if key_to_use.nil? 
+                raise RecoverableError, "No key found on keyring for #{r}"
+              end
+            }
             debug("Keys: #{keys}")
 
             always_trust = self.option(:always_trust)
@@ -112,7 +117,7 @@ class Hiera
               # error that it would spit out otherwise)
               keys.each do |key|
                 unless key.primary_uid.validity >= GPGME::VALIDITY_FULL
-                  raise StandardError, "Key #{key.sha} (#{key.email}) not trusted (if key trust is established by another means then specify always-trust)"
+                  raise RecoverableError, "Key #{key.sha} (#{key.email}) not trusted (if key trust is established by another means then specify always-trust)"
                 end
               end
             end

data/lib/hiera/backend/eyaml/encryptors/gpg/version.rb

@@ -3,7 +3,7 @@ class Hiera
     module Eyaml
       module Encryptors
         module Gpg
-          VERSION = "0.2"
+          VERSION = "0.3"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-eyaml-gpg
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiera-eyaml
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.8
 - !ruby/object:Gem::Dependency
   name: gpgme
   requirement: !ruby/object:Gem::Requirement