lib/hieracles/node.rb in hieracles-0.3.0 vs lib/hieracles/node.rb in hieracles-0.3.1

@@ -8,34 +8,34 @@
     include Hieracles::Utils
     include Hieracles::Interpolate
 
     attr_reader :hiera_params, :hiera, :facts, :notifications
 
-    def initialize(fqdn, options)
+    def initialize(fqdn, config)
       @fqdn = fqdn
-      Config.load(options)
-      @hiera = Hieracles::Hiera.new
+      @config = config
+      @hiera = Hieracles::Hiera.new @config
       @hiera_params = { fqdn: @fqdn }.
         merge(get_hiera_params(@fqdn)).
-        merge(Config.extraparams)
+        merge(@config.extraparams)
       @facts = deep_sort(@hiera_params.
-        merge(Config.scope).
+        merge(@config.scope).
         merge(puppet_facts))
     end
 
     def get_hiera_params(fqdn)
-      @__hiera_params ||= if File.exist?(File.join(Config.encpath, "#{fqdn}.yaml"))
-        load = YAML.load_file(File.join(Config.encpath, "#{fqdn}.yaml"))
+      @__hiera_params ||= if File.exist?(File.join(@config.encpath, "#{fqdn}.yaml"))
+        load = YAML.load_file(File.join(@config.encpath, "#{fqdn}.yaml"))
         sym_keys(load['parameters']).merge({ classes: load['classes']})
       else
         raise "Node not found"
       end
     end
 
     def files(without_common = true)
       @__files ||= @hiera.hierarchy.reduce([]) do |a, f|
-        file = parse("#{f}.yaml", @facts, Config.interactive)
+        file = parse("#{f}.yaml", @facts, @config.interactive)
         if file && 
            File.exist?(File.join(@hiera.datapath, file)) &&
            (!without_common ||
            !file[/common/])
           a << File.join(@hiera.datadir, file)
@@ -43,29 +43,60 @@
         a
       end
     end
 
     def paths(without_common = true)
-      files(without_common).map { |p| File.join(Config.basepath, p) }
+      files(without_common).map { |p| File.join(@config.basepath, p) }
     end
 
-    def params(without_common = true)
+    def params_old(without_common = true)
       params = {}
       files(without_common).reverse.each do |f|
-        data = YAML.load_file(File.join(Config.basepath, f))
+        data = YAML.load_file(File.join(@config.basepath, f))
         if data
           s = to_shallow_hash(data)
           s.each do |k,v|
             params[k] ||= []
-            # f needs interpolation
-            params[k] << { value: v, file: f, merged: merge_value(params[k], v) }
+            params[k] << { value: v, file: f }.merge(merge_value(params[k], v))
           end
         end
       end
       params.sort
     end
 
+    def params(without_common = true)
+      params = {}
+      files(without_common).each do |f|
+        data = YAML.load_file(File.join(@config.basepath, f))
+        if data
+          s = to_shallow_hash(data)
+          s.each do |k,v|
+            if params[k]
+              case @hiera.merge_behavior
+              when :deeper
+                params[k] = { value: v }.deep_merge!(params[k])
+              when :deep
+                params[k].deep_merge({ value: v })
+              end
+              params[k][:file] = '-'
+              params[k][:overriden] = true
+              params[k][:found_in].push({ value: v, file: f })
+            else
+              params[k] = {
+                value: v,
+                file: f,
+                overriden: false,
+                found_in: [{ value: v, file: f }]
+              }
+
+            end
+          end
+        end
+      end
+      params.sort.to_h
+    end
+
     def params_tree(without_common = true)
       params = {}
       paths(without_common).reverse.each do |f|
         data = YAML.load_file(f) || {}
         merge_trees params, data
@@ -97,32 +128,32 @@
       @_info ||= _get_info
     end
 
     def _get_info
       extra = {}
-      if Config.usedb
+      if @config.usedb
         extra = puppetdb_info
       end
       @hiera_params.merge extra
     end
 
     def classfiles
       @hiera_params[:classes].map do |cl|
-        format(Config.classpath, cl)
+        format(@config.classpath, cl)
       end
     end
 
     def modulepath(path)
-      File.join(Config.modulepath, path)
+      File.join(@config.modulepath, path)
     end
 
     def add_modules(line, modules)
       if /^\s*include\s*([-_:a-zA-Z0-9]*)\s*/.match(line)
         mod = $1
         mainmod = mod[/^[^:]*/]
         if Dir.exists? modulepath(mainmod)
-          modules[mod] = File.join(Config.modulepath, mainmod)
+          modules[mod] = File.join(@config.modulepath, mainmod)
         else
           modules[mod] = nil
         end
       end
       modules
@@ -131,11 +162,11 @@
     def puppetdb_info
       request_db.node_info(@fqdn).data
     end
 
     def puppet_facts
-      if Config.usedb
+      if @config.usedb
         resp = request_db.node_facts(@fqdn)
         @notifications = resp.notifications
         if resp.total_records > 0
           resp.data
         else
@@ -146,11 +177,11 @@
         {}
       end
     end
 
     def request_db
-      @_request ||= Hieracles::Puppetdb::Request.new Config.puppetdb
+      @_request ||= Hieracles::Puppetdb::Request.new @config.puppetdb
     end
 
     def merge_trees(left, right)
       case @hiera.merge_behavior
       when :deeper
@@ -163,24 +194,25 @@
     end
 
     def merge_value(previous, value)
       if value.is_a? Array
         if previous == []
-          deep_sort(value)
+          { merged: deep_sort(value) }
         else
-          left = previous.last[:merged]
+          left = { merged: previous.last[:merged] }
+          right = { merged: value }
           case @hiera.merge_behavior
           # TODO: handle the case where right is not an array
           when :deeper
-            deep_sort(left | value)
+            deep_sort(left.deep_merge!(right))
           when :deep
-            deep_sort(left | value)
+            deep_sort(left.deep_merge(right))
           else
-            deep_sort(value)
+            deep_sort(right)
           end
         end
       else
-        value
+        { merged: value }
       end
     end
 
     def error(message)
       if @notifications