hiera 3.3.0 → 3.3.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjYwZjFmOWEyMDM2ZGUwOGUzYTU3ODUwODBhNzQ4NDQyMWVjYzhiZg==
-  data.tar.gz: !binary |-
-    ZDNkNGRjODE5NjE5N2FlZDc4MWQ0MWMxMDBhYjA5ODNhYjg2ODZiOA==
+SHA1:
+  metadata.gz: 7c13650072ce82f7b941ac80e14c8a04c78e4b8e
+  data.tar.gz: 374ab47d4d1cb6462246d61dc1c4e6235a29a4f0
 SHA512:
-  metadata.gz: !binary |-
-    M2M2ZWIzNTI1NDQ1ZDc4NzAxZTIwZGQzYTNmODliNWY1ODAzNWVjNGVmYTRl
-    OTM4MTMzOWZkNDU2MWJhZjZmZDU4YjU0Y2ZiNmU0ZGVlODcwYzg5ZGYwODNi
-    OGMwYjlhODRmYmE4MjZmNmNhNzg3ZjU1NzM3ZTA1MDhhMDBmZTY=
-  data.tar.gz: !binary |-
-    MmY2NTZmOTZhODEyOGNhMDMxM2Q0MzI0NDVmNzlhYzc2NDVlMzk1MjBkMmQz
-    NWI4ZWJkZDhiNjIzNzczYTIzNjI4MTU3YTU4MWM2ZjJlOWFmNzNhNzdlOWYy
-    ZGIyNWRiNDBkNGIxNDQ2ZWM2ZDllN2Y1ZWY3OWJhZWY3ZjRkNzg=
+  metadata.gz: 0710bac409a578923260a095d31aa1bf355ee77e3ce4696973bd463a567a82551f5600bf92d2b081a32f2af10e2b505c4a26b7e187e82bc296774dd49268cd0d
+  data.tar.gz: c0e7e3b8c6a8adbd8d30e850a29a8523d2b61f48f03af50768bf76d53445e442098e81b6256b87b3bbf7091200e9e271ef8ccbbd44f7a1628a57446f0884df62

data/lib/hiera/config.rb

@@ -26,7 +26,13 @@ class Hiera::Config
                        raise detail
                      end
                    end
-          @config.merge! config if config
+          if config
+            version = config['version'] || config[:version] || 3
+            if version >= 4
+              raise "v4 hiera.yaml is only to be used inside an environment or a module and cannot be given to the global hiera"
+            end
+            @config.merge! config
+          end
         else
           raise "Config file #{source} not found"
         end

data/lib/hiera/filecache.rb

@@ -49,7 +49,7 @@ class Hiera
     # in processing will be propagated to the caller
     def read_file(path, expected_type = Object)
       if stale?(path)
-        data = File.read(path)
+        data = File.read(path, :encoding => 'BOM|UTF-8')
         @cache[path][:data] = block_given? ? yield(data) : data
 
         if !@cache[path][:data].is_a?(expected_type)

data/lib/hiera/version.rb

@@ -7,7 +7,7 @@
 
 
 class Hiera
-  VERSION = "3.3.0"
+  VERSION = "3.3.1"
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/unit/config_spec.rb

@@ -12,6 +12,10 @@ class Hiera
         }
       end
 
+      it 'should raise an error if the configuration version is greater than 3' do
+        expect { Hiera.new(:config => File.join(HieraSpec::FIXTURE_DIR, 'badconfig', 'config', 'hiera.yaml')) }.to raise_error(/v4 hiera\.yaml is only to be used inside an environment or a module/)
+      end
+
       it "should raise an error for missing config files" do
         File.expects(:exist?).with("/nonexisting").returns(false)
         YAML.expects(:load_file).with("/nonexisting").never

data/spec/unit/filecache_spec.rb

@@ -84,6 +84,36 @@ class Hiera
         end
       end
 
+      it "sets the encoding to UTF-8 when reading a file" do
+        begin
+          original_encoding = Encoding.default_external
+          Encoding.default_external = Encoding::ISO_8859_1
+
+          Dir.mktmpdir do |dir|
+            file = File.join(dir, "testing")
+            write_file(file, "my data")
+            expect(@cache.read_file(file).encoding).to eq(Encoding::UTF_8)
+          end
+        ensure
+          Encoding.default_external = original_encoding
+        end
+      end
+
+      it "reads a file with unicode characters" do
+        begin
+          original_encoding = Encoding.default_external
+          Encoding.default_external = Encoding::ISO_8859_1
+
+          Dir.mktmpdir do |dir|
+            file = File.join(dir, "testing")
+            write_file(file, "\u2603")
+            expect(@cache.read_file(file)).to eq("\u2603")
+          end
+        ensure
+          Encoding.default_external = original_encoding
+        end
+      end
+
       it "rereads data when the file changes" do
         Dir.mktmpdir do |dir|
           file = File.join(dir, "testing")

data/spec/unit/fixtures/badconfig/config/hiera.yaml

@@ -0,0 +1,6 @@
+---
+:version: 4
+:hierarchy:
+  - :name: "common"
+    :backend: yaml
+:datadir: "data"

data/spec/unit/fixtures/badconfig/data/common.yaml

@@ -0,0 +1,2 @@
+foo: '%{hiera("bar")}'
+bar: 'common'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies: []
 description: A pluggable data store for hierarcical data
 email: info@puppetlabs.com
@@ -17,11 +17,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- COPYING
-- LICENSE
-- README.md
 - bin/hiera
-- lib/hiera.rb
 - lib/hiera/backend.rb
 - lib/hiera/backend/json_backend.rb
 - lib/hiera/backend/yaml_backend.rb
@@ -36,6 +32,10 @@ files:
 - lib/hiera/recursive_guard.rb
 - lib/hiera/util.rb
 - lib/hiera/version.rb
+- lib/hiera.rb
+- COPYING
+- README.md
+- LICENSE
 - spec/spec_helper.rb
 - spec/unit/backend/json_backend_spec.rb
 - spec/unit/backend/yaml_backend_spec.rb
@@ -44,6 +44,8 @@ files:
 - spec/unit/console_logger_spec.rb
 - spec/unit/fallback_logger_spec.rb
 - spec/unit/filecache_spec.rb
+- spec/unit/fixtures/badconfig/config/hiera.yaml
+- spec/unit/fixtures/badconfig/data/common.yaml
 - spec/unit/fixtures/interpolate/config/hiera.yaml
 - spec/unit/fixtures/interpolate/config/hiera_iplm_hiera.yaml
 - spec/unit/fixtures/interpolate/config/hiera_iplm_hiera_bad.yaml
@@ -73,46 +75,48 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Light weight hierarchical data store
 test_files:
-- spec/unit/interpolate_spec.rb
-- spec/unit/fixtures/override/config/hiera.yaml
-- spec/unit/fixtures/override/data/alternate.yaml
-- spec/unit/fixtures/override/data/common.yaml
+- spec/spec_helper.rb
+- spec/unit/backend/json_backend_spec.rb
+- spec/unit/backend/yaml_backend_spec.rb
+- spec/unit/backend_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/console_logger_spec.rb
+- spec/unit/fallback_logger_spec.rb
+- spec/unit/filecache_spec.rb
+- spec/unit/fixtures/badconfig/config/hiera.yaml
+- spec/unit/fixtures/badconfig/data/common.yaml
+- spec/unit/fixtures/interpolate/config/hiera.yaml
 - spec/unit/fixtures/interpolate/config/hiera_iplm_hiera.yaml
 - spec/unit/fixtures/interpolate/config/hiera_iplm_hiera_bad.yaml
-- spec/unit/fixtures/interpolate/config/hiera.yaml
-- spec/unit/fixtures/interpolate/data/niltest.yaml
-- spec/unit/fixtures/interpolate/data/complex.yaml
-- spec/unit/fixtures/interpolate/data/frontend.json
-- spec/unit/fixtures/interpolate/data/role.json
 - spec/unit/fixtures/interpolate/data/bad_interpolation.yaml
+- spec/unit/fixtures/interpolate/data/complex.yaml
 - spec/unit/fixtures/interpolate/data/dotted_keys.yaml
-- spec/unit/fixtures/interpolate/data/weird_keys.yaml
 - spec/unit/fixtures/interpolate/data/empty_interpolation.yaml
+- spec/unit/fixtures/interpolate/data/frontend.json
+- spec/unit/fixtures/interpolate/data/niltest.yaml
 - spec/unit/fixtures/interpolate/data/recursive.yaml
-- spec/unit/backend_spec.rb
-- spec/unit/filecache_spec.rb
-- spec/unit/config_spec.rb
-- spec/unit/backend/yaml_backend_spec.rb
-- spec/unit/backend/json_backend_spec.rb
+- spec/unit/fixtures/interpolate/data/role.json
+- spec/unit/fixtures/interpolate/data/weird_keys.yaml
+- spec/unit/fixtures/override/config/hiera.yaml
+- spec/unit/fixtures/override/data/alternate.yaml
+- spec/unit/fixtures/override/data/common.yaml
+- spec/unit/hiera_spec.rb
+- spec/unit/interpolate_spec.rb
 - spec/unit/puppet_logger_spec.rb
-- spec/unit/console_logger_spec.rb
-- spec/unit/version_spec.rb
-- spec/unit/fallback_logger_spec.rb
 - spec/unit/util_spec.rb
-- spec/unit/hiera_spec.rb
-- spec/spec_helper.rb
+- spec/unit/version_spec.rb