hiera-yamll 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d51ba2ee6563b10745b2c612f70eaa8d64aaa15c
-  data.tar.gz: c4b824ce43c0b2bd20ac57a94103d9ff9a84f80d
+  metadata.gz: e82ddbe3f7f7899124b06d0716ef1293cb96e5c9
+  data.tar.gz: 06079d18c491c83c0e583d16ae7d1162076b4083
 SHA512:
-  metadata.gz: 71daa83a6d501cfc964074df82bf78bf63bafe61c205103ca566934cdc8f9c5d8008f639e8aa4881964027ea305d104afa87a5178aa8fac31f09e48bb84bc0e4
-  data.tar.gz: 2969f1e526ac8bc57a448d137bb42d1918b8f196e4660250e6a66131059e712acdefc06beb4ad9620a1c4284baf987587fa6ec0192c4d8954f1dfc1bf1884a29
+  metadata.gz: a3dc8f53705272d38954b79058a533f53588539b194f230f82336aba2a64b761eddd4c6edf59eabb5ee4064f20b96a438e4a31c2f9474f7c0eb802df9afa3ef8
+  data.tar.gz: 79427991e49ab38d8af922abfd947a40336a78f9ed5c3ca3d83c20ec05c74817d1f1d0c0de9605e08f55c22528d06a485cc815d870c5eaa62d77baf519fcd7bb

data/README.md

@@ -20,7 +20,6 @@ Or install it yourself as:
     $ gem install hiera-yamll
 
 ## Usage
-
 Install this gem along side your hiera installation in order to use this backend.
 
 ## Development

data/lib/hiera/backend/yamll_backend.rb

@@ -2,7 +2,7 @@ require 'hiera'
 class Hiera
   module Backend
     class Yamll_backend
-      VERSION = "0.2.0"
+      VERSION = "0.3.0"
       # This is left blank because we are hacking hiera backend logic
       # to get around a limitation of hiera where you cannot have
       # multiple backends of the same type.
@@ -15,12 +15,12 @@ class Hiera
         @cache = cache || Filecache.new
       end
 
-      def lookup(key, scope, order_override, resolution_type, context)
+      # context is for newer versions of hiera and we will use that variable as a way to determine versions of hiera
+      def lookup(key, scope, order_override, resolution_type, context=nil)
         answer = nil
         found = false
 
         Hiera.debug("Looking up #{key} in YAMLL backend")
-
         Backend.datasourcefiles(:yamll, scope, "yaml", order_override) do |source, yamlfile|
           data = @cache.read_file(yamlfile, Hash) do |data|
             YAML.load(data) || {}
@@ -41,7 +41,12 @@ class Hiera
           # the array
           #
           # for priority searches we break after the first found data item
-          new_answer = Backend.parse_answer(data[key], scope, {}, context)
+          if context
+            # versions of newer hiera use a context
+            new_answer = Backend.parse_answer(data[key], scope, {}, context)
+          else
+            new_answer = Backend.parse_answer(data[key], scope, {})
+          end
           case resolution_type.is_a?(Hash) ? :hash : resolution_type
           when :array
             raise Exception, "Hiera type mismatch for key '#{key}': expected Array and got #{new_answer.class}" unless new_answer.kind_of? Array or new_answer.kind_of? String
@@ -50,7 +55,11 @@ class Hiera
           when :hash
             raise Exception, "Hiera type mismatch for key '#{key}': expected Hash and got #{new_answer.class}" unless new_answer.kind_of? Hash
             answer ||= {}
-            answer = Backend.merge_answer(new_answer, answer, resolution_type)
+            if context
+              answer = Backend.merge_answer(new_answer, answer, resolution_type)
+            else
+              answer = Backend.merge_answer(new_answer, answer)
+            end
           else
             answer = new_answer
             break

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-yamll
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry