microwave 0.1004.6 → 0.1006.1

data/lib/chef/checksum.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 
 require 'chef/log'
+require 'chef/checksum/storage'
 require 'uuidtools'
 
 class Chef
@@ -25,6 +26,14 @@ class Chef
   class Checksum
     attr_accessor :checksum, :create_time
 
+    attr_reader :storage
+
+    # When a Checksum commits a sandboxed file to its final home in the checksum
+    # repo, this attribute will have the original on-disk path where the file
+    # was stored; it will be used if the commit is reverted to restore the sandbox
+    # to the pre-commit state.
+    attr_reader :original_committed_file_location
+    
     # Creates a new Chef::Checksum object.
     # === Arguments
     # checksum::: the MD5 content hash of the file
@@ -35,6 +44,7 @@ class Chef
       @create_time = Time.now.iso8601
       @checksum = checksum
       @original_committed_file_location = nil
+      @storage = Storage::Filesystem.new(Chef::Config.checksum_path, checksum)
     end
 
     def to_json(*a)
@@ -55,28 +65,38 @@ class Chef
       checksum
     end
 
+    # Moves the given +sandbox_file+ into the checksum repo using the path
+    # given by +file_location+ and saves the Checksum to the database
+    def commit_sandbox_file(sandbox_file)
+      @original_committed_file_location = sandbox_file
+      Chef::Log.info("Commiting sandbox file: move #{sandbox_file} to #{@storage}")
+      @storage.commit(sandbox_file)
+    end
 
-    ##
-    # On-Disk Checksum File Repo (Chef Server API)
-    ##
+    # Moves the checksum file back to its pre-commit location and deletes
+    # the checksum object from the database, effectively undoing +commit_sandbox_file+.
+    # Raises Chef::Exceptions::IllegalChecksumRevert if the original file location
+    # is unknown, which is will be the case if commit_sandbox_file was not
+    # previously called
+    def revert_sandbox_file_commit
+      unless original_committed_file_location
+        raise Chef::Exceptions::IllegalChecksumRevert, "Checksum #{self.inspect} cannot be reverted because the original sandbox file location is not known"
+      end
 
-    def file_location
-      File.join(checksum_repo_directory, checksum)
+      Chef::Log.warn("Reverting sandbox file commit: moving #{@storage} back to #{original_committed_file_location}")
+      @storage.revert(original_committed_file_location)
     end
 
-    def checksum_repo_directory
-      File.join(Chef::Config.checksum_path, checksum[0..1])
+    # Removes the on-disk file backing this checksum object, then removes it
+    # from the database
+    def purge
+      purge_file
     end
 
     private
 
-    # Deletes the file backing this checksum from the on-disk repo.
-    # Purging the checksums is how users can get back to a valid state if
-    # they've deleted files, so we silently swallow Errno::ENOENT here.
     def purge_file
-      FileUtils.rm(file_location)
-    rescue Errno::ENOENT
-      true
+      @storage.purge
     end
 
   end

data/lib/chef/checksum/storage.rb

@@ -0,0 +1,18 @@
+#
+# Author:: Andrea Campi (<andrea.campi@zephirworks.com>)
+# Copyright:: Copyright (c) 2011 Opscode, 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/checksum/storage/filesystem'

data/lib/chef/checksum/storage/filesystem.rb

@@ -0,0 +1,56 @@
+#
+# Author:: Tim Hinderliter (<tim@opscode.com>)
+# Copyright:: Copyright (c) 2011 Opscode, 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.
+
+class Chef
+  class Checksum
+    class Storage
+      class Filesystem
+        def initialize(base_dir, checksum)
+          @base_dir = base_dir
+          @checksum = checksum
+        end
+
+        def file_location
+          File.join(checksum_repo_directory, @checksum)
+        end
+        alias :to_s :file_location
+
+        def checksum_repo_directory
+          File.join(Chef::Config.checksum_path, @checksum[0..1])
+        end
+
+        def commit(sandbox_file)
+          FileUtils.mkdir_p(checksum_repo_directory)
+          File.rename(sandbox_file, file_location)
+        end
+
+        def revert(original_committed_file_location)
+          File.rename(file_location, original_committed_file_location)
+        end
+
+        # Deletes the file backing this checksum from the on-disk repo.
+        # Purging the checksums is how users can get back to a valid state if
+        # they've deleted files, so we silently swallow Errno::ENOENT here.
+        def purge
+          FileUtils.rm(file_location)
+        rescue Errno::ENOENT
+          true
+        end
+      end
+    end
+  end
+end

data/lib/chef/config.rb

@@ -64,7 +64,8 @@ class Chef
     interval nil
     log_level :info
     log_location STDOUT
-    verbose_logging nil
+    # toggle info level log items that can create a lot of output
+    verbose_logging true 
     node_name nil
     node_path "#{ENV['HOME']}/nodes"
 
@@ -84,6 +85,9 @@ class Chef
     # Exception Handlers
     exception_handlers []
 
+    # Start handlers
+    start_handlers []
+
     # Checksum Cache
     # Uses Moneta on the back-end
     cache_type "BasicFile"

data/lib/chef/cookbook/syntax_check.rb

@@ -109,7 +109,7 @@ class Chef
 
       def validate_template(erb_file)
         Chef::Log.debug("Testing template #{erb_file} for syntax errors...")
-        result = shell_out("sh -c 'erubis -x #{erb_file} | ruby -c'")
+        result = shell_out("erubis -x #{erb_file} | ruby -c")
         result.error!
         true
       rescue Chef::Exceptions::ShellCommandFailed

data/lib/chef/cookbook_version.rb

@@ -377,7 +377,24 @@ class Chef
       if found_pref
         @manifest_records_by_path[found_pref]
       else
-        raise Chef::Exceptions::FileNotFound, "cookbook #{name} does not contain file #{segment}/#{filename}"
+        if segment == :files || segment == :templates
+          error_message = "Cookbook '#{name}' (#{version}) does not contain a file at any of these locations:\n"
+          error_locations = [
+            "  #{segment}/#{node[:platform]}-#{node[:platform_version]}/#{filename}",
+            "  #{segment}/#{node[:platform]}/#{filename}",
+            "  #{segment}/default/#{filename}",
+          ]
+          error_message << error_locations.join("\n")
+          existing_files = segment_filenames(segment)
+          # Show the files that the cookbook does have. If the user made a typo,
+          # hopefully they'll see it here.
+          unless existing_files.empty?
+            error_message << "\n\nThis cookbook _does_ contain: ['#{existing_files.join("','")}']"
+          end
+          raise Chef::Exceptions::FileNotFound, error_message
+        else
+          raise Chef::Exceptions::FileNotFound, "cookbook #{name} does not contain file #{segment}/#{filename}"
+        end
       end
     end
 
@@ -422,7 +439,7 @@ class Chef
 
       best_pref = preferences.find { |pref| !filenames_by_pref[pref].empty? }
 
-      raise Chef::Exceptions::FileNotFound, "cookbook #{name} has no directory #{segment}/#{dirname}" unless best_pref
+      raise Chef::Exceptions::FileNotFound, "cookbook #{name} has no directory #{segment}/default/#{dirname}" unless best_pref
 
       filenames_by_pref[best_pref]
 
@@ -457,7 +474,7 @@ class Chef
 
       best_pref = preferences.find { |pref| !records_by_pref[pref].empty? }
 
-      raise Chef::Exceptions::FileNotFound, "cookbook #{name} has no directory #{segment}/#{dirname}" unless best_pref
+      raise Chef::Exceptions::FileNotFound, "cookbook #{name} (#{version}) has no directory #{segment}/default/#{dirname}" unless best_pref
 
       records_by_pref[best_pref]
     end
@@ -483,13 +500,24 @@ class Chef
 
         fqdn = node[:fqdn]
 
+        # Break version into components, eg: "5.7.1" => [ "5.7.1", "5.7", "5" ]
+        search_versions = []
+        parts = version.to_s.split('.')
+
+        parts.size.times do
+          search_versions << parts.join('.')
+          parts.pop
+        end
+
         # Most specific to least specific places to find the path
-        [
-         File.join(segment.to_s, "host-#{fqdn}", path),
-         File.join(segment.to_s, "#{platform}-#{version}", path),
-         File.join(segment.to_s, platform.to_s, path),
-         File.join(segment.to_s, "default", path)
-        ]
+        search_path = [ File.join(segment.to_s, "host-#{fqdn}", path) ]
+        search_versions.each do |v|
+          search_path << File.join(segment.to_s, "#{platform}-#{v}", path)
+        end
+        search_path << File.join(segment.to_s, platform.to_s, path)
+        search_path << File.join(segment.to_s, "default", path)
+
+        search_path
       else
         [File.join(segment, path)]
       end

data/lib/chef/file_access_control.rb

@@ -107,7 +107,7 @@ class Chef
     def set_group
       if (gid = target_gid) && (gid != stat.gid)
         File.chown(nil, gid, file)
-        Chef::Log.info("#{log_string} owner changed to #{gid}")
+        Chef::Log.info("#{log_string} group changed to #{gid}")
         modified
       end
     end

data/lib/chef/handler.rb

@@ -57,6 +57,27 @@ class Chef
   #
   class Handler
 
+    # The list of currently configured start handlers
+    def self.start_handlers
+      Array(Chef::Config[:start_handlers])
+    end
+
+    # Run the start handlers. This will usually be called by a notification
+    # from Chef::Client
+    def self.run_start_handlers(run_status)
+      Chef::Log.info("Running start handlers")
+      start_handlers.each do |handler|
+        handler.run_report_safely(run_status)
+      end
+      Chef::Log.info("Start handlers complete.")
+    end
+
+    # Wire up a notification to run the start handlers when the chef run
+    # starts.
+    Chef::Client.when_run_starts do |run_status|
+      run_start_handlers(run_status)
+    end
+
     # The list of currently configured report handlers
     def self.report_handlers
       Array(Chef::Config[:report_handlers])

data/lib/chef/mixin/command.rb

@@ -38,64 +38,6 @@ class Chef
         extend  ::Chef::Mixin::Command::Unix
       end
 
-      # If command is a block, returns true if the block returns true, false if it returns false.
-      # ("Only run this resource if the block is true")
-      #
-      # If the command is not a block, executes the command.  If it returns any status other than
-      # 0, it returns false (clearly, a 0 status code is true)
-      #
-      # === Parameters
-      # command<Block>, <String>:: A block to check, or a string to execute
-      #
-      # === Returns
-      # true:: Returns true if the block is true, or if the command returns 0
-      # false:: Returns false if the block is false, or if the command returns a non-zero exit code.
-      def only_if(command, args = {})
-        if command.kind_of?(Proc)
-          chdir_or_tmpdir(args[:cwd]) do
-            res = command.call
-            unless res
-              return false
-            end
-          end
-        else  
-          status = run_command({:command => command, :ignore_failure => true}.merge(args))
-          if status.exitstatus != 0
-            return false
-          end
-        end
-        true
-      end
-      
-      # If command is a block, returns false if the block returns true, true if it returns false.
-      # ("Do not run this resource if the block is true")
-      #
-      # If the command is not a block, executes the command.  If it returns a 0 exitstatus, returns false.
-      # ("Do not run this resource if the command returns 0")
-      #
-      # === Parameters
-      # command<Block>, <String>:: A block to check, or a string to execute
-      #
-      # === Returns
-      # true:: Returns true if the block is false, or if the command returns a non-zero exit status.
-      # false:: Returns false if the block is true, or if the command returns a 0 exit status.
-      def not_if(command, args = {})
-        if command.kind_of?(Proc)
-          chdir_or_tmpdir(args[:cwd]) do
-            res = command.call
-            if res
-              return false
-            end
-          end
-        else  
-          status = run_command({:command => command, :ignore_failure => true}.merge(args))
-          if status.exitstatus == 0
-            return false
-          end
-        end
-        true
-      end
-      
       # === Parameters
       # args<Hash>: A number of required and optional arguments
       #   command<String>, <Array>: A complete command with options to execute or a command and options as an Array 

data/lib/chef/mixin/command/windows.rb

@@ -35,7 +35,7 @@ class Chef
 
           #XXX :user, :group, :environment support?
 
-          Open4.popen4(cmd) do |stdin,stdout,stderr,cid|
+          Open3.popen3(cmd) do |stdin,stdout,stderr,cid|
             if b
               if args[:waitlast]
                 b[cid, stdin, stdout, stderr]

data/lib/chef/provider/file.rb

@@ -151,7 +151,11 @@ class Chef
       end
 
       def action_create_if_missing
-        action_create
+        if ::File.exists?(@new_resource.path)
+          Chef::Log.debug("File #{@new_resource.path} exists, taking no action.")
+        else
+          action_create
+        end
       end
 
       def action_delete

data/lib/chef/provider/remote_directory.rb

@@ -43,7 +43,6 @@ class Chef
           files_to_purge.delete(::File.join(@new_resource.path, cookbook_file_relative_path))
         end
         purge_unmanaged_files(files_to_purge)
-        Chef::Log.info("#{@new_resource} created")
       end
 
       def action_create_if_missing

data/lib/chef/resource.rb

@@ -21,7 +21,7 @@ require 'chef/mixin/params_validate'
 require 'chef/mixin/check_helper'
 require 'chef/mixin/language'
 require 'chef/mixin/convert_to_class_name'
-require 'chef/mixin/command'
+require 'chef/resource/conditional'
 require 'chef/resource_collection'
 require 'chef/node'
 
@@ -70,7 +70,7 @@ F
 
     end
 
-    FORBIDDEN_IVARS = [:@run_context, :@node]
+    FORBIDDEN_IVARS = [:@run_context, :@node, :@not_if, :@only_if]
     HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@name, :@node]
 
     include Chef::Mixin::CheckHelper
@@ -116,10 +116,8 @@ F
       @ignore_failure = false
       @retries = 0
       @retry_delay = 2
-      @not_if = nil
-      @not_if_args = {}
-      @only_if = nil
-      @only_if_args = {}
+      @not_if = []
+      @only_if = []
       @immediate_notifications = Array.new
       @delayed_notifications = Array.new
       @source_line = nil
@@ -371,24 +369,44 @@ F
       instance_vars
     end
 
-    def only_if(arg=nil, args = {}, &blk)
-      if Kernel.block_given?
-        @only_if = blk
-        @only_if_args = args
-      else
-        @only_if = arg if arg
-        @only_if_args = args if arg
+    # If command is a block, returns true if the block returns true, false if it returns false.
+    # ("Only run this resource if the block is true")
+    #
+    # If the command is not a block, executes the command.  If it returns any status other than
+    # 0, it returns false (clearly, a 0 status code is true)
+    #
+    # === Parameters
+    # command<String>:: A a string to execute.
+    # opts<Hash>:: Options control the execution of the command
+    # block<Proc>:: A ruby block to run. Ignored if a command is given.
+    #
+    # === Evaluation
+    # * evaluates to true if the block is true, or if the command returns 0
+    # * evaluates to false if the block is false, or if the command returns a non-zero exit code.
+    def only_if(command=nil, opts={}, &block)
+      if command || block_given?
+        @only_if << Conditional.only_if(command, opts, &block)
       end
       @only_if
     end
 
-    def not_if(arg=nil, args = {}, &blk)
-      if Kernel.block_given?
-        @not_if = blk
-        @not_if_args = args
-      else
-        @not_if = arg if arg
-        @not_if_args = args if arg
+    # If command is a block, returns false if the block returns true, true if it returns false.
+    # ("Do not run this resource if the block is true")
+    #
+    # If the command is not a block, executes the command.  If it returns a 0 exitstatus, returns false.
+    # ("Do not run this resource if the command returns 0")
+    #
+    # === Parameters
+    # command<String>:: A a string to execute.
+    # opts<Hash>:: Options control the execution of the command
+    # block<Proc>:: A ruby block to run. Ignored if a command is given.
+    #
+    # === Evaluation
+    # * evaluates to true if the block is false, or if the command returns a non-zero exit status.
+    # * evaluates to false if the block is true, or if the command returns a 0 exit status.
+    def not_if(command=nil, opts={}, &block)
+      if command || block_given?
+        @not_if << Conditional.not_if(command, opts, &block)
       end
       @not_if
     end
@@ -405,32 +423,17 @@ F
     end
 
     def run_action(action)
-      Chef::Log.debug("Processing #{self} action #{action} (#{defined_at})")
+      if Chef::Config[:verbose_logging] || Chef::Log.level == :debug
+        # This can be noisy
+        Chef::Log.info("Processing #{self} action #{action} (#{defined_at})")
+      end
 
       # ensure that we don't leave @updated_by_last_action set to true
       # on accident
       updated_by_last_action(false)
 
       begin
-        # Check if this resource has an only_if block -- if it does,
-        # evaluate the only_if block and skip the resource if
-        # appropriate.
-        if only_if
-          unless Chef::Mixin::Command.only_if(only_if, only_if_args)
-            Chef::Log.debug("Skipping #{self} due to only_if")
-            return
-          end
-        end
-
-        # Check if this resource has a not_if block -- if it does,
-        # evaluate the not_if block and skip the resource if
-        # appropriate.
-        if not_if
-          unless Chef::Mixin::Command.not_if(not_if, not_if_args)
-            Chef::Log.debug("Skipping #{self} due to not_if")
-            return
-          end
-        end
+        return if should_skip?
 
         provider = Chef::Platform.provider_for_resource(self)
         provider.load_current_resource
@@ -440,13 +443,35 @@ F
           Chef::Log.error("#{self} (#{defined_at}) had an error: #{e.message}")
         else
           Chef::Log.error("#{self} (#{defined_at}) has had an error")
-          new_exception = e.exception("#{self} (#{defined_at}) had an error: #{e.message}")
+          new_exception = e.exception("#{self} (#{defined_at}) had an error: #{e.class.name}: #{e.message}")
           new_exception.set_backtrace(e.backtrace)
           raise new_exception
         end
       end
     end
 
+    # Evaluates not_if and only_if conditionals. Returns a falsey value if any
+    # of the conditionals indicate that this resource should be skipped, i.e.,
+    # if an only_if evaluates to false or a not_if evaluates to true.
+    #
+    # If this resource should be skipped, returns the first conditional that
+    # "fails" its check. Subsequent conditionals are not evaluated, so in
+    # general it's not a good idea to rely on side effects from not_if or
+    # only_if commands/blocks being evaluated.
+    def should_skip?
+      conditionals = only_if + not_if
+      return false if conditionals.empty?
+
+      conditionals.find do |conditional|
+        if conditional.continue?
+          false
+        else
+          Chef::Log.debug("Skipping #{self} due to #{conditional.description}")
+          true
+        end
+      end
+    end
+
     def updated_by_last_action(true_or_false)
       @updated ||= true_or_false
       @updated_by_last_action = true_or_false