Fixing not_if and only_if to use run_command with the new ignore_exit value, making the whole experience better.. and fixing CHEF-97

Author: adamhjk

chef/lib/chef/mixin/command.rb

@@ -46,7 +46,7 @@ def only_if(command)
             return false
           end
         else  
-          status = popen4(command) { |p, i, o, e| i.close }
+          status = run_command(:command => command, :ignore_failure => true)
           if status.exitstatus != 0
             return false
           end
@@ -75,7 +75,7 @@ def not_if(command)
             return false
           end
         else  
-          status = popen4(command) { |p, i, o, e| i.close }
+          status = run_command(:command => command, :ignore_failure => true)
           if status.exitstatus == 0
             return false
           end
@@ -92,7 +92,8 @@ def not_if(command)
       #   cwd<String>: Working directory to execute command in, defaults to Dir.tmpdir
       #   timeout<String>: How many seconds to wait for the command to execute before timing out
       #   returns<String>: The single exit value command is expected to return, otherwise causes an exception
-      #
+      #   ignore_failure<Boolean>: Whether to raise an exception on failure, or just return the status
+      # 
       #   user<String>: The UID or user name of the user to execute the command as
       #   group<String>: The GID or group name of the group to execute the command as
       #   environment<Hash>: Pairs of environment variable names and their values to set before execution
@@ -102,6 +103,8 @@ def not_if(command)
       def run_command(args={})         
         command_stdout = nil
         command_stderr = nil
+        
+        args[:ignore_failure] ||= false
 
         if args.has_key?(:creates)
           if File.exists?(args[:creates])
@@ -160,23 +163,24 @@ def run_command(args={})
           else
             status = popen4(args[:command], args, &exec_processing_block)
           end
-        
-          args[:returns] ||= 0
-          if status.exitstatus != args[:returns]
-            # if the log level is not debug, through output of command when we fail
-            output = ""
-            if Chef::Log.logger.level > 0
-              output << "\n---- Begin #{args[:command]} STDOUT ----\n"
-              output << "#{command_stdout}\n"
-              output << "---- End #{args[:command]} STDOUT ----\n"
-              output << "---- Begin #{args[:command]} STDERR ----\n"
-              output << "#{command_stderr}\n"
-              output << "---- End #{args[:command]} STDERR ----\n"
+          
+          unless args[:ignore_failure] 
+            args[:returns] ||= 0
+            if status.exitstatus != args[:returns]
+              # if the log level is not debug, through output of command when we fail
+              output = ""
+              if Chef::Log.logger.level > 0
+                output << "\n---- Begin #{args[:command]} STDOUT ----\n"
+                output << "#{command_stdout}\n"
+                output << "---- End #{args[:command]} STDOUT ----\n"
+                output << "---- Begin #{args[:command]} STDERR ----\n"
+                output << "#{command_stderr}\n"
+                output << "---- End #{args[:command]} STDERR ----\n"
+              end
+              raise Chef::Exception::Exec, "#{args[:command_string]} returned #{status.exitstatus}, expected #{args[:returns]}#{output}"
             end
-            raise Chef::Exception::Exec, "#{args[:command_string]} returned #{status.exitstatus}, expected #{args[:returns]}#{output}"
-          else
-            Chef::Log.debug("Ran #{args[:command_string]} (#{args[:command]}) returned #{status.exitstatus}")
           end
+          Chef::Log.debug("Ran #{args[:command_string]} (#{args[:command]}) returned #{status.exitstatus}")
         end
         status
       end

example-repository/cookbooks/CHEF-97/recipes/default.rb

@@ -0,0 +1,41 @@
+#
+# Cookbook Name:: CHEF-97
+# Recipe:: default
+#
+# Copyright 2009, Opscode
+#
+# 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.
+#
+
+# Should not execute
+execute "echo onlyif" do
+  only_if "test -d /tmp/CHEF-97"
+end
+
+directory "/tmp/CHEF-97"
+
+# Should execute
+execute "echo onlyif"
+
+# Should not execute
+execute "echo notif" do
+  not_if "test -d /tmp/CHEF-97"
+end
+
+directory "/tmp/CHEF-97" do
+  action :delete
+end
+
+# Should execute
+execute "echo notif"
+