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

data/lib/chef/provider/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.
@@ -36,31 +36,31 @@ class Chef
           @current_resource.mode("%o" % (cstats.mode & 007777))
         end
         @current_resource
-      end      
-      
+      end
+
       def action_create
         unless ::File.exists?(@new_resource.path)
-          Chef::Log.info("Creating #{@new_resource} at #{@new_resource.path}")
           if @new_resource.recursive == true
             ::FileUtils.mkdir_p(@new_resource.path)
           else
             ::Dir.mkdir(@new_resource.path)
           end
           @new_resource.updated_by_last_action(true)
+          Chef::Log.info("#{@new_resource} created directory #{@new_resource.path}")
         end
         set_owner if @new_resource.owner != nil
         set_group if @new_resource.group != nil
         set_mode if @new_resource.mode != nil
       end
-      
+
       def action_delete
         if ::File.directory?(@new_resource.path) && ::File.writable?(@new_resource.path)
           if @new_resource.recursive == true
-            Chef::Log.info("Deleting #{@new_resource} recursively at #{@new_resource.path}")
             FileUtils.rm_rf(@new_resource.path)
+            Chef::Log.info("#{@new_resource} deleted #{@new_resource.path} recursively")
           else
-            Chef::Log.info("Deleting #{@new_resource} at #{@new_resource.path}")
             ::Dir.delete(@new_resource.path)
+            Chef::Log.info("#{@new_resource} deleted #{@new_resource.path}")
           end
           @new_resource.updated_by_last_action(true)
         else

data/lib/chef/provider/env.rb

@@ -39,14 +39,14 @@ class Chef
           @current_resource.value(env_value(@new_resource.key_name))
         else
           @key_exists = false
-          Chef::Log.debug("#{@new_resource}: key does not exist")
+          Chef::Log.debug("#{@new_resource} key does not exist")
         end
 
         @current_resource
       end
 
       def env_value(key_name)
-        raise Chef::Exceptions::Env, "#{@new_resource} - #{self.to_s} provider does not implement env_value!"
+        raise Chef::Exceptions::Env, "#{self.to_s} provider does not implement env_value!"
       end
 
       def env_key_exists(key_name)
@@ -73,12 +73,12 @@ class Chef
         if @key_exists
           if compare_value
             modify_env
-            Chef::Log.info("Altered #{@new_resource}")
+            Chef::Log.info("#{@new_resource} altered")
             @new_resource.updated_by_last_action(true)
           end
         else
           create_env
-          Chef::Log.debug("Created #{@new_resource}")
+          Chef::Log.info("#{@new_resource} created")
           @new_resource.updated_by_last_action(true)
         end
       end
@@ -92,7 +92,7 @@ class Chef
       def delete_element
         return false unless @new_resource.delim #no delim: delete the key
         if compare_value
-          Chef::Log.debug("#{@new_resource}: element '#{@new_resource.value}' does not exist")
+          Chef::Log.debug("#{@new_resource} element '#{@new_resource.value}' does not exist")
           return true #do not delete the key
         else
           new_value =
@@ -105,7 +105,7 @@ class Chef
           else
             old_value = @new_resource.value(new_value)
             create_env
-            Chef::Log.debug("Deleted #{old_value} element")
+            Chef::Log.debug("#{@new_resource} deleted #{old_value} element")
             @new_resource.updated_by_last_action(true)
             return true #we removed the element and updated; do not delete the key
           end
@@ -115,7 +115,7 @@ class Chef
       def action_delete
         if @key_exists && !delete_element
           delete_env
-          Chef::Log.debug("Deleted #{@new_resource}")
+          Chef::Log.info("#{@new_resource} deleted")
           @new_resource.updated_by_last_action(true)
         end
       end
@@ -124,8 +124,8 @@ class Chef
         if @key_exists
           if compare_value
             modify_env
+            Chef::Log.info("#{@new_resource} modified")
             @new_resource.updated_by_last_action(true)
-            Chef::Log.info("Modified #{@new_resource}")
           end
         else
           raise Chef::Exceptions::Env, "Cannot modify #{@new_resource} - key does not exist!"

data/lib/chef/provider/erl_call.rb

@@ -58,15 +58,15 @@ class Chef
         begin
           pid, stdin, stdout, stderr = popen4(command, :waitlast => true)
 
-          Chef::Log.debug("Running erl_call[#{@new_resource.name}]")
-          Chef::Log.debug("erl_call[#{@new_resource.name}] command: #{command}")
-          Chef::Log.debug("erl_call[#{@new_resource.name}] code: #{@new_resource.code}")
+          Chef::Log.debug("#{@new_resource} running")
+          Chef::Log.debug("#{@new_resource} command: #{command}")
+          Chef::Log.debug("#{@new_resource} code: #{@new_resource.code}")
 
           @new_resource.code.each_line { |line| stdin.puts(line.chomp) }
 
           stdin.close
 
-          Chef::Log.debug("erl_call[#{@new_resource.name}] output: ")
+          Chef::Log.debug("#{@new_resource} output: ")
 
           stdout_output = ""
           stdout.each_line { |line| stdout_output << line }
@@ -86,9 +86,10 @@ class Chef
             raise Chef::Exceptions::ErlCall, stdout_output
           end
 
-          Chef::Log.debug("#{stdout_output}")
-          Chef::Log.info("Ran erl_call[#{@new_resource.name}] successfully")
+          @new_resource.updated_by_last_action(true)
 
+          Chef::Log.debug("#{@new_resource} #{stdout_output}")
+          Chef::Log.info("#{@new_resouce} ran successfully")
         ensure
           Process.wait(pid) if pid
         end

data/lib/chef/provider/execute.rb

@@ -35,7 +35,7 @@ class Chef
 
         if sentinel_file = @new_resource.creates
           if ::File.exists?(sentinel_file)
-            Chef::Log.info("Skipping #{self} - sentinel file #{sentinel_file} exists.")
+            Chef::Log.debug("#{@new_resource} sentinel file #{sentinel_file} exists - nothing to do")
             return false
           end
         end
@@ -49,10 +49,15 @@ class Chef
         opts[:group] = @new_resource.group if @new_resource.group
         opts[:cwd] = @new_resource.cwd if @new_resource.cwd
         opts[:umask] = @new_resource.umask if @new_resource.umask
+        opts[:command_log_level] = :info
+        opts[:command_log_prepend] = @new_resource.to_s
+        if STDOUT.tty? && !Chef::Config[:daemon] && Chef::Log.info?
+          opts[:live_stream] = STDOUT
+        end
 
         result = shell_out!(@new_resource.command, opts)
         @new_resource.updated_by_last_action(true)
-        Chef::Log.info("Ran #{@new_resource} successfully")
+        Chef::Log.info("#{@new_resource} ran successfully")
       end
 
     end

data/lib/chef/provider/file.rb

@@ -63,9 +63,9 @@ class Chef
       # Set the content of the file, assuming it is not set correctly already.
       def set_content
         unless compare_content
-          Chef::Log.info("Setting content for #{@new_resource}")
           backup @new_resource.path if ::File.exists?(@new_resource.path)
           ::File.open(@new_resource.path, "w") {|f| f.write @new_resource.content }
+          Chef::Log.info("#{@new_resource} contents updated")
           @new_resource.updated_by_last_action(true)
         end
       end
@@ -88,9 +88,9 @@ class Chef
       # Set the ownership on the file, assuming it is not set correctly already.
       def set_owner
         unless compare_owner
-          Chef::Log.info("Setting owner to #{@set_user_id} for #{@new_resource}")
           @set_user_id = negative_complement(@set_user_id)
           ::File.chown(@set_user_id, nil, @new_resource.path)
+          Chef::Log.info("#{@new_resource} owner changed to #{@set_user_id}")
           @new_resource.updated_by_last_action(true)
         end
       end
@@ -111,9 +111,9 @@ class Chef
 
       def set_group
         unless compare_group
-          Chef::Log.info("Setting group to #{@set_group_id} for #{@new_resource}")
           @set_group_id = negative_complement(@set_group_id)
           ::File.chown(nil, @set_group_id, @new_resource.path)
+          Chef::Log.info("#{@new_resource} group changed to #{@set_group_id}")
           @new_resource.updated_by_last_action(true)
         end
       end
@@ -129,9 +129,9 @@ class Chef
 
       def set_mode
         unless compare_mode && @new_resource.mode != nil
-          Chef::Log.info("Setting mode to #{sprintf("%o" % octal_mode(@new_resource.mode))} for #{@new_resource}")
           # CHEF-174, bad mojo around treating integers as octal.  If a string is passed, we try to do the "right" thing
           ::File.chmod(octal_mode(@new_resource.mode), @new_resource.path)
+          Chef::Log.info("#{@new_resource} mode changed to #{sprintf("%o" % octal_mode(@new_resource.mode))}")
           @new_resource.updated_by_last_action(true)
         end
       end
@@ -139,9 +139,9 @@ class Chef
       def action_create
         assert_enclosing_directory_exists!
         unless ::File.exists?(@new_resource.path)
-          Chef::Log.info("Creating #{@new_resource} at #{@new_resource.path}")
           ::File.open(@new_resource.path, "w+") {|f| f.write @new_resource.content }
           @new_resource.updated_by_last_action(true)
+          Chef::Log.info("#{@new_resource} created file #{@new_resource.path}")
         else
           set_content unless @new_resource.content.nil?
         end
@@ -158,8 +158,8 @@ class Chef
         if ::File.exists?(@new_resource.path)
           if ::File.writable?(@new_resource.path)
             backup unless ::File.symlink?(@new_resource.path)
-            Chef::Log.info("Deleting #{@new_resource} at #{@new_resource.path}")
             ::File.delete(@new_resource.path)
+            Chef::Log.info("#{@new_resource} deleted file at #{@new_resource.path}")
             @new_resource.updated_by_last_action(true)
           else
             raise "Cannot delete #{@new_resource} at #{@new_resource_path}!"
@@ -170,8 +170,8 @@ class Chef
       def action_touch
         action_create
         time = Time.now
-        Chef::Log.info("Updating #{@new_resource} with new atime/mtime of #{time}")
         ::File.utime(time, time, @new_resource.path)
+        Chef::Log.info("#{@new_resource} updated atime and mtime to #{time}")
         @new_resource.updated_by_last_action(true)
       end
 
@@ -188,8 +188,8 @@ class Chef
           prefix = Chef::Config[:file_backup_path].to_s
           backup_path = ::File.join(prefix, backup_filename)
           FileUtils.mkdir_p(::File.dirname(backup_path)) if Chef::Config[:file_backup_path]
-          Chef::Log.info("Backing up #{@new_resource} to #{backup_path}")
           FileUtils.cp(file, backup_path, :preserve => true)
+          Chef::Log.info("#{@new_resource} backed up to #{backup_path}")
 
           # Clean up after the number of backups
           slice_number = @new_resource.backup
@@ -197,8 +197,8 @@ class Chef
           if backup_files.length >= @new_resource.backup
             remainder = backup_files.slice(slice_number..-1)
             remainder.each do |backup_to_delete|
-              Chef::Log.info("Removing backup of #{@new_resource} at #{backup_to_delete}")
               FileUtils.rm(backup_to_delete)
+              Chef::Log.info("#{@new_resource} removed backup at #{backup_to_delete}")
             end
           end
         end

data/lib/chef/provider/git.rb

@@ -44,7 +44,7 @@ class Chef
           enable_submodules
           @new_resource.updated_by_last_action(true)
         else
-          Chef::Log.info "Taking no action, checkout destination #{@new_resource.destination} already exists or is a non-empty directory"
+          Chef::Log.debug "#{@new_resource} checkout destination #{@new_resource.destination} already exists or is a non-empty directory"
         end
       end
 
@@ -63,7 +63,7 @@ class Chef
           unless current_revision_matches_target_revision?
             fetch_updates
             enable_submodules
-            Chef::Log.info "#{@new_resource} updated to revision: #{target_revision}"
+            Chef::Log.info "#{@new_resource} updated to revision #{target_revision}"
             @new_resource.updated_by_last_action(true)
           end
 
@@ -90,6 +90,7 @@ class Chef
       end
 
       def find_current_revision
+        Chef::Log.debug("#{@new_resource} finding current git revision")
         if ::File.exist?(::File.join(cwd, ".git"))
           # 128 is returned when we're not in a git repo. this is fine
           result = shell_out!('git rev-parse HEAD', :cwd => cwd, :returns => [0,128]).stdout.strip
@@ -104,24 +105,24 @@ class Chef
         args << "-o #{remote}" unless remote == 'origin'
         args << "--depth #{@new_resource.depth}" if @new_resource.depth
 
-        Chef::Log.info "Cloning repo #{@new_resource.repository} to #{@new_resource.destination}"
+        Chef::Log.info "#{@new_resource} cloning repo #{@new_resource.repository} to #{@new_resource.destination}"
 
         clone_cmd = "git clone #{args.join(' ')} #{@new_resource.repository} #{@new_resource.destination}"
-        shell_out!(clone_cmd, run_options)
+        shell_out!(clone_cmd, run_options(:command_log_level => :info))
       end
 
       def checkout
         sha_ref = target_revision
-        Chef::Log.info "Checking out branch: #{@new_resource.revision} reference: #{sha_ref}"
         # checkout into a local branch rather than a detached HEAD
         shell_out!("git checkout -b deploy #{sha_ref}", run_options(:cwd => @new_resource.destination))
+        Chef::Log.info "#{@new_resource} checked out branch: #{@new_resource.revision} reference: #{sha_ref}"
       end
 
       def enable_submodules
         if @new_resource.enable_submodules
-          Chef::Log.info "Enabling git submodules"
+          Chef::Log.info "#{@new_resource} enabling git submodules"
           command = "git submodule init && git submodule update"
-          shell_out!(command, run_options(:cwd => @new_resource.destination))
+          shell_out!(command, run_options(:cwd => @new_resource.destination, :command_log_level => :info))
         end
       end
 
@@ -143,7 +144,7 @@ class Chef
       def setup_remote_tracking_branches
         command = []
 
-        Chef::Log.info  "Configuring remote tracking branches for repository #{@new_resource.repository} "+
+        Chef::Log.debug "#{@new_resource} configuring remote tracking branches for repository #{@new_resource.repository} "+
                         "at remote #{@new_resource.remote}"
         command << "git config remote.#{@new_resource.remote}.url #{@new_resource.repository}"
         command << "git config remote.#{@new_resource.remote}.fetch +refs/heads/*:refs/remotes/#{@new_resource.remote}/*"
@@ -170,6 +171,7 @@ class Chef
       alias :revision_slug :target_revision
 
       def remote_resolve_reference
+        Chef::Log.debug("#{@new_resource} resolving remote reference")
         command = git('ls-remote', @new_resource.repository, @new_resource.revision)
         shell_out!(command, run_options).stdout
       end
@@ -180,6 +182,13 @@ class Chef
         run_opts[:user] = @new_resource.user if @new_resource.user
         run_opts[:group] = @new_resource.group if @new_resource.group
         run_opts[:environment] = {"GIT_SSH" => @new_resource.ssh_wrapper} if @new_resource.ssh_wrapper
+        run_opts[:command_log_prepend] = @new_resource.to_s
+        run_opts[:command_log_level] ||= :debug
+        if run_opts[:command_log_level] == :info
+          if STDOUT.tty? && !Chef::Config[:daemon] && Chef::Log.info?
+            run_opts[:live_stream] = STDOUT
+          end
+        end
         run_opts
       end
 

data/lib/chef/provider/group.rb

@@ -41,7 +41,7 @@ class Chef
           group_info = Etc.getgrnam(@new_resource.group_name)
         rescue ArgumentError => e
           @group_exists = false
-          Chef::Log.debug("#{@new_resource}: group does not exist")
+          Chef::Log.debug("#{@new_resource} group does not exist")
         end
         
         if group_info
@@ -77,12 +77,12 @@ class Chef
         case @group_exists
         when false
           create_group
-          Chef::Log.info("Created #{@new_resource}")
+          Chef::Log.info("#{@new_resource} created")
           @new_resource.updated_by_last_action(true)
         else 
           if compare_group
             manage_group
-            Chef::Log.info("Altered #{@new_resource}")
+            Chef::Log.info("#{@new_resource} altered")
             @new_resource.updated_by_last_action(true)
           end
         end
@@ -92,7 +92,7 @@ class Chef
         if @group_exists
           remove_group
           @new_resource.updated_by_last_action(true)
-          Chef::Log.info("Removed #{@new_resource}")
+          Chef::Log.info("#{@new_resource} removed")
         end
       end
       
@@ -100,7 +100,7 @@ class Chef
         if @group_exists && compare_group
           manage_group 
           @new_resource.updated_by_last_action(true)
-          Chef::Log.info("Managed #{@new_resource}")
+          Chef::Log.info("#{@new_resource} managed")
         end
       end
       
@@ -109,7 +109,7 @@ class Chef
           if compare_group
             manage_group
             @new_resource.updated_by_last_action(true)
-            Chef::Log.info("Modified #{@new_resource}")
+            Chef::Log.info("#{@new_resource} modified")
           end
         else
           raise Chef::Exceptions::Group, "Cannot modify #{@new_resource} - group does not exist!"

data/lib/chef/provider/group/aix.rb

@@ -56,7 +56,7 @@ class Chef
           { :gid => "id" }.sort { |a,b| a[0] <=> b[0] }.each do |field, option|
             if @current_resource.send(field) != @new_resource.send(field)
               if @new_resource.send(field)
-                Chef::Log.debug("#{@new_resource}: setting #{field.to_s} to #{@new_resource.send(field)}")
+                Chef::Log.debug("#{@new_resource} setting #{field.to_s} to #{@new_resource.send(field)}")
                 opts << " '#{option}=#{@new_resource.send(field)}'"
               end
             end

data/lib/chef/provider/group/dscl.rb

@@ -74,12 +74,12 @@ class Chef
 
         def set_members
           unless @new_resource.append
-            Chef::Log.debug("#{@new_resource}: removing group members #{@current_resource.members.join(' ')}") unless @current_resource.members.empty?
+            Chef::Log.debug("#{@new_resource} removing group members #{@current_resource.members.join(' ')}") unless @current_resource.members.empty?
             safe_dscl("create /Groups/#{@new_resource.group_name} GroupMembers ''") # clear guid list
             safe_dscl("create /Groups/#{@new_resource.group_name} GroupMembership ''") # clear user list
           end
           unless @new_resource.members.empty?
-            Chef::Log.debug("#{@new_resource}: setting group members #{@new_resource.members.join(', ')}")
+            Chef::Log.debug("#{@new_resource} setting group members #{@new_resource.members.join(', ')}")
             safe_dscl("append /Groups/#{@new_resource.group_name} GroupMembership #{@new_resource.members.join(' ')}")
           end
         end

data/lib/chef/provider/group/gpasswd.rb

@@ -36,15 +36,15 @@ class Chef
           unless @new_resource.members.empty?
             if(@new_resource.append)
               @new_resource.members.each do |member|
-                Chef::Log.debug("#{@new_resource}: appending member #{member} to group #{@new_resource.group_name}")
+                Chef::Log.debug("#{@new_resource} appending member #{member} to group #{@new_resource.group_name}")
                 shell_out!("gpasswd -a #{member} #{@new_resource.group_name}")
               end
             else
-              Chef::Log.debug("#{@new_resource}: setting group members to #{@new_resource.members.join(', ')}")
+              Chef::Log.debug("#{@new_resource} setting group members to #{@new_resource.members.join(', ')}")
               shell_out!("gpasswd -M #{@new_resource.members.join(',')} #{@new_resource.group_name}")
             end
           else
-            Chef::Log.debug("#{@new_resource}: not changing group members, the group has no members")
+            Chef::Log.debug("#{@new_resource} not changing group members, the group has no members")
           end
         end
       end

data/lib/chef/provider/group/groupadd.rb

@@ -67,8 +67,8 @@ class Chef
           { :gid => "-g" }.sort { |a,b| a[0] <=> b[0] }.each do |field, option|
             if @current_resource.send(field) != @new_resource.send(field)
               if @new_resource.send(field)
-                Chef::Log.debug("#{@new_resource}: setting #{field.to_s} to #{@new_resource.send(field)}")
                 opts << " #{option} '#{@new_resource.send(field)}'"
+                Chef::Log.debug("#{@new_resource} set #{field.to_s} to #{@new_resource.send(field)}")
               end
             end
           end