compat_resource 12.5.19 → 12.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed2ecdd1297aa8a03bbca891cff1174ba781795b
-  data.tar.gz: 33b5746d177b125bf0728714a29bae2a66ddcc69
+  metadata.gz: dcc44231613d35471cb0378bd77c57cdcf7f788b
+  data.tar.gz: 67886e5fff8f5c789dbdefb320966dd0a0534d32
 SHA512:
-  metadata.gz: 4dcf6ebf7059ab9d56b600b25ce940120ec9418ac33dcd0fcdaf7ee5f563f0226818814c6dc92ea338bffe2f49eb3495c299896674d1c52f0e378287588f8f5b
-  data.tar.gz: 48b108286a417bd3459157f54af57a3ce5e7d820851ad0d1fa1e9b5639078800ea35503bdcd2dcec8d391cbcd2e0af4ff8de67c54713e363a411376f083ecd6c
+  metadata.gz: 620e7fb90243c24c3ec80cfe532e8d67634a93253e27e8724a0fa48c0246203783864034857195fa6eb2cb99bd87dc48e204d7a99ede6c64a42116279d2c92db
+  data.tar.gz: e6e2986f4ffe22a66fa138718d19f030145d0baf2070a4ab5403d297164942c015eceb9b0fbe0d9b875ef2c585745bca682d1d677a3742cc26baa1dece0edf71

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

@@ -120,6 +120,10 @@ super if defined?(::Chef::Property)
       options[:instance_variable_name] = options[:instance_variable_name].to_sym if options[:instance_variable_name]
     end
 
+    def to_s
+      name
+    end
+
     #
     # The name of this property.
     #
@@ -251,16 +255,19 @@ super if defined?(::Chef::Property)
         return get(resource)
       end
 
-      # myprop nil is sometimes a get (backcompat)
       if value.nil? && !explicitly_accepts_nil?(resource)
-        # If you say "my_property nil" and the property explicitly accepts
-        # nil values, we consider this a get.
-        Chef.log_deprecation("#{name} nil currently does not overwrite the value of #{name}. This will change in Chef 13, and the value will be set to nil instead. Please change your code to explicitly accept nil using \"property :#{name}, [MyType, nil]\", or stop setting this value to nil.")
-        return get(resource)
+        # 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)
+        if !result.nil?
+          Chef.log_deprecation("#{name} nil currently does not overwrite the value of #{name}. This will change in Chef 13, and the value will be set to nil instead. Please change your code to explicitly accept nil using \"property :#{name}, [MyType, nil]\", or stop setting this value to nil.")
+        end
+        result
+      else
+        # Anything else, such as myprop(value) is a set
+        set(resource, value)
       end
-
-      # Anything else (myprop value) is a set
-      set(resource, value)
     end
 
     #
@@ -296,6 +303,28 @@ super if defined?(::Chef::Property)
         value
 
       else
+        # If the user does something like this:
+        #
+        # ```
+        # class MyResource < Chef::Resource
+        #   property :content
+        #   action :create do
+        #     file '/x.txt' do
+        #       content content
+        #     end
+        #   end
+        # end
+        # ```
+        #
+        # 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? &&
+           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
+
         if has_default?
           value = default
           if value.is_a?(DelayedEvaluator)
@@ -452,18 +481,22 @@ super if defined?(::Chef::Property)
       # stack trace if you use `define_method`.
       declared_in.class_eval <<-EOM, __FILE__, __LINE__+1
         def #{name}(value=NOT_PASSED)
+          raise "Property #{name} of \#{self} cannot be passed a block! If you meant to create a resource named #{name} instead, you'll need to first rename the property." if block_given?
           self.class.properties[#{name.inspect}].call(self, value)
         end
         def #{name}=(value)
+          raise "Property #{name} of \#{self} cannot be passed a block! If you meant to create a resource named #{name} instead, you'll need to first rename the property." if block_given?
           self.class.properties[#{name.inspect}].set(self, value)
         end
       EOM
     rescue SyntaxError
       # If the name is not a valid ruby name, we use define_method.
-      declared_in.define_method(name) do |value=NOT_PASSED|
+      declared_in.define_method(name) do |value=NOT_PASSED, &block|
+        raise "Property #{name} of #{self} cannot be passed a block! If you meant to create a resource named #{name} instead, you'll need to first rename the property." if block
         self.class.properties[name].call(self, value)
       end
-      declared_in.define_method("#{name}=") do |value|
+      declared_in.define_method("#{name}=") do |value, &block|
+        raise "Property #{name} of #{self} cannot be passed a block! If you meant to create a resource named #{name} instead, you'll need to first rename the property." if block
         self.class.properties[name].set(self, value)
       end
     end

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

@@ -150,26 +150,29 @@ super if defined?(::Chef::Resource)
     def current_value_does_not_exist!
       raise Chef::Exceptions::CurrentValueDoesNotExist
     end
-    def self.action_class
-      @action_class ||
-        # If the superclass needed one, then we need one as well.
-        if superclass.respond_to?(:action_class) && superclass.action_class
-          declare_action_class
-        end
-    end
-    def self.declare_action_class
-      return @action_class if @action_class
-
-      if superclass.respond_to?(:action_class)
-        base_provider = superclass.action_class
+    def self.action_class(&block)
+      return @action_class if @action_class && !block
+      # If the superclass needed one, then we need one as well.
+      if block || (superclass.respond_to?(:action_class) && superclass.action_class)
+        @action_class = declare_action_class(&block)
       end
-      base_provider ||= Chef::Provider
+      @action_class
+    end
+    def self.declare_action_class(&block)
+      @action_class ||= begin
+        if superclass.respond_to?(:action_class)
+          base_provider = superclass.action_class
+        end
+        base_provider ||= Chef::Provider
 
-      resource_class = self
-      @action_class = Class.new(base_provider) do
-        include ActionClass
-        self.resource_class = resource_class
+        resource_class = self
+        Class.new(base_provider) do
+          include ActionClass
+          self.resource_class = resource_class
+        end
       end
+      @action_class.class_eval(&block) if block
+      @action_class
     end
     FORBIDDEN_IVARS = [:@run_context, :@not_if, :@only_if, :@enclosing_provider]
     HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@name, :@not_if, :@only_if, :@elapsed_time, :@enclosing_provider]

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

@@ -25,6 +25,10 @@ class Chef < (defined?(::Chef) ? ::Chef : Object)
   class Resource < (defined?(::Chef::Resource) ? ::Chef::Resource : Object)
     module ActionClass
       CopiedFromChef.extend_chef_module(::Chef::Resource::ActionClass, self) if defined?(::Chef::Resource::ActionClass)
+      def to_s
+        "#{new_resource || "<no resource>"} action #{action ? action.inspect : "<no action>"}"
+      end
+
       #
       # If load_current_value! is defined on the resource, use that.
       #

data/files/lib/compat_resource/version.rb

@@ -1,3 +1,3 @@
 module CompatResource
-  VERSION = '12.5.19'
+  VERSION = '12.5.20'
 end

data/files/spec/data/Gemfile.lock

@@ -1,8 +1,10 @@
-GEM
+GIT
+  remote: git://github.com/chef/chef.git
+  revision: ac73c07e4183a083b5ca9a6fbe0ec5a9f9177219
+  branch: master
   specs:
-    builder (3.2.2)
-    chef (12.5.1)
-      chef-config (= 12.5.1)
+    chef (12.6.0)
+      chef-config (= 12.6.0)
       chef-zero (~> 4.2, >= 4.2.2)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -16,17 +18,22 @@ GEM
       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.2)
-      rspec-expectations (~> 3.2)
-      rspec-mocks (~> 3.2)
+      rspec-core (~> 3.4)
+      rspec-expectations (~> 3.4)
+      rspec-mocks (~> 3.4)
       rspec_junit_formatter (~> 0.2.0)
       serverspec (~> 2.7)
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
-    chef-config (12.5.1)
+    chef-config (12.6.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
+
+GEM
+  specs:
+    builder (3.2.2)
     chef-zero (4.3.2)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
@@ -73,6 +80,7 @@ GEM
       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)
@@ -119,7 +127,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  chef
+  chef!
 
 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.19
+  version: 12.5.20
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: files/bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake