chef-cookie_cutter 0.0.3 → 0.0.4

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c3a435bd8aef8a92df0486ce8c3b7d4020f1fcc9
4
- data.tar.gz: 0c1b174200d89f3a32bbd467bd3fd465072e17e6
3
+ metadata.gz: 393e8183e4a8bfdf5e0711871b29dae7ad897a3c
4
+ data.tar.gz: df372a6b6342845e13a80f81a9a69d44453d33ca
5
5
  SHA512:
6
- metadata.gz: bbe04ce9f5a487c64fa475de683e832b752c7e323c743b2a7a7418713a9e15974c6ffedd168624196aad98158ae7b44e6473b2173609f0d6aa5033e4cb2dfdc5
7
- data.tar.gz: 2a8de0e8b2fe00af1750f4956ce060e9b6447b966314f839786b35ebdfc209bc37164b6e6c9f28d70f1305e54636932816a85effe3c9bc99926c047451a80363
6
+ metadata.gz: 3bc2ffde8f09a5d41a9cfd01c501f609afae97231921a687c3030d9b7dc4f7d00ea987ed6190e123067f1e2a3dda570d6e313c08ac66d173bf506efc89b224fa
7
+ data.tar.gz: 0b727fbf2e2a348a722dcb69bd31da7adc4d5d9d4b71ac9cb6da780ac209767689dc8b0ded476ec2d4003cd2d25b4cafc0657dbbbe228d8553ba4bf127b4359e
@@ -27,9 +27,7 @@ class Chef
27
27
  ::Gem::Requirement.new(constraint).satisfied_by?(gem_version)
28
28
  end
29
29
 
30
- if chef_version('~> 12.5.0.alpha')
31
- require_relative 'cookie_cutter/fancy_property'
32
- end
30
+ require_relative 'cookie_cutter/fancy_property' if chef_version('~> 12.5')
33
31
 
34
32
  require_relative 'cookie_cutter/lwrp_build_params'
35
33
  require_relative 'cookie_cutter/lwrp_include'
@@ -20,7 +20,7 @@ class Chef
20
20
  module CookieCutter
21
21
  class FancyProperty < ::Chef::Property
22
22
  def call(resource, *args, **kwargs, &blk)
23
- return get(resource) if args.empty? && kwargs.empty?
23
+ return get(resource) if args.empty? && kwargs.empty? && !block_given?
24
24
  set(resource, *args, **kwargs, &blk)
25
25
  end
26
26
 
@@ -43,7 +43,11 @@ class Chef
43
43
  end
44
44
 
45
45
  def coerce(resource, *args, **kwargs, &blk)
46
- if options.key?(:coerce_class)
46
+ if options.key?(:coerce_class) && options.key?(:coerce)
47
+ value = coerce_class(options[:coerce_class], *args, **kwargs, &blk)
48
+ value = coerce_proc(resource, options[:coerce], value)
49
+ value
50
+ elsif options.key?(:coerce_class)
47
51
  coerce_class(options[:coerce_class], *args, **kwargs, &blk)
48
52
  elsif options.key?(:coerce)
49
53
  coerce_proc(resource, options[:coerce], *args, **kwargs, &blk)
metadata CHANGED
@@ -1,29 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef-cookie_cutter
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3
4
+ version: 0.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ole Claussen
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-10-01 00:00:00.000000000 Z
11
+ date: 2015-10-11 00:00:00.000000000 Z
12
12
  dependencies:
13
- - !ruby/object:Gem::Dependency
14
- name: chef
15
- requirement: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - ">"
18
- - !ruby/object:Gem::Version
19
- version: '0'
20
- type: :runtime
21
- prerelease: false
22
- version_requirements: !ruby/object:Gem::Requirement
23
- requirements:
24
- - - ">"
25
- - !ruby/object:Gem::Version
26
- version: '0'
27
13
  - !ruby/object:Gem::Dependency
28
14
  name: bundler
29
15
  requirement: !ruby/object:Gem::Requirement
@@ -42,30 +28,30 @@ dependencies:
42
28
  name: rake
43
29
  requirement: !ruby/object:Gem::Requirement
44
30
  requirements:
45
- - - ">="
31
+ - - "~>"
46
32
  - !ruby/object:Gem::Version
47
- version: '0'
33
+ version: '10.4'
48
34
  type: :development
49
35
  prerelease: false
50
36
  version_requirements: !ruby/object:Gem::Requirement
51
37
  requirements:
52
- - - ">="
38
+ - - "~>"
53
39
  - !ruby/object:Gem::Version
54
- version: '0'
40
+ version: '10.4'
55
41
  - !ruby/object:Gem::Dependency
56
42
  name: rubocop
57
43
  requirement: !ruby/object:Gem::Requirement
58
44
  requirements:
59
45
  - - "~>"
60
46
  - !ruby/object:Gem::Version
61
- version: '0'
47
+ version: '0.34'
62
48
  type: :development
63
49
  prerelease: false
64
50
  version_requirements: !ruby/object:Gem::Requirement
65
51
  requirements:
66
52
  - - "~>"
67
53
  - !ruby/object:Gem::Version
68
- version: '0'
54
+ version: '0.34'
69
55
  description: A small collection of Chef hacks and workarounds.
70
56
  email: claussen.ole@gmail.com
71
57
  executables: []