hieracles 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1b98d278d79f3de929cb583ab33e77f895f4676
-  data.tar.gz: 888be4768415d47ecef87847114b290e0a813d07
+  metadata.gz: 6f625244beacbc27c040813044b27538be1cc238
+  data.tar.gz: 43ee5e5416918b571def1e2ff14283c51f0b5d3f
 SHA512:
-  metadata.gz: 842f1c0ed05b9c4b11663b04bdab2c09f34a9713a732a6e76fcf75e171cbf12fed644e72f9d8aca820466d6afe7b4b35ede87df59e4d5b8a79759723a0360b49
-  data.tar.gz: c0fa911cc8b01be9eaa6f1d1fb419ebf020721abb865210c4f7a0ac79061a43a03b1a45035ec061b6cb6e2412b0d1756cc2dcd86227385347f6a20e7515d3184
+  metadata.gz: 52464e962c93a456f3911e9800991293a5250d3e8a9c39570d26792e46ca7def773f6eac6f486d6fb0a2b27cc947cfcc914bd1ebf8734c9d5287dd7f650e978c
+  data.tar.gz: 0502cf9ed9ee1c641a521990d94b5af61fa775307621b659679b663629c6c4e5b4dbed6c50418cd65717f7bd38ac03fea9a24363fdd9cc348272d641b8694acd

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Hieracles Changelog
 =======================
 
+### 0.2.0 - 2015-11-24
+- fix merging for unsorted arrays
+- translate all paths to absolute paths,
+  so that hc can be executed out of puppet dir
+
 ### 0.1.7 - 2015-11-23
 - various fixes on deep_merge behavior
 

data/README.md

@@ -46,16 +46,25 @@ At first launch it will create a configuration file in `~/.config/hieracles/conf
 
 Configuration variables are:
 
-- classpath
-- modulepath
-- basepath
-- encpath
-- hierafile
-- format
-- defaultscope
+- basepath (alias localpath)  
+  This is where your puppet repo is cloned
+- classpath  
+  where to find classes defined in the ENC
+- modulepath  
+  where to find modules called in the classes
+- encpath  
+  where to read information about each nodes
+- hierafile  
+  where to find a hierafile customised for your local puppet installation
+- format  
+  can be plain, console, csv, yaml, rawyaml, json
+- defaultscope  
+  a hash defining scope variables that will be used if not defined by a facts file or by params passed as arguments
 
 For an  example setup you can check in `spec/files`.
 
+If you don't specify the basepath, your current location will be used as a base path.
+
 Usage
 -------------
 

data/lib/hieracles/config.rb

@@ -17,11 +17,11 @@ module Hieracles
       @extraparams = extract_params(options[:params])
       values = get_config(@optionfile)
       @server = values['server']
-      @classpath = values['classpath']
-      @modulepath = values['modulepath'] || 'modules'
-      @encpath = options[:encpath] || values['encpath'] || 'enc'
-      @basepath = File.expand_path(options[:basepath] || values['basepath'] || '.')
-      @hierafile = options[:hierafile] || values['hierafile'] || 'hiera.yaml'
+      @basepath = File.expand_path(options[:basepath] || values['basepath'] || values['localpath'] || '.')
+      @classpath = build_path(values['classpath'])
+      @modulepath = resolve_path(values['modulepath'] || 'modules')
+      @encpath = resolve_path(options[:encpath] || values['encpath'] || 'enc')
+      @hierafile = resolve_path(options[:hierafile] || values['hierafile'] || 'hiera.yaml')
       @format = (options[:format] || values['format'] || 'console').capitalize
       facts_file = options[:yaml_facts] || options[:json_facts]
       facts_format = options[:json_facts] ? :json : :yaml
@@ -61,7 +61,7 @@ module Hieracles
     end
 
     def path(what)
-      File.join(@basepath, send(what.to_sym))
+      send(what.to_sym)
     end
 
     def load_facts(file, format)
@@ -72,5 +72,19 @@ module Hieracles
       end
     end
 
+    def resolve_path(path)
+      if File.exists?(File.expand_path(path))
+        File.expand_path(path)
+      elsif File.exists?(File.expand_path(File.join(@basepath, path)))
+        File.expand_path(File.join(@basepath, path))
+      else
+        raise IOError, "File #{path} not found."
+      end
+    end
+
+    def build_path(path)
+      File.expand_path(File.join(@basepath, path))
+    end
+
   end
 end

data/lib/hieracles/format.rb

@@ -54,5 +54,14 @@ module Hieracles
     def build_modules_line(key, value)
       "#{__callee__} not implemented, please inherit from the Hieracles::Format class to implement a format.\n"
     end
+
+    def is_merged?(v)
+      v[:value].is_a?(Array) && (v[:value] | v[:merged]) != v[:value]
+    end
+
+    def sanitize(v)
+      v.to_s.gsub('%', '%%')
+    end
+
   end
 end

data/lib/hieracles/formats/console.rb

@@ -55,30 +55,16 @@ module Hieracles
           first = value.pop
           filecolor_index = @colors[first[:file]]
           filecolor = COLORS[filecolor_index]
-          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('%', '%%')
-                            )
+          if is_merged? first
+            output << format("%s #{COLORS[5]} %s\n", "[-]", key, sanitize(first[:merged]) )
+            output << format("    #{COLORS[8]}\n", "[#{filecolor_index}] #{key} #{sanitize(first[:value])}" )
           else
-            output << format("#{filecolor} #{COLORS[5]} %s\n",
-                             "[#{filecolor_index}]",
-                              key,
-                              first[:value].to_s.gsub('%', '%%')
-                            )
+            output << format("#{filecolor} #{COLORS[5]} %s\n", "[#{filecolor_index}]", key, sanitize(first[:value]) )
           end
           while value.count > 0
             overriden = value.pop
             filecolor_index = @colors[overriden[:file]]
-            output << format("    #{COLORS[8]}\n",
-                             "[#{filecolor_index}] #{key} #{overriden[:value]}"
-                            )
+            output << format("    #{COLORS[8]}\n", "[#{filecolor_index}] #{key} #{overriden[:value]}")
           end
         end
         output

data/lib/hieracles/formats/csv.rb

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

data/lib/hieracles/formats/plain.rb

@@ -41,7 +41,7 @@ module Hieracles
         if !filter || Regexp.new(filter).match(key)
           first = value.pop
           filecolor_index = @index[first[:file]]
-          if first[:merged] != first[:value]
+          if is_merged? first
             output << "[-] #{key} #{first[:merged]}\n"
             output << "    [#{filecolor_index}] #{key} #{first[:value]}\n"
           else

data/lib/hieracles/hiera.rb

@@ -2,8 +2,8 @@ module Hieracles
   class Hiera
 
     def initialize
-      raise IOError, "Hierafile #{Config.hierafile} not found." unless File.exist? Config.path('hierafile')
-      @hierafile = Config.path('hierafile')
+      raise IOError, "Hierafile #{Config.hierafile} not found." unless File.exist? Config.hierafile
+      @hierafile = Config.hierafile
       @loaded = YAML.load_file(@hierafile)
     end
 

data/lib/hieracles/interpolate.rb

@@ -23,22 +23,10 @@ module Hieracles
     end
 
     # makes possible to set input and output
-    def setio(input, output)
+    def setio(input=STDIN, output=STDOUT)
       @@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

@@ -98,7 +98,7 @@ module Hieracles
     end
 
     def modulepath(path)
-      File.join(Config.path('modulepath'), path)
+      File.join(Config.modulepath, path)
     end
 
     def add_modules(line, modules)

data/lib/hieracles/registry.rb

@@ -4,17 +4,17 @@ module Hieracles
   	extend self
 
   	def farms(config)
-  		@_farms ||= Dir.glob(File.join(config.basepath, format(config.classpath, '*'))).sort
+  		@_farms ||= Dir.glob(format(config.classpath, '*')).sort
   	end
 
   	def nodes(config)
-  		@_nodes ||= Dir.glob(File.join(config.basepath, config.encpath, '*.yaml')).sort.map do |f|
+  		@_nodes ||= Dir.glob(File.join(config.encpath, '*.yaml')).sort.map do |f|
   			File.basename(f, '.yaml')
   		end
   	end
 
   	def modules(config)
-  		@_modules ||= Dir.glob(File.join(config.basepath, config.modulepath, '*')).sort.map do |f|
+  		@_modules ||= Dir.glob(File.join(config.modulepath, '*')).sort.map do |f|
   			File.basename(f)
   		end
   	end

data/spec/lib/config_spec.rb

@@ -4,14 +4,24 @@ describe Hieracles::Config do
   describe '.load' do
     context 'with an existing file' do
       let(:options) do
-        { config: 'spec/files/config.yml', basepath: 'spec/files' }
+        { 
+          config: 'spec/files/config.yml', 
+          basepath: 'spec/files'
+        }
+      end
+      let(:expected) do
+        {
+          classpath: File.expand_path('spec/files/farm_modules/%s.pp'),
+          modulepath: File.expand_path('spec/files/modules'),
+          hierafile: File.expand_path('spec/files/hiera.yaml')
+        }
       end
       before { Hieracles::Config.load options }
 
       it 'initialize config values' do
-        expect(Hieracles::Config.classpath).to eq 'farm_modules/%s.pp'
-        expect(Hieracles::Config.modulepath).to eq 'modules'
-        expect(Hieracles::Config.hierafile).to eq 'hiera.yaml'
+        expect(Hieracles::Config.classpath).to eq expected[:classpath]
+        expect(Hieracles::Config.modulepath).to eq expected[:modulepath]
+        expect(Hieracles::Config.hierafile).to eq expected[:hierafile]
         expect(Hieracles::Config.format).to eq 'Console'
       end
     end
@@ -19,21 +29,35 @@ describe Hieracles::Config do
     context 'with additional parameters' do
       let(:hierapath) { 'hiera.yaml' }
       let(:options) do
-        { config: 'spec/files/config.yml', basepath: 'spec/files', hierafile: hierapath }
+        { 
+          config: 'spec/files/config.yml', 
+          basepath: 'spec/files',
+          hierafile: hierapath
+        }
+      end
+      let(:expected) do
+        {
+          classpath: File.expand_path('spec/files/farm_modules/%s.pp'),
+          modulepath: File.expand_path('spec/files/modules'),
+          hierafile: File.expand_path('spec/files/hiera.yaml')
+        }
       end
       before { Hieracles::Config.load options }
 
       it 'initialize config values' do
-        expect(Hieracles::Config.classpath).to eq 'farm_modules/%s.pp'
-        expect(Hieracles::Config.modulepath).to eq 'modules'
-        expect(Hieracles::Config.hierafile).to eq hierapath
+        expect(Hieracles::Config.classpath).to eq expected[:classpath]
+        expect(Hieracles::Config.modulepath).to eq expected[:modulepath]
+        expect(Hieracles::Config.hierafile).to eq expected[:hierafile]
         expect(Hieracles::Config.format).to eq 'Console'
       end
     end
 
     context 'without an existing config file' do
       let(:options) do
-        { config: 'spec/files/config_no.yml' }
+        {
+          basepath: 'spec/files',
+          config: 'spec/files/config_no.yml'
+        }
       end
       before do
         FileUtils.rm(options[:config]) if File.exist? options[:config]
@@ -46,7 +70,7 @@ describe Hieracles::Config do
       end
 
       it 'initialize config values' do
-        expect(Hieracles::Config.classpath).to eq 'manifests/classes/%s.pp'
+        expect(Hieracles::Config.classpath).to eq File.expand_path('spec/files/manifests/classes/%s.pp')
       end
     end
   end

data/spec/lib/formats/console_spec.rb

@@ -53,26 +53,52 @@ describe Hieracles::Formats::Console do
   end
 
   describe ".build_params_line" do
-    let(:expected) { 
-       "\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) {
-      [
-        { file: 'path1', value: 'value1', merged: 'value1'},
-        { file: 'path2', value: 'value2', merged: 'value2'},
-      ] 
-    }
-    before {
-      console_format.instance_variable_set(:@colors,
-          {'path1' => 0, 'path2' => 1}
-        )
-    } 
-    it "outputs proper text" do
-      expect(console_format.send :build_params_line,
-        "params.this.var", 
-        params, 
-        nil).to eq expected
+    context "when not merged" do
+      let(:expected) { 
+         "\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) {
+        [
+          { file: 'path1', value: 'value1', merged: 'value1'},
+          { file: 'path2', value: 'value2', merged: 'value2'},
+        ] 
+      }
+      before {
+        console_format.instance_variable_set(:@colors,
+            {'path1' => 0, 'path2' => 1}
+          )
+      } 
+      it "outputs proper text" do
+        expect(console_format.send :build_params_line,
+          "params.this.var", 
+          params, 
+          nil).to eq expected
+      end
+    end
+    context "when merged" do
+      let(:expected) { 
+         "[-] \e[36mparams.this.var\e[0m [\"value1\", \"value2\"]\n"+
+         "    \e[97m[1] params.this.var [\"value2\"]\e[0m\n"+
+         "    \e[97m[0] params.this.var [\"value1\"]\e[0m\n"
+      }
+      let(:params) {
+        [
+          { file: 'path1', value: ['value1'], merged: ['value1'] },
+          { file: 'path2', value: ['value2'], merged: ['value1','value2'] }
+        ] 
+      }
+      before {
+        console_format.instance_variable_set(:@colors,
+            {'path1' => 0, 'path2' => 1}
+          )
+      } 
+      it "outputs proper text" do
+        expect(console_format.send :build_params_line,
+          "params.this.var", 
+          params, 
+          nil).to eq expected
+      end
     end
   end
 
@@ -104,4 +130,11 @@ describe Hieracles::Formats::Console do
       end
     end
   end
+
+  describe ".sanitize" do
+    let(:value) { "something with % inside" }
+    let(:expected) { "something with %% inside" }
+    it { expect(console_format.send :sanitize, value).to eq expected }
+  end
+
 end

data/spec/lib/formats/csv_spec.rb

@@ -51,25 +51,48 @@ describe Hieracles::Formats::Csv do
 
   describe ".build_params_line" do
     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
+      context "when not merged" do
+        let(:expected) { 
+           "0;1;params.this.var;[\"value1\"];0\n"+
+           "1;0;params.this.var;[\"value1\"];1\n"
+        }
+        let(:params) {
+          [
+            { file: 'path1', value: ['value1'], merged: ['value1'] },
+            { file: 'path2', value: ['value1'], merged: ['value1'] },
+          ] 
+        }
+        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 "when merged" 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
     end
     context "with non-array values" do

data/spec/lib/formats/plain_spec.rb

@@ -53,26 +53,52 @@ describe Hieracles::Formats::Plain do
   end
 
   describe ".build_params_line" do
-    let(:expected) { 
-       "[1] params.this.var value2\n"+
-       "    [0] params.this.var value1\n"
-    }
-    let(:params) {
-      [
-        { file: 'path1', value: 'value1', merged: 'value1'},
-        { file: 'path2', value: 'value2', merged: 'value2'},
-      ] 
-    }
-    before {
-      plain_format.instance_variable_set(:@index,
-          {'path1' => 0, 'path2' => 1}
-        )
-    } 
-    it "outputs proper text" do
-      expect(plain_format.send :build_params_line,
-        "params.this.var", 
-        params, 
-        nil).to eq expected
+    context "when not merged" do
+      let(:expected) { 
+         "[1] params.this.var value2\n"+
+         "    [0] params.this.var value1\n"
+      }
+      let(:params) {
+        [
+          { file: 'path1', value: 'value1', merged: 'value1'},
+          { file: 'path2', value: 'value2', merged: 'value2'},
+        ] 
+      }
+      before {
+        plain_format.instance_variable_set(:@index,
+            {'path1' => 0, 'path2' => 1}
+          )
+      } 
+      it "outputs proper text" do
+        expect(plain_format.send :build_params_line,
+          "params.this.var", 
+          params, 
+          nil).to eq expected
+      end
+    end
+    context "when merged" do
+      let(:expected) { 
+         "[-] params.this.var [\"value1\", \"value2\"]\n"+
+         "    [1] params.this.var [\"value2\"]\n"+
+         "    [0] params.this.var [\"value1\"]\n"
+      }
+      let(:params) {
+        [
+          { file: 'path1', value: ['value1'], merged: ['value1'] },
+          { file: 'path2', value: ['value2'], merged: ['value1','value2'] },
+        ] 
+      }
+      before {
+        plain_format.instance_variable_set(:@index,
+            {'path1' => 0, 'path2' => 1}
+          )
+      } 
+      it "outputs proper text" do
+        expect(plain_format.send :build_params_line,
+          "params.this.var", 
+          params, 
+          nil).to eq expected
+      end
     end
   end
 

data/spec/lib/hiera_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
 
 describe Hieracles::Hiera do
-  before { Hieracles::Config.load(options) }
 
   describe '.new' do
 
     context 'hiera file not found' do
-      let(:options) { { 
+      let(:options) { {
+        basepath: 'spec/files',
         config: 'spec/files/config.yml',
         basepath: 'spec/files',
         hierafile: 'hiera_no.yaml' 
       } }
       it 'raises an error' do
-        expect { Hieracles::Hiera.new }.to raise_error(IOError)
+        expect { Hieracles::Config.load(options) }.to raise_error(IOError)
       end
     end
     
@@ -26,6 +26,7 @@ describe Hieracles::Hiera do
         File.expand_path(File.join(options[:basepath], options[:hierafile]))
       }
       let(:hiera) { Hieracles::Hiera.new }
+      before { Hieracles::Config.load(options) }
       it 'load the file' do
         expect(hiera.instance_variable_get :@loaded).to be_a Hash
         expect(hiera.instance_variable_get :@hierafile).to eq expected
@@ -35,6 +36,7 @@ describe Hieracles::Hiera do
   end
 
   describe '.datapath' do
+    before { Hieracles::Config.load(options) }
     context 'hiera file do not have a yaml backend' do
       let(:options) { { 
         config: 'spec/files/config.yml',
@@ -74,6 +76,7 @@ describe Hieracles::Hiera do
   end
 
   describe '.datadir' do
+    before { Hieracles::Config.load(options) }
     let(:options) {
       {
         config: 'spec/files/config.yml',
@@ -86,6 +89,7 @@ describe Hieracles::Hiera do
   end
 
   context "with proper params" do
+    before { Hieracles::Config.load(options) }
     let(:options) {
       { 
         config: 'spec/files/config.yml',

data/spec/lib/node_spec.rb

@@ -155,9 +155,9 @@ describe Hieracles::Node do
         context "no unfound modules" do
           let(:expected) {
             {
-              "fake_module" => "modules/fake_module",
-              "fake_module2" => "modules/fake_module2",
-              "fake_module3" => "modules/fake_module3"
+              "fake_module" => File.expand_path("spec/files/modules/fake_module"),
+              "fake_module2" => File.expand_path("spec/files/modules/fake_module2"),
+              "fake_module3" => File.expand_path("spec/files/modules/fake_module3")
             }
           }
           it { expect(node.modules).to eq expected }
@@ -166,8 +166,8 @@ describe Hieracles::Node do
           let(:node) { Hieracles::Node.new 'server2.example.com', options }
           let(:expected) {
             {
-              "fake_module" => "modules/fake_module",
-              "fake_module2" => "modules/fake_module2",
+              "fake_module" => File.expand_path("spec/files/modules/fake_module"),
+              "fake_module2" => File.expand_path("spec/files/modules/fake_module2"),
               "fake_module4" => nil
             }
           }
@@ -181,11 +181,11 @@ describe Hieracles::Node do
           let(:node) { Hieracles::Node.new 'server4.example.com', options }
           let(:expected) {
             {
-              "fake_module" => "modules/fake_module",
-              "fake_module2" => "modules/fake_module2",
+              "fake_module" => File.expand_path("spec/files/modules/fake_module"),
+              "fake_module2" => File.expand_path("spec/files/modules/fake_module2"),
               "fake_module4" => nil,
-              "faux_module1" => "modules/faux_module1",
-              "faux_module2" => "modules/faux_module2"
+              "faux_module1" => File.expand_path("spec/files/modules/faux_module1"),
+              "faux_module2" => File.expand_path("spec/files/modules/faux_module2")
             }
           }
           it { expect(node.modules).to eq expected }

data/spec/lib/registry_spec.rb

@@ -5,12 +5,15 @@ describe Hieracles::Registry do
 
   describe '.farms' do
     let(:options) do
-      { config: 'spec/files/config.yml', basepath: 'spec/files' }
+      { 
+        config: 'spec/files/config.yml', 
+        basepath: 'spec/files'
+      }
     end
     let(:expected) { [
-    		File.join(base, options[:basepath], 'farm_modules', 'dev.pp'),
-    		File.join(base, options[:basepath], 'farm_modules', 'dev2.pp'),
-    		File.join(base, options[:basepath], 'farm_modules', 'dev4.pp')
+    		File.join(Hieracles::Config.basepath, 'farm_modules', 'dev.pp'),
+    		File.join(Hieracles::Config.basepath, 'farm_modules', 'dev2.pp'),
+    		File.join(Hieracles::Config.basepath, 'farm_modules', 'dev4.pp')
   	] }
     before { Hieracles::Config.load options}
     it { expect(Hieracles::Registry.farms Hieracles::Config).to eq expected }
@@ -18,7 +21,10 @@ describe Hieracles::Registry do
 
   describe '.nodes' do
     let(:options) do
-      { config: 'spec/files/config.yml', basepath: 'spec/files' }
+      { 
+        config: 'spec/files/config.yml',
+        basepath: 'spec/files'
+      }
     end
     let(:expected) { [
     		'server.example.com',
@@ -32,7 +38,10 @@ describe Hieracles::Registry do
 
   describe '.modules' do
     let(:options) do
-      { config: 'spec/files/config.yml', basepath: 'spec/files' }
+      {
+        config: 'spec/files/config.yml',
+        basepath: 'spec/files'
+      }
     end
     let(:expected) { [
     		'fake_module',

metadata

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