hieracles 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b13932e02e3a94c2d72d12c3bb35a08cddc239c1
-  data.tar.gz: f32c03c50537af5fa362e43e0eb1226c1c44bd4a
+  metadata.gz: fbed104b2e5efb9ab631dc6c92dbcdc15c12c93b
+  data.tar.gz: 23a3969b635a47856e7e4881b303db9de6080ecd
 SHA512:
-  metadata.gz: efed20535c8925465eea69ee04e563b60ed889ebd618f01982c5d6e00734519dbeda24b9148e45cc760c845fc7e16ad345993db2f6ddfa977ac5b75669cd5300
-  data.tar.gz: d9294d57191f85635277dc500a308972b169a806ac76d1994a942729c6b0307b9a6d1dff63530aef979f7c7b95b1135df6462ed03c2a78f9fd96f2cc6bce2685
+  metadata.gz: ef265813311aab75f57bc92bbe35cb2526969be6937741f909ea232a2d37bf7b7778e42d72bf255ed6e61afa9f0be6c90a9f02675c43b0578029442c75735273
+  data.tar.gz: 1c5d72ac972d07fd0e7751796b9be488ff39e91bc2789855d01d6caf96b356ddb50a5a4f3d3ddfb8a9b2b50644b33f2351485d54c957153c4eefe47dc2562cba

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Hieracles Changelog
 =======================
 
+### 0.3.5 - 2016-02-18
+- change extraparams separator from ; to , to avoid having to quote argument
+- fix merge order for extraparams to override configuration and puppetdb values
+
 ### 0.3.4 - 2016-02-12
 - add a farms_counted method to registry for a ponderated list of farms
 

data/README.md

@@ -96,7 +96,7 @@ Usage
 
     Extra args:
       -f <plain|console|csv|yaml|rawyaml|json> - default console
-      -p extraparam=what;anotherparam=this 
+      -p extraparam=what,anotherparam=this 
       -c <configfile>
       -h <hierafile>
       -b <basepath> default ./

data/hc.1

@@ -105,10 +105,10 @@ provenance of each params.
 
 .TP
 .PD 0
-.B \-p \fRextraparam=what;anotherparam=this
+.B \-p \fRextraparam=what,anotherparam=this
 .TP
 .PD
-.B \-\-params \fRextraparam=what;anotherparam=this
+.B \-\-params \fRextraparam=what,anotherparam=this
 makes possible to add additional params. 
 Those params will be merged with the ones provided in the hierafile.
 

data/lib/hieracles/config.rb

@@ -62,7 +62,7 @@ module Hieracles
     # str is like: something=xxx;another=yyy  
     def extract_params(str)
       return {} unless str
-      str.split(';').reduce({}) do |a, k|
+      str.split(',').reduce({}) do |a, k|
         a["#{k[/^[^=]*/]}".to_sym] = k[/[^=]*$/]
         a
       end

data/lib/hieracles/node.rb

@@ -17,9 +17,10 @@ module Hieracles
       @hiera_params = { fqdn: @fqdn }.
         merge(get_hiera_params(@fqdn)).
         merge(@config.extraparams)
-      @facts = deep_sort(@hiera_params.
-        merge(@config.scope).
-        merge(puppet_facts))
+      @facts = deep_sort(@config.scope.
+        merge(puppet_facts).
+        merge(@hiera_params)
+        )
     end
 
     def get_hiera_params(fqdn)

data/lib/hieracles/options/hc.rb

@@ -88,7 +88,7 @@ Available commands:
 
 Extra args:
   -f <plain|console|csv|yaml|rawyaml|json> default console
-  -p extraparam=what;anotherparam=this 
+  -p extraparam=what,anotherparam=this 
   -c <configfile>
   -h <hierafile>
   -b <basepath> default ./

data/lib/hieracles/puppetdb/request.rb

@@ -56,6 +56,10 @@ module Hieracles
       end
       alias_method :res, :resources
 
+      def events
+        @client.request("events")
+      end
+
     private
 
       def extract_names(resp, label = 'certname')

data/spec/lib/config_spec.rb

@@ -119,7 +119,7 @@ describe Hieracles::Config do
           config: 'spec/files/config.yml'
         }
       end
-    let(:str)  { 'bla=blu;one=two' }
+    let(:str)  { 'bla=blu,one=two' }
     let(:expected) { { bla: 'blu', one: 'two' } }
     let(:config) { Hieracles::Config.new options }
     it { expect(config.extract_params(str)).to eq expected }

data/spec/lib/node_spec.rb

@@ -15,7 +15,7 @@ describe Hieracles::Node do
     context "when extra parameters are specified" do
       describe '.new' do
         let(:extraoptions) {
-          options.merge({ params: 'key1=value1;key2=value2' })
+          options.merge({ params: 'key1=value1,key2=value2' })
         }
         let(:config) { Hieracles::Config.new extraoptions }
         let(:node) { Hieracles::Node.new 'server.example.com', config }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hieracles
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty