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

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

@@ -65,14 +65,14 @@ class Chef
           opt = ""
           unless @new_resource.members.empty?
             opt << " -M #{@new_resource.members.join(',')}"
-            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(', ')}")
           else
             # New member list is empty so we should delete any old group members
             unless @current_resource.members.empty?
               opt << " -d #{@current_resource.members.join(',')}"
-              Chef::Log.debug("#{@new_resource}: removing group members #{@current_resource.members.join(', ')}")
+              Chef::Log.debug("#{@new_resource} removing group members #{@current_resource.members.join(', ')}")
             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
           opt

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

@@ -40,7 +40,7 @@ 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}")
                 run_command(:command => "usermod #{append_flags} #{@new_resource.group_name} #{member}" )
 
               end
@@ -48,7 +48,7 @@ class Chef
               raise Chef::Exceptions::Group, "setting group members directly is not supported by #{self.to_s}"
             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/windows.rb

@@ -40,7 +40,7 @@ class Chef
             members = @net_group.local_get_members
           rescue => e
             @group_exists = false
-            Chef::Log.debug("#{@new_resource}: group does not exist")
+            Chef::Log.debug("#{@new_resource} group does not exist")
           end
 
           if members

data/lib/chef/provider/ifconfig.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.
@@ -76,12 +76,12 @@ class Chef
             command << " metric #{@new_resource.metric}" if @new_resource.metric
             command << " mtu #{@new_resource.mtu}" if @new_resource.mtu
           end
-  
+
           run_command(
             :command => command
           )
+          Chef::Log.info("#{@new_resource} added")
           @new_resource.updated_by_last_action(true)
-
         end
 
         # Write out the config files
@@ -92,13 +92,14 @@ class Chef
         # check to see if load_current_resource found the interface
         if @current_resource.device
           command = "ifconfig #{@new_resource.device} down"
-  
+
           run_command(
             :command => command
           )
+          Chef::Log.info("#{@new_resource} deleted")
           @new_resource.updated_by_last_action(true)
         else
-          Chef::Log.debug("Ifconfig #{@current_resource} does not exist")
+          Chef::Log.debug("#{@new_resource} does not exist - nothing to do")
         end
       end
 
@@ -121,12 +122,13 @@ class Chef
           network_file = ::File.new("/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}", "w")
           network_file.puts(template.result(b))
           network_file.close
+          Chef::Log.info("#{@new_resource} created configuration file")
         when "debian","ubuntu"
           # template
         when "slackware"
           # template
         end
-      end 
+      end
     end
   end
 end

data/lib/chef/provider/link.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,12 +36,12 @@ class Chef
       end
 
       private :negative_complement
-      
+
       def load_current_resource
         @current_resource = Chef::Resource::Link.new(@new_resource.name)
         @current_resource.target_file(@new_resource.target_file)
         @current_resource.link_type(@new_resource.link_type)
-        if @new_resource.link_type == :symbolic          
+        if @new_resource.link_type == :symbolic
           if ::File.exists?(@current_resource.target_file) && ::File.symlink?(@current_resource.target_file)
             @current_resource.to(
               ::File.expand_path(::File.readlink(@current_resource.target_file))
@@ -64,68 +64,71 @@ class Chef
           end
         end
         @current_resource
-      end      
-      
+      end
+
       # Compare the ownership of a symlink.  Returns true if they are the same, false if they are not.
       def compare_owner
         return false if @new_resource.owner.nil?
-        
+
         @set_user_id = case @new_resource.owner
                        when /^\d+$/, Integer
                          @new_resource.owner.to_i
                        else
-                         # This raises an ArgumentError if you can't find the user         
+                         # This raises an ArgumentError if you can't find the user
                          Etc.getpwnam(@new_resource.owner).uid
                        end
-        
+
         @set_user_id == @current_resource.owner
       end
-      
+
       # Set the ownership on the symlink, 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.lchown(@set_user_id, nil, @new_resource.target_file)
+          Chef::Log.info("#{@new_resource} owner changed to #{@set_user_id}")
           @new_resource.updated_by_last_action(true)
         end
       end
-      
+
       # Compares the group of a symlink.  Returns true if they are the same, false if they are not.
       def compare_group
         return false if @new_resource.group.nil?
-        
+
         @set_group_id = case @new_resource.group
                         when /^\d+$/, Integer
                           @new_resource.group.to_i
                         else
                           Etc.getgrnam(@new_resource.group).gid
                         end
-        
+
         @set_group_id == @current_resource.group
       end
-      
+
       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.lchown(nil, @set_group_id, @new_resource.target_file)
+          Chef::Log.info("#{@new_resource} group changed to #{@set_group_id}")
           @new_resource.updated_by_last_action(true)
         end
       end
-      
+
       def action_create
         if @current_resource.to != ::File.expand_path(@new_resource.to, @new_resource.target_file)
-          Chef::Log.info("Creating a #{@new_resource.link_type} link from #{@new_resource.to} -> #{@new_resource.target_file} for #{@new_resource}")
           if @new_resource.link_type == :symbolic
             unless (::File.symlink?(@new_resource.target_file) && ::File.readlink(@new_resource.target_file) == @new_resource.to)
               if ::File.symlink?(@new_resource.target_file) || ::File.exist?(@new_resource.target_file)
                 ::File.unlink(@new_resource.target_file)
               end
               ::File.symlink(@new_resource.to,@new_resource.target_file)
-          end
+              Chef::Log.debug("#{@new_resource} created #{@new_resource.link_type} link from #{@new_resource.to} -> #{@new_resource.target_file}")
+              Chef::Log.info("#{@new_resource} created")
+            end
           elsif @new_resource.link_type == :hard
             ::File.link(@new_resource.to, @new_resource.target_file)
+            Chef::Log.debug("#{@new_resource} created #{@new_resource.link_type} link from #{@new_resource.to} -> #{@new_resource.target_file}")
+            Chef::Log.info("#{@new_resource} created")
           end
           @new_resource.updated_by_last_action(true)
         end
@@ -134,21 +137,21 @@ class Chef
           set_group unless @new_resource.group.nil?
         end
       end
-      
+
       def action_delete
-        if @new_resource.link_type == :symbolic 
+        if @new_resource.link_type == :symbolic
           if ::File.symlink?(@new_resource.target_file)
-            Chef::Log.info("Deleting #{@new_resource} at #{@new_resource.target_file}")
             ::File.delete(@new_resource.target_file)
+            Chef::Log.info("#{@new_resource} deleted")
             @new_resource.updated_by_last_action(true)
           elsif ::File.exists?(@new_resource.target_file)
             raise Chef::Exceptions::Link, "Cannot delete #{@new_resource} at #{@new_resource.target_file}! Not a symbolic link."
           end
-        elsif @new_resource.link_type == :hard 
+        elsif @new_resource.link_type == :hard
           if ::File.exists?(@new_resource.target_file)
              if ::File.exists?(@new_resource.to) && ::File.stat(@current_resource.target_file).ino == ::File.stat(@new_resource.to).ino
-               Chef::Log.info("Deleting #{@new_resource} at #{@new_resource.target_file}")
                ::File.delete(@new_resource.target_file)
+               Chef::Log.info("#{@new_resource} deleted")
                @new_resource.updated_by_last_action(true)
              else
                raise Chef::Exceptions::Link, "Cannot delete #{@new_resource} at #{@new_resource.target_file}! Not a hard link."

data/lib/chef/provider/mdadm.rb

@@ -34,7 +34,7 @@ class Chef
       def load_current_resource
         @current_resource = Chef::Resource::Mdadm.new(@new_resource.name)
         @current_resource.raid_device(@new_resource.raid_device)
-        Chef::Log.debug("Checking for software raid device #{@current_resource.raid_device}")
+        Chef::Log.debug("#{@new_resource} checking for software raid device #{@current_resource.raid_device}")
 
         mdadm = shell_out!("mdadm --detail --scan")
         exists = mdadm.stdout.include?(@new_resource.raid_device)
@@ -52,37 +52,37 @@ class Chef
       def action_create
         unless @current_resource.exists
           command = "yes | mdadm --create #{@new_resource.raid_device} --chunk=#{@new_resource.chunk} --level #{@new_resource.level} --raid-devices #{@new_resource.devices.length} #{@new_resource.devices.join(" ")}"
-          Chef::Log.debug("mdadm command: #{command}")
+          Chef::Log.debug("#{@new_resource} mdadm command: #{command}")
           #pid, stdin, stdout, stderr = popen4(command)
           shell_out!(command)
-          Chef::Log.info("Created mdadm raid device (#{@new_resource.raid_device})")
+          Chef::Log.info("#{@new_resource} created raid device (#{@new_resource.raid_device})")
           @new_resource.updated_by_last_action(true)
         else
-          Chef::Log.debug("mdadm raid device already exists, skipping create (#{@new_resource.raid_device})")
+          Chef::Log.debug("#{@new_resource} raid device already exists, skipping create (#{@new_resource.raid_device})")
         end
       end
 
       def action_assemble
         unless @current_resource.exists
           command = "yes | mdadm --assemble #{@new_resource.raid_device} #{@new_resource.devices.join(" ")}"
-          Chef::Log.debug("mdadm command: #{command}")
+          Chef::Log.debug("#{@new_resource} mdadm command: #{command}")
           shell_out!(command)
-          Chef::Log.info("Assembled mdadm raid device (#{@new_resource.raid_device})")
+          Chef::Log.info("#{@new_resource} assembled raid device (#{@new_resource.raid_device})")
           @new_resource.updated_by_last_action(true)
         else
-          Chef::Log.debug("mdadm raid device already exists, skipping assemble (#{@new_resource.raid_device})")
+          Chef::Log.debug("#{@new_resource} raid device already exists, skipping assemble (#{@new_resource.raid_device})")
         end
       end
 
       def action_stop
         if @current_resource.exists
           command = "yes | mdadm --stop #{@new_resource.raid_device}"
-          Chef::Log.debug("mdadm command: #{command}")
+          Chef::Log.debug("#{@new_resource} mdadm command: #{command}")
           shell_out!(command)
-          Chef::Log.info("Stopped mdadm raid device (#{@new_resource.raid_device})")
+          Chef::Log.info("#{@new_resource} stopped raid device (#{@new_resource.raid_device})")
           @new_resource.updated_by_last_action(true)
         else
-          Chef::Log.debug("mdadm raid device doesn't exist (#{@new_resource.raid_device})")
+          Chef::Log.debug("#{@new_resource} raid device doesn't exist (#{@new_resource.raid_device}) - not stopping")
         end
       end
 

data/lib/chef/provider/mount.rb

@@ -28,27 +28,25 @@ class Chef
 
       def action_mount
         unless @current_resource.mounted
-          Chef::Log.debug("#{@new_resource}: attempting to mount")
           status = mount_fs()
           if status
             @new_resource.updated_by_last_action(true)
-            Chef::Log.info("#{@new_resource}: mounted successfully")
+            Chef::Log.info("#{@new_resource} mounted")
           end
         else
-          Chef::Log.debug("#{@new_resource}: not mounting, already mounted")
+          Chef::Log.debug("#{@new_resource} is already mounted")
         end
       end
 
       def action_umount
         if @current_resource.mounted
-          Chef::Log.debug("#{@new_resource}: attempting to unmount")
           status = umount_fs()
           if status
             @new_resource.updated_by_last_action(true)
-            Chef::Log.info("#{@new_resource}: unmounted successfully")
+            Chef::Log.info("#{@new_resource} unmounted")
           end
         else
-          Chef::Log.debug("#{@new_resource}: not unmounting, already unmounted")
+          Chef::Log.debug("#{@new_resource} is already unmounted")
         end
       end
 
@@ -57,14 +55,13 @@ class Chef
           raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :remount"
         else
           if @current_resource.mounted
-            Chef::Log.debug("#{@new_resource}: attempting to remount")
             status = remount_fs()
             if status
               @new_resource.updated_by_last_action(true)
-              Chef::Log.info("#{@new_resource}: remounted successfully")
+              Chef::Log.info("#{@new_resource} remounted")
             end
           else
-            Chef::Log.debug("#{@new_resource}: not mounted, not remounting")
+            Chef::Log.debug("#{@new_resource} not mounted, nothing to remount")
           end
         end
       end
@@ -74,9 +71,9 @@ class Chef
           status = enable_fs
           if status
             @new_resource.updated_by_last_action(true)
-            Chef::Log.info("#{@new_resource}: enabled successfully")
+            Chef::Log.info("#{@new_resource} enabled")
           else
-            Chef::Log.debug("#{@new_resource}: not enabling, already enabled")
+            Chef::Log.debug("#{@new_resource} already enabled")
           end
         end
       end
@@ -86,9 +83,9 @@ class Chef
           status = disable_fs
           if status
             @new_resource.updated_by_last_action(true)            
-            Chef::Log.info("#{@new_resource}: disabled successfully")
+            Chef::Log.info("#{@new_resource} disabled")
           else
-            Chef::Log.debug("#{@new_resource}: not disabling, already disabled")
+            Chef::Log.debug("#{@new_resource} already disabled")
           end
         end
       end

data/lib/chef/provider/mount/mount.rb

@@ -94,18 +94,18 @@ class Chef
             end
             command << " #{@new_resource.mount_point}"
             shell_out!(command)
-            Chef::Log.info("Mounted #{@new_resource.mount_point}")
+            Chef::Log.debug("#{@new_resource} is mounted at #{@new_resource.mount_point}")
           else
-            Chef::Log.debug("#{@new_resource.mount_point} is already mounted.")
+            Chef::Log.debug("#{@new_resource} is already mounted at #{@new_resource.mount_point}")
           end
         end
 
         def umount_fs
           if @current_resource.mounted
             shell_out!("umount #{@new_resource.mount_point}")
-            Chef::Log.info("Unmounted #{@new_resource.mount_point}")
+            Chef::Log.debug("#{@new_resource} is no longer mounted at #{@new_resource.mount_point}")
           else
-            Chef::Log.debug("#{@new_resource.mount_point} is not mounted.")
+            Chef::Log.debug("#{@new_resource} is not mounted at #{@new_resource.mount_point}")
           end
         end
 
@@ -114,19 +114,19 @@ class Chef
             shell_out!("mount -o remount #{@new_resource.mount_point}")
 
             @new_resource.updated_by_last_action(true)
-            Chef::Log.info("Remounted #{@new_resource.mount_point}")
+            Chef::Log.debug("#{@new_resource} is remounted at #{@new_resource.mount_point}")
           elsif @current_resource.mounted
             umount_fs
             sleep 1
             mount_fs
           else
-            Chef::Log.debug("#{@new_resource.mount_point} is not mounted.")
+            Chef::Log.debug("#{@new_resource} is not mounted at #{@new_resource.mount_point} - nothing to do")
           end
         end
 
         def enable_fs
           if @current_resource.enabled && mount_options_unchanged?
-            Chef::Log.debug("#{@new_resource.mount_point} is already enabled.")
+            Chef::Log.debug("#{@new_resource} is already enabled - nothing to do")
             return nil
           end
           
@@ -137,7 +137,7 @@ class Chef
           end
           ::File.open("/etc/fstab", "a") do |fstab|
             fstab.puts("#{device_fstab} #{@new_resource.mount_point} #{@new_resource.fstype} #{@new_resource.options.nil? ? "defaults" : @new_resource.options.join(",")} #{@new_resource.dump} #{@new_resource.pass}")
-            Chef::Log.info("Enabled #{@new_resource.mount_point}")
+            Chef::Log.debug("#{@new_resource} is enabled at #{@new_resource.mount_point}")
           end
         end
 
@@ -149,7 +149,7 @@ class Chef
             ::File.readlines("/etc/fstab").reverse_each do |line|
               if !found && line =~ /^#{device_fstab_regex}\s+#{Regexp.escape(@new_resource.mount_point)}/
                 found = true
-                Chef::Log.debug("Removing #{@new_resource.mount_point} from fstab")
+                Chef::Log.debug("#{@new_resource} is removed from fstab")
                 next
               else
                 contents << line
@@ -160,7 +160,7 @@ class Chef
               contents.reverse_each { |line| fstab.puts line}
             end
           else
-            Chef::Log.debug("#{@new_resource.mount_point} is not enabled")
+            Chef::Log.debug("#{@new_resource} is not enabled - nothing to do")
           end
         end
 

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

@@ -60,17 +60,18 @@ class Chef
         def mount_fs
           unless @current_resource.mounted
             @mount.add(@new_resource.device)
+            Chef::Log.debug("#{@new_resource} is mounted at #{@new_resource.mount_point}")
           else
-            Chef::Log.debug("#{@new_resource.mount_point} is already mounted.")
+            Chef::Log.debug("#{@new_resource} is already mounted at #{@new_resource.mount_point}")
           end
         end
 
         def umount_fs
           if @current_resource.mounted
             @mount.delete
-            Chef::Log.info("Unmounted #{@new_resource.mount_point}")
+            Chef::Log.debug("#{@new_resource} is no longer mounted at #{@new_resource.mount_point}")
           else
-            Chef::Log.debug("#{@new_resource.mount_point} is not mounted.")
+            Chef::Log.debug("#{@new_resource} is not mounted at #{@new_resource.mount_point}")
           end
         end