cheffish 13.1.0 → 14.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +5 -5
- data/Gemfile +1 -1
- data/cheffish.gemspec +1 -1
- data/lib/cheffish/merged_config.rb +2 -3
- data/lib/cheffish/version.rb +1 -1
- data/spec/functional/merged_config_spec.rb +0 -11
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: 1f6ecddddfa8f90832d8ad7d05400ca5b048adc893f76fcae5f7fd6ecfc53c9b
|
4
|
+
data.tar.gz: 9101aace718148349b30e201d9f73827e8bbb53ed7cc9c0b611f7165d8cad2ce
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 54e953e78c992fde1f9b668b5ac4c922ecb84600fe954f6a065da4fe81405ef7973c197e774a24c4bc27442bf6cdd14db80306f54f1827f91278ea1e95776f34
|
7
|
+
data.tar.gz: ea7a0e239965f8943f7fbd1cbeae547142be925c1e1612649b6fdce356c946921b19f8e29d6fc7ab202c2a32854aca2aefa3c06b00b4729aa6aa75f9d9888a3f
|
data/Gemfile
CHANGED
@@ -18,7 +18,7 @@ if ENV["GEMFILE_MOD"]
|
|
18
18
|
instance_eval(ENV["GEMFILE_MOD"])
|
19
19
|
else
|
20
20
|
group :development do
|
21
|
-
gem "chef", git: "https://github.com/chef/chef" # until 13 is released
|
21
|
+
gem "chef", git: "https://github.com/chef/chef", branch: "tm/inject_log" # until 13 is released
|
22
22
|
gem "ohai", git: "https://github.com/chef/ohai" # until 13 is released
|
23
23
|
end
|
24
24
|
end
|
data/cheffish.gemspec
CHANGED
@@ -3,8 +3,8 @@ require "chef/mash"
|
|
3
3
|
module Cheffish
|
4
4
|
class MergedConfig
|
5
5
|
def initialize(*configs)
|
6
|
-
@configs = configs.map { |config| Mash.from_hash config
|
7
|
-
@merge_arrays = Mash.new
|
6
|
+
@configs = configs.map { |config| Chef::Mash.from_hash config }
|
7
|
+
@merge_arrays = Chef::Mash.new
|
8
8
|
end
|
9
9
|
|
10
10
|
include Enumerable
|
@@ -48,7 +48,6 @@ module Cheffish
|
|
48
48
|
end
|
49
49
|
|
50
50
|
def method_missing(name, *args)
|
51
|
-
$stderr.puts "WARN: deprecated use of method_missing on a Cheffish::MergedConfig object at #{caller[0]}"
|
52
51
|
if args.count > 0
|
53
52
|
raise NoMethodError, "Unexpected method #{name} for MergedConfig with arguments #{args}"
|
54
53
|
else
|
data/lib/cheffish/version.rb
CHANGED
@@ -24,13 +24,6 @@ describe "merged_config" do
|
|
24
24
|
Cheffish::MergedConfig.new(c1, c2)
|
25
25
|
end
|
26
26
|
|
27
|
-
let(:nested_config) do
|
28
|
-
c1 = { :test => { :test => "val" } }
|
29
|
-
c2 = { :test => { :test2 => "val2" } }
|
30
|
-
mc = Cheffish::MergedConfig.new(c2)
|
31
|
-
Cheffish::MergedConfig.new(c1, mc)
|
32
|
-
end
|
33
|
-
|
34
27
|
it "returns value in config" do
|
35
28
|
expect(config.test).to eq("val")
|
36
29
|
end
|
@@ -64,8 +57,4 @@ describe "merged_config" do
|
|
64
57
|
it "merges values when they're hashes" do
|
65
58
|
expect(config_hashes[:test].keys).to eq(%w{test test2})
|
66
59
|
end
|
67
|
-
|
68
|
-
it "supports nested merged configs" do
|
69
|
-
expect(nested_config[:test].keys).to eq(%w{test test2})
|
70
|
-
end
|
71
60
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cheffish
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 14.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- John Keiser
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2018-03-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: chef-zero
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '
|
19
|
+
version: '14.0'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: '
|
26
|
+
version: '14.0'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: net-ssh
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
130
130
|
version: '0'
|
131
131
|
requirements: []
|
132
132
|
rubyforge_project:
|
133
|
-
rubygems_version: 2.
|
133
|
+
rubygems_version: 2.7.3
|
134
134
|
signing_key:
|
135
135
|
specification_version: 4
|
136
136
|
summary: A library to manipulate Chef in Chef.
|