hiera-eyaml-gpg 0.5 → 0.6.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d242d1b87c6d3e32f596825c3e12ea6a2eca674b
-  data.tar.gz: d60b66d7831ff97bca0400b500a7f5e39f5203a5
+  metadata.gz: 4311fd310b650c1251a0a49efd95999c714e9853
+  data.tar.gz: 480ed21891bc8818ca8709e20febafe467e5e368
 SHA512:
-  metadata.gz: 897ac15882a34951e0e41b247ffaea743a1770c6dcd27797b17eed5fca6faef2140023b43b571008a34142e85b1b2c75e5812ee73adf26e0b575873483a5af77
-  data.tar.gz: 59952cce538d8c64f6154140746bb14a00ace299f9d428ebf7436ed282d14ee78278709f8efd2eaf38637be8c5b87f263e9cb3a704aa1c52b875c9e192908092
+  metadata.gz: c9d84dd9a9a90ebb0b7f867c81936296a96afe6d4dec6233e972dd69ea08f07effa6d97d61040041b1e6e29015cac0f0db587d153b73ca80e0be2bb8d94f4d06
+  data.tar.gz: 3e870d0cf9b14611734423096d638b8dc85942713572543f12de5a6083bdb677534e5e189b7bb1939bbc097ccdd14f7e61f8968d36521c5622b63094084b9094

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

@@ -3,7 +3,7 @@ class Hiera
     module Eyaml
       module Encryptors
         module Gpg
-          VERSION = "0.5"
+          VERSION = "0.6.rc1"
         end
       end
     end

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

@@ -26,7 +26,7 @@ class Hiera
           self.options = {
             :gnupghome => { :desc => "Location of your GNUPGHOME directory",
                             :type => :string,
-                            :default => "#{ENV[["HOME", "HOMEPATH"].detect { |h| ENV[h] != nil }]}/.gnupg" },
+                            :default => "#{["HOME", "HOMEPATH"].reject { |h| ENV[h].nil? }.map { |h| ENV[h]+"/.gnupg" }.first || ""}",
             :always_trust => { :desc => "Assume that used keys are fully trusted",
                                :type => :boolean,
                                :default => false },
@@ -57,6 +57,20 @@ class Hiera
               end
           end
 
+          def self.gnupghome
+            gnupghome = self.option :gnupghome
+            debug("GNUPGHOME is #{gnupghome}")
+            if gnupghome.nil? || gnupghome.empty?
+              warn("No GPG home directory configured, check gpg_gnupghome configuration value is correct")
+              raise ArgumentError, "No GPG home directory configured, check gpg_gnupghome configuration value is correct"
+            elsif !File.directory?(gnupghome)
+              warn("Configured GPG home directory #{gnupghome} doesn't exist, check gpg_gnupghome configuration value is correct")
+              raise ArgumentError, "Configured GPG home directory #{gnupghome} doesn't exist, check gpg_gnupghome configuration value is correct"
+            else
+              gnupghome
+            end
+          end
+
           def self.find_recipients
             recipient_option = self.option :recipients
             recipients = if !recipient_option.nil?
@@ -86,7 +100,7 @@ class Hiera
                   selected_file = nil
                   path.descend{|path| path
                     potential_file = path.join('hiera-eyaml-gpg.recipients')
-                    selected_file = potential_file if potential_file.exist? 
+                    selected_file = potential_file if potential_file.exist?
                   }
                   debug("Using file at #{selected_file}")
                   selected_file
@@ -94,7 +108,9 @@ class Hiera
               end
 
               unless recipient_file.nil?
-                recipient_file.readlines.map{ |line| line.strip } 
+                recipient_file.readlines.map{ |line|
+                  line.strip unless line.start_with? '#'
+                }.compact
               else
                 []
               end
@@ -106,9 +122,7 @@ class Hiera
               raise RecoverableError, "Encryption is only supported when using the 'gpgme' gem"
             end
 
-            gnupghome = self.option :gnupghome
-            GPGME::Engine.home_dir = gnupghome
-            debug("GNUPGHOME is #{gnupghome}")
+            GPGME::Engine.home_dir = self.gnupghome
 
             ctx = GPGME::Ctx.new
 
@@ -117,9 +131,9 @@ class Hiera
 
             raise RecoverableError, 'No recipients provided, don\'t know who to encrypt to' if recipients.empty?
 
-            keys = recipients.map {|r| 
-              key_to_use = ctx.keys(r).first 
-              if key_to_use.nil? 
+            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
               key_to_use
@@ -146,8 +160,7 @@ class Hiera
           end
 
           def self.decrypt ciphertext
-            gnupghome = self.option :gnupghome
-            debug("GNUPGHOME is #{gnupghome}")
+            gnupghome = self.gnupghome
 
             unless defined?(GPGME)
               RubyGpg.config.homedir = gnupghome if gnupghome

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-eyaml-gpg
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.6.rc1
 platform: ruby
 authors:
 - Simon Hildrew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiera-eyaml
@@ -55,9 +55,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14