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

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

@@ -30,16 +30,15 @@ class Chef::Provider::Service::Gentoo < Chef::Provider::Service::Init
     
     raise Chef::Exceptions::Service unless ::File.exists?("/sbin/rc-update")
     
-    Chef::Log.debug "#{@new_resource}: checking service enable state"
     @current_resource.enabled(
       Dir.glob("/etc/runlevels/**/#{@current_resource.service_name}").any? do |file|
         exists = ::File.exists? file
         readable = ::File.readable? file
-        Chef::Log.debug "#{@new_resource}: exists: #{exists}, readable: #{readable}"
+        Chef::Log.debug "#{@new_resource} exists: #{exists}, readable: #{readable}"
         exists and readable
       end
     )
-    Chef::Log.debug "#{@new_resource}: enabled: #{@current_resource.enabled}"
+    Chef::Log.debug "#{@new_resource} enabled: #{@current_resource.enabled}"
 
     @current_resource
   end

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

@@ -32,6 +32,7 @@ class Chef
             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
@@ -44,19 +45,20 @@ class Chef
             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
               nil
             end
           elsif
-            Chef::Log.debug "#{@new_resource}: falling back to process table inspection"
+            Chef::Log.debug "#{@new_resource} falling back to process table inspection"
             if ps_cmd.nil? or ps_cmd.empty?
-              raise Chef::Exceptions::Service, "#{@new_resource}: could not determine how to inspect the process table, please set this nodes 'command.ps' attribute"
+              raise Chef::Exceptions::Service, "#{@new_resource} could not determine how to inspect the process table, please set this nodes 'command.ps' attribute"
             end
             status = popen4(ps_cmd) do |pid, stdin, stdout, stderr|
               r = Regexp.new(@new_resource.pattern)
-              Chef::Log.debug "#{@new_resource}: attempting to match '#{@new_resource.pattern}' (#{r.inspect}) against process list"
+              Chef::Log.debug "#{@new_resource} attempting to match '#{@new_resource.pattern}' (#{r.inspect}) against process list"
               stdout.each_line do |line|
                 if r.match(line)
                   @current_resource.running true
@@ -68,7 +70,7 @@ class Chef
             unless status.exitstatus == 0
               raise Chef::Exceptions::Service, "Command #{ps_cmd} failed"
             else
-              Chef::Log.debug "#{@new_resource}: running: #{@current_resource.running}"
+              Chef::Log.debug "#{@new_resource} running: #{@current_resource.running}"
             end
           end
 
@@ -108,7 +110,7 @@ class Chef
             raise Chef::Exceptions::Service, "#{self.to_s} requires that reload_command to be set"
           end
         end
-        
+
         def ps_cmd
           @run_context.node[:command] && @run_context.node[:command][:ps]
         end

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

@@ -86,23 +86,23 @@ class Chef
 
           # Get enabled/disabled state by reading job configuration file
           if ::File.exists?("#{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}")
-            Chef::Log.debug("#{@new_resource}: found #{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}")
+            Chef::Log.debug("#{@new_resource} found #{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}")
             ::File.open("#{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}",'r') do |file|
               while line = file.gets
                 case line
                 when /^start on/
-                  Chef::Log.debug("#{@new_resource}: enabled: #{line.chomp}")
+                  Chef::Log.debug("#{@new_resource} enabled: #{line.chomp}")
                   @current_resource.enabled true
                   break
                 when /^#start on/
-                  Chef::Log.debug("#{@new_resource}: disabled: #{line.chomp}")
+                  Chef::Log.debug("#{@new_resource} disabled: #{line.chomp}")
                   @current_resource.enabled false
                   break
                 end
               end
             end
           else
-            Chef::Log.debug("#{@new_resource}: did not find #{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}")
+            Chef::Log.debug("#{@new_resource} did not find #{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}")
             @current_resource.enabled false
           end
 
@@ -113,7 +113,7 @@ class Chef
           # Calling start on a service that is already started will return 1
           # Our 'goal' when we call start is to ensure the service is started
           if @current_resource.running
-            Chef::Log.debug("#{@new_resource}: Already running, not starting")
+            Chef::Log.debug("#{@new_resource} already running, not starting")
           else
             if @new_resource.start_command
               super
@@ -127,7 +127,7 @@ class Chef
           # Calling stop on a service that is already stopped will return 1
           # Our 'goal' when we call stop is to ensure the service is stopped
           unless @current_resource.running
-            Chef::Log.debug("#{@new_resource}: Not running, not stopping")
+            Chef::Log.debug("#{@new_resource} not running, not stopping")
           else
             if @new_resource.stop_command
               super
@@ -157,14 +157,14 @@ class Chef
         # https://bugs.launchpad.net/upstart/+bug/94065
 
         def enable_service
-          Chef::Log.warn("#{@new_resource}: upstart lacks inherent support for enabling services, editing job config file")
+          Chef::Log.debug("#{@new_resource} upstart lacks inherent support for enabling services, editing job config file")
           conf = Chef::Util::FileEdit.new("#{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}")
           conf.search_file_replace(/^#start on/, "start on")
           conf.write_file
         end
 
         def disable_service
-          Chef::Log.warn("#{@new_resource}: upstart lacks inherent support for disabling services, editing job config file")
+          Chef::Log.debug("#{@new_resource} upstart lacks inherent support for disabling services, editing job config file")
           conf = Chef::Util::FileEdit.new("#{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}")
           conf.search_file_replace(/^start on/, "#start on")
           conf.write_file

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

@@ -55,7 +55,7 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service::Simple
         end
       end
 
-      Chef::Log.debug "#{@new_resource}: running: #{@current_resource.running}"
+      Chef::Log.debug "#{@new_resource} running: #{@current_resource.running}"
     rescue Exception => e
       raise Chef::Exceptions::Service, "Exception determining state of service #{@new_resource.service_name}: #{e.message}"
     end
@@ -83,7 +83,7 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service::Simple
   def stop_service
     begin
       if @new_resource.stop_command
-        Chef::Log.debug "stopping service using the given stop_command"
+        Chef::Log.debug "#{@new_resource} stopping service using the given stop_command"
         popen4(@new_resource.stop_command) do |pid, stdin, stdout, stderr|
           Chef::Log.debug stdout.readlines
         end
@@ -103,7 +103,7 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service::Simple
   def restart_service
     begin
       if @new_resource.restart_command
-        Chef::Log.debug "restarting service using the given restart_command"
+        Chef::Log.debug "#{@new_resource} restarting service using the given restart_command"
         popen4(@new_resource.restart_command) do |pid, stdin, stdout, stderr|
           Chef::Log.debug stdout.readlines
         end

data/lib/chef/provider/subversion.rb

@@ -44,7 +44,7 @@ class Chef
           run_command(run_options(:command => checkout_command))
           @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 - nothing to do"
         end
       end
 
@@ -54,7 +54,7 @@ class Chef
           run_command(run_options(:command => export_command))
           @new_resource.updated_by_last_action(true)
         else
-          Chef::Log.info "Taking no action, export destination #{@new_resource.destination} already exists or is a non-empty directory"
+          Chef::Log.debug "#{@new_resource} export destination #{@new_resource.destination} already exists or is a non-empty directory - nothing to do"
         end
       end
 
@@ -81,22 +81,25 @@ class Chef
       end
 
       def sync_command
-        Chef::Log.info "Updating working copy #{@new_resource.destination} to revision #{@new_resource.revision}"
-        scm :update, @new_resource.svn_arguments, verbose, authentication, "-r#{revision_int}", @new_resource.destination
+        c = scm :update, @new_resource.svn_arguments, verbose, authentication, "-r#{revision_int}", @new_resource.destination
+        Chef::Log.debug "#{@new_resource} updated working copy #{@new_resource.destination} to revision #{@new_resource.revision}"
+				c
       end
 
       def checkout_command
-        Chef::Log.info "checking out #{@new_resource.repository} at revision #{@new_resource.revision} to #{@new_resource.destination}"
-        scm :checkout, @new_resource.svn_arguments, verbose, authentication,
+        c = scm :checkout, @new_resource.svn_arguments, verbose, authentication,
             "-r#{revision_int}", @new_resource.repository, @new_resource.destination
+        Chef::Log.info "#{@new_resource} checked out #{@new_resource.repository} at revision #{@new_resource.revision} to #{@new_resource.destination}"
+				c
       end
 
       def export_command
-        Chef::Log.info "exporting #{@new_resource.repository} at revision #{@new_resource.revision} to #{@new_resource.destination}"
         args = ["--force"]
         args << @new_resource.svn_arguments << verbose << authentication <<
             "-r#{revision_int}" << @new_resource.repository << @new_resource.destination
-        scm :export, *args
+        c = scm :export, *args
+        Chef::Log.info "#{@new_resource} exported #{@new_resource.repository} at revision #{@new_resource.revision} to #{@new_resource.destination}"
+				c
       end
 
       # If the specified revision isn't an integer ("HEAD" for example), look
@@ -157,7 +160,7 @@ class Chef
         end
         raise "Could not parse `svn info` data: #{svn_info}" unless repo_attrs.kind_of?(Hash)
         rev = (repo_attrs['Last Changed Rev'] || repo_attrs['Revision']).to_s
-        Chef::Log.debug "Resolved revision #{@new_resource.revision} to #{rev}"
+        Chef::Log.debug "#{@new_resource} resolved revision #{@new_resource.revision} to #{rev}"
         rev
       end
 

data/lib/chef/provider/template.rb

@@ -42,10 +42,10 @@ class Chef
             Chef::Log.debug("#{@new_resource} content has not changed.")
             set_all_access_controls(@new_resource.path)
           else
-            Chef::Log.info("Writing updated content for #{@new_resource} to #{@new_resource.path}")
             backup
             set_all_access_controls(rendered_template.path)
             FileUtils.mv(rendered_template.path, @new_resource.path)
+            Chef::Log.info("#{@new_resource} updated content")
             @new_resource.updated_by_last_action(true)
           end
         end
@@ -53,14 +53,13 @@ class Chef
 
       def action_create_if_missing
         if ::File.exists?(@new_resource.path)
-          Chef::Log.debug("Template #{@new_resource} exists, taking no action.")
+          Chef::Log.debug("#{@new_resource} exists - taking no action")
         else
           action_create
         end
       end
 
       def template_location
-        Chef::Log.debug("looking for template #{@new_resource.source} in cookbook #{cookbook_name.inspect}")
         @template_file_cache_location ||= begin
           if @new_resource.local
             @new_resource.source

data/lib/chef/provider/user.rb

@@ -51,7 +51,7 @@ class Chef
           user_info = Etc.getpwnam(@new_resource.username)
         rescue ArgumentError => e
           @user_exists = false
-          Chef::Log.debug("User #{@new_resource.username} does not exist")
+          Chef::Log.debug("#{@new_resource} user does not exist")
           user_info = nil
         end
         
@@ -67,7 +67,6 @@ class Chef
             begin
               require 'shadow'
             rescue LoadError
-              Chef::Log.error("You must have ruby-shadow installed for password support!")
               raise Chef::Exceptions::MissingLibrary, "You must have ruby-shadow installed for password support!"
             else
               shadow_info = Shadow::Passwd.getspnam(@new_resource.username)
@@ -97,11 +96,11 @@ class Chef
       def action_create
         if !@user_exists
           create_user
-          Chef::Log.info("Created #{@new_resource}")
+          Chef::Log.info("#{@new_resource} created")
           @new_resource.updated_by_last_action(true)
         elsif compare_user
           manage_user
-          Chef::Log.info("Altered #{@new_resource}")
+          Chef::Log.info("#{@new_resource} altered")
           @new_resource.updated_by_last_action(true)
         end
       end
@@ -110,7 +109,7 @@ class Chef
         if @user_exists
           remove_user
           @new_resource.updated_by_last_action(true)
-          Chef::Log.info("Removed #{@new_resource}")
+          Chef::Log.info("#{@new_resource} removed")
         end
       end
 
@@ -122,7 +121,7 @@ class Chef
         if @user_exists && compare_user
           manage_user
           @new_resource.updated_by_last_action(true)
-          Chef::Log.info("Managed #{@new_resource}")
+          Chef::Log.info("#{@new_resource} managed")
         end
       end
 
@@ -135,10 +134,10 @@ class Chef
           if compare_user
             manage_user
             @new_resource.updated_by_last_action(true)
-            Chef::Log.info("Modified #{@new_resource}")
+            Chef::Log.info("#{@new_resource} modified")
           end
         else
-          raise Chef::Exceptions::User, "Cannot modify #{@new_resource} - user does not exist!"
+          raise Chef::Exceptions::User, "Cannot modify user - does not exist!"
         end
       end
 
@@ -147,12 +146,12 @@ class Chef
           if check_lock() == false
             lock_user
             @new_resource.updated_by_last_action(true)
-            Chef::Log.info("Locked #{@new_resource}")
+            Chef::Log.info("#{@new_resource} locked")
           else
-            Chef::Log.debug("No need to lock #{@new_resource}")
+            Chef::Log.debug("#{@new_resource} already locked - nothing to do")
           end
         else
-          raise Chef::Exceptions::User, "Cannot lock #{@new_resource} - user does not exist!"
+          raise Chef::Exceptions::User, "Cannot lock user - does not exist!"
         end
       end
 
@@ -169,12 +168,12 @@ class Chef
           if check_lock() == true
             unlock_user
             @new_resource.updated_by_last_action(true)
-            Chef::Log.info("Unlocked #{@new_resource}")
+            Chef::Log.info("#{@new_resource} unlocked")
           else
-            Chef::Log.debug("No need to unlock #{@new_resource}")
+            Chef::Log.debug("#{@new_resource} already unlocked - nothing to do")
           end
         else
-          raise Chef::Exceptions::User, "Cannot unlock #{@new_resource} - user does not exist!"
+          raise Chef::Exceptions::User, "Cannot unlock user - does not exist!"
         end
       end
       

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

@@ -117,7 +117,7 @@ class Chef
           if @new_resource.password
             shadow_hash = nil
             
-            Chef::Log.debug("#{new_resource}: updating password")
+            Chef::Log.debug("#{new_resource} updating password")
             if osx_shadow_hash?(@new_resource.password)
               shadow_hash = @new_resource.password.upcase
             else
@@ -257,7 +257,7 @@ class Chef
         end
 
         def move_home
-          Chef::Log.debug("moving #{self} home from #{@current_resource.home} to #{@new_resource.home}")
+          Chef::Log.debug("#{@new_resource} moving #{self} home from #{@current_resource.home} to #{@new_resource.home}")
           
           src = @current_resource.home
           FileUtils.mkdir_p(@new_resource.home)

data/lib/chef/provider/user/pw.rb

@@ -80,13 +80,13 @@ class Chef
             field_symbol = field.to_sym
             if @current_resource.send(field_symbol) != @new_resource.send(field_symbol)
               if @new_resource.send(field_symbol)
-                Chef::Log.debug("Setting #{@new_resource} #{field} to #{@new_resource.send(field_symbol)}")
+                Chef::Log.debug("#{@new_resource} setting #{field} to #{@new_resource.send(field_symbol)}")
                 opts << " #{option} '#{@new_resource.send(field_symbol)}'"
               end
             end
           end
           if @new_resource.supports[:manage_home]
-            Chef::Log.debug("Managing the home directory for #{@new_resource}")
+            Chef::Log.debug("#{@new_resource} is managing the users home directory")
             opts << " -m"
           end
           opts
@@ -94,7 +94,7 @@ class Chef
       
         def modify_password
           if @current_resource.password != @new_resource.password
-            Chef::Log.debug("#{new_resource}: updating password")
+            Chef::Log.debug("#{new_resource} updating password")
             command = "pw usermod #{@new_resource.username} -H 0"
             status = popen4(command, :waitlast => true) do |pid, stdin, stdout, stderr|
               stdin.puts "#{@new_resource.password}"
@@ -104,7 +104,7 @@ class Chef
               raise Chef::Exceptions::User, "pw failed - #{status.inspect}!"
             end
           else
-            Chef::Log.debug("#{new_resource}: no change needed to password")
+            Chef::Log.debug("#{new_resource} no change needed to password")
           end
         end
       end

data/lib/chef/provider/user/useradd.rb

@@ -98,17 +98,17 @@ class Chef
           UNIVERSAL_OPTIONS.each do |field, option|
             if @current_resource.send(field) != @new_resource.send(field)
               if @new_resource.send(field)
-                Chef::Log.debug("Setting #{@new_resource} #{field} to #{@new_resource.send(field)}")
+                Chef::Log.debug("#{@new_resource} setting #{field} to #{@new_resource.send(field)}")
                 opts << " #{option} '#{@new_resource.send(field)}'"
               end
             end
           end
           if updating_home?
             if managing_home_dir?
-              Chef::Log.debug("Managing the home directory for #{@new_resource}")
+              Chef::Log.debug("#{@new_resource} managing the users home directory")
               opts << " -d '#{@new_resource.home}'"
             else
-              Chef::Log.debug("Setting #{@new_resource} home to #{@new_resource.home}")
+              Chef::Log.debug("#{@new_resource} setting home to #{@new_resource.home}")
               opts << " -d '#{@new_resource.home}'"
             end
           end

data/lib/chef/provider/user/windows.rb

@@ -39,7 +39,7 @@ class Chef
             user_info = @net_user.get_info
           rescue
             @user_exists = false
-            Chef::Log.debug("User #{@new_resource.username} does not exist")
+            Chef::Log.debug("#{@new_resource} does not exist")
           end
 
           if user_info
@@ -60,7 +60,7 @@ class Chef
         # <false>:: If the users are identical
         def compare_user
           unless @net_user.validate_credentials(@new_resource.password)
-            Chef::Log.debug("User #{@new_resource.username} password has changed")
+            Chef::Log.debug("#{@new_resource} password has changed")
             return true
           end
           [ :uid, :gid, :comment, :home, :shell ].any? do |user_attrib|
@@ -109,7 +109,7 @@ class Chef
             if @current_resource.send(field_symbol) != @new_resource.send(field_symbol)
               if @new_resource.send(field_symbol)
                 unless field_symbol == :password
-                  Chef::Log.debug("Setting #{@new_resource} #{field} to #{@new_resource.send(field_symbol)}")
+                  Chef::Log.debug("#{@new_resource} setting #{field} to #{@new_resource.send(field_symbol)}")
                 end
                 opts[option.to_sym] = @new_resource.send(field_symbol)
               end

data/lib/chef/resource.rb

@@ -240,7 +240,7 @@ F
         notifications.each do |resources_notifications|
           resources_notifications.each do |resource, notification|
             action, timing = notification[0], notification[1]
-            Chef::Log.debug "adding notification from resource #{self} to `#{resource.inspect}' => `#{notification.inspect}'"
+            Chef::Log.debug "Adding notification from resource #{self} to `#{resource.inspect}' => `#{notification.inspect}'"
             add_notification(action, resource, timing)
           end
         end
@@ -419,8 +419,9 @@ F
           Chef::Log.error("#{self} (#{defined_at}) had an error: #{e.message}")
         else
           Chef::Log.error("#{self} (#{defined_at}) has had an error")
-          msg = e.message
-          raise e.exception("#{self} (#{defined_at}) had an error: #{e.message}") 
+          new_exception = e.exception("#{self} (#{defined_at}) had an error: #{e.message}")
+          new_exception.set_backtrace(e.backtrace)
+          raise new_exception
         end
       end
     end