chef 0.10.0.beta.6 → 0.10.0.beta.7

data/lib/chef/provider/package/yum.rb

@@ -126,7 +126,7 @@ class Chef
 
                 # Expect [ { :version => "ver", :release => "rel" }, { :version => "ver", :release => "rel" }, { :version => "ver", :release => "rel" } ] ???
                 matching_versions.each do |ver|
-                  Chef::Log.debug("#{package_name}: trying to match #{desired_version} to version #{ver[:version]} and release #{ver[:release]}")
+                  Chef::Log.debug("#{@new_resource} trying to match #{desired_version} to version #{ver[:version]} and release #{ver[:release]}")
                   if (desired_version == "#{ver[:version]}-#{ver[:release]}")
                     return true
                   end
@@ -176,7 +176,7 @@ class Chef
               raise Chef::Exceptions::Package, "Package #{@new_resource.name} not found: #{@new_resource.source}"
             end
 
-            Chef::Log.debug("Checking rpm status for  #{@new_resource.package_name}")
+            Chef::Log.debug("#{@new_resource} checking rpm status")
             status = popen4("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@new_resource.source}") do |pid, stdin, stdout, stderr|
               stdout.each do |line|
                 case line
@@ -188,7 +188,7 @@ class Chef
             end
           end
 
-          Chef::Log.debug("Checking yum info for #{@new_resource.package_name}#{yum_arch}")
+          Chef::Log.debug("#{@new_resource} checking yum info for #{@new_resource.package_name}#{yum_arch}")
 
           @yum.refresh
 
@@ -201,7 +201,7 @@ class Chef
           else
             @candidate_version = installed_version
           end
-          Chef::Log.debug("#{@current_resource.name}: Installed version: #{installed_version} Candidate version: #{candidate_version}")
+          Chef::Log.debug("#{@new_resource} installed version: #{installed_version} candidate version: #{candidate_version}")
 
           @current_resource
         end

data/lib/chef/provider/package/zypper.rb

@@ -35,24 +35,24 @@ class Chef
           is_out_of_date=false
           version=''
           oud_version=''
-          Chef::Log.debug("Checking zypper for #{@new_resource.package_name}")
+          Chef::Log.debug("#{@new_resource} checking zypper")
           status = popen4("zypper info #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
               case line
               when /^Version: (.+)$/
                 version = $1
-                Chef::Log.debug("zypper version=#{$1}")
+                Chef::Log.debug("#{@new_resource} version #{$1}")
               when /^Installed: Yes$/
                 is_installed=true
-                Chef::Log.debug("zypper installed true")
+                Chef::Log.debug("#{@new_resource} is installed")
                 
               when /^Installed: No$/
                 is_installed=false
-                Chef::Log.debug("zypper installed false")
+                Chef::Log.debug("#{@new_resource} is not installed")
               when /^Status: out-of-date \(version (.+) installed\)$/
                 is_out_of_date=true
                 oud_version=$1
-                Chef::Log.debug("zypper out of date version=#{$1}")
+                Chef::Log.debug("#{@new_resource} out of date version #{$1}")
               end
             end
           end
@@ -60,28 +60,22 @@ class Chef
           if is_installed==false
             @candidate_version=version
             @current_resource.version(nil)
-            Chef::Log.debug("dentro installed false");
           end
  
           if is_installed==true
             if is_out_of_date==true
               @current_resource.version(oud_version)
               @candidate_version=version
-              Chef::Log.debug("dentro installed outofdate");
             else 
               @current_resource.version(version)
               @candidate_version=version
-              Chef::Log.debug("dentro installed");
             end
           end
 
-
           unless status.exitstatus == 0
             raise Chef::Exceptions::Package, "zypper failed - #{status.inspect}!"
           end
-
           
-          Chef::Log.debug("zypper current resource      #{@current_resource}")
           @current_resource
         end
 

data/lib/chef/provider/remote_directory.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -32,8 +32,7 @@ class Chef
 
       def action_create
         super
-        Chef::Log.debug("Doing a remote recursive directory transfer for #{@new_resource}")
-          
+
         files_to_purge = Set.new(
           Dir.glob(::File.join(@new_resource.path, '**', '*'), ::File::FNM_DOTMATCH).select do |name|
             name !~ /(?:^|#{Regexp.escape(::File::SEPARATOR)})\.\.?$/
@@ -45,6 +44,8 @@ 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")
+        @new_resource.updated_by_last_action(true)
       end
 
       def action_create_if_missing
@@ -59,11 +60,11 @@ class Chef
         if @new_resource.purge
           unmanaged_files.sort.reverse.each do |f|
             if ::File.directory?(f)
-              Chef::Log.debug("Removing directory #{f}")
               Dir::rmdir(f)
+              Chef::Log.debug("#{@new_resource} removed directory #{f}")
             else
-              Chef::Log.debug("Deleting file #{f}")
               ::File.delete(f)
+              Chef::Log.debug("#{@new_resource} deleted file #{f}")
             end
           end
         end
@@ -74,15 +75,15 @@ class Chef
         files = cookbook.relative_filenames_in_preferred_directory(node, :files, @new_resource.source)
         files.sort.reverse
       end
-      
+
       def directory_root_in_cookbook_cache
         @directory_root_in_cookbook_cache ||= begin
           cookbook = run_context.cookbook_collection[resource_cookbook]
           cookbook.preferred_filename_on_disk_location(node, :files, @new_resource.source, @new_resource.path)
         end
       end
-      
-      # Determine the cookbook to get the file from. If new resource sets an 
+
+      # Determine the cookbook to get the file from. If new resource sets an
       # explicit cookbook, use it, otherwise fall back to the implicit cookbook
       # i.e., the cookbook the resource was declared in.
       def resource_cookbook
@@ -91,9 +92,9 @@ class Chef
 
       def create_cookbook_file(cookbook_file_relative_path)
         full_path = ::File.join(@new_resource.path, cookbook_file_relative_path)
-        
+
         ensure_directory_exists(::File.dirname(full_path))
-        
+
         file_to_fetch = cookbook_file_resource(full_path, cookbook_file_relative_path)
         if @new_resource.overwrite
           file_to_fetch.run_action(:create)
@@ -102,7 +103,7 @@ class Chef
         end
         @new_resource.updated_by_last_action(true) if file_to_fetch.updated?
       end
-      
+
       def cookbook_file_resource(target_path, relative_source_path)
         cookbook_file = Chef::Resource::CookbookFile.new(target_path, run_context)
         cookbook_file.cookbook_name = @new_resource.cookbook || @new_resource.cookbook_name
@@ -111,10 +112,10 @@ class Chef
         cookbook_file.group(@new_resource.files_group)  if @new_resource.files_group
         cookbook_file.owner(@new_resource.files_owner)  if @new_resource.files_owner
         cookbook_file.backup(@new_resource.files_backup) if @new_resource.files_backup
-        
+
         cookbook_file
       end
-      
+
       def ensure_directory_exists(path)
         unless ::File.directory?(path)
           directory_to_create = resource_for_directory(path)

data/lib/chef/provider/remote_file.rb

@@ -34,18 +34,18 @@ class Chef
       def action_create
         assert_enclosing_directory_exists!
 
-        Chef::Log.debug("Checking #{@new_resource} for changes")
+        Chef::Log.debug("#{@new_resource} checking for changes")
 
         if current_resource_matches_target_checksum?
-          Chef::Log.debug("File #{@new_resource} checksum matches target checksum (#{@new_resource.checksum}), not updating")
+          Chef::Log.debug("#{@new_resource} checksum matches target checksum (#{@new_resource.checksum}) - not updating")
         else
           Chef::REST.new(@new_resource.source, nil, nil).fetch(@new_resource.source) do |raw_file|
             if matches_current_checksum?(raw_file)
-              Chef::Log.debug "#{@new_resource}: Target and Source checksums are the same, taking no action"
+              Chef::Log.debug "#{@new_resource} target and source checksums are the same - not updating"
             else
               backup_new_resource
-              Chef::Log.debug "copying remote file from origin #{raw_file.path} to destination #{@new_resource.path}"
               FileUtils.cp raw_file.path, @new_resource.path
+              Chef::Log.info "#{@new_resource} updated"
               @new_resource.updated_by_last_action(true)
             end
           end
@@ -57,7 +57,7 @@ class Chef
 
       def action_create_if_missing
         if ::File.exists?(@new_resource.path)
-          Chef::Log.debug("File #{@new_resource.path} exists, taking no action.")
+          Chef::Log.debug("#{@new_resource} exists, taking no action.")
         else
           action_create
         end
@@ -74,24 +74,23 @@ class Chef
       end
 
       def matches_current_checksum?(candidate_file)
-        Chef::Log.debug "#{@new_resource}: Checking for file existence of #{@new_resource.path}"
+        Chef::Log.debug "#{@new_resource} checking for file existence of #{@new_resource.path}"
         if ::File.exists?(@new_resource.path)
-          Chef::Log.debug "#{@new_resource}: File exists at #{@new_resource.path}"
+          Chef::Log.debug "#{@new_resource} file exists at #{@new_resource.path}"
           @new_resource.checksum(checksum(candidate_file.path))
-          Chef::Log.debug "#{@new_resource}: Target checksum: #{@current_resource.checksum}"
-          Chef::Log.debug "#{@new_resource}: Source checksum: #{@new_resource.checksum}"
+          Chef::Log.debug "#{@new_resource} target checksum: #{@current_resource.checksum}"
+          Chef::Log.debug "#{@new_resource} source checksum: #{@new_resource.checksum}"
 
           @new_resource.checksum == @current_resource.checksum
         else
-          Chef::Log.info "#{@new_resource}: Creating #{@new_resource.path}"
+          Chef::Log.debug "#{@new_resource} creating #{@new_resource.path}"
           false
         end
       end
 
       def backup_new_resource
         if ::File.exists?(@new_resource.path)
-          Chef::Log.debug "#{@new_resource}: checksum changed from #{@current_resource.checksum} to #{@new_resource.checksum}"
-          Chef::Log.info "#{@new_resource}: Updating #{@new_resource.path}"
+          Chef::Log.debug "#{@new_resource} checksum changed from #{@current_resource.checksum} to #{@new_resource.checksum}"
           backup @new_resource.path
         end
       end

data/lib/chef/provider/route.rb

@@ -63,8 +63,6 @@ class Chef::Provider::Route < Chef::Provider
     def load_current_resource
       is_running = nil
 
-      Chef::Log.debug("Configuring Route #{@new_resource.name}")
-
       # cidr or quad dot mask
       if @new_resource.netmask
         new_ip = IPAddr.new("#{@new_resource.target}/#{@new_resource.netmask}")
@@ -86,7 +84,7 @@ class Chef::Provider::Route < Chef::Provider
           destination = IPAddr.new(destination.scan(/../).reverse.to_s.hex, Socket::AF_INET).to_s
           gateway = IPAddr.new(gateway.scan(/../).reverse.to_s.hex, Socket::AF_INET).to_s
           mask = IPAddr.new(mask.scan(/../).reverse.to_s.hex, Socket::AF_INET).to_s
-          Chef::Log.debug( "System has route:  dest=#{destination} mask=#{mask} gw=#{gateway}")
+          Chef::Log.debug("#{@new_resource} system has route: dest=#{destination} mask=#{mask} gw=#{gateway}")
 
           # check if what were trying to configure is already there
           # use an ipaddr object with ip/mask this way we can have
@@ -94,7 +92,7 @@ class Chef::Provider::Route < Chef::Provider
           # expanding bitmask by hand.
           #
           running_ip = IPAddr.new("#{destination}/#{mask}")
-          Chef::Log.debug( "new ip: #{new_ip.inspect} running ip: #{running_ip.inspect} ")
+          Chef::Log.debug("#{@new_resource} new ip: #{new_ip.inspect} running ip: #{running_ip.inspect}")
           is_running = true if running_ip == new_ip
         end
       route_file.close
@@ -103,13 +101,13 @@ class Chef::Provider::Route < Chef::Provider
 
     def action_add
       # check to see if load_current_resource found the route
-      if  is_running
-        Chef::Log.debug("Route #{@new_resource.name} already active ")
+      if is_running
+        Chef::Log.debug("#{@new_resource} route already active - nothing to do")
       else
         command = generate_command(:add)
 
-        Chef::Log.info("Adding route: #{command} ")
         run_command( :command => command )
+        Chef::Log.info("#{@new_resource} added")
         @new_resource.updated_by_last_action(true)
       end
 
@@ -121,11 +119,11 @@ class Chef::Provider::Route < Chef::Provider
       if is_running
         command = generate_command(:delete)
 
-        Chef::Log.info("Removing route: #{command}")
         run_command( :command => command )
+        Chef::Log.info("#{@new_resource} removed")
         @new_resource.updated_by_last_action(true)
       else
-        Chef::Log.debug("Route #{@new_resource.name} does not exist")
+        Chef::Log.debug("#{@new_resource} route does not exist - nothing to do")
       end
     end
 
@@ -156,7 +154,7 @@ class Chef::Provider::Route < Chef::Provider
         conf.each do |k, v|
           network_file = ::File.new("/etc/sysconfig/network-scripts/route-#{k}", "w")
           network_file.puts(conf[k])
-          Chef::Log.debug("writing route.#{k}\n#{conf[k]}")
+          Chef::Log.debug("#{@new_resource} writing route.#{k}\n#{conf[k]}")
           network_file.close
         end
       end

data/lib/chef/provider/ruby_block.rb

@@ -26,6 +26,7 @@ class Chef
 
       def action_create
         @new_resource.block.call
+				Chef::Log.info("#{@new_resource} called")
         @new_resource.updated_by_last_action(true)
       end
     end

data/lib/chef/provider/service.rb

@@ -32,57 +32,52 @@ class Chef
 
       def action_enable
         if @current_resource.enabled
-          Chef::Log.debug("#{@new_resource}: not enabling, already enabled")
+          Chef::Log.debug("#{@new_resource} already enabled - nothing to do")
         else
-          Chef::Log.debug("#{@new_resource}: attempting to enable")
           if enable_service
             @new_resource.updated_by_last_action(true)
-            Chef::Log.info("#{@new_resource}: enabled successfully")
+            Chef::Log.info("#{@new_resource} enabled")
           end
         end
       end
 
       def action_disable
         if @current_resource.enabled
-          Chef::Log.debug("#{@new_resource}: attempting to disable")
           if disable_service
             @new_resource.updated_by_last_action(true)
-            Chef::Log.info("#{@new_resource}: disabled successfully")
+            Chef::Log.info("#{@new_resource} disabled")
           end
         else
-          Chef::Log.debug("#{@new_resource}: not disabling, already disabled")
+          Chef::Log.debug("#{@new_resource} already disabled - nothing to do")
         end
       end
 
       def action_start
         unless @current_resource.running
-          Chef::Log.debug("#{@new_resource}: attempting to start")
           if start_service
             @new_resource.updated_by_last_action(true)
-            Chef::Log.info("Started service #{@new_resource} successfully")
+            Chef::Log.info("#{@new_resource} started")
           end
         else
-          Chef::Log.debug("#{@new_resource}: not starting, already running")
+          Chef::Log.debug("#{@new_resource} already running - nothing to do")
         end 
       end
 
       def action_stop
         if @current_resource.running
-          Chef::Log.debug("#{@new_resource}: attempting to stop")
           if stop_service
             @new_resource.updated_by_last_action(true)
-            Chef::Log.info("#{@new_resource}: stopped successfully")
+            Chef::Log.info("#{@new_resource} stopped")
           end
         else
-          Chef::Log.debug("#{@new_resource}: not stopping, already stopped")
+          Chef::Log.debug("#{@new_resource} already stopped - nothing to do")
         end 
       end
       
       def action_restart
-        Chef::Log.debug("#{@new_resource}: attempting to restart")
         if restart_service
           @new_resource.updated_by_last_action(true)
-          Chef::Log.info("#{@new_resource}: restarted successfully")
+          Chef::Log.info("#{@new_resource} restarted")
         end
       end
 
@@ -91,10 +86,9 @@ class Chef
           raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :reload"
         end
         if @current_resource.running
-          Chef::Log.debug("#{@new_resource}: attempting to reload")
           if reload_service
             @new_resource.updated_by_last_action(true)
-            Chef::Log.info("#{@new_resource}: reloaded successfully")
+            Chef::Log.info("#{@new_resource} reloaded")
           end
         end
       end

data/lib/chef/provider/service/debian.rb

@@ -72,7 +72,7 @@ class Chef
           enabled = false
 
           priority.each { |runlevel, arguments|
-            Chef::Log.debug("service[#{@current_resource.name}]: runlevel #{runlevel}, action #{arguments[0]}, priority #{arguments[1]}")
+            Chef::Log.debug("#{@new_resource} runlevel #{runlevel}, action #{arguments[0]}, priority #{arguments[1]}")
             
             # if we are in a update-rc.d default startup runlevel && we start in this runlevel
             if (2..5).include?(runlevel.to_i) && arguments[0] == :start

data/lib/chef/provider/service/freebsd.rb

@@ -30,20 +30,19 @@ class Chef
 
           # Determine if we're talking about /etc/rc.d or /usr/local/etc/rc.d
           if ::File.exists?("/etc/rc.d/#{current_resource.service_name}")
-            @init_command = "/etc/rc.d/#{current_resource.service_name}" 
+            @init_command = "/etc/rc.d/#{current_resource.service_name}"
           elsif ::File.exists?("/usr/local/etc/rc.d/#{current_resource.service_name}")
-            @init_command = "/usr/local/etc/rc.d/#{current_resource.service_name}" 
+            @init_command = "/usr/local/etc/rc.d/#{current_resource.service_name}"
           else
             raise Chef::Exceptions::Service, "#{@new_resource}: unable to locate the rc.d script"
           end
-          Chef::Log.debug("#{@current_resource.name} found at #{@init_command}")
-            
-          if @new_resource.supports[:status]
-            Chef::Log.debug("#{@new_resource} supports status, checking state")
+          Chef::Log.debug("#{@current_resource} found at #{@init_command}")
 
+          if @new_resource.supports[:status]
             begin
               if run_command(:command => "#{@init_command} status") == 0
                 @current_resource.running true
+                Chef::Log.debug("#{@new_resource} is running")
               end
             rescue Chef::Exceptions::Exec
               @current_resource.running false
@@ -51,11 +50,10 @@ class Chef
             end
 
           elsif @new_resource.status_command
-            Chef::Log.debug("#{@new_resource} doesn't support status but you have specified a status command, running..")
-
             begin
               if run_command(:command => @new_resource.status_command) == 0
                 @current_resource.running true
+                Chef::Log.debug("#{@new_resource} is running")
               end
             rescue Chef::Exceptions::Exec
               @current_resource.running false
@@ -66,12 +64,12 @@ class Chef
             Chef::Log.debug("#{@new_resource} does not support status and you have not specified a status command, falling back to process table inspection")
 
             if node[:command][:ps].nil? or node[:command][:ps].empty?
-              raise Chef::Exceptions::Service, "#{@new_resource}: could not determine how to inspect the process table, please set this nodes 'ps' attribute"
+              raise Chef::Exceptions::Service, "#{@new_resource} could not determine how to inspect the process table, please set this nodes 'ps' attribute"
             end
 
             status = popen4(node[:command][:ps]) do |pid, stdin, stdout, stderr|
               r = Regexp.new(@new_resource.pattern)
-              Chef::Log.debug("#{@new_resource}: attempting to match #{@new_resource.pattern} (#{r}) against process table")
+              Chef::Log.debug("#{@new_resource} attempting to match #{@new_resource.pattern} (#{r}) against process table")
               stdout.each_line do |line|
                 if r.match(line)
                   @current_resource.running true
@@ -83,7 +81,7 @@ class Chef
             unless status.exitstatus == 0
               raise Chef::Exceptions::Service, "Command #{node[:command][:ps]} failed"
             else
-              Chef::Log.debug("#{@new_resource}: #{node[:command][:ps]} exited and parsed successfully, process running: #{@current_resource.running}")
+              Chef::Log.debug("#{@new_resource} #{node[:command][:ps]} exited and parsed successfully, process running: #{@current_resource.running}")
             end
           end
 
@@ -102,21 +100,21 @@ class Chef
           unless @current_resource.enabled
             Chef::Log.debug("#{@new_resource.name} enable/disable state unknown")
           end
-                  
+
           @current_resource
         end
 
         def read_rc_conf
           ::File.open("/etc/rc.conf", 'r') { |file| file.readlines }
         end
-        
+
         def write_rc_conf(lines)
           ::File.open("/etc/rc.conf", 'w') do |file|
             lines.each { |line| file.puts(line) }
           end
         end
-        
-        
+
+
         # The variable name used in /etc/rc.conf for enabling this service
         def service_enable_variable_name
           # Look for name="foo" in the shell script @init_command. Use this for determining the variable name in /etc/rc.conf
@@ -132,7 +130,7 @@ class Chef
           end
           raise Chef::Exceptions::Service, "Could not find name=\"service\" line in #{@init_command}"
         end
-        
+
         def set_service_enable(value)
           lines = read_rc_conf
           # Remove line that set the old value
@@ -141,7 +139,7 @@ class Chef
           lines << "#{service_enable_variable_name}=\"#{value}\""
           write_rc_conf(lines)
         end
-        
+
         def enable_service()
           set_service_enable("YES") unless @current_resource.enabled
         end
@@ -149,7 +147,7 @@ class Chef
         def disable_service()
           set_service_enable("NO") if @current_resource.enabled
         end
-     
+
       end
     end
   end