chef 0.8.10 → 0.8.14

data/lib/chef/provider.rb

@@ -49,10 +49,10 @@ class Chef
     
     protected
     
-    def recipe_eval(*args, &block)
+    def recipe_eval(&block)
       provider_collection, @collection = @collection, Chef::ResourceCollection.new
       
-      instance_eval(*args, &block)
+      instance_eval(&block)
       Chef::Runner.new(@node, @collection).converge
       
       @collection = provider_collection

data/lib/chef/provider/cron.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.
@@ -35,19 +35,19 @@ class Chef
       attr_accessor :cron_exists, :cron_empty
 
       def load_current_resource
-        crontab = String.new
+        crontab_lines = []
         @current_resource = Chef::Resource::Cron.new(@new_resource.name)
         @current_resource.user(@new_resource.user)
         status = popen4("crontab -l -u #{@new_resource.user}") do |pid, stdin, stdout, stderr|
-          stdout.each { |line| crontab << line }
+          stdout.each_line { |line| crontab_lines << line }
         end
         if status.exitstatus > 1
           raise Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: #{status.exitstatus}"
         elsif status.exitstatus == 0
           cron_found = false
-          crontab.each do |line|
-            case line
-            when /^# Chef Name: #{@new_resource.name}/
+          crontab_lines.each do |line|
+            case line.chomp
+            when "# Chef Name: #{@new_resource.name}"
               Chef::Log.debug("Found cron '#{@new_resource.name}'")
               cron_found = true
               @cron_exists = true
@@ -66,11 +66,11 @@ class Chef
               next
             when CRON_PATTERN
               if cron_found
-                @current_resource.minute($1) 
-                @current_resource.hour($2) 
+                @current_resource.minute($1)
+                @current_resource.hour($2)
                 @current_resource.day($3)
-                @current_resource.month($4) 
-                @current_resource.weekday($5) 
+                @current_resource.month($4)
+                @current_resource.weekday($5)
                 @current_resource.command($6)
                 cron_found=false
               end
@@ -84,7 +84,7 @@ class Chef
           Chef::Log.debug("Cron empty for '#{@new_resource.user}'")
           @cron_empty = true
         end
-        
+
         @current_resource
       end
 
@@ -112,8 +112,8 @@ class Chef
           end
           status = popen4("crontab -l -u #{@new_resource.user}") do |pid, stdin, stdout, stderr|
             stdout.each_line do |line|
-              case line
-              when /^# Chef Name: #{@new_resource.name}\n/
+              case line.chomp
+              when "# Chef Name: #{@new_resource.name}"
                 cron_found = true
                 next
               when CRON_PATTERN
@@ -125,12 +125,12 @@ class Chef
               else
                 next if cron_found
               end
-              crontab << line 
+              crontab << line
             end
           end
 
           status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr|
-            crontab.each { |line| stdin.puts "#{line}" }
+            crontab.each_line { |line| stdin.puts "#{line}" }
           end
           Chef::Log.info("Updated cron '#{@new_resource.name}'")
           @new_resource.updated = true
@@ -140,11 +140,11 @@ class Chef
               stdout.each { |line| crontab << line }
             end
           end
-  
+
           crontab << newcron
 
           status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr|
-            crontab.each { |line| stdin.puts "#{line}" }
+            crontab.each_line { |line| stdin.puts "#{line}" }
           end
           Chef::Log.info("Added cron '#{@new_resource.name}'")
           @new_resource.updated = true
@@ -157,8 +157,8 @@ class Chef
           cron_found = false
           status = popen4("crontab -l -u #{@new_resource.user}") do |pid, stdin, stdout, stderr|
             stdout.each_line do |line|
-              case line
-              when /^# Chef Name: #{@new_resource.name}\n/
+              case line.chomp
+              when "# Chef Name: #{@new_resource.name}"
                 cron_found = true
                 next
               when CRON_PATTERN
@@ -169,12 +169,12 @@ class Chef
               else
                 next if cron_found
               end
-              crontab << line 
+              crontab << line
             end
           end
 
           status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr|
-            crontab.each { |line| stdin.puts "#{line}" }
+            crontab.each_line { |line| stdin.puts "#{line}" }
           end
           Chef::Log.debug("Deleted cron '#{@new_resource.name}'")
           @new_resource.updated = true

data/lib/chef/provider/deploy/revision.rb

@@ -50,11 +50,15 @@ class Chef
           cache
         end
         
+        def sorted_releases_from_filesystem
+          Dir.glob(new_resource.deploy_to + "/releases/*").sort_by { |d| ::File.ctime(d) }
+        end
+
         def load_cache
           begin
             JSON.parse(Chef::FileCache.load("revision-deploys/#{new_resource.name}"))
           rescue Chef::Exceptions::FileNotFound
-            save_cache([])
+            sorted_releases_from_filesystem
           end
         end
         

data/lib/chef/provider/erl_call.rb

@@ -59,11 +59,11 @@ class Chef
           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}")
-          @new_resource.code.each { |line| stdin.puts "#{line.chomp!}" }
+          @new_resource.code.each_line { |line| stdin.puts "#{line.chomp!}" }
           stdin.close
           Chef::Log.info("Ran erl_call[#{@new_resource.name}] successfully")
           Chef::Log.debug("erl_call[#{@new_resource.name}] output: ")
-          stdout.each { |line| Chef::Log.debug("#{line}")}
+          stdout.each_line { |line| Chef::Log.debug("#{line}")}
         end
       end
 

data/lib/chef/provider/file.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.
@@ -37,15 +37,16 @@ class Chef
         end
         big
       end
-      
+
       def octal_mode(mode)
         ((mode.respond_to?(:oct) ? mode.oct : mode.to_i) & 007777)
       end
 
       private :negative_complement, :octal_mode
-      
+
       def load_current_resource
         @current_resource = Chef::Resource::File.new(@new_resource.name)
+        @new_resource.path.gsub!(/\\/, "/") # for Windows
         @current_resource.path(@new_resource.path)
         if ::File.exist?(@current_resource.path) && ::File.readable?(@current_resource.path)
           cstats = ::File.stat(@current_resource.path)
@@ -56,22 +57,36 @@ class Chef
         end
         @current_resource
       end
-      
+
+      # Compare the content of a file.  Returns true if they are the same, false if they are not.
+      def compare_content
+        @current_resource.checksum == new_resource_content_checksum
+      end
+
+      # 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}")
+          ::File.open(@new_resource.path, "w") {|f| f.write @new_resource.content }
+          @new_resource.updated = true
+        end
+      end
+
       # Compare the ownership of a file.  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 file, assuming it is not set correctly already.
       def set_owner
         unless compare_owner
@@ -81,21 +96,21 @@ class Chef
           @new_resource.updated = true
         end
       end
-      
+
       # Compares the group of a file.  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}")
@@ -104,7 +119,7 @@ class Chef
           @new_resource.updated = true
         end
       end
-      
+
       def compare_mode
         case @new_resource.mode
         when /^\d+$/, Integer
@@ -113,7 +128,7 @@ class Chef
           false
         end
       end
-      
+
       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}")
@@ -122,22 +137,23 @@ class Chef
           @new_resource.updated = true
         end
       end
-      
+
       def action_create
         unless ::File.exists?(@new_resource.path)
           Chef::Log.info("Creating #{@new_resource} at #{@new_resource.path}")
           ::File.open(@new_resource.path, "w+") { |f| }
           @new_resource.updated = true
         end
+        set_content unless @new_resource.content.nil?
         set_owner unless @new_resource.owner.nil?
         set_group unless @new_resource.group.nil?
         set_mode unless @new_resource.mode.nil?
       end
-      
+
       def action_create_if_missing
         action_create
       end
-      
+
       def action_delete
         if ::File.exists?(@new_resource.path)
           if ::File.writable?(@new_resource.path)
@@ -150,7 +166,7 @@ class Chef
           end
         end
       end
-      
+
       def action_touch
         action_create
         time = Time.now
@@ -158,7 +174,7 @@ class Chef
         ::File.utime(time, time, @new_resource.path)
         @new_resource.updated = true
       end
-      
+
       def backup(file=nil)
         file ||= @new_resource.path
         if @new_resource.backup != false && @new_resource.backup > 0 && ::File.exist?(file)
@@ -171,7 +187,7 @@ class Chef
           end
           Chef::Log.info("Backing up #{@new_resource} to #{prefix + backup_filename}")
           FileUtils.cp(file, prefix + backup_filename, :preserve => true)
-          
+
           # Clean up after the number of backups
           slice_number = @new_resource.backup
           backup_files = Dir[prefix + "#{@new_resource.path}.chef-*"].sort { |a,b| b <=> a }
@@ -184,12 +200,17 @@ class Chef
           end
         end
       end
-      
+
       def generate_url(url, type, args=nil)
         cookbook_name = (@new_resource.respond_to?(:cookbook) && @new_resource.cookbook) ? @new_resource.cookbook : @new_resource.cookbook_name
         generate_cookbook_url(url, cookbook_name, type, @node, args)
       end
-      
+
+      private
+
+      def new_resource_content_checksum
+        @new_resource.content && Digest::SHA2.hexdigest(@new_resource.content)
+      end
     end
   end
 end

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

@@ -75,11 +75,13 @@ 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?
-            safe_dscl("create /Groups/#{@new_resource.group_name} GroupMembers") # clear guid list
-            safe_dscl("create /Groups/#{@new_resource.group_name} GroupMembership") # clear user list
+            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(', ')}")
+            safe_dscl("append /Groups/#{@new_resource.group_name} GroupMembership #{@new_resource.members.join(' ')}")
           end
-          Chef::Log.debug("#{@new_resource}: setting group members #{@new_resource.members.join(', ')}") unless @new_resource.members.empty?
-          safe_dscl("append /Groups/#{@new_resource.group_name} GroupMembership #{@new_resource.members.join(' ')}")
         end
 
         def load_current_resource

data/lib/chef/provider/mdadm.rb

@@ -26,10 +26,6 @@ class Chef
 
       include Chef::Mixin::Command
 
-      def initialize(node, new_resource)
-        super(node, new_resource)
-      end
-
       def load_current_resource
         @current_resource = Chef::Resource::Mdadm.new(@new_resource.name)
         @current_resource.raid_device(@new_resource.raid_device)

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

@@ -64,12 +64,16 @@ class Chef
 
           # Check to see if there is a entry in /etc/fstab. Last entry for a volume wins.
           enabled = false
-          ::File.read("/etc/fstab").each do |line|
+          ::File.foreach("/etc/fstab") do |line|
             case line
             when /^[#\s]/
               next
-            when /^#{device_fstab_regex}\s+#{@new_resource.mount_point}/
+            when /^#{device_fstab_regex}\s+#{@new_resource.mount_point}\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)/
               enabled = true
+              @current_resource.fstype($1)
+              @current_resource.options($2)
+              @current_resource.dump($3.to_i)
+              @current_resource.pass($4.to_i)
               Chef::Log.debug("Found mount #{device_fstab} to #{@new_resource.mount_point} in /etc/fstab")
             when /^[\/\w]+\s+#{@new_resource.mount_point}/
               enabled = false
@@ -119,13 +123,21 @@ class Chef
         end
 
         def enable_fs
-          unless @current_resource.enabled
-            ::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}")
+          if @current_resource.enabled
+            if @current_resource.fstype == @new_resource.fstype and
+                @current_resource.options == @new_resource.options and
+                @current_resource.dump == @new_resource.dump and
+                @current_resource.pass == @new_resource.pass
+              Chef::Log.debug("#{@new_resource.mount_point} is already enabled.")
+              return
             end
-          else
-            Chef::Log.debug("#{@new_resource.mount_point} is already enabled.")
+            # The current options don't match what we have, so
+            # disable, then enable.
+            disable_fs
+          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}")
           end
         end
 

data/lib/chef/provider/package.rb

@@ -120,7 +120,7 @@ class Chef
         raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :purge" 
       end
       
-      def preseed_package(name, version, preseed)
+      def preseed_package(name, version)
         raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support pre-seeding package install/upgrade instructions - don't ask it to!" 
       end
       

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

@@ -7,9 +7,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.
@@ -24,8 +24,13 @@ require 'chef/resource/package'
 class Chef
   class Provider
     class Package
-      class Freebsd < Chef::Provider::Package  
-      
+      class Freebsd < Chef::Provider::Package
+
+        def initialize(*args)
+          super
+          @current_resource = Chef::Resource::Package.new(@new_resource.name)
+        end
+
         def current_installed_version
           command = "pkg_info -E \"#{package_name}*\""
           status = popen4(command) do |pid, stdin, stdout, stderr|
@@ -41,7 +46,7 @@ class Chef
           end
           nil
         end
-        
+
         def port_path
           case @new_resource.package_name
           # When the package name starts with a '/' treat it as the full path to the ports directory
@@ -61,10 +66,10 @@ class Chef
                 end
               end
             end
-            raise Chef::Exception::Package, "Could not find port with the name #{@new_resource.package_name}"
-          end          
+            raise Chef::Exceptions::Package, "Could not find port with the name #{@new_resource.package_name}"
+          end
         end
-        
+
         def ports_makefile_variable_value(variable)
           command = "cd #{port_path}; make -V #{variable}"
           status = popen4(command) do |pid, stdin, stdout, stderr|
@@ -75,34 +80,33 @@ class Chef
           end
           nil
         end
-        
+
         def ports_candidate_version
           ports_makefile_variable_value("PORTVERSION")
         end
-        
+
         def load_current_resource
-          @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @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
-          
+
           @candidate_version = ports_candidate_version
           Chef::Log.debug("Ports candidate version is #{@candidate_version}") if @candidate_version
-          
+
           @current_resource
         end
-        
+
         def latest_link_name
           ports_makefile_variable_value("LATEST_LINK")
         end
-        
+
         # The name of the package (without the version number) as understood by pkg_add and pkg_info
         def package_name
           if ports_makefile_variable_value("PKGNAME") =~ /^(.+)-[^-]+$/
             $1
           else
-            raise Chef::Exception::Package, "Unexpected form for PKGNAME variable in #{port_path}/Makefile"
+            raise Chef::Exceptions::Package, "Unexpected form for PKGNAME variable in #{port_path}/Makefile"
           end
         end
 
@@ -134,7 +138,7 @@ class Chef
             end
           end
         end
-      
+
         def remove_package(name, version)
           # a version is mandatory
           if version