compat_resource 12.5.24 → 12.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b43476b4e56018153025c91b2b3d6e5d4ecf3021
-  data.tar.gz: 48a0daf0fad464624385d8281de0f949a459985e
+  metadata.gz: e5dfb347c43cb92ce7d991d612a9f16618745b64
+  data.tar.gz: 2d06d99a83ba561c9fcadff17337efe3cd7ba02f
 SHA512:
-  metadata.gz: 860a5a3512307bbc876109f6b730e15cd2f8093848dee6757588ea9792e2437deeace765f21fa9aff6819d4f3ace355033711e90f64d6f41504e3ce7dff5cfa7
-  data.tar.gz: 8f8c861770dd8a4eadba59284c72b4a615c12d234b62e4663745de373959adf61f2bd50e43d49858e14ed0dc1ef64f876a280d6ca859bb99456f45d712161d7b
+  metadata.gz: 9d0cdfe5d8e82073a7b37672b976c98746b235cf691faacdfd5cb098e5e3578850efa0e1f6c30f49ffec3039d15f69b5eb2764dbe139573f25ecc538e834ef22
+  data.tar.gz: b5ed330998b09e77a3bb0f2d5004fc10411ece0d25e4fc6647f696e240b6ed908c1ed468631be5476716b320bfc42bec87be76d6419b8ba91d5acc41eb1c222f

data/files/lib/chef_compat/monkeypatches/chef/provider.rb

@@ -15,21 +15,24 @@ class Chef::Provider
     include Chef::DSL::DataQuery
     include Chef::DSL::IncludeRecipe
 
-    module ::ChefCompat
-      module Monkeypatches
-        module InlineResources
-          module ClassMethods
-            def action(name, &block)
-              super(name) { send("compile_action_#{name}") }
-              # We put the action in its own method so that super() works.
-              define_method("compile_action_#{name}", &block)
+    unless Chef::Provider::InlineResources::ClassMethods.instance_method(:action).source_location[0] =~ /chefspec/
+      # Don't override action if chefspec is doing its thing
+      module ::ChefCompat
+        module Monkeypatches
+          module InlineResources
+            module ClassMethods
+              def action(name, &block)
+                super(name) { send("compile_action_#{name}") }
+                # We put the action in its own method so that super() works.
+                define_method("compile_action_#{name}", &block)
+              end
             end
           end
         end
       end
-    end
-    module ClassMethods
-      prepend ChefCompat::Monkeypatches::InlineResources::ClassMethods
+      module ClassMethods
+        prepend ChefCompat::Monkeypatches::InlineResources::ClassMethods
+      end
     end
   end
 end

data/files/lib/chef_compat/resource.rb

@@ -1,6 +1,13 @@
 require 'chef_compat/monkeypatches'
 require 'chef_compat/copied_from_chef/chef/resource'
 
+# We do NOT want action defined if chefspec is engaged
+if Chef::Provider::InlineResources::ClassMethods.instance_method(:action).source_location[0] =~ /chefspec/
+  ChefCompat::CopiedFromChef::Chef::Provider::InlineResources::ClassMethods.instance_eval do
+    remove_method(:action)
+  end
+end
+
 module ChefCompat
   class Resource < ChefCompat::CopiedFromChef::Chef::Resource
     def initialize(*args, &block)

data/files/lib/compat_resource/version.rb

@@ -1,3 +1,3 @@
 module CompatResource
-  VERSION = '12.5.24'
+  VERSION = '12.5.25'
 end

data/files/spec/data/Gemfile.lock

@@ -1,23 +1,34 @@
 GEM
   specs:
-    chef (12.0.3)
-      chef-zero (~> 3.2)
+    builder (3.2.2)
+    chef (12.4.3)
+      chef-config (= 12.4.3)
+      chef-zero (~> 4.2, >= 4.2.2, < 4.3.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
-      ffi-yajl (~> 1.2)
+      ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
       mixlib-authentication (~> 1.3)
       mixlib-cli (~> 1.4)
-      mixlib-config (~> 2.0)
       mixlib-log (~> 1.3)
-      mixlib-shellout (>= 2.0.0.rc.0, < 3.0)
+      mixlib-shellout (>= 2.0.0.rc.0, < 2.2)
       net-ssh (~> 2.6)
       net-ssh-multi (~> 1.1)
-      ohai (~> 8.0)
+      ohai (~> 8.0, < 8.6)
       plist (~> 3.1.0)
       pry (~> 0.9)
-    chef-zero (3.2.1)
-      ffi-yajl (~> 1.1)
+      rspec-core (~> 3.2)
+      rspec-expectations (~> 3.2)
+      rspec-mocks (~> 3.2)
+      rspec_junit_formatter (~> 0.2.0)
+      serverspec (~> 2.7)
+      specinfra (~> 2.10)
+      syslog-logger (~> 1.6)
+    chef-config (12.4.3)
+      mixlib-config (~> 2.0)
+      mixlib-shellout (~> 2.0)
+    chef-zero (4.2.3)
+      ffi-yajl (>= 1.1, < 3.0)
       hashie (~> 2.0)
       mixlib-log (~> 1.3)
       rack
@@ -26,8 +37,7 @@ GEM
     diff-lcs (1.2.5)
     erubis (2.7.0)
     ffi (1.9.10)
-    ffi-yajl (1.4.0)
-      ffi (~> 1.5)
+    ffi-yajl (2.2.2)
       libyajl2 (~> 1.2)
     hashie (2.1.2)
     highline (1.7.8)
@@ -40,16 +50,20 @@ GEM
     mixlib-cli (1.5.0)
     mixlib-config (2.2.1)
     mixlib-log (1.6.0)
-    mixlib-shellout (2.2.5)
+    mixlib-shellout (2.1.0)
+    multi_json (1.11.2)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    ohai (8.4.0)
+    net-telnet (0.1.1)
+    ohai (8.5.1)
       ffi (~> 1.9)
-      ffi-yajl (>= 1.1, < 3.0)
+      ffi-yajl (~> 2.2)
       ipaddress
       mime-types (~> 2.0)
       mixlib-cli
@@ -66,7 +80,38 @@ GEM
       slop (~> 3.4)
     rack (1.6.4)
     rake (10.4.2)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    serverspec (2.25.0)
+      multi_json
+      rspec (~> 3.0)
+      rspec-its
+      specinfra (~> 2.46)
+    sfl (2.2)
     slop (3.6.0)
+    specinfra (2.47.0)
+      net-scp
+      net-ssh (>= 2.7, < 3.1)
+      net-telnet
+      sfl
+    syslog-logger (1.6.8)
     systemu (2.6.5)
     uuidtools (2.1.5)
     wmi-lite (1.0.0)
@@ -75,7 +120,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  chef (= 12.0.3)
+  chef (~> 12.4.0)
 
 BUNDLED WITH
    1.10.6

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compat_resource
 version: !ruby/object:Gem::Version
-  version: 12.5.24
+  version: 12.5.25
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: files/bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake