Enable guard_interpreters for the execute resource and set the default interpreter for the execute resource to be :execute.

This ensures that attributes of the resource like :environment & :cwd can be inherited by the guard when guard is specified as a string.

4 files changed, 59 insertions, 44 deletions

diff --git a/lib/chef/guard_interpreter/resource_guard_interpreter.rb b/lib/chef/guard_interpreter/resource_guard_interpreter.rb
index 229a8502c7..8eaa82c0a5 100644
--- a/lib/chef/guard_interpreter/resource_guard_interpreter.rb
+++ b/lib/chef/guard_interpreter/resource_guard_interpreter.rb
@@ -33,10 +33,19 @@ class Chef
         # to the resource
         merge_inherited_attributes
 
-        # Script resources have a code attribute, which is
-        # what is used to execute the command, so include
-        # that with attributes specified by caller in opts
-        block_attributes = @command_opts.merge({:code => @command})
+        # Only execute and script resources and use guard attributes.
+        # The command to be executed on them are passed via different attributes.
+        # Script resources use code attribute and execute resources use
+        # command attribute. Moreover script resources are also execute
+        # resources. Here we make sure @command is assigned to the right
+        # attribute by checking the type of the resources.
+        # We need to make sure we check for Script first because any resource
+        # that can get to here is an Execute resource.
+        if @parent_resource.is_a? Chef::Resource::Script
+          block_attributes = @command_opts.merge({:code => @command})
+        else
+          block_attributes = @command_opts.merge({:command => @command})
+        end
 
         # Handles cases like powershell_script where default
         # attributes are different when used in a guard vs. not. For
@@ -79,7 +88,7 @@ class Chef
           raise ArgumentError, "Specified guard_interpreter resource #{parent_resource.guard_interpreter.to_s} unknown for this platform"
         end
 
-        if ! resource_class.ancestors.include?(Chef::Resource::Script)
+        if ! resource_class.ancestors.include?(Chef::Resource::Execute)
           raise ArgumentError, "Specified guard interpreter class #{resource_class} must be a kind of Chef::Resource::Script resource"
         end
 
diff --git a/lib/chef/resource/conditional.rb b/lib/chef/resource/conditional.rb
index 324c5a4676..6a987d3086 100644
--- a/lib/chef/resource/conditional.rb
+++ b/lib/chef/resource/conditional.rb
@@ -54,23 +54,29 @@ class Chef
       end
 
       def configure
-        case @command
-        when String
-          @guard_interpreter = new_guard_interpreter(@parent_resource, @command, @command_opts, &@block)
-          @block = nil
-        when nil
-          # we should have a block if we get here
-          if @parent_resource.guard_interpreter != :default
-            msg = "#{@parent_resource.name} was given a guard_interpreter of #{@parent_resource.guard_interpreter}, "
-            msg << "but not given a command as a string. guard_interpreter does not support blocks (because they just contain ruby)."
-            raise ArgumentError, msg
-          end
-
+        if @block_given
+          # If a block is given, we will not interpret the block with a guard interpreter.
           @guard_interpreter = nil
           @command, @command_opts = nil, nil
         else
-          # command was passed, but it wasn't a String
-          raise ArgumentError, "Invalid only_if/not_if command, expected a string: #{command.inspect} (#{command.class})"
+          case @command
+          when String
+            @guard_interpreter = new_guard_interpreter(@parent_resource, @command, @command_opts, &@block)
+            @block = nil
+          when nil
+            # We should have a block if we get here
+            if @parent_resource.guard_interpreter != :default
+              msg = "#{@parent_resource.name} was given a guard_interpreter of #{@parent_resource.guard_interpreter}, "
+              msg << "but not given a command as a string. guard_interpreter does not support blocks (because they just contain ruby)."
+              raise ArgumentError, msg
+            end
+
+            @guard_interpreter = nil
+            @command, @command_opts = nil, nil
+          else
+            # command was passed, but it wasn't a String
+            raise ArgumentError, "Invalid only_if/not_if command, expected a string: #{command.inspect} (#{command.class})"
+          end
         end
       end
 
diff --git a/lib/chef/resource/execute.rb b/lib/chef/resource/execute.rb
index 80ee16c5ec..e0a1bbb8c0 100644
--- a/lib/chef/resource/execute.rb
+++ b/lib/chef/resource/execute.rb
@@ -40,6 +40,7 @@ class Chef
         @user = nil
         @allowed_actions.push(:run)
         @umask = nil
+        @guard_interpreter = :execute
       end
 
       def umask(arg=nil)
@@ -116,6 +117,30 @@ class Chef
         )
       end
 
+      def self.set_guard_inherited_attributes(*inherited_attributes)
+        @class_inherited_attributes = inherited_attributes
+      end
+
+      def self.guard_inherited_attributes(*inherited_attributes)
+        # Similar to patterns elsewhere, return attributes from this
+        # class and superclasses as a form of inheritance
+        ancestor_attributes = []
+
+        if superclass.respond_to?(:guard_inherited_attributes)
+          ancestor_attributes = superclass.guard_inherited_attributes
+        end
+
+        ancestor_attributes.concat(@class_inherited_attributes ? @class_inherited_attributes : []).uniq
+      end
+
+      set_guard_inherited_attributes(
+       :cwd,
+       :environment,
+       :group,
+       :user,
+       :umask
+       )
+
     end
   end
 end
diff --git a/lib/chef/resource/script.rb b/lib/chef/resource/script.rb
index 6f66fb9094..8cc9c6f0c5 100644
--- a/lib/chef/resource/script.rb
+++ b/lib/chef/resource/script.rb
@@ -58,31 +58,6 @@ class Chef
         )
       end
 
-      def self.set_guard_inherited_attributes(*inherited_attributes)
-        @class_inherited_attributes = inherited_attributes
-      end
-
-      def self.guard_inherited_attributes(*inherited_attributes)
-        # Similar to patterns elsewhere, return attributes from this
-        # class and superclasses as a form of inheritance
-        ancestor_attributes = []
-
-        if superclass.respond_to?(:guard_inherited_attributes)
-          ancestor_attributes = superclass.guard_inherited_attributes
-        end
-
-        ancestor_attributes.concat(@class_inherited_attributes ? @class_inherited_attributes : []).uniq
-      end
-
-      set_guard_inherited_attributes(
-       :cwd,
-       :environment,
-       :group,
-       :path,
-       :user,
-       :umask
-       )
-
     end
   end
 end