cheffish 14.0.0 → 14.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f6ecddddfa8f90832d8ad7d05400ca5b048adc893f76fcae5f7fd6ecfc53c9b
-  data.tar.gz: 9101aace718148349b30e201d9f73827e8bbb53ed7cc9c0b611f7165d8cad2ce
+  metadata.gz: b322f6c35d8de419ca2d82d4b6314d6611ea8fc1f3713a0dd2a226d805f9cf32
+  data.tar.gz: e9f224665c4aa7c477310f58873db64f785c2ea57550cd0c2a78b1ac9239c9cc
 SHA512:
-  metadata.gz: 54e953e78c992fde1f9b668b5ac4c922ecb84600fe954f6a065da4fe81405ef7973c197e774a24c4bc27442bf6cdd14db80306f54f1827f91278ea1e95776f34
-  data.tar.gz: ea7a0e239965f8943f7fbd1cbeae547142be925c1e1612649b6fdce356c946921b19f8e29d6fc7ab202c2a32854aca2aefa3c06b00b4729aa6aa75f9d9888a3f
+  metadata.gz: 79ff38ae7d3a5739e5a8d1464758899156c6d8282713d6c5a22cb18e3fd0229a58f69c3db4d7588b2f57585b0ab555a2314850f9b0f61fa868f4ec2426266bd7
+  data.tar.gz: fbaf1722dd64857f8da5946f4b61a7249370113f34b98cf63802513dd6f30bf12d37e27ebe777cf78d428402043fa0a01281487b9daf57de4e857d7348258dc9

data/Gemfile

@@ -2,12 +2,8 @@ source "https://rubygems.org"
 
 gemspec
 
-group :changelog do
-  gem "github_changelog_generator", git: "https://github.com/tduffield/github-changelog-generator", branch: "adjust-tag-section-mapping"
-end
-
 group :development do
-  gem "chefstyle"
+  gem "chefstyle", "= 0.6.0"
   gem "rake"
   gem "rspec", "~> 3.0"
 end
@@ -18,7 +14,7 @@ if ENV["GEMFILE_MOD"]
   instance_eval(ENV["GEMFILE_MOD"])
 else
   group :development do
-    gem "chef", git: "https://github.com/chef/chef", branch: "tm/inject_log" # until 13 is released
-    gem "ohai", git: "https://github.com/chef/ohai" # until 13 is released
+    gem "chef", "~> 14"
+    gem "ohai", "~> 14"
   end
 end

data/Rakefile

@@ -31,8 +31,7 @@ begin
     config.enhancement_labels = "enhancement,Enhancement,Improvement,New Feature,Feature".split(",")
     config.bug_labels = "bug,Bug,Upstream Bug".split(",")
     config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Discussion".split(",")
-    config.max_issues = 0
-    config.add_issues_wo_labels = false
+    config.issues = false
   end
 rescue LoadError
 end

data/cheffish.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = "jkeiser@chef.io"
   s.homepage = "http://github.com/chef/cheffish"
 
-  s.required_ruby_version = ">= 2.3.3"
+  s.required_ruby_version = ">= 2.4.0"
 
   s.add_dependency "chef-zero", "~> 14.0"
   s.add_dependency "net-ssh"

data/lib/cheffish/merged_config.rb

@@ -3,8 +3,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.map { |config| Mash.from_hash config.to_hash }
+      @merge_arrays = Mash.new
     end
 
     include Enumerable
@@ -48,6 +48,7 @@ module Cheffish
     end
 
     def method_missing(name, *args)
+      $stderr.puts "WARN: deprecated use of method_missing on a Cheffish::MergedConfig object at #{caller[0]}"
       if args.count > 0
         raise NoMethodError, "Unexpected method #{name} for MergedConfig with arguments #{args}"
       else

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = "14.0.0"
+  VERSION = "14.0.1"
 end

data/spec/functional/merged_config_spec.rb

@@ -24,6 +24,13 @@ describe "merged_config" do
     Cheffish::MergedConfig.new(c1, c2)
   end
 
+  let(:nested_config) do
+    c1 = { :test => { :test => "val" } }
+    c2 = { :test => { :test2 => "val2" } }
+    mc = Cheffish::MergedConfig.new(c2)
+    Cheffish::MergedConfig.new(c1, mc)
+  end
+
   it "returns value in config" do
     expect(config.test).to eq("val")
   end
@@ -57,4 +64,8 @@ describe "merged_config" do
   it "merges values when they're hashes" do
     expect(config_hashes[:test].keys).to eq(%w{test test2})
   end
+
+  it "supports nested merged configs" do
+    expect(nested_config[:test].keys).to eq(%w{test test2})
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 14.0.0
+  version: 14.0.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -122,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.3
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A library to manipulate Chef in Chef.