hieracles 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c2b378bf82fee62a7577b514281f9ed47af9886
-  data.tar.gz: 6af4a764f1138d3e274b5f72752d2602f32d3966
+  metadata.gz: d9b3915635847cd54b684b61feca924b9d11df20
+  data.tar.gz: 52c52b2b41f67079a635e8b092727c8478841ba7
 SHA512:
-  metadata.gz: 64d4bd38c3e9859edd3c2583180f640fc318eae6f0dfbcf336f38d22b0b4ede390a1589f6c2d9b7b81c73f66ca5c85872015ec3f1dcd498b13937c2d023ef55e
-  data.tar.gz: 3f1e85e5a9dd5e726e1542be700c7a7e2838e017ee32bfff962d02b43985900956b0e7db50c95a7c0465dc5b9fba2691829de34c1a1c831e666f0d7a4f103380
+  metadata.gz: 5f84fcf5cf3c49774c8fb7f6b6a025674c6e2b11173b65e66e75fa2bf0994274f9a8c096d5a7b5d5a7f8741d90193dc0394ec9852392aae7362d0a2a7a9effd4
+  data.tar.gz: 0ccd90fa9677651c2a75eb05eb427155321d18961594959d11eec87523353dfce36fafc697651dc3c0af18409e64c2ce3993f81676ab5d6c97ce3dd44770c6fe

data/CHANGELOG.md

@@ -1,9 +1,16 @@
 Hieracles Changelog
 =======================
 
+### 0.1.6 - 2015-11-18
+- add dependency on `deep-merge` gem like hiera does
+- take in account the `merge_behavior` in hiera file
+- make possible to use `%{::variables}` from puppet scope
+  but this is a temporary implementation, 
+  only works for top level variables
+
 ### 0.1.5 - 2015-11-15
 - add `interactive` new option `-i` for having 
-  CLI user promtped to fill up missing scope vars
+  CLI user prompted to fill up missing scope vars
 - implement interpolation adapted from the code of hiera
 - fixed the single option parsing for `-i`
 
@@ -27,7 +34,7 @@ Hieracles Changelog
 - display full local path in params output
 - add an option to display version
 - fix yaml output for true and false cases
-- added a simple filter fetaure for yaml format,
+- added a simple filter feature for yaml format,
   but it only matches like a 'start_with'
 
 ### 0.0.6 - 2015-09-21

data/README.md

@@ -8,12 +8,16 @@ Hieracles
 [![Dependency Status](https://img.shields.io/gemnasium/Gandi/hieracles.svg)](https://gemnasium.com/Gandi/hieracles)
 [![Code Climate](https://img.shields.io/codeclimate/github/Gandi/hieracles.svg)](https://codeclimate.com/github/Gandi/hieracles)
 
-Hieracles is a command-line tool for analysis and deep examination of [Hiera][hiera] paramaters in a [Puppet][puppet] setup. It's used internally at [Gandi][gandi] and its first incarnation is strongly tied to Gandi puppet architecture. But Hieracles tends to become, in time, a generic Hiera overlay visualisation tool.
+Hieracles is a command-line tool for analysis and deep examination of [Hiera][hiera] parameters in a [Puppet][puppet] setup. It can be used to quickly visualize, from a local puppet (typically on a developers environment), all the Hiera params related to a specific node.
+
+It's used internally at [Gandi][gandi] and its first incarnation is strongly tied to Gandi puppet architecture. But Hieracles tends to become, in time, a generic Hiera overlay visualization tool.
+
+Have a look at the [Changelog](CHANGELOG.md) for details about the evolution.
 
 Prerequisite
 ---------------
 
-There are many ways to setup puppet and use hiera. This tool is designed to match a certain kind of setup, including:
+There are many ways to setup puppet and use Hiera. This tool is designed to match a certain kind of setup, including:
 
 - an [external node classifier (ENC)][enc]
 - a yaml hiera datastore
@@ -139,17 +143,38 @@ Otherwise
 
 Debian packaging
 --------------------
-On a Jessie
 
-    apt-get install gem2deb ruby-coveralls ruby-all-dev ruby-rspec ruby-rspec-expectations 
+A debian/ dir is included you can just use `sbuild` in here and it will build the .deb.
 
-Then build
+For new releases:
 
-    gem2deb -p hieracles hieracles
+- update the debian/changelog file
+
+FreeBSD packaging
+--------------------
 
-and install
+For new releases:
+
+- update the Makefile with new version number
+- in a FreeBSD jail or machine:
+```
+cd hieracles
+git pull
+cd ports/
+make makesum
+# test the stuff, get that there is no warning or what
+portlint
+make stage
+make check-orphans
+make package
+make install
+make deinstall
+make clean
+cd ..
+shar `find rubygem-hieracles` > rubygem-hieracles.shar
+```
+- on https://bugs.freebsd.org submit the new version
 
-    dpkg -i hieracles_0.0.6-1_all.deb
 
 Todo
 --------------
@@ -166,7 +191,7 @@ Todo
 
 Authors
 -----------
-Hieracles original code is writen by [@mose](https://github.com/mose).
+Hieracles original code is written by [@mose](https://github.com/mose).
 
 License
 -----------

data/hc.1

@@ -13,8 +13,11 @@ hc \- Command tool for Hieracles
 .SH DESCRIPTION
 .PP
 Hieracles is a command-line tool for analysis and deep examination
-of [Hiera][hiera] parameters in a [Puppet][puppet] setup. It's used
-internally at Gandi and its first incarnation is strongly
+of Hiera parameters in a Puppet setup. It can be used to quickly
+visualize, from a local puppet (typically on a developers
+environment), all the Hiera params related to a specific node.
+.PP
+It's used internally at Gandi and its first incarnation is strongly
 tied to Gandi puppet architecture. But Hieracles tends to become, in
 time, a generic Hiera overlay visualization tool.
 .PP

data/hieracles.gemspec

@@ -77,6 +77,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency 'deep_merge'
+
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'rspec', "~> 3.0"

data/lib/hieracles/config.rb

@@ -15,8 +15,7 @@ module Hieracles
     def load(options)
       @optionfile = options[:config] || defaultconfig
       @extraparams = extract_params(options[:params])
-      initconfig(@optionfile) unless File.exist? @optionfile
-      values = YAML.load_file(@optionfile)
+      values = get_config(@optionfile)
       @server = values['server']
       @classpath = values['classpath']
       @modulepath = values['modulepath'] || 'modules'
@@ -30,6 +29,11 @@ module Hieracles
       @interactive = options[:interactive] || values['interactive']
     end
 
+    def get_config(file)
+      initconfig(file) unless File.exist? file
+      values = YAML.load_file(file)
+    end
+
     def initconfig(file)
       FileUtils.mkdir_p(File.dirname(file))
       File.open(file, 'w') do |f|

data/lib/hieracles/formats/console.rb

@@ -52,7 +52,7 @@ module Hieracles
       def build_params_line(key, value, filter)
         output = ''
         if !filter || Regexp.new(filter).match(key)
-          first = value.shift
+          first = value.pop
           filecolor_index = @colors[first[:file]]
           filecolor = COLORS[filecolor_index]
           output << format("#{filecolor} #{COLORS[5]} %s\n",
@@ -61,7 +61,7 @@ module Hieracles
                             first[:value].to_s.gsub('%', '%%')
                           )
           while value.count > 0
-            overriden = value.shift
+            overriden = value.pop
             filecolor_index = @colors[overriden[:file]]
             output << format("    #{COLORS[8]}\n",
                              "[#{filecolor_index}] #{key} #{overriden[:value]}"

data/lib/hieracles/formats/csv.rb

@@ -28,11 +28,11 @@ module Hieracles
       def build_params_line(key, value, filter)
         output = ''
         if !filter || Regexp.new(filter).match(key)
-          first = value.shift
+          first = value.pop
           output << make_csv(in_what_file(first[:file]) +
                    [key, first[:value].to_s, '0'])
           while value.count > 0
-            overriden = value.shift
+            overriden = value.pop
             output << make_csv(in_what_file(overriden[:file]) +
                      [key, overriden[:value].to_s, '1'])
           end

data/lib/hieracles/formats/plain.rb

@@ -39,11 +39,11 @@ module Hieracles
       def build_params_line(key, value, filter)
         output = ''
         if !filter || Regexp.new(filter).match(key)
-          first = value.shift
+          first = value.pop
           filecolor_index = @index[first[:file]]
           output << "[#{filecolor_index}] #{key} #{first[:value]}\n"
           while value.count > 0
-            overriden = value.shift
+            overriden = value.pop
             filecolor_index = @index[overriden[:file]]
             output << "    [#{filecolor_index}] #{key} #{overriden[:value]}\n"
           end

data/lib/hieracles/formats/yaml.rb

@@ -91,7 +91,12 @@ module Hieracles
       def added(output, key, leaf, params)
         output += leaf.to_s
         if params["#{key.join('.')}"]
-          output += " # " + params[key.join('.')][0][:file]
+          params["#{key.join('.')}"].each do |k|
+            if k[:value].to_s == leaf.to_s
+              output += " # " + k[:file]
+              break
+            end
+          end
         end
         output
       end

data/lib/hieracles/hiera.rb

@@ -26,5 +26,14 @@ module Hieracles
       hierarchy.join(',').scan(/%\{(?:::)?([^\}]*)\}/).flatten.uniq
     end
 
+    def merge_behavior
+      case @loaded[:merge_behavior]
+      when :deep,'deep',:deeper,'deeper'
+        @loaded[:merge_behavior].to_sym
+      else
+        :native
+      end
+    end
+
   end
 end

data/lib/hieracles/interpolate.rb

@@ -2,22 +2,43 @@ module Hieracles
   module Interpolate
 
     def parse(data, values, interactive = false)
-      data.gsub(/%\{(?:(scope|hiera|literal|alias) *)?([^\}]*)\}/) do |match|
+      data.gsub(/%\{(?:(scope|hiera|literal|alias)\(['"])?(?:::)?([^\}"']*)(?:["']\))?\}/) do |match|
         if interactive && !values[$2.to_sym]
-          puts
-          puts "#{match} is not defined."
-          puts "Is it missing in your ENC source?"
-          puts "Maybe you should define a default value for that scope variable in your config file?"
-          puts "Do you want to provide a temmporary value? [input value]"
-          print "#{$2} = "
-          val = $stdin.gets.chomp
-          values[$2.to_sym] = val
-          val
+          values[$2.to_sym] = ask_about($2)
+          values[$2.to_sym]
         else
           values[$2.to_sym]
         end
       end
     end
 
+    def ask_about(var)
+      @@output.puts
+      @@output.puts "'#{var}' is not defined."
+      @@output.puts "Is it missing in your ENC source?"
+      @@output.puts "Maybe you should define a default value for that scope variable in your config file?"
+      @@output.puts "Do you want to provide a temmporary value? [input value]"
+      @@output.print "#{var} = "
+      @@input.gets.chomp
+    end
+
+    # makes possible to set input and output
+    def setio(input, output)
+      @@input = input
+      @@output = output
+    end
+
+    private
+
+    # defaults to STDIN
+    def input
+      @@input ||= STDIN
+    end
+
+    # defaults to STDOUT
+    def output
+      @@output ||= STDOUT
+    end
+
   end
 end

data/lib/hieracles/node.rb

@@ -1,6 +1,7 @@
 require "net/http"
 require "uri"
 require "yaml"
+require 'deep_merge'
 
 module Hieracles
   class Node
@@ -47,7 +48,7 @@ module Hieracles
 
     def params(without_common = true)
       params = {}
-      files(without_common).each do |f|
+      files(without_common).reverse.each do |f|
         data = YAML.load_file(File.join(Config.basepath, f))
         if data
           s = to_shallow_hash(data)
@@ -63,12 +64,9 @@ module Hieracles
 
     def params_tree(without_common = true)
       params = {}
-      paths(without_common).each do |f|
-        data = YAML.load_file(f)
-        if data
-          # data needs interpolation
-          deep_merge!(params, data)
-        end
+      paths(without_common).reverse.each do |f|
+        data = YAML.load_file(f) || {}
+        merge_trees params, data
       end
       deep_sort(params)
     end
@@ -116,5 +114,16 @@ module Hieracles
       modules
     end
 
+    def merge_trees(left, right)
+      case @hiera.merge_behavior
+      when :deeper
+        left.deep_merge!(right)
+      when :deep
+        left.deep_merge(right)
+      else # Native and undefined
+        local_merge!(left, right)
+      end
+    end
+
   end
 end

data/lib/hieracles/utils.rb

@@ -19,12 +19,12 @@ module Hieracles
         keys = key.to_s.split('.').reverse
         leaf_key = keys.shift
         key_hash = keys.reduce(leaf_key.to_sym => value) { |h, k| { k.to_sym => h } }
-        deep_merge!(a, key_hash)
+        local_merge!(a, key_hash)
         a
       end
     end
     
-    def deep_merge!(hash1, hash2)
+    def local_merge!(hash1, hash2)
       merger = proc { |key, v1, v2| v1.is_a?(Hash) && v2.is_a?(Hash) ? v1.merge(v2, &merger) : v2 }
       hash1.merge!(hash2, &merger)
     end

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

@@ -1 +1,9 @@
 somefarmparam: false
+another:
+  more_sublevel: something
+  sublevel:
+    array:
+      - one
+      - two
+      - three
+

data/spec/files/params/nodes/server.example.com.yaml

@@ -3,3 +3,6 @@ common_param:
 another:
   sublevel:
     thing: always
+    array:
+      - four
+      - five

data/spec/lib/formats/console_spec.rb

@@ -54,8 +54,8 @@ describe Hieracles::Formats::Console do
 
   describe ".build_params_line" do
     let(:expected) { 
-       "\e[31m[0]\e[0m \e[36mparams.this.var\e[0m value1\n"+
-       "    \e[97m[1] params.this.var value2\e[0m\n"
+       "\e[32m[1]\e[0m \e[36mparams.this.var\e[0m value2\n"+
+       "    \e[97m[0] params.this.var value1\e[0m\n"
     }
     let(:params) {
       [

data/spec/lib/formats/csv_spec.rb

@@ -51,8 +51,8 @@ describe Hieracles::Formats::Csv do
 
   describe ".build_params_line" do
     let(:expected) { 
-       "1;0;params.this.var;value1;0\n"+
-       "0;1;params.this.var;value2;1\n"
+       "0;1;params.this.var;value2;0\n"+
+       "1;0;params.this.var;value1;1\n"
     }
     let(:params) {
       [

data/spec/lib/formats/plain_spec.rb

@@ -54,8 +54,8 @@ describe Hieracles::Formats::Plain do
 
   describe ".build_params_line" do
     let(:expected) { 
-       "[0] params.this.var value1\n"+
-       "    [1] params.this.var value2\n"
+       "[1] params.this.var value2\n"+
+       "    [0] params.this.var value1\n"
     }
     let(:params) {
       [

data/spec/lib/formats/yaml_spec.rb

@@ -127,7 +127,7 @@ describe Hieracles::Formats::Yaml do
         { 
           'key' => [{
             file: 'what/file',
-            value: 'value'
+            value: 'true'
           }]
         }
       }
@@ -144,7 +144,7 @@ describe Hieracles::Formats::Yaml do
         { 
           'key' => [{
             file: 'what/file',
-            value: 'value'
+            value: 'false'
           }]
         }
       }
@@ -161,7 +161,7 @@ describe Hieracles::Formats::Yaml do
         { 
           'key' => [{
             file: 'what/file',
-            value: 'value'
+            value: '3'
           }]
         }
       }
@@ -178,7 +178,7 @@ describe Hieracles::Formats::Yaml do
         { 
           'key' => [{
             file: 'what/file',
-            value: 'value'
+            value: '0.3'
           }]
         }
       }
@@ -308,6 +308,43 @@ describe Hieracles::Formats::Yaml do
       }
       it { expect(yaml_format.mergetree('', [], input, params)).to eq expected }
     end
+    context "with a 3-levels double string key-value and override" do
+      let(:params) {
+        { 
+          'key.sublevel.subsublevel' => [{
+            file: 'what/file',
+            value: 'value'
+          }],
+          'key2.sublevel' => [
+            {
+              file: 'what/file2',
+              value: 'value'
+            },
+            {
+              file: 'what/file1',
+              value: 'value2'
+            }
+          ]
+        }
+      }
+      let(:input) {
+        { 
+          'key' => {
+            'sublevel' => {
+              'subsublevel' => 'value'
+            }
+          },
+          'key2' => {
+            'sublevel' => 'value2'
+          }
+        }
+      }
+      let(:expected) {
+        "\nkey: \n  sublevel: \n    subsublevel: value # what/file" +
+        "\nkey2: \n  sublevel: value2 # what/file1"
+      }
+      it { expect(yaml_format.mergetree('', [], input, params)).to eq expected }
+    end
   end
 
 end

data/spec/lib/node_spec.rb

@@ -1,58 +1,208 @@
 require 'spec_helper'
 
 describe Hieracles::Node do
-  let(:options) {
-    { 
-      config: 'spec/files/config.yml',
-      hierafile: 'hiera.yaml',
-      encpath: 'enc',
-      basepath: 'spec/files'
+  context "with native merge" do
+    let(:options) {
+      { 
+        config: 'spec/files/config.yml',
+        hierafile: 'hiera.yaml',
+        encpath: 'enc',
+        basepath: 'spec/files'
+      }
     }
-  }
 
-  context "when extra parameters are specified" do
-    describe '.new' do
-      let(:extraoptions) {
-        options.merge({ params: 'key1=value1;key2=value2' })
-      }
-      let(:node) { Hieracles::Node.new 'server.example.com', extraoptions }
-      let(:expected) {
-        { 
-          classes: ['dev'],
-          fqdn: 'server.example.com',
-          country: 'fr',
-          datacenter: 'equinix',
-          farm: 'dev',
-          key1: 'value1',
-          key2: 'value2'
+    context "when extra parameters are specified" do
+      describe '.new' do
+        let(:extraoptions) {
+          options.merge({ params: 'key1=value1;key2=value2' })
         }
-      }
-      it { expect(node).to be_a Hieracles::Node }
-      it { expect(node.hiera_params).to eq expected }
+        let(:node) { Hieracles::Node.new 'server.example.com', extraoptions }
+        let(:expected) {
+          { 
+            classes: ['dev'],
+            fqdn: 'server.example.com',
+            country: 'fr',
+            datacenter: 'equinix',
+            farm: 'dev',
+            key1: 'value1',
+            key2: 'value2'
+          }
+        }
+        it { expect(node).to be_a Hieracles::Node }
+        it { expect(node.hiera_params).to eq expected }
+      end
     end
-  end
 
-  context "when parameters are not valid" do
-    let(:node) { Hieracles::Node.new 'server_not_there.example.com', options }
-    it { expect{ node }.to raise_error(RuntimeError) }
-  end
+    context "when parameters are not valid" do
+      let(:node) { Hieracles::Node.new 'server_not_there.example.com', options }
+      it { expect{ node }.to raise_error(RuntimeError) }
+    end
 
-  context "when parameters are valid" do
-    let(:node) { Hieracles::Node.new 'server.example.com', options }
+    context "when parameters are valid" do
+      let(:node) { Hieracles::Node.new 'server.example.com', options }
 
-    describe '.new' do
-      let(:expected) {
-        { 
+      describe '.new' do
+        let(:expected) {
+          { 
+            classes: ['dev'],
+            fqdn: 'server.example.com',
+            country: 'fr',
+            datacenter: 'equinix',
+            farm: 'dev'
+          }
+        }
+        it { expect(node).to be_a Hieracles::Node }
+        it { expect(node.hiera_params).to eq expected }
+      end
+
+      describe '.files' do
+        let(:expected) {
+          [
+            'params/nodes/server.example.com.yaml',
+            'params/farm/dev.yaml'
+          ]
+        }
+        it { expect(node.files).to eq expected }
+      end
+
+      describe '.paths' do
+        let(:expected) {
+          [
+            File.join(node.hiera.datapath, 'nodes/server.example.com.yaml'),
+            File.join(node.hiera.datapath, 'farm/dev.yaml')
+          ]
+        }
+        it { expect(node.paths).to eq expected }
+      end
+
+      describe '.params' do
+        let(:expected) {
+          [
+            [ "another.more_sublevel", 
+              [{
+                value: "something",
+                file: 'params/farm/dev.yaml'
+              }]
+            ],
+            [ "another.sublevel.array", 
+              [
+                {
+                  value: ["one", "two", "three"],
+                  file: 'params/farm/dev.yaml'
+                },
+                {
+                  value: ["four", "five"],
+                  file: 'params/nodes/server.example.com.yaml'
+                }
+              ]
+            ],
+            [ "another.sublevel.thing", 
+              [{
+                value: "always",
+                file: 'params/nodes/server.example.com.yaml'
+              }]
+            ],
+            [ "common_param.subparam",
+              [{
+                value: "overriden", 
+                file: 'params/nodes/server.example.com.yaml'
+              }]
+            ], 
+            [ "somefarmparam", 
+              [{
+                value: false,
+                file: 'params/farm/dev.yaml'
+              }]
+            ]
+          ]
+        }
+        it { expect(node.params).to eq expected }
+      end
+
+      describe '.params_tree' do
+        let(:expected) {
+          {
+            "another" => { 
+              "more_sublevel" => "something",
+              "sublevel" => {
+                "array" => ["five", "four"],
+                "thing" => "always"
+              }
+            },
+            "common_param" => {
+              "subparam" => "overriden"
+            }, 
+            "somefarmparam" => false
+          }
+        }
+        it { expect(node.params_tree).to eq expected }
+      end
+
+      describe '.modules' do
+        context "no unfound modules" do
+          let(:expected) {
+            {
+              "fake_module" => "modules/fake_module",
+              "fake_module2" => "modules/fake_module2",
+              "fake_module3" => "modules/fake_module3"
+            }
+          }
+          it { expect(node.modules).to eq expected }
+        end
+        context "one unfound modules" do
+          let(:node) { Hieracles::Node.new 'server2.example.com', options }
+          let(:expected) {
+            {
+              "fake_module" => "modules/fake_module",
+              "fake_module2" => "modules/fake_module2",
+              "fake_module4" => nil
+            }
+          }
+          it { expect(node.modules).to eq expected }
+        end
+        context "no farm file found" do
+          let(:node) { Hieracles::Node.new 'server3.example.com', options }
+          it { expect { node.modules }.to raise_error(RuntimeError) }
+        end
+        context "multiple classes included" do
+          let(:node) { Hieracles::Node.new 'server4.example.com', options }
+          let(:expected) {
+            {
+              "fake_module" => "modules/fake_module",
+              "fake_module2" => "modules/fake_module2",
+              "fake_module4" => nil,
+              "faux_module1" => "modules/faux_module1",
+              "faux_module2" => "modules/faux_module2"
+            }
+          }
+          it { expect(node.modules).to eq expected }
+        end
+      end
+
+      describe '.info' do
+        let(:expected) { {
           classes: ['dev'],
           fqdn: 'server.example.com',
-          country: 'fr',
           datacenter: 'equinix',
+          country: 'fr',
           farm: 'dev'
-        }
-      }
-      it { expect(node).to be_a Hieracles::Node }
-      it { expect(node.hiera_params).to eq expected }
+        } }
+        it { expect(node.info).to eq expected }
+      end
+
     end
+  end
+
+  context "when parameters include double-column variables" do
+    let(:options) {
+      { 
+        config: 'spec/files/config.yml',
+        hierafile: 'hiera_columns.yaml',
+        encpath: 'enc',
+        basepath: 'spec/files'
+      }
+    }
+    let(:node) { Hieracles::Node.new 'server.example.com', options }
 
     describe '.files' do
       let(:expected) {
@@ -63,20 +213,41 @@ describe Hieracles::Node do
       }
       it { expect(node.files).to eq expected }
     end
+  end
 
-    describe '.paths' do
-      let(:expected) {
-        [
-          File.join(node.hiera.datapath, 'nodes/server.example.com.yaml'),
-          File.join(node.hiera.datapath, 'farm/dev.yaml')
-        ]
+
+  context "with deep merge" do
+    let(:options) {
+      { 
+        config: 'spec/files/config.yml',
+        hierafile: 'hiera_deep.yaml',
+        encpath: 'enc',
+        basepath: 'spec/files'
       }
-      it { expect(node.paths).to eq expected }
-    end
+    }
+    let(:node) { Hieracles::Node.new 'server.example.com', options }
 
     describe '.params' do
       let(:expected) {
         [
+          [ "another.more_sublevel", 
+            [{
+              value: "something",
+              file: 'params/farm/dev.yaml'
+            }]
+          ],
+          [ "another.sublevel.array", 
+            [
+              {
+                value: ["one", "two", "three"],
+                file: 'params/farm/dev.yaml'
+              },
+              {
+                value: ["four", "five"],
+                file: 'params/nodes/server.example.com.yaml'
+              }
+            ]
+          ],
           [ "another.sublevel.thing", 
             [{
               value: "always",
@@ -103,9 +274,11 @@ describe Hieracles::Node do
     describe '.params_tree' do
       let(:expected) {
         {
-          "another" => { 
+          "another" => {
+            "more_sublevel" => "something",
             "sublevel" => {
-              "thing" => "always"
+              "array" => ["five", "four", "one", "three", "two"],
+              "thing" => "always",
             }
           },
           "common_param" => {
@@ -117,57 +290,81 @@ describe Hieracles::Node do
       it { expect(node.params_tree).to eq expected }
     end
 
+  end
 
-    describe '.modules' do
-      context "no unfound modules" do
-        let(:expected) {
-          {
-            "fake_module" => "modules/fake_module",
-            "fake_module2" => "modules/fake_module2",
-            "fake_module3" => "modules/fake_module3"
-          }
-        }
-        it { expect(node.modules).to eq expected }
-      end
-      context "one unfound modules" do
-        let(:node) { Hieracles::Node.new 'server2.example.com', options }
-        let(:expected) {
-          {
-            "fake_module" => "modules/fake_module",
-            "fake_module2" => "modules/fake_module2",
-            "fake_module4" => nil
-          }
-        }
-        it { expect(node.modules).to eq expected }
-      end
-      context "no farm file found" do
-        let(:node) { Hieracles::Node.new 'server3.example.com', options }
-        it { expect { node.modules }.to raise_error(RuntimeError) }
-      end
-      context "multiple classes included" do
-        let(:node) { Hieracles::Node.new 'server4.example.com', options }
-        let(:expected) {
-          {
-            "fake_module" => "modules/fake_module",
-            "fake_module2" => "modules/fake_module2",
-            "fake_module4" => nil,
-            "faux_module1" => "modules/faux_module1",
-            "faux_module2" => "modules/faux_module2"
-          }
-        }
-        it { expect(node.modules).to eq expected }
-      end
+
+  context "with deeper merge" do
+    let(:options) {
+      { 
+        config: 'spec/files/config.yml',
+        hierafile: 'hiera_deeper.yaml',
+        encpath: 'enc',
+        basepath: 'spec/files'
+      }
+    }
+    let(:node) { Hieracles::Node.new 'server.example.com', options }
+
+    describe '.params' do
+      let(:expected) {
+        [
+          [ "another.more_sublevel", 
+            [{
+              value: "something",
+              file: 'params/farm/dev.yaml'
+            }]
+          ],
+          [ "another.sublevel.array", 
+            [
+              {
+                value: ["one", "two", "three"],
+                file: 'params/farm/dev.yaml'
+              },
+              {
+                value: ["four", "five"],
+                file: 'params/nodes/server.example.com.yaml'
+              }
+            ]
+          ],
+          [ "another.sublevel.thing", 
+            [{
+              value: "always",
+              file: 'params/nodes/server.example.com.yaml'
+            }]
+          ],
+          [ "common_param.subparam",
+            [{
+              value: "overriden", 
+              file: 'params/nodes/server.example.com.yaml'
+            }]
+          ], 
+          [ "somefarmparam", 
+            [{
+              value: false,
+              file: 'params/farm/dev.yaml'
+            }]
+          ]
+        ]
+      }
+      it { expect(node.params).to eq expected }
     end
 
-    describe '.info' do
-      let(:expected) { {
-        classes: ['dev'],
-        fqdn: 'server.example.com',
-        datacenter: 'equinix',
-        country: 'fr',
-        farm: 'dev'
-      } }
-      it { expect(node.info).to eq expected }
+    describe '.params_tree' do
+      let(:expected) {
+        {
+          "another" => {
+            "more_sublevel" => "something",
+            "sublevel" => {
+              "array" => ["five", "four", "one", "three", "two"],
+              "thing" => "always",
+            }
+          },
+          "common_param" => {
+            "subparam" => "overriden"
+          }, 
+          "somefarmparam" => false
+        }
+      }
+      it { expect(node.params_tree).to eq expected }
     end
 
   end

data/spec/lib/optparse_spec.rb

@@ -32,7 +32,7 @@ describe Hieracles::Optparse do
       end
     end
 
-    context 'with funny arguments' do
+    context 'with funnily ordered arguments' do
       let(:array) { ['arg1', '-u', 'path/to/config-file', 'arg2', '-f', 'thatformat'] }
       let(:expected_payload) { ['arg1', 'arg2'] }
       let(:expected_options) do
@@ -48,7 +48,7 @@ describe Hieracles::Optparse do
     end
 
     context 'with arguments in alternative syntax' do
-      let(:array) { ['arg1', 'arg2', '-config', 'path/to/config-file', '-format', 'thatformat'] }
+      let(:array) { ['arg1', 'arg2', '-config', 'path/to/config-file', '--format', 'thatformat'] }
       let(:expected_payload) { ['arg1', 'arg2'] }
       let(:expected_options) do
         { config: 'path/to/config-file', format: 'thatformat' }
@@ -61,5 +61,23 @@ describe Hieracles::Optparse do
         expect(subject.options).to eq expected_options
       end
     end
+
+
+    context 'with arguments containing boolean element' do
+      let(:array) { ['arg1', 'arg2', '-i', '-format', 'thatformat'] }
+      let(:expected_payload) { ['arg1', 'arg2'] }
+      let(:expected_options) do
+        { format: 'thatformat', interactive: true }
+      end
+      subject { Hieracles::Optparse.new array }
+      it "populates payload" do
+        expect(subject.payload).to eq expected_payload
+      end
+      it 'populates options' do
+        expect(subject.options).to eq expected_options
+      end
+    end
+
+
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hieracles
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement