hiera-housekeeper 0.5 → 0.8

data/lib/hiera/backend/housekeeper_backend.rb

@@ -4,8 +4,27 @@
 
 require 'socket'
 
+
 class Hiera
     module Backend
+        class HouseKeeperCache
+          @@cache = {}
+
+          def self.lookup (housekeeper_server, housekeeper_identity, housekeeper_branch, source)
+            return @@cache[source] if @@cache.include? source
+
+            begin
+                uri = URI.parse("http://#{housekeeper_server}:80/file/#{housekeeper_identity}/branches/#{housekeeper_branch}/hieradata/#{source}.gpg")
+                gpgfile = open(uri).read()
+            rescue OpenURI::HTTPError
+                gpgfile = :next
+            end
+
+            @@cache[source] = gpgfile
+            return gpgfile
+          end
+        end
+
         class Housekeeper_backend
 
         def initialize
@@ -40,19 +59,12 @@ class Hiera
             housekeeper_branch = Backend.parse_string(Config[:housekeeper][:branch], scope) || "master"
             housekeeper_identity = "#{housekeeper_keyname}@#{fqdn}"
 
-            seen_sources = []
-
             Backend.datasources(scope, order_override) do |source|
-                begin
-                    next if seen_sources.include? source
-                    uri = URI.parse("http://#{housekeeper_server}:80/file/#{housekeeper_identity}/branches/#{housekeeper_branch}/hieradata/#{source}.gpg")
-                    seen_sources.push(source)
-                    gpgfile = open(uri).read()
-                rescue OpenURI::HTTPError
-                    next
-                end
+                gpgfile = HouseKeeperCache.lookup(housekeeper_server, housekeeper_identity, housekeeper_branch, source)
+
+                next if gpgfile == :next
 
-                unless @data.has_key?(gpgfile) and !stale?(gpgfile)
+                unless @data.has_key?(gpgfile)
                     plain = decrypt(gpgfile, key_dir)
 
                     next if !plain
@@ -71,10 +83,10 @@ class Hiera
                 data = @data[gpgfile]
                 next if !data
                 next if data.empty?
-                debug ("Data contains valid YAML")
+                debug("Data contains valid YAML")
 
                 next unless data.include?(key)
-                debug ("Key #{key} found in YAML document, Passing answer to hiera")
+                debug("Key #{key} found in YAML document, Passing answer to hiera")
 
                 parsed_answer = Backend.parse_answer(data[key], scope)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-housekeeper
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.8'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiera