figleaf 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c3ffa2ddc1516568962663915086576c9537c7f
-  data.tar.gz: dc3a87ec97a6c98c2a34c2c1b726ec158744c59a
+  metadata.gz: ec9ac4b9f179b8da23d4fe6fd4f89573ad041f40
+  data.tar.gz: 6d35c13f543461265cc76ca339335f392fcdf03f
 SHA512:
-  metadata.gz: 758279631bd487d533e30b88bbe731a47ff136b34cddeb03c1e64dec22168d32d54fb6596d5886d238335e1f6ff591c07ea5e05df80849e57edd344615147d75
-  data.tar.gz: cef0b6499ad5c4d7c7b0e8a24ba26d42c68676e6e1afae4668d78398433cb51c522f469f6c52b0cc71e1c2f96f59c45315893868c2218629ae8995cb7a38c046
+  metadata.gz: 80c139d2c4a5b3cb77999e9101940248ecb2b82ec9dc83420d89f7fc7462fe7875de2c61c9b7ba868be611500a5fa6b27dc53e707c3d730784741f740a551e4f
+  data.tar.gz: 4bb3aefcc80e712dcb231a413f3b3e867004248ca4a36491d8c56e2f9b29889a98a7dc8d6fb304043d914ab7919a486c87478b9b02ed783d8dfc932bfb4f6d6c

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## 0.2.7, 0.2.8 and 0.2.9 (2017/09/28)
+Bugfixes
+
 ## 0.2.6 (2017/09/28)
 Add ability to write config files in ruby
 

data/lib/figleaf/config.rb

@@ -9,6 +9,8 @@ module Figleaf
       instance_eval(&block)
 
       property
+    rescue Exception => e
+      raise Settings::InvalidRb, "Configuration has invalid Ruby\n" + e.message
     end
 
     def method_missing(method_name, *args, &block)
@@ -50,6 +52,8 @@ module Figleaf
       else
         val
       end
+    rescue => e
+      raise Settings::InvalidRb, "Configuration has invalid Ruby\n" + e.message
     end
   end
 end

data/lib/figleaf/settings.rb

@@ -70,7 +70,7 @@ module Figleaf
 
         default = config["default"]
         property = config[env_to_load]
-        property = default.merge(property) if !default.nil?
+        property = default.merge(property || {}) if !default.nil?
 
         [property_name, use_hashie_if_hash(property)]
       end

data/lib/figleaf/version.rb

@@ -1,3 +1,3 @@
 module Figleaf
-  VERSION = '0.2.7'
+  VERSION = '0.2.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: figleaf
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Juan C. Müller