bogo-config 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d3fb69b6897f82bdf3c449aad1af27ded1f4b70
-  data.tar.gz: 3797393d8f40e4dbc338d7fde873b7e82ea3b36a
+  metadata.gz: df28c06334f917e1601e2447192762e77051b48f
+  data.tar.gz: ab84955b7760e680209998b3f8fef5c8adbb31fe
 SHA512:
-  metadata.gz: 41f2a7a7f6ed477163249e4f7ff8d93edeb30c98e9fe6910632d876ba0b5aa0f60927c6d95c1d919181631573b19e21586312f515a4a25a12b2091508d0612df
-  data.tar.gz: 899b349790ebb5f3f9cce302c0ffda2b93edcd9a32f112aa64bd1501874fe6279dc073e1c95cfd13530827fcc78f830fd11c1286921499b11a09b88ca8ab44ef
+  metadata.gz: a58dec6a9c1f3e4965e351b9081d7d5b01e77cfd97b65b3935da36a035902f2181f7f84905a417ec9ca476236f5e46a00c4b2ae829b02f82d53ae645e52e4140
+  data.tar.gz: facd21861645d92456a2dbd7029fb453d6edb300e31df7e9510f04b01d8d27d14d2e31b1b8bf3da2d22280c4b155371660b526a1189cbaebcccbd830f291fb45

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.12
+* Allow Ruby config disable via environment variable
+* Remove exclusive use during init
+
 ## v0.1.10
 * Gracefully handle failures of ruby files (rescue parse errors)
 

data/README.md

@@ -79,7 +79,7 @@ JSON example could also be written as:
 
 ```ruby
 # /tmp/bogo-config.rb
-Configuration do
+Configuration.new do
   bind do
     address '0.0.0.0'
     port 8080
@@ -123,5 +123,16 @@ The path provided on initialization can also be a directory.
 The contents of the directory will be read in string sorted
 order and deep merged. Files can be a mix of supported types.
 
+### Ruby evaluation
+
+Ruby evaluation is super awesome, except when you don't want
+it and then it's not super awesome. If a running process needs
+to disable Ruby based evaluation (a service perhaps), this
+can be done with an environment variable:
+
+```
+export BOGO_CONFIG_DISABLE_EVAL=true
+```
+
 ## Info
-* Repository: https://github.com/spox/bogo-config
+* Repository: https://github.com/spox/bogo-config

data/lib/bogo-config/config.rb

@@ -123,11 +123,10 @@ module Bogo
       end
       if(hash)
         is_immutable = data.frozen?
-        Thread.exclusive do
-          load_data(hash)
-          @data = hash.to_smash.deep_merge(data.to_smash)
-          @data.to_smash(:freeze) if is_immutable
-        end
+        # TODO: synchronize here
+        load_data(hash)
+        @data = hash.to_smash.deep_merge(data.to_smash)
+        @data.to_smash(:freeze) if is_immutable
       end
       self
     end
@@ -178,7 +177,7 @@ module Bogo
         json_load(file_path)
       when '.xml'
         xml_load(file_path)
-      when '.rb'
+      when '.rb' && eval_enabled?
         struct_load(file_path)
       else
         result = [:struct_load, :json_load, :yaml_load, :xml_load].map do |loader|
@@ -263,10 +262,24 @@ module Bogo
     # @param file_path
     # @return [Smash]
     def struct_load(file_path)
-      result = Module.new.instance_eval(
-        IO.read(file_path), file_path, 1
-      )
-      result._dump.to_smash
+      if(eval_disabled?)
+        raise 'Ruby based configuration evaluation is currently disabled!'
+      else
+        result = Module.new.instance_eval(
+          IO.read(file_path), file_path, 1
+        )
+        result._dump.to_smash
+      end
+    end
+
+    # @return [TrueClass, FalseClass]
+    def eval_enabled?
+      ENV['BOGO_CONFIG_DISABLE_EVAL'].to_s.downcase != 'true'
+    end
+
+    # @return [TrueClass, FalseClass]
+    def eval_disabled?
+      !eval_enabled?
     end
 
   end

data/lib/bogo-config/version.rb

@@ -1,6 +1,6 @@
 module Bogo
   class Config
     # Current library version
-    VERSION = Gem::Version.new('0.1.10')
+    VERSION = Gem::Version.new('0.1.12')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bogo-config
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo
@@ -112,4 +112,3 @@ signing_key:
 specification_version: 4
 summary: Configuration helper library
 test_files: []
-has_rdoc: