hiera 1.1.1 → 1.1.2.rc1

data/lib/hiera.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 class Hiera
-  VERSION = "1.1.1"
+  VERSION = "1.1.2-rc1"
 
   autoload :Config,         "hiera/config"
   autoload :Util,           "hiera/util"

data/lib/hiera/config.rb

@@ -1,17 +1,30 @@
 class Hiera::Config
   class << self
-    # Takes a string or hash as input, strings are treated as filenames
+    ##
+    # load takes a string or hash as input, strings are treated as filenames
     # hashes are stored as data that would have been in the config file
     #
     # Unless specified it will only use YAML as backend with a single
     # 'common' hierarchy and console logger
+    #
+    # @return [Hash] representing the configuration.  e.g.
+    #   {:backends => "yaml", :hierarchy => "common"}
     def load(source)
       @config = {:backends => "yaml",
                  :hierarchy => "common"}
 
       if source.is_a?(String)
         if File.exist?(source)
-          config = YAML.load_file(source)
+          config = begin
+                     yaml_load_file(source)
+                   rescue TypeError => detail
+                     case detail.message
+                     when /no implicit conversion from nil to integer/
+                       false
+                     else
+                       raise detail
+                     end
+                   end
           @config.merge! config if config
         else
           raise "Config file #{source} not found"
@@ -32,6 +45,16 @@ class Hiera::Config
       @config
     end
 
+    ##
+    # yaml_load_file directly delegates to YAML.load_file and is intended to be
+    # a private, internal method suitable for stubbing and mocking.
+    #
+    # @return [Object] return value of {YAML.load_file}
+    def yaml_load_file(source)
+      YAML.load_file(source)
+    end
+    private :yaml_load_file
+
     def load_backends
       @config[:backends].each do |backend|
         begin

data/spec/unit/config_spec.rb

@@ -59,6 +59,18 @@ class Hiera
         Hiera.expects(:logger=).with("console")
         Config.load({})
       end
+
+      context "loading '/dev/null' as spec tests do" do
+        before :each do
+          # Simulate the behavior of YAML.load_file('/dev/null') in MRI 1.9.3p194
+          Config.stubs(:yaml_load_file).
+            raises(TypeError, "no implicit conversion from nil to integer")
+        end
+
+        it "is not exceptional behavior" do
+          expect { Config.load('/dev/null') }.to_not raise_error
+        end
+      end
     end
 
     describe "#load_backends" do

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hiera
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  hash: -3999677168
+  prerelease: 6
   segments: 
   - 1
   - 1
+  - 2
+  - rc
   - 1
-  version: 1.1.1
+  version: 1.1.2.rc1
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-31 00:00:00 Z
+date: 2012-12-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -81,12 +83,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: