remote_file.rb in chef-0.10.0.beta.7

- old
+ new

@@ -32,22 +32,22 @@
       end
 
       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
         end
         enforce_ownership_and_permissions
@@ -55,11 +55,11 @@
         @new_resource.updated_by_last_action?
       end
 
       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
       end
 
@@ -72,27 +72,26 @@
       def current_resource_matches_target_checksum?
         @new_resource.checksum && @current_resource.checksum && @current_resource.checksum =~ /^#{Regexp.escape(@new_resource.checksum)}/
       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
 
       def source_file(source, current_checksum, &block)