mixlib-config 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05795379d8df703468f3f0dea7e8e28f9229cbca557e1e6ab6b1bf5b36781536'
-  data.tar.gz: 951f9d4f144a3d60a46d8c702962c7c9ca08eafbe6a3edd104b32b347691ebb3
+  metadata.gz: df81f1268299346629241aff765fad4fcb4e458fe9eaa810a187a6dd1397b3d5
+  data.tar.gz: 1fb4968f38fef4c1f8b78baf4e9516e8295803b68778eb259698db4b094d998e
 SHA512:
-  metadata.gz: eeb6834b5842c7b4ac030f4465a9d54e784cd8925cfc09fb0d307b35241eedd4769abf7eb67ded947093180d53c35491f8b5444e479d75604434aa385df62277
-  data.tar.gz: 76e29d1167cfcc8314c1823971c7290fc4da7f403f06a99f42480e9adc1390b70482a192a08a619f11f61568c207a43feec9591e2a97890cf27b645454942505
+  metadata.gz: e0576c33521eafd4f4a3db47704536c491da50f98ca3052fcbba06e28cbf87d8f865ddee060694e4931e7369e7250bf70793c78362e9ca3d29b6f1aee4c12007
+  data.tar.gz: 46d0dcb314b8840048d16692fedec257a7871fcd9ff2b2859fa888af35c602e0e25a63d6f2a21f1b4cee36b5825d0b001e3a745a31f2484d63e626566120225e

data/README.md

@@ -43,11 +43,12 @@ And you can modify configuration values with this syntax:
   MyConfig[:first_value] = 'foobar' # sets first_value to 'foobar'
 ```
 
-If you prefer to allow your users to pass in configuration via YAML or JSON files, `mixlib-config` supports that too!
+If you prefer to allow your users to pass in configuration via YAML, JSON or TOML files, `mixlib-config` supports that too!
 
 ```ruby
   MyConfig.from_file('~/.myconfig.yml')
   MyConfig.from_file('~/.myconfig.json')
+  MyConfig.from_file('~/.myconfig.toml')
 ```
 
 This way, a user could write a YAML config file that looked like this:
@@ -67,6 +68,13 @@ or a JSON file that looks like this:
 }
 ```
 
+or a TOML file that looks like this:
+
+```toml
+first_value = "hi"
+second_value = "goodbye"
+```
+
 Please note: There is an inherent limitation in the logic you can do with YAML and JSON file. At this time, `mixlib-config` does not support ERB or other logic in YAML or JSON config (read "static content only").
 
 ## Nested Configuration
@@ -294,4 +302,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-

data/lib/mixlib/config/version.rb

@@ -19,7 +19,7 @@
 module Mixlib
   module Config
 
-    VERSION = "2.2.5"
+    VERSION = "2.2.6"
 
   end
 end

data/lib/mixlib/config.rb

@@ -57,6 +57,8 @@ module Mixlib
         from_yaml(filename)
       elsif File.extname(filename) == ".json"
         from_json(filename)
+      elsif File.extname(filename) == ".toml"
+        from_toml(filename)
       else
         instance_eval(IO.read(filename), filename, 1)
       end
@@ -80,6 +82,11 @@ module Mixlib
       from_hash(JSON.parse(IO.read(filename)), filename)
     end
 
+    def from_toml(filename)
+      require "tomlrb"
+      from_hash(Tomlrb.parse(IO.read(filename), symbolize_keys: true))
+    end
+
     # Transforms a Hash into method-style configuration syntax to be processed
     #
     # === Parameters

data/mixlib-config.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |s|
   s.description = s.summary
   s.license = "Apache-2.0"
 
+  s.add_dependency "tomlrb"
+
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "chefstyle"

data/spec/mixlib/config_spec.rb

@@ -759,8 +759,8 @@ describe Mixlib::Config do
         x 10
         y 20
       end
-      @klass.blah.x.should == 10
-      @klass.blah.y.should == 20
+      expect(@klass.blah.x).to eq 10
+      expect(@klass.blah.y).to eq 20
     end
 
     it "setting the context values in a yielded block overrides the default values" do
@@ -768,8 +768,8 @@ describe Mixlib::Config do
         b.x = 10
         b.y = 20
       end
-      @klass.blah.x.should == 10
-      @klass.blah.y.should == 20
+      expect(@klass.blah.x).to eq 10
+      expect(@klass.blah.y).to eq 20
     end
 
     it "after reset of the parent class, children are reset" do
@@ -1186,7 +1186,7 @@ alpha: beta
       EOH
     end
 
-    it "turns YAML into method-style setting" do
+    it "turns JSON into method-style setting" do
       allow(File).to receive(:exists?).and_return(true)
       allow(File).to receive(:readable?).and_return(true)
       allow(IO).to receive(:read).with("config.json").and_return(json)
@@ -1200,6 +1200,28 @@ alpha: beta
     end
   end
 
+  describe ".from_toml" do
+    let(:toml) do
+      <<-EOH
+foo = ["bar", "baz", "matazz"]
+alpha = "beta"
+      EOH
+    end
+
+    it "turns TOML into method-style setting" do
+      allow(File).to receive(:exists?).and_return(true)
+      allow(File).to receive(:readable?).and_return(true)
+      allow(IO).to receive(:read).with("config.toml").and_return(toml)
+
+      expect(lambda do
+        ConfigIt.from_file("config.toml")
+      end).to_not raise_error
+
+      expect(ConfigIt.foo).to eql(%w{ bar baz matazz })
+      expect(ConfigIt.alpha).to eql("beta")
+    end
+  end
+
   describe ".from_hash" do
     let(:hash) do
       {

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-config
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: tomlrb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement