hieracles 0.3.4 → 0.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/README.md +1 -1
- data/hc.1 +2 -2
- data/lib/hieracles/config.rb +1 -1
- data/lib/hieracles/node.rb +4 -3
- data/lib/hieracles/options/hc.rb +1 -1
- data/lib/hieracles/puppetdb/request.rb +4 -0
- data/spec/lib/config_spec.rb +1 -1
- data/spec/lib/node_spec.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fbed104b2e5efb9ab631dc6c92dbcdc15c12c93b
|
4
|
+
data.tar.gz: 23a3969b635a47856e7e4881b303db9de6080ecd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ef265813311aab75f57bc92bbe35cb2526969be6937741f909ea232a2d37bf7b7778e42d72bf255ed6e61afa9f0be6c90a9f02675c43b0578029442c75735273
|
7
|
+
data.tar.gz: 1c5d72ac972d07fd0e7751796b9be488ff39e91bc2789855d01d6caf96b356ddb50a5a4f3d3ddfb8a9b2b50644b33f2351485d54c957153c4eefe47dc2562cba
|
data/CHANGELOG.md
CHANGED
@@ -1,6 +1,10 @@
|
|
1
1
|
Hieracles Changelog
|
2
2
|
=======================
|
3
3
|
|
4
|
+
### 0.3.5 - 2016-02-18
|
5
|
+
- change extraparams separator from ; to , to avoid having to quote argument
|
6
|
+
- fix merge order for extraparams to override configuration and puppetdb values
|
7
|
+
|
4
8
|
### 0.3.4 - 2016-02-12
|
5
9
|
- add a farms_counted method to registry for a ponderated list of farms
|
6
10
|
|
data/README.md
CHANGED
data/hc.1
CHANGED
@@ -105,10 +105,10 @@ provenance of each params.
|
|
105
105
|
|
106
106
|
.TP
|
107
107
|
.PD 0
|
108
|
-
.B \-p \fRextraparam=what
|
108
|
+
.B \-p \fRextraparam=what,anotherparam=this
|
109
109
|
.TP
|
110
110
|
.PD
|
111
|
-
.B \-\-params \fRextraparam=what
|
111
|
+
.B \-\-params \fRextraparam=what,anotherparam=this
|
112
112
|
makes possible to add additional params.
|
113
113
|
Those params will be merged with the ones provided in the hierafile.
|
114
114
|
|
data/lib/hieracles/config.rb
CHANGED
data/lib/hieracles/node.rb
CHANGED
@@ -17,9 +17,10 @@ module Hieracles
|
|
17
17
|
@hiera_params = { fqdn: @fqdn }.
|
18
18
|
merge(get_hiera_params(@fqdn)).
|
19
19
|
merge(@config.extraparams)
|
20
|
-
@facts = deep_sort(@
|
21
|
-
merge(
|
22
|
-
merge(
|
20
|
+
@facts = deep_sort(@config.scope.
|
21
|
+
merge(puppet_facts).
|
22
|
+
merge(@hiera_params)
|
23
|
+
)
|
23
24
|
end
|
24
25
|
|
25
26
|
def get_hiera_params(fqdn)
|
data/lib/hieracles/options/hc.rb
CHANGED
data/spec/lib/config_spec.rb
CHANGED
@@ -119,7 +119,7 @@ describe Hieracles::Config do
|
|
119
119
|
config: 'spec/files/config.yml'
|
120
120
|
}
|
121
121
|
end
|
122
|
-
let(:str) { 'bla=blu
|
122
|
+
let(:str) { 'bla=blu,one=two' }
|
123
123
|
let(:expected) { { bla: 'blu', one: 'two' } }
|
124
124
|
let(:config) { Hieracles::Config.new options }
|
125
125
|
it { expect(config.extract_params(str)).to eq expected }
|
data/spec/lib/node_spec.rb
CHANGED
@@ -15,7 +15,7 @@ describe Hieracles::Node do
|
|
15
15
|
context "when extra parameters are specified" do
|
16
16
|
describe '.new' do
|
17
17
|
let(:extraoptions) {
|
18
|
-
options.merge({ params: 'key1=value1
|
18
|
+
options.merge({ params: 'key1=value1,key2=value2' })
|
19
19
|
}
|
20
20
|
let(:config) { Hieracles::Config.new extraoptions }
|
21
21
|
let(:node) { Hieracles::Node.new 'server.example.com', config }
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: hieracles
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- mose
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-02-
|
11
|
+
date: 2016-02-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: httparty
|