mixlib-config 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebf0bd30e24aaeef0c7f79e0e4ce25adc6bef352
-  data.tar.gz: 800fd90f845685bd25aedc76fa6a5fc93bd0b485
+  metadata.gz: d8af6841c4facccc997e4f034d65114d5cb37493
+  data.tar.gz: 83cce1c086a8ced0d664a0c69fbda32984abbf49
 SHA512:
-  metadata.gz: db587efec382225f4f1f8655b7f0d364825c34b3897913b516f8398e0b2b18a94d025e85f0f4ee83d3237f5b5f94c498b80036262f11a9036ff75bae12be2ef6
-  data.tar.gz: 6d06502f5e374fe48227ac4f82eba7dd330ecdfeba2becfadf5f078c3fa3a25eec7043a736dd23279d656eec13108507d4ece022beba8e002e0d404821022fd2
+  metadata.gz: ec9e172a49462573a09580ecd568ce2fa8c3827f48d38c93a5288269481d0b023e111a8acadd801f0682f7081ea56a70f9201747d90dff55f09f2867a648256d
+  data.tar.gz: 46eeefec4cd14ba0283461a319955c444e5ab0b0f4213ed4fe85c309ccf3bc48b0687b0fb2d1b462b4914b2e89b0d3c473194dca3f00b675dd28658671726216

data/README.md

@@ -59,11 +59,30 @@ Often you want to be able to group configuration options to provide a common con
   end
 ```
 
-The user can write their config file like this:
+The user can write their config file in one of three formats:
 
+#### Method Style
 ```ruby
-  logging.base_filename 'superlog'
-  logging.max_log_files 2
+logging.base_filename 'superlog'
+logging.max_log_files 2
+```
+
+#### Block Style
+Using this format the block is executed in the context, so all configurables on that context is directly accessible
+```ruby
+logging do
+  base_filename 'superlog'
+  max_log_files 2
+end
+```
+
+#### Block with Argument Style
+Using this format the context is given to the block as an argument
+```ruby
+logging do |l|
+  l.base_filename = 'superlog'
+  l.max_log_files = 2
+end
 ```
 
 You can access these variables thus:

data/lib/mixlib/config.rb

@@ -174,6 +174,7 @@ module Mixlib
       end
       result
     end
+    alias :to_hash :save
 
     # Restore non-default values from the given hash.
     #
@@ -416,7 +417,7 @@ module Mixlib
       if configurables.has_key?(symbol)
         configurables[symbol].set(self.configuration, value)
       elsif config_contexts.has_key?(symbol)
-        config_contexts[symbol].restore(value)
+        config_contexts[symbol].restore(value.to_hash)
       else
         if config_strict_mode == :warn
           Chef::Log.warn("Setting unsupported config value #{symbol}.")
@@ -461,8 +462,18 @@ module Mixlib
         internal_set(symbol, value)
       end
       # Getter
-      meta.send :define_method, symbol do |*args|
-        internal_get_or_set(symbol, *args)
+      meta.send :define_method, symbol do |*args, &block|
+        # If a block was given, eval it in the context
+        if block
+          # If the block expects no arguments, then instance_eval
+          if block.arity == 0
+            internal_get(symbol).instance_eval(&block)
+          else # yield to the block
+            block.yield(internal_get(symbol))
+          end
+        else
+          internal_get_or_set(symbol, *args)
+        end
       end
     end
   end

data/lib/mixlib/config/version.rb

@@ -19,7 +19,7 @@
 module Mixlib
   module Config
 
-    VERSION = "2.2.3"
+    VERSION = "2.2.4"
 
   end
 end

data/spec/mixlib/config_spec.rb

@@ -754,6 +754,24 @@ describe Mixlib::Config do
       expect(@klass.blah.z).to eql(10)
     end
 
+    it "setting the context values in a block overrides the default values" do
+      @klass.blah do
+        x 10
+        y 20
+      end
+      @klass.blah.x.should == 10
+      @klass.blah.y.should == 20
+    end
+
+    it "setting the context values in a yielded block overrides the default values" do
+      @klass.blah do |b|
+        b.x = 10
+        b.y = 20
+      end
+      @klass.blah.x.should == 10
+      @klass.blah.y.should == 20
+    end
+
     it "after reset of the parent class, children are reset" do
       @klass.blah.x = 10
       expect(@klass.blah.x).to eql(10)
@@ -850,12 +868,20 @@ describe Mixlib::Config do
       expect(@klass.blah.yarr.y).to eql(6)
     end
 
-    it "resmoves added properties not included in saved state" do
+    it "removes added properties not included in saved state" do
       @klass.blah.yarr.z = 12
       @klass.restore( :blah => { :yarr => { :x => 10 } } )
       expect(@klass.blah.yarr.x).to eql(10)
       expect(@klass.blah.yarr.z).to eql(nil)
     end
+
+    it "can set a config context from another context" do
+      @klass.blah.blyme = { :x => 7 }
+      blyme = @klass.blah.blyme
+      @klass.blah.yarr.x = 12
+      @klass.blah.yarr = blyme
+      expect(@klass.blah.yarr.x).to eql(7)
+    end
   end
 
   describe "When a config_context with no defaulted values exists" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-config
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake