Add Chef::GuardInterpreter.for_resource method to reduce duplication

4 files changed, 37 insertions, 19 deletions

diff --git a/lib/chef/guard_interpreter.rb b/lib/chef/guard_interpreter.rb
new file mode 100644
index 0000000000..b968f273b9
--- /dev/null
+++ b/lib/chef/guard_interpreter.rb
@@ -0,0 +1,32 @@
+#
+# Author:: Steven Danna (<steve@chef.io>)
+# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/guard_interpreter/default_guard_interpreter'
+require 'chef/guard_interpreter/resource_guard_interpreter'
+
+class Chef
+  class GuardInterpreter
+    def self.for_resource(resource, command, command_opts)
+      if resource.guard_interpreter == :default
+        Chef::GuardInterpreter::DefaultGuardInterpreter.new(command, command_opts)
+      else
+        Chef::GuardInterpreter::ResourceGuardInterpreter.new(resource, command, command_opts)
+      end
+    end
+  end
+end
diff --git a/lib/chef/guard_interpreter/resource_guard_interpreter.rb b/lib/chef/guard_interpreter/resource_guard_interpreter.rb
index fb545c95eb..1e2a534c18 100644
--- a/lib/chef/guard_interpreter/resource_guard_interpreter.rb
+++ b/lib/chef/guard_interpreter/resource_guard_interpreter.rb
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/guard_interpreter/default_guard_interpreter'
+require 'chef/guard_interpreter'
 
 class Chef
   class GuardInterpreter
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
diff --git a/lib/chef/resource/file/verification.rb b/lib/chef/resource/file/verification.rb
index 4071aaaeaa..f1ca0f1883 100644
--- a/lib/chef/resource/file/verification.rb
+++ b/lib/chef/resource/file/verification.rb
@@ -17,6 +17,7 @@
 #
 
 require 'chef/exceptions'
+require 'chef/guard_interpreter'
 require 'chef/mixin/descendants_tracker'
 
 class Chef
@@ -106,11 +107,7 @@ class Chef
         # the same set of options that the not_if/only_if blocks do
         def verify_command(path, opts)
           command = @command % {:file => path}
-          interpreter = if @parent_resource.guard_interpreter == :default
-                          Chef::GuardInterpreter::DefaultGuardInterpreter.new(command, @command_opts)
-                        else
-                          Chef::GuardInterpreter::ResourceGuardInterpreter.new(@parent_resource, command, @command_opts)
-                        end
+          interpreter = Chef::GuardInterpreter.for_resource(@parent_resource, command, @command_opts)
           interpreter.evaluate
         end