hieracles 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b3915635847cd54b684b61feca924b9d11df20
-  data.tar.gz: 52c52b2b41f67079a635e8b092727c8478841ba7
+  metadata.gz: b1b98d278d79f3de929cb583ab33e77f895f4676
+  data.tar.gz: 888be4768415d47ecef87847114b290e0a813d07
 SHA512:
-  metadata.gz: 5f84fcf5cf3c49774c8fb7f6b6a025674c6e2b11173b65e66e75fa2bf0994274f9a8c096d5a7b5d5a7f8741d90193dc0394ec9852392aae7362d0a2a7a9effd4
-  data.tar.gz: 0ccd90fa9677651c2a75eb05eb427155321d18961594959d11eec87523353dfce36fafc697651dc3c0af18409e64c2ce3993f81676ab5d6c97ce3dd44770c6fe
+  metadata.gz: 842f1c0ed05b9c4b11663b04bdab2c09f34a9713a732a6e76fcf75e171cbf12fed644e72f9d8aca820466d6afe7b4b35ede87df59e4d5b8a79759723a0360b49
+  data.tar.gz: c0fa911cc8b01be9eaa6f1d1fb419ebf020721abb865210c4f7a0ac79061a43a03b1a45035ec061b6cb6e2412b0d1756cc2dcd86227385347f6a20e7515d3184

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 Hieracles Changelog
 =======================
 
+### 0.1.7 - 2015-11-23
+- various fixes on deep_merge behavior
+
 ### 0.1.6 - 2015-11-18
 - add dependency on `deep-merge` gem like hiera does
 - take in account the `merge_behavior` in hiera file

data/lib/hieracles/formats/console.rb

@@ -41,7 +41,7 @@ module Hieracles
       end
 
       def build_head(without_common)
-        output = ''
+        output = "[-] (merged)\n"
         @node.files(without_common).each_with_index do |f, i|
           output << format("#{COLORS[i]}\n", "[#{i}] #{f}")
           @colors[f] = i
@@ -55,11 +55,24 @@ module Hieracles
           first = value.pop
           filecolor_index = @colors[first[:file]]
           filecolor = COLORS[filecolor_index]
-          output << format("#{filecolor} #{COLORS[5]} %s\n",
-                           "[#{filecolor_index}]",
-                            key,
-                            first[:value].to_s.gsub('%', '%%')
-                          )
+          if first[:merged] != first[:value]
+            output << format("%s #{COLORS[5]} %s\n",
+                             "[-]",
+                              key,
+                              first[:merged].to_s.gsub('%', '%%')
+                            )
+            output << format("    #{COLORS[8]} #{COLORS[8]} #{COLORS[8]}\n",
+                             "[#{filecolor_index}]",
+                              key,
+                              first[:value].to_s.gsub('%', '%%')
+                            )
+          else
+            output << format("#{filecolor} #{COLORS[5]} %s\n",
+                             "[#{filecolor_index}]",
+                              key,
+                              first[:value].to_s.gsub('%', '%%')
+                            )
+          end
           while value.count > 0
             overriden = value.pop
             filecolor_index = @colors[overriden[:file]]

data/lib/hieracles/formats/csv.rb

@@ -29,8 +29,15 @@ module Hieracles
         output = ''
         if !filter || Regexp.new(filter).match(key)
           first = value.pop
-          output << make_csv(in_what_file(first[:file]) +
-                   [key, first[:value].to_s, '0'])
+          if first[:value] == first[:merged]
+            output << make_csv(in_what_file(first[:file]) +
+                     [key, first[:value].to_s, '0'])
+          else
+            output << make_csv(in_what_file('-') +
+                     [key, first[:merged].to_s, '0'])
+            output << make_csv(in_what_file(first[:file]) +
+                     [key, first[:value].to_s, '1'])
+          end
           while value.count > 0
             overriden = value.pop
             output << make_csv(in_what_file(overriden[:file]) +

data/lib/hieracles/formats/plain.rb

@@ -28,7 +28,7 @@ module Hieracles
       end
 
       def build_head(without_common)
-        output = ''
+        output = "[-] (merged)\n"
         @node.files(without_common).each_with_index do |f, i|
           output << "[#{i}] #{f}\n"
           @index[f] = i
@@ -41,7 +41,12 @@ module Hieracles
         if !filter || Regexp.new(filter).match(key)
           first = value.pop
           filecolor_index = @index[first[:file]]
-          output << "[#{filecolor_index}] #{key} #{first[:value]}\n"
+          if first[:merged] != first[:value]
+            output << "[-] #{key} #{first[:merged]}\n"
+            output << "    [#{filecolor_index}] #{key} #{first[:value]}\n"
+          else
+            output << "[#{filecolor_index}] #{key} #{first[:value]}\n"
+          end
           while value.count > 0
             overriden = value.pop
             filecolor_index = @index[overriden[:file]]

data/lib/hieracles/formats/yaml.rb

@@ -57,7 +57,14 @@ module Hieracles
         aryaml = yaml.each_line.map do |l|
           indent + l
         end
-        output += "\n" + indent + "# " + params[key.join('.')][0][:file]
+        if @node.hiera.merge_behavior == :deep ||
+           @node.hiera.merge_behavior == :deeper 
+          params[key.join('.')].each do |f|
+            output += "\n" + indent + "# " + f[:file]
+          end
+        else
+          output += "\n" + indent + "# " + params[key.join('.')].last[:file]
+        end
         output += "\n" + aryaml.join().chomp
         output        
       end

data/lib/hieracles/node.rb

@@ -55,7 +55,7 @@ module Hieracles
           s.each do |k,v|
             params[k] ||= []
             # f needs interpolation
-            params[k] << { value: v, file: f}
+            params[k] << { value: v, file: f, merged: merge_value(params[k], v) }
           end
         end
       end
@@ -120,10 +120,31 @@ module Hieracles
         left.deep_merge!(right)
       when :deep
         left.deep_merge(right)
-      else # Native and undefined
+      else
         local_merge!(left, right)
       end
     end
 
+    def merge_value(previous, value)
+      if value.is_a? Array
+        if previous == []
+          deep_sort(value)
+        else
+          left = previous.last[:merged]
+          case @hiera.merge_behavior
+          # TODO: handle the case where right is not an array
+          when :deeper
+            deep_sort(left | value)
+          when :deep
+            deep_sort(left | value)
+          else
+            deep_sort(value)
+          end
+        end
+      else
+        value
+      end
+    end
+
   end
 end

data/spec/files/params/farm/dev.yaml

@@ -1,3 +1,5 @@
+common_param:
+  subparam: override-me
 somefarmparam: false
 another:
   more_sublevel: something

data/spec/lib/formats/console_spec.rb

@@ -43,7 +43,7 @@ describe Hieracles::Formats::Console do
   end
 
   describe ".build_head" do
-    let(:expected) { "\e[31m[0] path1\e[0m\n\e[32m[1] path2\e[0m\n\n" }
+    let(:expected) { "[-] (merged)\n\e[31m[0] path1\e[0m\n\e[32m[1] path2\e[0m\n\n" }
     before {
       allow(node).to receive(:files).and_return(['path1', 'path2'])
     }
@@ -59,8 +59,8 @@ describe Hieracles::Formats::Console do
     }
     let(:params) {
       [
-        { file: 'path1', value: 'value1'},
-        { file: 'path2', value: 'value2'},
+        { file: 'path1', value: 'value1', merged: 'value1'},
+        { file: 'path2', value: 'value2', merged: 'value2'},
       ] 
     }
     before {

data/spec/lib/formats/csv_spec.rb

@@ -50,24 +50,48 @@ describe Hieracles::Formats::Csv do
   end
 
   describe ".build_params_line" do
-    let(:expected) { 
-       "0;1;params.this.var;value2;0\n"+
-       "1;0;params.this.var;value1;1\n"
-    }
-    let(:params) {
-      [
-        { file: 'path1', value: 'value1'},
-        { file: 'path2', value: 'value2'},
-      ] 
-    }
-    before {
-      allow(node).to receive(:files).and_return(['path1', 'path2'])
-    }
-    it "outputs proper text" do
-      expect(csv_format.send :build_params_line,
-        "params.this.var", 
-        params, 
-        nil).to eq expected
+    context "with array values" do
+      let(:expected) { 
+         "0;0;params.this.var;[\"value1\", \"value2\"];0\n"+
+         "0;1;params.this.var;[\"value2\"];1\n"+
+         "1;0;params.this.var;[\"value1\"];1\n"
+      }
+      let(:params) {
+        [
+          { file: 'path1', value: ['value1'], merged: ['value1'] },
+          { file: 'path2', value: ['value2'], merged: ['value1','value2'] },
+        ] 
+      }
+      before {
+        allow(node).to receive(:files).and_return(['path1', 'path2'])
+      }
+      it "outputs proper text" do
+        expect(csv_format.send :build_params_line,
+          "params.this.var", 
+          params, 
+          nil).to eq expected
+      end
+    end
+    context "with non-array values" do
+      let(:expected) { 
+         "0;1;params.this.var;value2;0\n"+
+         "1;0;params.this.var;value1;1\n"
+      }
+      let(:params) {
+        [
+          { file: 'path1', value: 'value1', merged: 'value1' },
+          { file: 'path2', value: 'value2', merged: 'value2' },
+        ] 
+      }
+      before {
+        allow(node).to receive(:files).and_return(['path1', 'path2'])
+      }
+      it "outputs proper text" do
+        expect(csv_format.send :build_params_line,
+          "params.this.var", 
+          params, 
+          nil).to eq expected
+      end
     end
   end
 

data/spec/lib/formats/plain_spec.rb

@@ -43,7 +43,7 @@ describe Hieracles::Formats::Plain do
   end
 
   describe ".build_head" do
-    let(:expected) { "[0] path1\n[1] path2\n\n" }
+    let(:expected) { "[-] (merged)\n[0] path1\n[1] path2\n\n" }
     before {
       allow(node).to receive(:files).and_return(['path1', 'path2'])
     }
@@ -59,8 +59,8 @@ describe Hieracles::Formats::Plain do
     }
     let(:params) {
       [
-        { file: 'path1', value: 'value1'},
-        { file: 'path2', value: 'value2'},
+        { file: 'path1', value: 'value1', merged: 'value1'},
+        { file: 'path2', value: 'value2', merged: 'value2'},
       ] 
     }
     before {

data/spec/lib/formats/yaml_spec.rb

@@ -205,8 +205,61 @@ describe Hieracles::Formats::Yaml do
       let(:expected) {
         "\nkey: \n  # what/file\n  - value1\n  - value2"
       }
+      let(:hiera) { Struct.new( :merge_behavior ) }
+      before {
+        allow(node).to receive(:hiera).and_return(
+          hiera.new('deeper')
+        )
+      }
       it { expect(yaml_format.mergetree('', [], input, params)).to eq expected }
     end
+    context "with a double array key-value" do
+      let(:params) {
+        { 
+          'key' => [
+            {
+              file: 'what/file',
+              value: ['value1', 'value2'],
+              merged: ['value1', 'value2']
+            },
+            {
+              file: 'what/other-file',
+              value: ['value3'],
+              merged: ['value1', 'value2', 'value3']
+            }
+          ]
+        }
+      }
+      let(:hiera) { Struct.new( :merge_behavior ) }
+      context "with native merge behavior" do
+        let(:input) {
+          { 'key' => ['value3'] }
+        }
+        let(:expected) {
+          "\nkey: \n  # what/other-file\n  - value3"
+        }
+        before {
+          allow(node).to receive(:hiera).and_return(
+            hiera.new(:native)
+          )
+        }
+        it { expect(yaml_format.mergetree('', [], input, params)).to eq expected }
+      end
+      context "with deep merge behavior" do
+        let(:input) {
+          { 'key' => ['value1', 'value2', 'value3'] }
+        }
+        let(:expected) {
+          "\nkey: \n  # what/file\n  # what/other-file\n  - value1\n  - value2\n  - value3"
+        }
+        before {
+          allow(node).to receive(:hiera).and_return(
+            hiera.new(:deep)
+          )
+        }
+        it { expect(yaml_format.mergetree('', [], input, params)).to eq expected }
+      end
+    end
     context "with a 2-levels string key-value" do
       let(:params) {
         { 

data/spec/lib/node_spec.rb

@@ -81,37 +81,50 @@ describe Hieracles::Node do
             [ "another.more_sublevel", 
               [{
                 value: "something",
-                file: 'params/farm/dev.yaml'
+                file: 'params/farm/dev.yaml',
+                merged: 'something'
               }]
             ],
             [ "another.sublevel.array", 
               [
                 {
                   value: ["one", "two", "three"],
-                  file: 'params/farm/dev.yaml'
+                  file: 'params/farm/dev.yaml',
+                  merged: ["one", "three", "two"]
                 },
                 {
                   value: ["four", "five"],
-                  file: 'params/nodes/server.example.com.yaml'
+                  file: 'params/nodes/server.example.com.yaml',
+                  merged: ["five", "four"]
                 }
               ]
             ],
             [ "another.sublevel.thing", 
               [{
                 value: "always",
-                file: 'params/nodes/server.example.com.yaml'
+                file: 'params/nodes/server.example.com.yaml',
+                merged: "always"
               }]
             ],
             [ "common_param.subparam",
-              [{
-                value: "overriden", 
-                file: 'params/nodes/server.example.com.yaml'
-              }]
+              [
+                {
+                  value: "override-me", 
+                  file: 'params/farm/dev.yaml',
+                  merged: "override-me"
+                },
+                {
+                  value: "overriden", 
+                  file: 'params/nodes/server.example.com.yaml',
+                  merged: "overriden"
+                }
+              ]
             ], 
             [ "somefarmparam", 
               [{
                 value: false,
-                file: 'params/farm/dev.yaml'
+                file: 'params/farm/dev.yaml',
+                merged: false
               }]
             ]
           ]
@@ -233,37 +246,50 @@ describe Hieracles::Node do
           [ "another.more_sublevel", 
             [{
               value: "something",
-              file: 'params/farm/dev.yaml'
+              file: 'params/farm/dev.yaml',
+              merged: "something"
             }]
           ],
           [ "another.sublevel.array", 
             [
               {
                 value: ["one", "two", "three"],
-                file: 'params/farm/dev.yaml'
+                file: 'params/farm/dev.yaml',
+                merged: ["one", "three", "two"]
               },
               {
                 value: ["four", "five"],
-                file: 'params/nodes/server.example.com.yaml'
+                file: 'params/nodes/server.example.com.yaml',
+                merged: ["five", "four", "one", "three", "two"]
               }
             ]
           ],
           [ "another.sublevel.thing", 
             [{
               value: "always",
-              file: 'params/nodes/server.example.com.yaml'
+              file: 'params/nodes/server.example.com.yaml',
+              merged: "always"
             }]
           ],
           [ "common_param.subparam",
-            [{
-              value: "overriden", 
-              file: 'params/nodes/server.example.com.yaml'
-            }]
+            [
+              {
+                value: "override-me", 
+                file: 'params/farm/dev.yaml',
+                merged: "override-me"
+              },
+              {
+                value: "overriden", 
+                file: 'params/nodes/server.example.com.yaml',
+                merged: "overriden"
+              }
+            ]
           ], 
           [ "somefarmparam", 
             [{
               value: false,
-              file: 'params/farm/dev.yaml'
+              file: 'params/farm/dev.yaml',
+              merged: false
             }]
           ]
         ]
@@ -282,7 +308,7 @@ describe Hieracles::Node do
             }
           },
           "common_param" => {
-            "subparam" => "overriden"
+            "subparam" => "override-me"
           }, 
           "somefarmparam" => false
         }
@@ -310,37 +336,50 @@ describe Hieracles::Node do
           [ "another.more_sublevel", 
             [{
               value: "something",
-              file: 'params/farm/dev.yaml'
+              file: 'params/farm/dev.yaml',
+              merged: "something"
             }]
           ],
           [ "another.sublevel.array", 
             [
               {
                 value: ["one", "two", "three"],
-                file: 'params/farm/dev.yaml'
+                file: 'params/farm/dev.yaml',
+                merged: ["one", "three", "two"]
               },
               {
                 value: ["four", "five"],
-                file: 'params/nodes/server.example.com.yaml'
+                file: 'params/nodes/server.example.com.yaml',
+                merged: ["five", "four", "one", "three", "two"]
               }
             ]
           ],
           [ "another.sublevel.thing", 
             [{
               value: "always",
-              file: 'params/nodes/server.example.com.yaml'
+              file: 'params/nodes/server.example.com.yaml',
+              merged: "always"
             }]
           ],
           [ "common_param.subparam",
-            [{
-              value: "overriden", 
-              file: 'params/nodes/server.example.com.yaml'
-            }]
+            [
+              {
+                value: "override-me", 
+                file: 'params/farm/dev.yaml',
+                merged: "override-me"
+              },
+              {
+                value: "overriden", 
+                file: 'params/nodes/server.example.com.yaml',
+                merged: "overriden"
+              }
+            ]
           ], 
           [ "somefarmparam", 
             [{
               value: false,
-              file: 'params/farm/dev.yaml'
+              file: 'params/farm/dev.yaml',
+              merged: false
             }]
           ]
         ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hieracles
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge