hiera-eyaml 1.3.6 → 1.3.7

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
- metadata.gz: fd604ddb2c6f8adf745fed348920b45ab3a0051d
4
- data.tar.gz: 01e94d73736916ca89cb7bcd23959eedae9d07b0
3
+ metadata.gz: 35b1bd91e6c23c3a0c52c99a84aa89c6e6e144ab
4
+ data.tar.gz: e9f39be021a877caf772a79e0d8e145d138c0ee8
5
5
  SHA512:
6
- metadata.gz: f0f880c7d2ca7c3d3408e4a586652af2f988fe54881d629dd667de7f92029812faae72118877260eb4edbbd6e4f15042af5ac93eb65f7d125daf7de6cffc4b54
7
- data.tar.gz: 31a004da4f61c74f0e03abc544efeae5a2daf31ea2a76543700b098e3cef3948d12b79a06d8c55ee464dc4c7783a467e73cb09f75c9ad60e18f711d01d517d5b
6
+ metadata.gz: 18fc2732feabb0946f769c38adad97d7f1f02bd9a19a7861a70a2ca00b36b8a3d7f3808a8cbed2cf58572329b6b29f3723c5aad0a378fd71e2897b9e2bdcb054
7
+ data.tar.gz: b93af7d7f78bbf81cadc47656ed8bdd5286935c71ce7c19588f10fccf68016ddaa72b6e2f6b1bd4a2b4c5155bfaa5d40230b506dbdee7f7483effab80a8f5e6d
@@ -2,7 +2,7 @@ class Hiera
2
2
  module Backend
3
3
  module Eyaml
4
4
 
5
- VERSION = "1.3.6"
5
+ VERSION = "1.3.7"
6
6
 
7
7
  def self.default_encryption_scheme= new_encryption
8
8
  @@default_encryption_scheme = new_encryption
@@ -38,6 +38,9 @@ class Hiera
38
38
  format = args[:format].nil? ? @format : args[:format]
39
39
  case format
40
40
  when :block
41
+ # strip any white space
42
+ @cipher = @cipher.gsub(/ /m, "")
43
+ # normalize indentation
41
44
  ciphertext = @cipher.gsub(/\n/, "\n" + @indentation)
42
45
  chevron = (args[:use_chevron].nil? || args[:use_chevron]) ? ">\n" : ''
43
46
  "#{label_string}#{chevron}" + @indentation + "ENC[#{@encryptor.tag},#{ciphertext}]"
@@ -120,7 +123,7 @@ class Hiera
120
123
 
121
124
  class DecBlockTokenType < TokenType
122
125
  def initialize
123
- @regex = />\n(\s*)DEC(\(\d+\))?::(\w+)\[(.+?)\]\!/
126
+ @regex = />\n(\s*)DEC(\(\d+\))?::(\w+)\[(.+?)\]\!/m
124
127
  end
125
128
  def create_token(string)
126
129
  md = @regex.match(string)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hiera-eyaml
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.6
4
+ version: 1.3.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tom Poulton
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-11-12 00:00:00.000000000 Z
11
+ date: 2013-11-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: trollop