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

data/lib/chef/provider/ohai.rb

@@ -33,8 +33,9 @@ class Chef
         else
           ohai.all_plugins
         end
-
         node.automatic_attrs.merge! ohai.data
+        Chef::Log.info("#{@new_resource} reloaded")
+        @new_resource.updated_by_last_action(true)
       end
     end
   end

data/lib/chef/provider/package.rb

@@ -43,6 +43,7 @@ class Chef
         elsif @current_resource.version == nil
           install_version = candidate_version
         else
+          Chef::Log.debug("#{@new_resource} is already installed - nothing to do")
           return
         end
 
@@ -50,7 +51,6 @@ class Chef
           raise(Chef::Exceptions::Package, "No version specified, and no candidate version available for #{@new_resource.package_name}")
         end
 
-        Chef::Log.info("Installing #{@new_resource} version #{install_version}")
 
         # We need to make sure we handle the preseed file
         if @new_resource.response_file
@@ -61,25 +61,29 @@ class Chef
         if status
           @new_resource.updated_by_last_action(true)
         end
+        Chef::Log.info("#{@new_resource} installed version #{install_version}")
       end
 
       def action_upgrade
         if @current_resource.version != candidate_version
           orig_version = @current_resource.version || "uninstalled"
-          Chef::Log.info("Upgrading #{@new_resource} version from #{orig_version} to #{candidate_version}")
           status = upgrade_package(@new_resource.package_name, candidate_version)
           if status
             @new_resource.updated_by_last_action(true)
           end
+          Chef::Log.info("#{@new_resource} upgraded from #{orig_version} to #{candidate_version}")
+        else
+          Chef::Log.debug("#{@new_resource} is at the latest version - nothing to do")
         end
       end
 
       def action_remove
         if removing_package?
-          Chef::Log.info("Removing #{@new_resource}")
           remove_package(@current_resource.package_name, @new_resource.version)
           @new_resource.updated_by_last_action(true)
+          Chef::Log.info("#{@new_resource} removed")
         else
+          Chef::Log.debug("#{@new_resource} package does not exist - nothing to do")
         end
       end
 
@@ -97,9 +101,9 @@ class Chef
 
       def action_purge
         if removing_package?
-          Chef::Log.info("Purging #{@new_resource}")
           purge_package(@current_resource.package_name, @new_resource.version)
           @new_resource.updated_by_last_action(true)
+          Chef::Log.info("#{@new_resource} purged")
         end
       end
 
@@ -125,8 +129,8 @@ class Chef
 
       def get_preseed_file(name, version)
         resource = preseed_resource(name, version)
-        Chef::Log.debug("Fetching preseed file to #{resource.path}")
         resource.run_action('create')
+        Chef::Log.debug("#{@new_resource} fetched preseed file to #{resource.path}")
 
         if resource.updated_by_last_action?
           resource.path
@@ -141,7 +145,7 @@ class Chef
         # The full path where the preseed file will be stored
         cache_seed_to = "#{file_cache_dir}/#{name}-#{version}.seed"
 
-        Chef::Log.debug("Fetching preseed file to #{cache_seed_to}")
+        Chef::Log.debug("#{@new_resource} fetching preseed file to #{cache_seed_to}")
 
         remote_file = Chef::Resource::CookbookFile.new(cache_seed_to, run_context)
         remote_file.cookbook_name = @new_resource.cookbook_name

data/lib/chef/provider/package/apt.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.
@@ -23,27 +23,27 @@ require 'chef/resource/package'
 class Chef
   class Provider
     class Package
-      class Apt < Chef::Provider::Package  
-      
+      class Apt < Chef::Provider::Package
+
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @current_resource.package_name(@new_resource.package_name)
-        
-          Chef::Log.debug("Checking apt-cache policy for #{@new_resource.package_name}")
+
+          Chef::Log.debug("#{@new_resource} checking apt-cache policy")
           status = popen4("apt-cache policy #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
               case line
               when /^\s{2}Installed: (.+)$/
                 installed_version = $1
                 if installed_version == '(none)'
-                  Chef::Log.debug("Current version is nil")
+                  Chef::Log.debug("#{@new_resource} current version is nil")
                   @current_resource.version(nil)
                 else
-                  Chef::Log.debug("Current version is #{installed_version}")
+                  Chef::Log.debug("#{@new_resource} current version is #{installed_version}")
                   @current_resource.version(installed_version)
                 end
               when /^\s{2}Candidate: (.+)$/
-                Chef::Log.debug("Candidate version is #{$1}")                
+                Chef::Log.debug("#{@new_resource} candidate version is #{$1}")
                 @candidate_version = $1
               end
             end
@@ -52,14 +52,14 @@ class Chef
           unless status.exitstatus == 0
             raise Chef::Exceptions::Package, "apt-cache failed - #{status.inspect}!"
           end
-          
+
           if @candidate_version == "(none)"
             raise Chef::Exceptions::Package, "apt does not have a version of package #{@new_resource.package_name}"
           end
-        
+
           @current_resource
         end
-      
+
         def install_package(name, version)
           run_command_with_systems_locale(
             :command => "apt-get -q -y#{expand_options(@new_resource.options)} install #{name}=#{version}",
@@ -68,11 +68,11 @@ class Chef
             }
           )
         end
-      
+
         def upgrade_package(name, version)
           install_package(name, version)
         end
-      
+
         def remove_package(name, version)
           run_command_with_systems_locale(
             :command => "apt-get -q -y#{expand_options(@new_resource.options)} remove #{@new_resource.package_name}",
@@ -81,7 +81,7 @@ class Chef
             }
           )
         end
-      
+
         def purge_package(name, version)
           run_command_with_systems_locale(
             :command => "apt-get -q -y#{expand_options(@new_resource.options)} purge #{@new_resource.package_name}",
@@ -90,11 +90,11 @@ class Chef
             }
           )
         end
-        
+
         def preseed_package(name, version)
           preseed_file = get_preseed_file(name, version)
           if preseed_file
-            Chef::Log.info("Pre-seeding #{@new_resource} with package installation instructions.")
+            Chef::Log.info("#{@new_resource} pre-seeding package installation instructions")
             run_command_with_systems_locale(
               :command => "debconf-set-selections #{preseed_file}",
               :environment => {
@@ -103,7 +103,7 @@ class Chef
             )
           end
         end
-      
+
       end
     end
   end

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

@@ -45,7 +45,7 @@ class Chef
             end
 
             # Get information from the package if supplied
-            Chef::Log.debug("Checking dpkg status for #{@new_resource.package_name}")
+            Chef::Log.debug("#{@new_resource} checking dpkg status")
             status = popen4("dpkg-deb -W #{@new_resource.source}") do |pid, stdin, stdout, stderr|
               stdout.each_line do |line|
                 if pkginfo = DPKG_INFO.match(line)
@@ -58,7 +58,7 @@ class Chef
           
           # Check to see if it is installed
           package_installed = nil
-          Chef::Log.debug("Checking install state for #{@current_resource.package_name}")
+          Chef::Log.debug("#{@new_resource} checking install state")
           status = popen4("dpkg -s #{@current_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each_line do |line|
               case line
@@ -66,7 +66,7 @@ class Chef
                 package_installed = true
               when DPKG_VERSION
                 if package_installed
-                  Chef::Log.debug("Current version is #{$1}")                
+                  Chef::Log.debug("#{@new_resource} current version is #{$1}")
                   @current_resource.version($1)
                 end
               end

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

@@ -95,10 +95,10 @@ class Chef
           end
 
           if package_version == @new_resource.version
-            Chef::Log.debug("#{@new_resource.package_name} at version #{@new_resource.version}")
+            Chef::Log.debug("#{@new_resource} at version #{@new_resource.version}")
             @current_resource.version(@new_resource.version)
           else
-            Chef::Log.debug("#{@new_resource.package_name} at version #{package_version}")
+            Chef::Log.debug("#{@new_resource} at version #{package_version}")
             @current_resource.version(package_version)
           end
 

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

@@ -69,10 +69,10 @@ class Chef
           @current_resource.package_name(@new_resource.package_name)
 
           @current_resource.version(current_installed_version)
-          Chef::Log.debug("Current version is #{@current_resource.version}") if @current_resource.version
+          Chef::Log.debug("#{@new_resource} current version is #{@current_resource.version}") if @current_resource.version
 
           @candidate_version = ports_candidate_version
-          Chef::Log.debug("Ports candidate version is #{@candidate_version}") if @candidate_version
+          Chef::Log.debug("#{@new_resource} ports candidate version is #{@candidate_version}") if @candidate_version
 
           @current_resource
         end
@@ -97,13 +97,12 @@ class Chef
               shell_out!("make -DBATCH install", :cwd => port_path, :env => nil).status
             when /^http/, /^ftp/
               shell_out!("pkg_add -r #{package_name}", :env => { "PACKAGESITE" => @new_resource.source, 'LC_ALL' => nil }).status
-              Chef::Log.info("Installed package #{package_name} from: #{@new_resource.source}")
+              Chef::Log.debug("#{@new_resource} installed from: #{@new_resource.source}")
             when /^\//
               shell_out!("pkg_add #{@new_resource.name}", :env => { "PKG_PATH" => @new_resource.source , 'LC_ALL'=>nil}).status
-              Chef::Log.info("Installed package #{@new_resource.name} from: #{@new_resource.source}")
+              Chef::Log.debug("#{@new_resource} installed from: #{@new_resource.source}")
             else
               shell_out!("pkg_add -r #{latest_link_name}", :env => nil).status
-              Chef::Log.info("Installed package #{package_name}")
             end
           end
         end

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

@@ -7,7 +7,7 @@ class Chef
           @current_resource.package_name(@new_resource.package_name)
 
           @current_resource.version(current_installed_version)
-          Chef::Log.debug("Current version is #{@current_resource.version}") if @current_resource.version
+          Chef::Log.debug("#{@new_resource} current version is #{@current_resource.version}") if @current_resource.version
 
           @candidate_version = macports_candidate_version
 
@@ -15,7 +15,7 @@ class Chef
             raise Chef::Exceptions::Package, "Could not get a candidate version for this package -- #{@new_resource.name} does not seem to be a valid package!"
           end
 
-          Chef::Log.debug("MacPorts candidate version is #{@candidate_version}") if @candidate_version
+          Chef::Log.debug("#{@new_resource} candidate version is #{@candidate_version}") if @candidate_version
 
           @current_resource
         end

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

@@ -31,12 +31,12 @@ class Chef
 
           @current_resource.version(nil)
 
-          Chef::Log.debug("Checking pacman for #{@new_resource.package_name}")
+          Chef::Log.debug("#{@new_resource} checking pacman for #{@new_resource.package_name}")
           status = popen4("pacman -Qi #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
               case line
               when /^Version(\s?)*: (.+)$/
-                Chef::Log.debug("Current version is #{$2}")
+                Chef::Log.debug("#{@new_resource} current version is #{$2}")
                 @current_resource.version($2)
               end
             end

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

@@ -46,7 +46,7 @@ class Chef
             raise Chef::Exceptions::Package, "Multiple packages found for #{@new_resource.package_name}: #{atoms.join(" ")}. Specify a category."
           elsif versions.size == 1
             @current_resource.version(versions.first.last)
-            Chef::Log.debug("Got current version #{$1}")
+            Chef::Log.debug("#{@new_resource} current version #{$1}")
           end
 
           @current_resource

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

@@ -34,7 +34,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
@@ -50,12 +50,12 @@ class Chef
             end
           end
           
-          Chef::Log.debug("Checking install state for #{@current_resource.package_name}")
+          Chef::Log.debug("#{@new_resource} checking install state")
           status = popen4("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@current_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
               case line
               when /([\w\d_.-]+)\s([\w\d_.-]+)/
-                Chef::Log.debug("Current version is #{$2}")
+                Chef::Log.debug("#{@new_resource} current version is #{$2}")
                 @current_resource.version($2)
               end
             end

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

@@ -100,11 +100,11 @@ class Chef
           def candidate_version_from_file(gem_dependency, source)
             spec = Gem::Format.from_file_by_path(source).spec
             if spec.satisfies_requirement?(gem_dependency)
-              logger.debug {"found candidate gem version #{spec.version} from local gem package #{source}"}
+              logger.debug {"#{@new_resource} found candidate gem version #{spec.version} from local gem package #{source}"}
               spec.version
             else
               # This is probably going to end badly...
-              logger.warn { "The gem package #{source} does not satisfy the requirements #{gem_dependency.to_s}" }
+              logger.warn { "#{@new_resource} gem package #{source} does not satisfy the requirements #{gem_dependency.to_s}" }
               nil
             end
           end
@@ -133,11 +133,11 @@ class Chef
             spec = spec_with_source && spec_with_source[0]
             version = spec && spec_with_source[0].version
             if version
-              logger.debug { "Found gem #{spec.name} version #{version} for platform #{spec.platform} from #{spec_with_source[1]}" }
+              logger.debug { "#{@new_resource} found gem #{spec.name} version #{version} for platform #{spec.platform} from #{spec_with_source[1]}" }
               version
             else
               source_list = sources.compact.empty? ? "[#{Gem.sources.join(', ')}]" : "[#{sources.join(', ')}]"
-              logger.warn { "Failed to find gem #{gem_dependency} from #{source_list}" }
+              logger.warn { "#{@new_resource} failed to find gem #{gem_dependency} from #{source_list}" }
               nil
             end
           end
@@ -328,16 +328,16 @@ class Chef
           # is the current version
           if !matching_installed_versions.empty?
             gemspec = matching_installed_versions.last
-            logger.debug { "Found installed gem #{gemspec.name} version #{gemspec.version} matching #{gem_dependency}"}
+            logger.debug { "#{@new_resource} found installed gem #{gemspec.name} version #{gemspec.version} matching #{gem_dependency}"}
             gemspec
           # If no version matching the requirements exists, the latest installed
           # version is the current version.
           elsif !all_installed_versions.empty?
             gemspec = all_installed_versions.last
-            logger.debug { "Newest installed version of gem #{gemspec.name} is #{gemspec.version}" }
+            logger.debug { "#{@new_resource} newest installed version of gem #{gemspec.name} is #{gemspec.version}" }
             gemspec
           else
-            logger.debug { "No installed version found for #{gem_dependency.to_s}"}
+            logger.debug { "#{@new_resource} no installed version found for #{gem_dependency.to_s}"}
             nil
           end
         end

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

@@ -39,7 +39,7 @@ class Chef
               raise Chef::Exceptions::Package, "Package #{@new_resource.name} not found: #{@new_resource.source}"
             end
 
-            Chef::Log.debug("Checking pkg status for #{@new_resource.package_name}")
+            Chef::Log.debug("#{@new_resource} checking pkg status")
             status = popen4("pkginfo -l -d #{@new_resource.source} #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
               stdout.each do |line|
                 case line
@@ -52,12 +52,12 @@ class Chef
             raise Chef::Exceptions::Package, "Source for package #{@new_resource.name} required for action install"
           end
 
-          Chef::Log.debug("Checking install state for #{@current_resource.package_name}")
+          Chef::Log.debug("#{@new_resource} checking install state")
           status = popen4("pkginfo -l #{@current_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
               case line
               when /VERSION:\s+(.+)/
-                Chef::Log.debug("Package #{@current_resource.package_name} #{$1} is already installed")
+                Chef::Log.debug("#{@new_resource} version #{$1} is already installed")
                 @current_resource.version($1)
               end
             end
@@ -82,7 +82,7 @@ class Chef
               when /VERSION:\s+(.+)/
                 @candidate_version = $1
                 @new_resource.version($1)
-                Chef::Log.debug("candidate_version: setting install candidate version to #{@candidate_version}")
+                Chef::Log.debug("#{@new_resource} setting install candidate version to #{@candidate_version}")
               end
             end
           end
@@ -93,17 +93,17 @@ class Chef
         end
 
         def install_package(name, version)
-          Chef::Log.debug("Options: #{@new_resource.options}")
+          Chef::Log.debug("#{@new_resource} package install options: #{@new_resource.options}")
           if @new_resource.options.nil?
             run_command_with_systems_locale(
                     :command => "pkgadd -n -d #{@new_resource.source} all"
                   )
-            Chef::Log.debug("Installed package: #{@new_resource.package_name} #{@new_resource.version} from: #{@new_resource.source}")
+            Chef::Log.debug("#{@new_resource} installed version #{@new_resource.version} from: #{@new_resource.source}")
           else
             run_command_with_systems_locale(
               :command => "pkgadd -n#{expand_options(@new_resource.options)} -d #{@new_resource.source} all"
             )
-            Chef::Log.debug("Installed package: #{@new_resource.package_name} #{@new_resource.version} from: #{@new_resource.source}")
+            Chef::Log.debug("#{@new_resource} installed version #{@new_resource.version} from: #{@new_resource.source}")
           end
         end
 
@@ -112,12 +112,12 @@ class Chef
             run_command_with_systems_locale(
                     :command => "pkgrm -n #{name}"
                   )
-            Chef::Log.debug("Removed package #{@new_resource.package_name} #{@new_resource.version}")
+            Chef::Log.debug("#{@new_resource} removed version #{@new_resource.version}")
           else
             run_command_with_systems_locale(
               :command => "pkgrm -n#{expand_options(@new_resource.options)} #{name}"
             )
-            Chef::Log.debug("Removed package #{@new_resource.package_name} #{@new_resource.version}")
+            Chef::Log.debug("#{@new_resource} removed version #{@new_resource.version}")
           end
         end