Add Chef::GuardInterpreter.for_resource method to reduce duplication

1 files changed, 2 insertions, 13 deletions

diff --git a/lib/chef/resource/conditional.rb b/lib/chef/resource/conditional.rb
index cdc2638ef0..35bdae8d69 100644
--- a/lib/chef/resource/conditional.rb
+++ b/lib/chef/resource/conditional.rb
@@ -17,7 +17,7 @@
 #
 
 require 'chef/mixin/shell_out'
-require 'chef/guard_interpreter/resource_guard_interpreter'
+require 'chef/guard_interpreter'
 
 class Chef
   class Resource
@@ -56,7 +56,7 @@ class Chef
       def configure
         case @command
         when String,Array
-          @guard_interpreter = new_guard_interpreter(@parent_resource, @command, @command_opts, &@block)
+          @guard_interpreter = Chef::GuardInterpreter.for_resource(@parent_resource, @command, @command_opts)
           @block = nil
         when nil
           # We should have a block if we get here
@@ -122,17 +122,6 @@ class Chef
           "#{@positivity} { #code block }"
         end
       end
-
-      private
-
-      def new_guard_interpreter(parent_resource, command, opts)
-        if parent_resource.guard_interpreter == :default
-          guard_interpreter = Chef::GuardInterpreter::DefaultGuardInterpreter.new(command, opts)
-        else
-          guard_interpreter = Chef::GuardInterpreter::ResourceGuardInterpreter.new(parent_resource, command, opts)
-        end
-      end
-
     end
   end
 end