compat_resource 12.5.22 → 12.5.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56f5605c8ca73b413ec75b669cf3549c4de2f505
-  data.tar.gz: f921bee4348789f9273c7f2b957e6ecd2f27e0d9
+  metadata.gz: 20b6ff32f42d52aecb0ecb45f035cd0f8c249cae
+  data.tar.gz: 307a13a11117fbda601165b63e63d778e9f558b4
 SHA512:
-  metadata.gz: ed1175035f86084a16308023862e78a0fb629e69658a535a00eca05655e46b70c4057af23eb22f2131f75ac7ef46a4fccfde1eb080b09a6debbb217207898ad0
-  data.tar.gz: 436e9ccc5fedd5f05c6968f7f8b16b0e335fc85fbc4408bcc6348b15d8d85fa264d13ac2360ba596a58271c84b370b884b4062ebce13c737df9be7e9006f0864
+  metadata.gz: ec41b460026d108a332797bbd87d0285bb3432d2e2a69abed92c724f680c7606cd0b50751f0170f815aca299df194598fb22eab1c5468c18a357fd547221aa11
+  data.tar.gz: c8a0dc03a4daf33d7b471ddb423365391049efd1d06e5c1e7aa16356013d85f6c2673f62bfd1f9007d675e8da0824abd9062ad53cd1f474fba43e77e828bedb9

data/Rakefile

@@ -45,14 +45,14 @@ KEEP_FUNCTIONS = {
     resource_name self.use_automatic_resource_name
 
     identity state state_for_resource_reporter property_is_set reset_property
-    to_hash
+    resource_initializing to_hash
     self.properties self.state_properties self.state_attr
     self.identity_properties self.identity_property self.identity_attrs
     self.property self.property_type
     self.lazy
 
     action allowed_actions self.allowed_actions self.default_action
-    currently_running_action self.action self.declare_action_class self.action_class
+    self.action self.declare_action_class self.action_class
 
     load_current_value current_value_does_not_exist
     self.load_current_value

data/files/lib/chef_compat/copied_from_chef/chef/property.rb

@@ -319,9 +319,9 @@ super if defined?(::Chef::Property)
         #
         # It won't do what they expect. This checks whether you try to *read*
         # `content` while we are compiling the resource.
-        if resource.respond_to?(:enclosing_provider) && resource.enclosing_provider &&
-           !resource.currently_running_action &&
-           !name_property? &&
+        if resource.resource_initializing &&
+           resource.respond_to?(:enclosing_provider) &&
+           resource.enclosing_provider &&
            resource.enclosing_provider.respond_to?(name)
            Chef::Log.warn("#{Chef::Log.caller_location}: property #{name} is declared in both #{resource} and #{resource.enclosing_provider}. Use new_resource.#{name} instead. At #{Chef::Log.caller_location}")
         end

data/files/lib/chef_compat/copied_from_chef/chef/resource.rb

@@ -73,7 +73,7 @@ super if defined?(::Chef::Resource)
       return result.values.first if identity_properties.size == 1
       result
     end
-    attr_reader :currently_running_action
+    attr_accessor :resource_initializing
     def to_hash
       # Grab all current state, then any other ivars (backcompat)
       result = {}

data/files/lib/chef_compat/copied_from_chef/chef/resource_builder.rb

@@ -75,7 +75,14 @@ super if defined?(::Chef::ResourceBuilder)
       resource.params = params
 
       # Evaluate resource attribute DSL
-      resource.instance_eval(&block) if block_given?
+      if block_given?
+        resource.resource_initializing = true
+        begin
+          resource.instance_eval(&block)
+        ensure
+          resource.resource_initializing = false
+        end
+      end
 
       # emit a cloned resource warning if it is warranted
       if prior_resource

data/files/lib/compat_resource/version.rb

@@ -1,3 +1,3 @@
 module CompatResource
-  VERSION = '12.5.22'
+  VERSION = '12.5.23'
 end

data/files/spec/data/Gemfile.lock

@@ -1,20 +1,20 @@
 GEM
   specs:
     builder (3.2.2)
-    chef (12.5.1)
-      chef-config (= 12.5.1)
-      chef-zero (~> 4.2, >= 4.2.2)
+    chef (12.1.0)
+      chef-zero (~> 4.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
-      ffi-yajl (~> 2.2)
+      ffi-yajl (~> 1.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)
+      mixlib-shellout (>= 2.0.0.rc.0, < 3.0)
       net-ssh (~> 2.6)
       net-ssh-multi (~> 1.1)
-      ohai (>= 8.6.0.alpha.1, < 9)
+      ohai (~> 8.0)
       plist (~> 3.1.0)
       pry (~> 0.9)
       rspec-core (~> 3.2)
@@ -23,13 +23,9 @@ GEM
       rspec_junit_formatter (~> 0.2.0)
       serverspec (~> 2.7)
       specinfra (~> 2.10)
-      syslog-logger (~> 1.6)
-    chef-config (12.5.1)
-      mixlib-config (~> 2.0)
-      mixlib-shellout (~> 2.0)
-    chef-zero (4.4.0)
-      ffi-yajl (~> 2.2)
-      hashie (>= 2.0, < 4.0)
+    chef-zero (4.2.3)
+      ffi-yajl (>= 1.1, < 3.0)
+      hashie (~> 2.0)
       mixlib-log (~> 1.3)
       rack
       uuidtools (~> 2.1)
@@ -37,13 +33,15 @@ GEM
     diff-lcs (1.2.5)
     erubis (2.7.0)
     ffi (1.9.10)
-    ffi-yajl (2.2.2)
+    ffi-yajl (1.4.0)
+      ffi (~> 1.5)
       libyajl2 (~> 1.2)
-    hashie (3.4.3)
+    hashie (2.1.2)
     highline (1.7.8)
     ipaddress (0.8.0)
     libyajl2 (1.2.0)
     method_source (0.8.2)
+    mime-types (2.99)
     mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-cli (1.5.0)
@@ -60,11 +58,11 @@ GEM
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
-    ohai (8.8.1)
-      chef-config (>= 12.5.0.alpha.1, < 13)
+    ohai (8.4.0)
       ffi (~> 1.9)
-      ffi-yajl (~> 2.2)
+      ffi-yajl (>= 1.1, < 3.0)
       ipaddress
+      mime-types (~> 2.0)
       mixlib-cli
       mixlib-config (~> 2.0)
       mixlib-log
@@ -110,7 +108,6 @@ GEM
       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)
@@ -119,7 +116,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  chef (= 12.5.1)
+  chef (>= 12.1, < 12.2)
 
 BUNDLED WITH
    1.10.6

data/files/spec/data/cookbooks/future/libraries/future_custom_resource.rb

@@ -4,5 +4,9 @@ class FutureCustomResource < ChefCompat::Resource
   action :create do
     converge_if_changed do
     end
+    future_custom_resource 'hi' do
+      x x # test that a warning is emitted properly (and no crashey)
+      action :nothing
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compat_resource
 version: !ruby/object:Gem::Version
-  version: 12.5.22
+  version: 12.5.23
 platform: ruby
 authors:
 - John Keiser