chef 0.7.10 → 0.7.12

data/lib/chef/provider/ifconfig.rb

@@ -106,7 +106,7 @@ class Chef
       def generate_config
         b = binding
         case node[:platform]
-        when ("centos" || "redhat" || "fedora")
+        when "centos","redhat","fedora"
           content = %{
 <% if @new_resource.device %>DEVICE=<%= @new_resource.device %><% end %>
 <% if @new_resource.onboot %>ONBOOT=<%= @new_resource.onboot %><% end %>
@@ -120,9 +120,9 @@ class Chef
           network_file = ::File.new("/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}", "w")
           network_file.puts(template.result(b))
           network_file.close
-        when ("debian" || "ubantu")
+        when "debian","ubuntu"
           # template
-        when ("slackware")
+        when "slackware"
           # template
         end
       end 

data/lib/chef/provider/mount.rb

@@ -26,10 +26,6 @@ class Chef
 
       include Chef::Mixin::Command
 
-      def initialize(node, new_resource)
-        super(node, new_resource)
-      end
-
       def action_mount
         unless @current_resource.mounted
           Chef::Log.debug("#{@new_resource}: attempting to mount")

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

@@ -27,8 +27,8 @@ class Chef
 
         include Chef::Mixin::Command
 
-        def initialize(node, new_resource)
-          super(node, new_resource)
+        def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil)
+          super(node, new_resource, collection, definitions, cookbook_loader)
           @real_device = nil
         end
         attr_accessor :real_device

data/lib/chef/provider/package.rb

@@ -30,8 +30,8 @@ class Chef
       
       attr_accessor :candidate_version
       
-      def initialize(node, new_resource)
-        super(node, new_resource)
+      def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil)
+        super(node, new_resource, collection, definitions, cookbook_loader)
         @candidate_version = nil
       end
       

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

@@ -61,7 +61,7 @@ class Chef
         end
       
         def install_package(name, version)
-          run_command(
+          run_command_with_systems_locale(
             :command => "apt-get -q -y#{expand_options(@new_resource.options)} install #{name}=#{version}",
             :environment => {
               "DEBIAN_FRONTEND" => "noninteractive"
@@ -74,7 +74,7 @@ class Chef
         end
       
         def remove_package(name, version)
-          run_command(
+          run_command_with_systems_locale(
             :command => "apt-get -q -y#{expand_options(@new_resource.options)} remove #{@new_resource.package_name}",
             :environment => {
               "DEBIAN_FRONTEND" => "noninteractive"
@@ -83,7 +83,7 @@ class Chef
         end
       
         def purge_package(name, version)
-          run_command(
+          run_command_with_systems_locale(
             :command => "apt-get -q -y#{expand_options(@new_resource.options)} purge #{@new_resource.package_name}",
             :environment => {
               "DEBIAN_FRONTEND" => "noninteractive"
@@ -95,7 +95,7 @@ class Chef
           preseed_file = get_preseed_file(name, version)
           if preseed_file
             Chef::Log.info("Pre-seeding #{@new_resource} with package installation instructions.")
-            run_command(
+            run_command_with_systems_locale(
               :command => "debconf-set-selections #{preseed_file}",
               :environment => {
                 "DEBIAN_FRONTEND" => "noninteractive"

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

@@ -40,10 +40,9 @@ class Chef
             Chef::Log.debug("Checking dpkg status for #{@new_resource.package_name}")
             status = popen4("dpkg-deb -W #{@new_resource.source}") do |pid, stdin, stdout, stderr|
               stdout.each do |line|
-                case line
-                when /([\w\d]+)\t([\w\d.-]+)/
-                  @current_resource.package_name($1)
-                  @new_resource.version($2)
+                if pkginfo = /([a-z\d\-\+]+)\t([\w\d.-]+)/.match(line)
+                  @current_resource.package_name(pkginfo[1])
+                  @new_resource.version(pkginfo[2])
                 end
               end
             end
@@ -79,31 +78,28 @@ class Chef
         end
      
         def install_package(name, version)
-          run_command(
+          run_command_with_systems_locale(
             :command => "dpkg -i#{expand_options(@new_resource.options)} #{@new_resource.source}",
             :environment => {
-              "DEBIAN_FRONTEND" => "noninteractive",
-              "LANG" => "en_US"
+              "DEBIAN_FRONTEND" => "noninteractive"
             }
           )
         end
 
         def remove_package(name, version)
-          run_command(
+          run_command_with_systems_locale(
             :command => "dpkg -r#{expand_options(@new_resource.options)} #{@new_resource.package_name}",
             :environment => {
-              "DEBIAN_FRONTEND" => "noninteractive",
-              "LANG" => "en_US"
+              "DEBIAN_FRONTEND" => "noninteractive"
             }
           )
         end
       
         def purge_package(name, version)
-          run_command(
+          run_command_with_systems_locale(
             :command => "dpkg -P#{expand_options(@new_resource.options)} #{@new_resource.package_name}",
             :environment => {
-              "DEBIAN_FRONTEND" => "noninteractive",
-              "LANG" => "en_US"
+              "DEBIAN_FRONTEND" => "noninteractive"
             }
           )
         end

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

@@ -110,24 +110,24 @@ class Chef
           unless @current_resource.version
             case @new_resource.source
             when /^ports$/
-              run_command(
+              run_command_with_systems_locale(
                 :command => "make -DBATCH install",
                 :cwd => "#{port_path}"
               )
             when /^http/, /^ftp/
-              run_command(
+              run_command_with_systems_locale(
                 :command => "pkg_add -r #{package_name}",
                 :environment => { "PACKAGESITE" => @new_resource.source }
               )
               Chef::Log.info("Installed package #{package_name} from: #{@new_resource.source}")
             when /^\//
-              run_command(
+              run_command_with_systems_locale(
                 :command => "pkg_add #{@new_resource.name}",
                 :environment => { "PKG_PATH" => @new_resource.source }
               )
               Chef::Log.info("Installed package #{@new_resource.name} from: #{@new_resource.source}")
             else
-              run_command(
+              run_command_with_systems_locale(
                 :command => "pkg_add -r #{latest_link_name}"
               )
               Chef::Log.info("Installed package #{package_name}")
@@ -138,11 +138,11 @@ class Chef
         def remove_package(name, version)
           # a version is mandatory
           if version
-            run_command(
+            run_command_with_systems_locale(
               :command => "pkg_delete #{package_name}-#{version}"
             )
           else
-            run_command(
+            run_command_with_systems_locale(
               :command => "pkg_delete #{package_name}-#{@current_resource.version}"
             )
           end

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

@@ -45,7 +45,7 @@ class Chef
           unless @current_resource.version == version
             command = "port install #{name}"
             command << " @#{version}" if version and !version.empty? 
-            run_command(
+            run_command_with_systems_locale(
               :command => command
             )
           end
@@ -54,7 +54,7 @@ class Chef
         def purge_package(name, version)
           command = "port uninstall #{name}"
           command << " @#{version}" if version and !version.empty?
-          run_command(
+          run_command_with_systems_locale(
             :command => command
           )
         end
@@ -63,7 +63,7 @@ class Chef
           command = "port deactivate #{name}"
           command << " @#{version}" if version and !version.empty?
 
-          run_command(
+          run_command_with_systems_locale(
             :command => command
           )
         end
@@ -78,7 +78,7 @@ class Chef
             # that hasn't been installed.
             install_package(name, version)
           elsif current_version != version
-            run_command(
+            run_command_with_systems_locale(
               :command => "port upgrade #{name} @#{version}"
             )
           end

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

@@ -38,7 +38,7 @@ class Chef
 
           if( ::File.exists?(catdir) )
             Dir.entries(catdir).each do |entry|
-              if(entry =~ /^#{Regexp.escape(pkg)}\-(.+)/)
+              if(entry =~ /^#{Regexp.escape(pkg)}\-(\d[\.\d]*((_(alpha|beta|pre|rc|p)\d*)*)?)/)
                 @current_resource.version($1)
                 Chef::Log.debug("Got current version #{$1}")
                 break
@@ -93,7 +93,7 @@ class Chef
             pkg = "~#{name}-#{$1}"
           end
      
-          run_command(
+          run_command_with_systems_locale(
             :command => "emerge -g --color n --nospinner --quiet#{expand_options(@new_resource.options)} #{pkg}"
           )
         end
@@ -109,7 +109,7 @@ class Chef
             pkg = "#{@new_resource.package_name}"
           end
 
-          run_command(
+          run_command_with_systems_locale(
             :command => "emerge --unmerge --color n --nospinner --quiet#{expand_options(@new_resource.options)} #{pkg}"
           )
         end

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

@@ -69,24 +69,24 @@ class Chef
         end
         
         def install_package(name, version)
-          run_command(
+          run_command_with_systems_locale(
             :command => "rpm -i #{@new_resource.source}"
           )
         end
         
         def upgrade_package(name, version)
-          run_command(
+          run_command_with_systems_locale(
             :command => "rpm -U #{@new_resource.source}"
           )
         end
         
         def remove_package(name, version)
           if version
-            run_command(
+            run_command_with_systems_locale(
               :command => "rpm -e #{name}-#{version}"
             )
           else
-            run_command(
+            run_command_with_systems_locale(
               :command => "rpm -e #{name}"
             )
           end

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

@@ -99,8 +99,8 @@ class Chef
           if @new_resource.source
             src = "  --source=#{@new_resource.source} --source=http://gems.rubyforge.org"
           end  
-          run_command(
-            :command => "#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src}"
+          run_command_with_systems_locale(
+            :command => "#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src}#{opts}"
           )
         end
       
@@ -110,11 +110,11 @@ class Chef
       
         def remove_package(name, version)
           if version
-            run_command(
+            run_command_with_systems_locale(
               :command => "#{gem_binary_path} uninstall #{name} -q -v \"#{version}\""
             )
           else
-            run_command(
+            run_command_with_systems_locale(
               :command => "#{gem_binary_path} uninstall #{name} -q -a"
             )
           end
@@ -123,6 +123,12 @@ class Chef
         def purge_package(name, version)
           remove_package(name, version)
         end
+        
+        private
+        
+        def opts
+          expand_options(@new_resource.options)
+        end
       
       end
     end

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

@@ -106,9 +106,9 @@ class Chef
           end
         end
 
-        def initialize(node, new_resource)
+        def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil)
           @yum = YumCache.instance
-          super(node, new_resource)
+          super(node, new_resource, collection, definitions, cookbook_loader)
         end
       
         def load_current_resource
@@ -133,7 +133,7 @@ class Chef
         end
 
         def install_package(name, version)
-          run_command(
+          run_command_with_systems_locale(
             :command => "yum -q -y install #{name}-#{version}"
           )
           @yum.flush
@@ -142,7 +142,7 @@ class Chef
         def upgrade_package(name, version)
           # If we have a version, we can upgrade - otherwise, install
           if @current_resource.version
-            run_command(
+            run_command_with_systems_locale(
               :command => "yum -q -y update #{name}-#{version}"
             )   
             @yum.flush
@@ -153,11 +153,11 @@ class Chef
 
         def remove_package(name, version)
           if version
-            run_command(
+            run_command_with_systems_locale(
              :command => "yum -q -y remove #{name}-#{version}"
             )
           else
-            run_command(
+            run_command_with_systems_locale(
              :command => "yum -q -y remove #{name}"
             )
           end

data/lib/chef/provider/remote_file.rb

@@ -55,23 +55,30 @@ class Chef
                        get_from_local_cookbook(source)
 
             # If the file exists
+            Chef::Log.debug "#{@new_resource}: Checking for file existence of #{@new_resource.path}"
             if ::File.exists?(@new_resource.path)
               # And it matches the checksum of the raw file
               @new_resource.checksum(self.checksum(raw_file.path))
+              Chef::Log.debug "#{@new_resource}: File exists at #{@new_resource.path}"
+              Chef::Log.debug "#{@new_resource}: Target checksum: #{@current_resource.checksum}"
+              Chef::Log.debug "#{@new_resource}: Source checksum: #{@new_resource.checksum}"
               if @new_resource.checksum != @current_resource.checksum
                 # Updating target file, let's perform a backup!
-                Chef::Log.debug("#{@new_resource} changed from #{@current_resource.checksum} to #{@new_resource.checksum}")
-                Chef::Log.info("Updating #{@new_resource} at #{@new_resource.path}")
-                backup(@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}"
+                backup @new_resource.path
+                FileUtils.cp raw_file.path, @new_resource.path
+                @new_resource.updated = true
+              else
+                Chef::Log.debug "#{@new_resource}: Target and Source checksums are the same, taking no action"
               end
             else
               # We're creating a new file
-              Chef::Log.info("Creating #{@new_resource} at #{@new_resource.path}")
+              Chef::Log.info "#{@new_resource}: Creating #{@new_resource.path}"
+              FileUtils.cp raw_file.path, @new_resource.path
+              @new_resource.updated = true
             end
 
-            FileUtils.cp(raw_file.path, @new_resource.path)
-            @new_resource.updated = true
-
             # We're done with the file, so make sure to close it if it was open.
             raw_file.close unless raw_file.closed?
           rescue Net::HTTPRetriableError => e

data/lib/chef/provider/service.rb

@@ -25,8 +25,8 @@ class Chef
 
       include Chef::Mixin::Command
 
-      def initialize(node, new_resource)
-        super(node, new_resource)
+      def initialize(node, new_resource, collection=nil, definitions=nil, cookbook_loader=nil)
+        super(node, new_resource, collection, definitions, cookbook_loader)
         @enabled = nil
       end
 
@@ -35,6 +35,7 @@ class Chef
           Chef::Log.debug("#{@new_resource}: attempting to enable")
           status = enable_service()
           if status
+            @new_resource.updated = true
             Chef::Log.info("#{@new_resource}: enabled successfully")
           end
         else
@@ -47,6 +48,7 @@ class Chef
           Chef::Log.debug("#{@new_resource}: attempting to disable")
           status = disable_service()
           if status
+            @new_resource.updated = true
             Chef::Log.info("#{@new_resource}: disabled successfully")
           end
         else
@@ -59,6 +61,7 @@ class Chef
           Chef::Log.debug("#{@new_resource}: attempting to start")
           status = start_service()
           if status
+            @new_resource.updated = true
             Chef::Log.info("Started service #{@new_resource} successfully")
           end
         else
@@ -71,6 +74,7 @@ class Chef
           Chef::Log.debug("#{@new_resource}: attempting to stop")
           status = stop_service()
           if status
+            @new_resource.updated = true
             Chef::Log.info("#{@new_resource}: stopped successfully")
           end
         else
@@ -82,6 +86,7 @@ class Chef
         Chef::Log.debug("#{@new_resource}: attempting to restart")
         status = restart_service()
         if status
+          @new_resource.updated = true
           Chef::Log.info("#{@new_resource}: restarted successfully")
         end
       end
@@ -94,6 +99,7 @@ class Chef
             Chef::Log.debug("#{@new_resource}: attempting to reload")
             status = reload_service()
             if status
+              @new_resource.updated = true
               Chef::Log.info("#{@new_resource}: reloaded successfully")
             end
           end