compat_resource 12.8.0 → 12.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6fd0d2ca1ca0f62f0e064d99997a276cdc3434e
-  data.tar.gz: 7d48e84a1e2db8feee6aac0929f55b284500e6d9
+  metadata.gz: 1c45688963a295258e1f01af0d8aa7330b874cca
+  data.tar.gz: 77dc4540fab1ca49ea48fd5b682e05e7ab94bcfb
 SHA512:
-  metadata.gz: f782d62935ed677342fa443a1c791a4b32ac13fcf0a63d671ea1fea7dc9871fe3808fe4d7ac378a08e01de0301a5ac0c99e3520f5f13a8903364f3cf7eb7acbb
-  data.tar.gz: 631f9f2186847f5fd2bd3c95b63315def9280ed8e2dafb006f72e65a7262c480da3ff632d234012c65b27c3dd731991d33d48ea259a69ba4dd2b8e09d35e764c
+  metadata.gz: 4e8f74255fd8a62cd100dff05f85977a2b83594683b00128247967896e4533948fa6cdff8c05548347678bd3b0083ffb2c52151e5a1734698a5818ef7818fb30
+  data.tar.gz: 4a5cbcb9bad8c0edc20896791e7c0cced8ebaae9a1d39e8fcd10b5238537fddb2a503ef92bc7b67670b8bad974a21d66689a650bf65b6aa20599ac853df7618c

data/files/lib/chef_compat/copied_from_chef/chef/dsl/declare_resource.rb

@@ -97,9 +97,7 @@ class Chef < (defined?(::Chef) ? ::Chef : Object)
       #
       def build_resource(type, name, created_at = nil, run_context: self.run_context, &resource_attrs_block)
         created_at ||= caller[0]
-        Thread.exclusive do
-          require "chef_compat/copied_from_chef/chef/resource_builder" unless defined?(Chef::ResourceBuilder)
-        end
+        require "chef_compat/copied_from_chef/chef/resource_builder" unless defined?(Chef::ResourceBuilder)
 
         Chef::ResourceBuilder.new(
           type:                type,

data/files/lib/chef_compat/copied_from_chef/chef/mixin/params_validate.rb

@@ -476,7 +476,7 @@ class Chef < (defined?(::Chef) ? ::Chef : Object)
       # "value nil" and to keep default stickiness working exactly the same
       # @api private
       class SetOrReturnProperty < (defined?(::Chef::Mixin::ParamsValidate::SetOrReturnProperty) ? ::Chef::Mixin::ParamsValidate::SetOrReturnProperty : Chef::Property)
-        def get(resource)
+        def get(resource, nil_set: false)
           value = super
           # All values are sticky, frozen or not
           if !is_set?(resource)
@@ -488,7 +488,7 @@ class Chef < (defined?(::Chef) ? ::Chef : Object)
         def call(resource, value = NOT_PASSED)
           # setting to nil does a get
           if value.nil? && !explicitly_accepts_nil?(resource)
-            get(resource)
+            get(resource, nil_set: true)
           else
             super
           end

data/files/lib/chef_compat/copied_from_chef/chef/mixin/properties.rb

@@ -106,7 +106,7 @@ class Chef < (defined?(::Chef) ? ::Chef : Object)
         def property(name, type = NOT_PASSED, **options)
           name = name.to_sym
 
-          options.each { |k, v| options[k.to_sym] = v if k.is_a?(String) }
+          options = options.inject({}) { |memo, (key, value)| memo[key.to_sym] = value; memo }
 
           options[:instance_variable_name] = :"@#{name}" if !options.has_key?(:instance_variable_name)
           options[:name] = name

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

@@ -93,7 +93,7 @@ class Chef < (defined?(::Chef) ? ::Chef : Object)
     #
     def initialize(**options)
 super if defined?(::Chef::Property)
-      options.each { |k, v| options[k.to_sym] = v; options.delete(k) if k.is_a?(String) }
+      options = options.inject({}) { |memo, (key, value)| memo[key.to_sym] = value; memo }
       @options = options
       options[:name] = options[:name].to_sym if options[:name]
       options[:instance_variable_name] = options[:instance_variable_name].to_sym if options[:instance_variable_name]
@@ -272,7 +272,7 @@ super if defined?(::Chef::Property)
         # In Chef 12, value(nil) does a *get* instead of a set, so we
         # warn if the value would have been changed. In Chef 13, it will be
         # equivalent to value = nil.
-        result = get(resource)
+        result = get(resource, nil_set: true)
 
         # Warn about this becoming a set in Chef 13.
         begin
@@ -317,7 +317,7 @@ super if defined?(::Chef::Property)
     # @raise Chef::Exceptions::ValidationFailed If the value is invalid for
     #   this property, or if the value is required and not set.
     #
-    def get(resource)
+    def get(resource, nil_set: false)
       # If it's set, return it (and evaluate any lazy values)
       if is_set?(resource)
         value = get_value(resource)
@@ -341,7 +341,8 @@ 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?(:resource_initializing) &&
+        if !nil_set &&
+            resource.respond_to?(:resource_initializing) &&
             resource.resource_initializing &&
             resource.respond_to?(:enclosing_provider) &&
             resource.enclosing_provider &&

data/files/lib/chef_compat/monkeypatches.rb

@@ -1,7 +1,9 @@
 require 'chef_compat/monkeypatches/chef'
 require 'chef_compat/monkeypatches/chef/log'
+require 'chef_compat/monkeypatches/chef/mixin/params_validate'
 require 'chef_compat/monkeypatches/chef/recipe'
 require 'chef_compat/monkeypatches/chef/resource'
+require 'chef_compat/monkeypatches/chef/property'
 require 'chef_compat/monkeypatches/chef/provider'
 require 'chef_compat/monkeypatches/chef/resource/lwrp_base'
 require 'chef_compat/monkeypatches/chef/exceptions'

data/files/lib/chef_compat/monkeypatches/chef/mixin/params_validate.rb

@@ -0,0 +1,17 @@
+if Chef::VERSION.to_f >= 12.5 && Chef::VERSION.to_f <= 12.8
+  require 'chef/mixin/params_validate'
+  class Chef
+    module Mixin
+      module ParamsValidate
+        class SetOrReturnProperty < Chef::Property
+          # 12.9 introduced a new optional parameter to `get()` to avoid a nil-set warning.
+          # When their method gets called with 2 args, we need to ignore and call with 1.
+          alias_method :_original_get2, :get
+          def get(resource, *args)
+            _original_get2(resource)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# 12.9 introduced a new optional parameter to `get()` to avoid a nil-set warning.
+# We need to mimick it here.
+if Chef::VERSION.to_f >= 12.5 && Chef::VERSION.to_f <= 12.8
+  require 'chef/property'
+  class Chef
+    class Property
+      # 12.9 introduced a new optional parameter to `get()` to avoid a nil-set warning.
+      # When their method gets called with 2 args, we need to ignore and call with 1.
+      alias_method :_original_get, :get
+      def get(resource, *args)
+        _original_get(resource)
+      end
+    end
+  end
+end

data/files/lib/compat_resource/version.rb

@@ -1,3 +1,3 @@
 module CompatResource
-  VERSION = '12.8.0'
+  VERSION = '12.9.0'
 end

data/files/spec/data/Gemfile

@@ -1,3 +1,5 @@
+source 'https://rubygems.org'
+
 if ENV['GEMFILE_MOD']
   instance_eval(ENV['GEMFILE_MOD'])
 else

data/files/spec/data/Gemfile.lock

@@ -1,23 +1,23 @@
-GEM
+PATH
+  remote: /Users/jkeiser/src/chef
   specs:
-    builder (3.2.2)
-    chef (12.6.0)
-      chef-config (= 12.6.0)
-      chef-zero (~> 4.2, >= 4.2.2)
+    chef (12.9.0)
+      bundler (>= 1.10)
+      chef-config (= 12.9.0)
+      chef-zero (~> 4.5)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
-      mixlib-authentication (~> 1.3)
+      mixlib-authentication (~> 1.4)
       mixlib-cli (~> 1.4)
       mixlib-log (~> 1.3)
       mixlib-shellout (~> 2.0)
-      net-ssh (~> 2.6)
+      net-ssh (>= 2.9, < 4.0)
       net-ssh-multi (~> 1.1)
       ohai (>= 8.6.0.alpha.1, < 9)
       plist (~> 3.1.0)
       proxifier (~> 1.0)
-      pry (~> 0.9)
       rspec-core (~> 3.4)
       rspec-expectations (~> 3.4)
       rspec-mocks (~> 3.4)
@@ -25,16 +25,21 @@ GEM
       serverspec (~> 2.7)
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
-    chef-config (12.6.0)
+      uuidtools (~> 2.1.5)
+    chef-config (12.9.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-zero (4.4.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.2)
+    chef-zero (4.5.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
       rack
       uuidtools (~> 2.1)
-    coderay (1.1.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     ffi (1.9.10)
@@ -42,9 +47,8 @@ GEM
       libyajl2 (~> 1.2)
     hashie (3.4.3)
     highline (1.7.8)
-    ipaddress (0.8.2)
+    ipaddress (0.8.3)
     libyajl2 (1.2.0)
-    method_source (0.8.2)
     mixlib-authentication (1.4.0)
       mixlib-log
       rspec-core (~> 3.2)
@@ -53,18 +57,18 @@ GEM
     mixlib-cli (1.5.0)
     mixlib-config (2.2.1)
     mixlib-log (1.6.0)
-    mixlib-shellout (2.2.5)
+    mixlib-shellout (2.2.6)
     multi_json (1.11.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
+    net-ssh (3.0.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)
     net-telnet (0.1.1)
-    ohai (8.9.0)
+    ohai (8.12.1)
       chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -73,22 +77,17 @@ GEM
       mixlib-config (~> 2.0)
       mixlib-log
       mixlib-shellout (~> 2.0)
-      rake (~> 10.1)
+      plist
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
     plist (3.1.0)
     proxifier (1.0.3)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
     rack (1.6.4)
-    rake (10.5.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.2)
+    rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -103,14 +102,13 @@ GEM
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    serverspec (2.29.1)
+    serverspec (2.31.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
-      specinfra (~> 2.48)
+      specinfra (~> 2.53)
     sfl (2.2)
-    slop (3.6.0)
-    specinfra (2.50.3)
+    specinfra (2.53.1)
       net-scp
       net-ssh (>= 2.7, < 3.1)
       net-telnet
@@ -124,7 +122,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  chef
+  chef!
 
 BUNDLED WITH
    1.11.2

data/files/spec/data/config.rb

@@ -1,2 +1,3 @@
 local_mode true
 chef_repo_path File.dirname(__FILE__)
+log_level :debug

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: compat_resource
 version: !ruby/object:Gem::Version
-  version: 12.8.0
+  version: 12.9.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: files/bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cheffish
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: stove
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Bring some new features of Chef 12.5 to previous 12.X releases
@@ -108,6 +108,8 @@ files:
 - files/lib/chef_compat/monkeypatches/chef.rb
 - files/lib/chef_compat/monkeypatches/chef/exceptions.rb
 - files/lib/chef_compat/monkeypatches/chef/log.rb
+- files/lib/chef_compat/monkeypatches/chef/mixin/params_validate.rb
+- files/lib/chef_compat/monkeypatches/chef/property.rb
 - files/lib/chef_compat/monkeypatches/chef/provider.rb
 - files/lib/chef_compat/monkeypatches/chef/recipe.rb
 - files/lib/chef_compat/monkeypatches/chef/resource.rb
@@ -154,17 +156,17 @@ require_paths:
 - files/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Bring some new features of Chef 12.5 to previous 12.X releases