hiera-expander 0.0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbdf028e46e168248cefff82e182b2f2e7945fd0
-  data.tar.gz: c50f410c7f4b87a6d3eaa36d79d4b75aaeb37fea
+  metadata.gz: 8689daff779c78d3d1410c9b7cbed0d8fc7e3563
+  data.tar.gz: 138659f44c99ebf46ba52199be51419b9454dbb2
 SHA512:
-  metadata.gz: 7a13b4484e759eafcb564db5060561703668ba8da192713bc02598f9469b84df68668b3161240be4180b08bb1ceb2731f086523f7dd31fcc4bfafb144e0de80f
-  data.tar.gz: fbfe91cccdd4ed58a5b84c76637a05e379e0cd9b3009eb88369273c08a4fe4631db03f41a4bce5f1c2477924732f7119beffa5d4f37189a0573e4102824c7ce2
+  metadata.gz: e59e855de0537dcfb725c87416e8584aae61f8f8f089b064404839071d7d1ff6736005a53aaf5258f84b8162dc23b840e996abf69c015704bb29fb40040b56fd
+  data.tar.gz: e167f321bc96079dfd554a09888d2fb64fb00452a3cdf6422ed018ef2eb192b30a967f40e068ab98ca7c792fa22b48b50a1bf5bf05dae50413942d8a9b09791e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hiera-expander (0.0.1)
+    hiera-expander (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/hiera/backend/expander.rb

@@ -20,16 +20,14 @@ require 'hiera' # loads backend and config
 
 class Hiera
   module Expander
-    VERSION = "0.0.1"
-  end
+    VERSION = "0.1.1"
 
-  alias_method :original_initialize, :initialize
-  def initialize(*args)
-    original_initialize(*args)
-    Config[:expander] ||= {
-      expand_sources: true,
-      include_roots:  false
-    }
+    def self.config
+      @config ||= {
+        expand_sources: true,
+        include_roots:  false
+      }.merge(Config[:expander] || {})
+    end
   end
 
   module Backend
@@ -45,24 +43,44 @@ class Hiera
       #
       # The source names will be subject to variable expansion based
       # on scope
-      def datasources(scope, override=nil, hierarchy=nil)
+      alias_method :original_datasources, :datasources
+      def datasources(scope, override=nil, hierarchy=nil, &block)
         if hierarchy
           hierarchy = [hierarchy]
         elsif Config.include?(:hierarchy)
           hierarchy = [Config[:hierarchy]].flatten
         else
-          hierarchy = ["common"]
+          hierarchy = ['common']
         end
 
         hierarchy.insert(0, override) if override
 
-        hierarchy.flatten.map do |source|
-          source = parse_string(source, scope, {}, :order_override => override)
-          unless source.empty? || source =~ %r:(^/|/{2,}|/$):
-            expand_source(source).each do |src|
-              yield(src)
-            end
+        # interpolate and expand sources
+        hierarchy.collect! do |source|
+          case method(:parse_string).parameters.size
+          when 4 then
+            source = parse_string(source, scope, {}, :order_override => override)
+          else
+            source = parse_string(source, scope)
           end
+
+          # cull sources that are empty or have an empty interpolation in the
+          # beginning or middle of the path. Empty interpolations at the end
+          # of the source path are fine and may or may not be culled during the
+          # duplicate source detection and removal phase.
+          next if source.empty? || source =~ %r:(^/|//):
+
+          expand_source(source)
+        end.flatten!.reject!(&:nil?)
+
+        # detect duplicate sources and removing them using a
+        # 'keep-last-duplicate' strategy
+        hierarchy.reverse!
+        hierarchy.uniq!
+        hierarchy.reverse!
+
+        hierarchy.map do |source|
+          yield(source) unless source.empty? || source =~ %r:(^/|//|/$):
         end
       end
 
@@ -84,7 +102,7 @@ class Hiera
       # If you require the roots on all sources, simply set the config
       # entry 'include_roots' to true.
       def expand_source(source)
-        return [source] unless Config[:expander][:expand_sources]
+        return [source] unless Expander.config[:expand_sources]
 
         root, path = source.split('/', 2)
         return [root] if path.nil? || path.empty?
@@ -94,9 +112,9 @@ class Hiera
           while subpath = path.pop
             paths << File.join(root, *path, subpath)
           end
-          paths << root if Config[:expander][:include_roots]
+          paths << root if Expander.config[:include_roots]
         end
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-expander
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors:
 - Carl P. Corliss