salthiera 0.1 → 0.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- data.tar.gz: b3bd8ac1830135bc9f921f621e22a91f8513d1ad
4
- metadata.gz: bda943843e60bf6ed7c5fed8cb05fbdeb986db6e
3
+ metadata.gz: 5461ff49c54a09e4177915e17099fddc9cebadc9
4
+ data.tar.gz: 4d8b101c4a9253b7b00e783c1c83b386a5bffa63
5
5
  SHA512:
6
- data.tar.gz: 20be867bae02f46069e12896694140a7b0b8535f733dbd5196b9acb29ca5c25363c82d2da6c90c576125b28de37f49429b68f77476ef09382a112e95623a122f
7
- metadata.gz: c50cf042528029489d54b98c966c580dbac20f4d5cd63483b90f8ae6327eb5e42d63fbdf28d313f9009b9eb6c45bc6a2aaab2e212edfcebc55f4bc91a115918a
6
+ metadata.gz: 799aa3067dc9a909e53149325fa3dab93b31b3be9422e3bf31d750bb9d4801cf8f355e93ad3a55f3f324ef1c2a285cc2fb523d0980b1b0305aea41d6acffa722
7
+ data.tar.gz: c38b356619db6e625920a99deaeedfc5f673cf18934f68d6240f8c23827a9d39d9a562a54884ebd0aef52474bc7b3a695e870b5be12af23a63090f0357a230c1
@@ -6,7 +6,7 @@ require 'salt_hiera/plugins/no_plugin'
6
6
  module SaltHiera
7
7
  class SaltHiera
8
8
 
9
- VERSION="0.1"
9
+ VERSION="0.3"
10
10
 
11
11
  def initialize attributes
12
12
  raise "Config error (#{params})" unless attributes[:config_file]
@@ -53,6 +53,12 @@ class SaltHiera
53
53
 
54
54
  results = {}
55
55
 
56
+ @config.keys.each do |key|
57
+ if @config[key].class == String
58
+ @config[key].gsub!(/\%\{(.*?)\}/) {|exp| @params[exp[2..-2]] || "!NOT_DEFINED!" } # Detokenize
59
+ end
60
+ end
61
+
56
62
  @config["hierarchy"].reverse.each do |hierarchy|
57
63
  Logger.debug "Analysing hierarchy element: #{hierarchy}"
58
64
  hierarchy_type, hierarchy_glob = hierarchy.split(':', 2)
data/salthiera.gemspec CHANGED
@@ -16,7 +16,4 @@ Gem::Specification.new do |gem|
16
16
  gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
17
17
  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
18
18
  gem.require_paths = ["lib"]
19
-
20
- gem.add_dependency('trollop', '>=2.0')
21
- gem.add_dependency('highline', '>=1.6.19')
22
19
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: salthiera
3
3
  version: !ruby/object:Gem::Version
4
- version: "0.1"
4
+ version: "0.3"
5
5
  platform: ruby
6
6
  authors:
7
7
  - Geoff Meakin
@@ -9,28 +9,9 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2014-01-28 00:00:00 Z
13
- dependencies:
14
- - !ruby/object:Gem::Dependency
15
- name: trollop
16
- version_requirements: &id001 !ruby/object:Gem::Requirement
17
- requirements:
18
- - - ">="
19
- - !ruby/object:Gem::Version
20
- version: "2.0"
21
- prerelease: false
22
- requirement: *id001
23
- type: :runtime
24
- - !ruby/object:Gem::Dependency
25
- name: highline
26
- version_requirements: &id002 !ruby/object:Gem::Requirement
27
- requirements:
28
- - - ">="
29
- - !ruby/object:Gem::Version
30
- version: 1.6.19
31
- prerelease: false
32
- requirement: *id002
33
- type: :runtime
12
+ date: 2014-04-28 00:00:00 Z
13
+ dependencies: []
14
+
34
15
  description: Hiera like tool for use as an external pillar with SaltStack
35
16
  email:
36
17
  executables:
@@ -74,13 +55,13 @@ require_paths:
74
55
  - lib
75
56
  required_ruby_version: !ruby/object:Gem::Requirement
76
57
  requirements:
77
- - &id003
58
+ - &id001
78
59
  - ">="
79
60
  - !ruby/object:Gem::Version
80
61
  version: "0"
81
62
  required_rubygems_version: !ruby/object:Gem::Requirement
82
63
  requirements:
83
- - *id003
64
+ - *id001
84
65
  requirements: []
85
66
 
86
67
  rubyforge_project: