hiera-housekeeper 0.12 → 0.13

data/lib/hiera/backend/housekeeper_backend.rb

@@ -58,6 +58,9 @@ class Hiera
             housekeeper_keyname = Backend.parse_string(Config[:housekeeper][:keyname], scope) || "housekeeper"
             housekeeper_branch = Backend.parse_string(Config[:housekeeper][:branch], scope) || "master"
             housekeeper_identity = "#{housekeeper_keyname}@#{fqdn}"
+            # Unfortunately the way the callback function works means we can only get this into the passphrase
+            # method by using an instance variable or by modifying gpgme. I chose the former.
+            @housekeeper_keypass = Backend.parse_string(Config[:housekeeper][:keypass], scope) || "housekeeper_bgch"
 
             Backend.datasources(scope, order_override) do |source|
                 gpgfile = HouseKeeperCache.lookup(housekeeper_server, housekeeper_identity, housekeeper_branch, source)
@@ -116,13 +119,10 @@ class Hiera
         end
 
         def passfunc(hook, uid_hint, passphrase_info, prev_was_bad, fd)
-         housekeeper_keypass = "housekeeper_bgch" # Just for a second to test...
-         $stderr.write("Passphrase for #{uid_hint}: ")
-         $stderr.flush
          begin
            system('stty -echo')
            io = IO.for_fd(fd, 'w')
-           io.puts(housekeeper_keypass)
+           io.puts(@housekeeper_keypass)
            io.flush
          ensure
            (0 ... $_.length).each do |i| $_[i] = ?0 end if $_

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-housekeeper
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: '0.13'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiera