compat_resource 12.5.24 → 12.5.25

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.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/files/lib/chef_compat/monkeypatches/chef/provider.rb +14 -11
  3. data/files/lib/chef_compat/resource.rb +7 -0
  4. data/files/lib/compat_resource/version.rb +1 -1
  5. data/files/spec/data/Gemfile.lock +59 -14
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b43476b4e56018153025c91b2b3d6e5d4ecf3021
4
- data.tar.gz: 48a0daf0fad464624385d8281de0f949a459985e
3
+ metadata.gz: e5dfb347c43cb92ce7d991d612a9f16618745b64
4
+ data.tar.gz: 2d06d99a83ba561c9fcadff17337efe3cd7ba02f
5
5
  SHA512:
6
- metadata.gz: 860a5a3512307bbc876109f6b730e15cd2f8093848dee6757588ea9792e2437deeace765f21fa9aff6819d4f3ace355033711e90f64d6f41504e3ce7dff5cfa7
7
- data.tar.gz: 8f8c861770dd8a4eadba59284c72b4a615c12d234b62e4663745de373959adf61f2bd50e43d49858e14ed0dc1ef64f876a280d6ca859bb99456f45d712161d7b
6
+ metadata.gz: 9d0cdfe5d8e82073a7b37672b976c98746b235cf691faacdfd5cb098e5e3578850efa0e1f6c30f49ffec3039d15f69b5eb2764dbe139573f25ecc538e834ef22
7
+ data.tar.gz: b5ed330998b09e77a3bb0f2d5004fc10411ece0d25e4fc6647f696e240b6ed908c1ed468631be5476716b320bfc42bec87be76d6419b8ba91d5acc41eb1c222f
data/files/lib/chef_compat/monkeypatches/chef/provider.rb CHANGED
@@ -15,21 +15,24 @@ class Chef::Provider
15
15
  include Chef::DSL::DataQuery
16
16
  include Chef::DSL::IncludeRecipe
17
17
 
18
- module ::ChefCompat
19
- module Monkeypatches
20
- module InlineResources
21
- module ClassMethods
22
- def action(name, &block)
23
- super(name) { send("compile_action_#{name}") }
24
- # We put the action in its own method so that super() works.
25
- define_method("compile_action_#{name}", &block)
18
+ unless Chef::Provider::InlineResources::ClassMethods.instance_method(:action).source_location[0] =~ /chefspec/
19
+ # Don't override action if chefspec is doing its thing
20
+ module ::ChefCompat
21
+ module Monkeypatches
22
+ module InlineResources
23
+ module ClassMethods
24
+ def action(name, &block)
25
+ super(name) { send("compile_action_#{name}") }
26
+ # We put the action in its own method so that super() works.
27
+ define_method("compile_action_#{name}", &block)
28
+ end
26
29
  end
27
30
  end
28
31
  end
29
32
  end
30
- end
31
- module ClassMethods
32
- prepend ChefCompat::Monkeypatches::InlineResources::ClassMethods
33
+ module ClassMethods
34
+ prepend ChefCompat::Monkeypatches::InlineResources::ClassMethods
35
+ end
33
36
  end
34
37
  end
35
38
  end
data/files/lib/chef_compat/resource.rb CHANGED
@@ -1,6 +1,13 @@
1
1
  require 'chef_compat/monkeypatches'
2
2
  require 'chef_compat/copied_from_chef/chef/resource'
3
3
 
4
+ # We do NOT want action defined if chefspec is engaged
5
+ if Chef::Provider::InlineResources::ClassMethods.instance_method(:action).source_location[0] =~ /chefspec/
6
+ ChefCompat::CopiedFromChef::Chef::Provider::InlineResources::ClassMethods.instance_eval do
7
+ remove_method(:action)
8
+ end
9
+ end
10
+
4
11
  module ChefCompat
5
12
  class Resource < ChefCompat::CopiedFromChef::Chef::Resource
6
13
  def initialize(*args, &block)
data/files/lib/compat_resource/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CompatResource
2
- VERSION = '12.5.24'
2
+ VERSION = '12.5.25'
3
3
  end
data/files/spec/data/Gemfile.lock CHANGED
@@ -1,23 +1,34 @@
1
1
  GEM
2
2
  specs:
3
- chef (12.0.3)
4
- chef-zero (~> 3.2)
3
+ builder (3.2.2)
4
+ chef (12.4.3)
5
+ chef-config (= 12.4.3)
6
+ chef-zero (~> 4.2, >= 4.2.2, < 4.3.0)
5
7
  diff-lcs (~> 1.2, >= 1.2.4)
6
8
  erubis (~> 2.7)
7
- ffi-yajl (~> 1.2)
9
+ ffi-yajl (~> 2.2)
8
10
  highline (~> 1.6, >= 1.6.9)
9
11
  mixlib-authentication (~> 1.3)
10
12
  mixlib-cli (~> 1.4)
11
- mixlib-config (~> 2.0)
12
13
  mixlib-log (~> 1.3)
13
- mixlib-shellout (>= 2.0.0.rc.0, < 3.0)
14
+ mixlib-shellout (>= 2.0.0.rc.0, < 2.2)
14
15
  net-ssh (~> 2.6)
15
16
  net-ssh-multi (~> 1.1)
16
- ohai (~> 8.0)
17
+ ohai (~> 8.0, < 8.6)
17
18
  plist (~> 3.1.0)
18
19
  pry (~> 0.9)
19
- chef-zero (3.2.1)
20
- ffi-yajl (~> 1.1)
20
+ rspec-core (~> 3.2)
21
+ rspec-expectations (~> 3.2)
22
+ rspec-mocks (~> 3.2)
23
+ rspec_junit_formatter (~> 0.2.0)
24
+ serverspec (~> 2.7)
25
+ specinfra (~> 2.10)
26
+ syslog-logger (~> 1.6)
27
+ chef-config (12.4.3)
28
+ mixlib-config (~> 2.0)
29
+ mixlib-shellout (~> 2.0)
30
+ chef-zero (4.2.3)
31
+ ffi-yajl (>= 1.1, < 3.0)
21
32
  hashie (~> 2.0)
22
33
  mixlib-log (~> 1.3)
23
34
  rack
@@ -26,8 +37,7 @@ GEM
26
37
  diff-lcs (1.2.5)
27
38
  erubis (2.7.0)
28
39
  ffi (1.9.10)
29
- ffi-yajl (1.4.0)
30
- ffi (~> 1.5)
40
+ ffi-yajl (2.2.2)
31
41
  libyajl2 (~> 1.2)
32
42
  hashie (2.1.2)
33
43
  highline (1.7.8)
@@ -40,16 +50,20 @@ GEM
40
50
  mixlib-cli (1.5.0)
41
51
  mixlib-config (2.2.1)
42
52
  mixlib-log (1.6.0)
43
- mixlib-shellout (2.2.5)
53
+ mixlib-shellout (2.1.0)
54
+ multi_json (1.11.2)
55
+ net-scp (1.2.1)
56
+ net-ssh (>= 2.6.5)
44
57
  net-ssh (2.9.2)
45
58
  net-ssh-gateway (1.2.0)
46
59
  net-ssh (>= 2.6.5)
47
60
  net-ssh-multi (1.2.1)
48
61
  net-ssh (>= 2.6.5)
49
62
  net-ssh-gateway (>= 1.2.0)
50
- ohai (8.4.0)
63
+ net-telnet (0.1.1)
64
+ ohai (8.5.1)
51
65
  ffi (~> 1.9)
52
- ffi-yajl (>= 1.1, < 3.0)
66
+ ffi-yajl (~> 2.2)
53
67
  ipaddress
54
68
  mime-types (~> 2.0)
55
69
  mixlib-cli
@@ -66,7 +80,38 @@ GEM
66
80
  slop (~> 3.4)
67
81
  rack (1.6.4)
68
82
  rake (10.4.2)
83
+ rspec (3.4.0)
84
+ rspec-core (~> 3.4.0)
85
+ rspec-expectations (~> 3.4.0)
86
+ rspec-mocks (~> 3.4.0)
87
+ rspec-core (3.4.1)
88
+ rspec-support (~> 3.4.0)
89
+ rspec-expectations (3.4.0)
90
+ diff-lcs (>= 1.2.0, < 2.0)
91
+ rspec-support (~> 3.4.0)
92
+ rspec-its (1.2.0)
93
+ rspec-core (>= 3.0.0)
94
+ rspec-expectations (>= 3.0.0)
95
+ rspec-mocks (3.4.0)
96
+ diff-lcs (>= 1.2.0, < 2.0)
97
+ rspec-support (~> 3.4.0)
98
+ rspec-support (3.4.1)
99
+ rspec_junit_formatter (0.2.3)
100
+ builder (< 4)
101
+ rspec-core (>= 2, < 4, != 2.12.0)
102
+ serverspec (2.25.0)
103
+ multi_json
104
+ rspec (~> 3.0)
105
+ rspec-its
106
+ specinfra (~> 2.46)
107
+ sfl (2.2)
69
108
  slop (3.6.0)
109
+ specinfra (2.47.0)
110
+ net-scp
111
+ net-ssh (>= 2.7, < 3.1)
112
+ net-telnet
113
+ sfl
114
+ syslog-logger (1.6.8)
70
115
  systemu (2.6.5)
71
116
  uuidtools (2.1.5)
72
117
  wmi-lite (1.0.0)
@@ -75,7 +120,7 @@ PLATFORMS
75
120
  ruby
76
121
 
77
122
  DEPENDENCIES
78
- chef (= 12.0.3)
123
+ chef (~> 12.4.0)
79
124
 
80
125
  BUNDLED WITH
81
126
  1.10.6
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: compat_resource
3
3
  version: !ruby/object:Gem::Version
4
- version: 12.5.24
4
+ version: 12.5.25
5
5
  platform: ruby
6
6
  authors:
7
7
  - John Keiser
8
8
  autorequire:
9
9
  bindir: files/bin
10
10
  cert_chain: []
11
- date: 2015-12-15 00:00:00.000000000 Z
11
+ date: 2015-12-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake