cheffish 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e80fab8f974325b02588b59deeceb5ef09f09d93
-  data.tar.gz: c529cab52c9114b867220a79c57547047621c513
+  metadata.gz: 18704ce9d93e9b7f2e0009aec7fae8796e7b890b
+  data.tar.gz: 94d26ffa96ea4363482d9c76dd0b734a3b06c15e
 SHA512:
-  metadata.gz: 43c6db79856bea2d371c38c6937f3e53d4c1cafa1e053686dca513d943a8882ccaa56821d0db37d249c102e10680135fd658fe9a94cd46d3743e0fa7f2916df2
-  data.tar.gz: c63bb304439024c4ca4732c05fd12f602b72bbba3cebe0338e24ee18ca16612ac821a5e822c998b668edac62f3e022d0a5c67f0037ffd8056c4b2839db139f32
+  metadata.gz: 750e6567aeb409b1f68d692d4a7f41b22592a0cfabd6d1081b43c44fa24a50fc37fc9a73be328e250815a53ac75c13478ebb6372b4c133b4308512c22eb47f90
+  data.tar.gz: 21a7ce7717192db9bf36fc18ceccdf10e528fae29bf35417f751b0b88250e7dd33d5f0aed2c4cc13b1d3abd33df9ba132ccf8e06521611e105bdd1e29e16b24c

data/lib/cheffish/merged_config.rb

@@ -1,10 +1,8 @@
-require "chef/mash"
-
 module Cheffish
   class MergedConfig
     def initialize(*configs)
-      @configs = configs.map { |config| Chef::Mash.from_hash config }
-      @merge_arrays = Chef::Mash.new
+      @configs = configs
+      @merge_arrays = {}
     end
 
     include Enumerable

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

data/spec/functional/merged_config_spec.rb

@@ -6,24 +6,6 @@ describe "merged_config" do
     Cheffish::MergedConfig.new({ :test => "val" })
   end
 
-  let(:collision) do
-    c1 = { :test1 => "c1.1", "test2" => "c1.2" }
-    c2 = { "test1" => "c2.1", "test3" => "c2.3" }
-    Cheffish::MergedConfig.new(c1, c2)
-  end
-
-  let(:config_mismatch) do
-    c1 = { :test => { :test => "val" } }
-    c2 = { :test => [2, 3, 4] }
-    Cheffish::MergedConfig.new(c1, c2)
-  end
-
-  let(:config_hashes) do
-    c1 = { :test => { :test => "val" } }
-    c2 = { :test => { :test2 => "val2" } }
-    Cheffish::MergedConfig.new(c1, c2)
-  end
-
   it "returns value in config" do
     expect(config.test).to eq("val")
   end
@@ -33,28 +15,6 @@ describe "merged_config" do
   end
 
   it "has an informative string representation" do
-    expect("#{config}").to eq("{\"test\"=>\"val\"}")
-  end
-
-  it "has indifferent str/sym access" do
-    expect(config["test"]).to eq("val")
-  end
-
-  it "respects precedence between the different configs" do
-    expect(collision["test1"]).to eq("c1.1")
-    expect(collision[:test1]).to eq("c1.1")
-  end
-
-  it "merges the configs" do
-    expect(collision[:test2]).to eq("c1.2")
-    expect(collision[:test3]).to eq("c2.3")
-  end
-
-  it "handle merged value type mismatch" do
-    expect(config_mismatch[:test]).to eq("test" => "val")
-  end
-
-  it "merges values when they're hashes" do
-    expect(config_hashes[:test].keys).to eq(%w{test test2})
+    expect("#{config}").to eq("{:test=>\"val\"}")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: A library to manipulate Chef in Chef.