chef 0.9.8 → 0.9.10.rc.0

data/lib/chef/provider/deploy.rb

@@ -68,7 +68,7 @@ class Chef
           end
         else
           deploy
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         end
       end
       
@@ -78,7 +78,7 @@ class Chef
           FileUtils.rm_rf(release_path)
         end
         deploy
-        @new_resource.updated = true
+        @new_resource.updated_by_last_action(true)
       end
       
       def action_rollback
@@ -102,7 +102,7 @@ class Chef
           FileUtils.rm_rf i 
           release_deleted(i)
         end
-        @new_resource.updated = true
+        @new_resource.updated_by_last_action(true)
       end
       
       def deploy

data/lib/chef/provider/directory.rb

@@ -46,7 +46,7 @@ class Chef
           else
             ::Dir.mkdir(@new_resource.path)
           end
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         end
         set_owner if @new_resource.owner != nil
         set_group if @new_resource.group != nil
@@ -62,7 +62,7 @@ class Chef
             Chef::Log.info("Deleting #{@new_resource} at #{@new_resource.path}")
             ::Dir.delete(@new_resource.path)
           end
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         else
           raise RuntimeError, "Cannot delete #{@new_resource} at #{@new_resource_path}!" if ::File.exists?(@new_resource.path)
         end

data/lib/chef/provider/env.rb

@@ -74,12 +74,12 @@ class Chef
           if compare_value
             modify_env
             Chef::Log.info("Altered #{@new_resource}")
-            @new_resource.updated = true
+            @new_resource.updated_by_last_action(true)
           end
         else
           create_env
           Chef::Log.debug("Created #{@new_resource}")
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         end
       end
 
@@ -106,7 +106,7 @@ class Chef
             old_value = @new_resource.value(new_value)
             create_env
             Chef::Log.debug("Deleted #{old_value} element")
-            @new_resource.updated = true
+            @new_resource.updated_by_last_action(true)
             return true #we removed the element and updated; do not delete the key
           end
         end
@@ -116,7 +116,7 @@ class Chef
         if @key_exists && !delete_element
           delete_env
           Chef::Log.debug("Deleted #{@new_resource}")
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         end
       end
 
@@ -124,7 +124,7 @@ class Chef
         if @key_exists
           if compare_value
             modify_env
-            @new_resource.updated = true
+            @new_resource.updated_by_last_action(true)
             Chef::Log.info("Modified #{@new_resource}")
           end
         else

data/lib/chef/provider/execute.rb

@@ -48,7 +48,7 @@ class Chef
         
         status = run_command(command_args)
         if status
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
           Chef::Log.info("Ran #{@new_resource} successfully")
         end
       end

data/lib/chef/provider/file.rb

@@ -66,7 +66,7 @@ class Chef
           Chef::Log.info("Setting content for #{@new_resource}")
           backup @new_resource.path if ::File.exists?(@new_resource.path)
           ::File.open(@new_resource.path, "w") {|f| f.write @new_resource.content }
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         end
       end
 
@@ -91,7 +91,7 @@ class Chef
           Chef::Log.info("Setting owner to #{@set_user_id} for #{@new_resource}")
           @set_user_id = negative_complement(@set_user_id)
           ::File.chown(@set_user_id, nil, @new_resource.path)
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         end
       end
 
@@ -114,7 +114,7 @@ class Chef
           Chef::Log.info("Setting group to #{@set_group_id} for #{@new_resource}")
           @set_group_id = negative_complement(@set_group_id)
           ::File.chown(nil, @set_group_id, @new_resource.path)
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         end
       end
 
@@ -132,17 +132,18 @@ class Chef
           Chef::Log.info("Setting mode to #{sprintf("%o" % octal_mode(@new_resource.mode))} for #{@new_resource}")
           # CHEF-174, bad mojo around treating integers as octal.  If a string is passed, we try to do the "right" thing
           ::File.chmod(octal_mode(@new_resource.mode), @new_resource.path)
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(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
+          ::File.open(@new_resource.path, "w+") {|f| f.write @new_resource.content }
+          @new_resource.updated_by_last_action(true)
+        else
+          set_content unless @new_resource.content.nil?
         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?
@@ -158,7 +159,7 @@ class Chef
             backup unless ::File.symlink?(@new_resource.path)
             Chef::Log.info("Deleting #{@new_resource} at #{@new_resource.path}")
             ::File.delete(@new_resource.path)
-            @new_resource.updated = true
+            @new_resource.updated_by_last_action(true)
           else
             raise "Cannot delete #{@new_resource} at #{@new_resource_path}!"
           end
@@ -170,7 +171,7 @@ class Chef
         time = Time.now
         Chef::Log.info("Updating #{@new_resource} with new atime/mtime of #{time}")
         ::File.utime(time, time, @new_resource.path)
-        @new_resource.updated = true
+        @new_resource.updated_by_last_action(true)
       end
 
       def backup(file=nil)

data/lib/chef/provider/git.rb

@@ -40,7 +40,7 @@ class Chef
           clone
           checkout
           enable_submodules
-          @new_resource.updated = true
+          @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"
         end
@@ -49,18 +49,26 @@ class Chef
       def action_export
         action_checkout
         FileUtils.rm_rf(::File.join(@new_resource.destination,".git"))
-        @new_resource.updated = true
+        @new_resource.updated_by_last_action(true)
       end
       
       def action_sync
         if !::File.exist?(@new_resource.destination) || Dir.entries(@new_resource.destination) == ['.','..']
           action_checkout
+          @new_resource.updated_by_last_action(true)
         else
+          current_rev = find_current_revision
+          Chef::Log.debug "#{@new_resource} revision: #{current_rev}"
           sync
           enable_submodules
+          new_rev = find_current_revision
+          if current_rev == new_rev
+            @new_resource.updated_by_last_action(false)
+          else
+            Chef::Log.info "#{@new_resource} updated revision is: #{new_rev}"
+            @new_resource.updated_by_last_action(true)
+          end
         end
-
-        @new_resource.updated = true
       end
       
       def find_current_revision

data/lib/chef/provider/group.rb

@@ -78,12 +78,12 @@ class Chef
         when false
           create_group
           Chef::Log.info("Created #{@new_resource}")
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         else 
           if compare_group
             manage_group
             Chef::Log.info("Altered #{@new_resource}")
-            @new_resource.updated = true
+            @new_resource.updated_by_last_action(true)
           end
         end
       end
@@ -91,7 +91,7 @@ class Chef
       def action_remove
         if @group_exists
           remove_group
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
           Chef::Log.info("Removed #{@new_resource}")
         end
       end
@@ -99,7 +99,7 @@ class Chef
       def action_manage
         if @group_exists && compare_group
           manage_group 
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
           Chef::Log.info("Managed #{@new_resource}")
         end
       end
@@ -108,7 +108,7 @@ class Chef
         if @group_exists 
           if compare_group
             manage_group
-            @new_resource.updated = true
+            @new_resource.updated_by_last_action(true)
             Chef::Log.info("Modified #{@new_resource}")
           end
         else

data/lib/chef/provider/http_request.rb

@@ -27,19 +27,35 @@ class Chef
       def load_current_resource
         @rest = Chef::REST.new(@new_resource.url, nil, nil)
       end
-      
+
+      # Send a HEAD request to @new_resource.url, with ?message=@new_resource.message
+      def action_head
+        message = check_message(@new_resource.message)
+        modified = @rest.run_request(
+          :HEAD,
+          @rest.create_url("#{@new_resource.url}?message=#{message}"),
+          @new_resource.headers,
+          false,
+          10,
+          false
+        )
+        @new_resource.updated_by_last_action(modified)
+        Chef::Log.info("#{@new_resource} HEAD to #{@new_resource.url} successful")
+        Chef::Log.debug("#{@new_resource} HEAD request response: #{modified}")
+      end
+
       # Send a GET request to @new_resource.url, with ?message=@new_resource.message
       def action_get  
         message = check_message(@new_resource.message)
         body = @rest.run_request(
           :GET, 
           @rest.create_url("#{@new_resource.url}?message=#{message}"),
-          {},
+          @new_resource.headers,
           false,
           10,
           false
         )
-        @new_resource.updated = true
+        @new_resource.updated_by_last_action(true)
         Chef::Log.info("#{@new_resource} GET to #{@new_resource.url} successful")
         Chef::Log.debug("#{@new_resource} GET request response: #{body}")
       end
@@ -50,12 +66,12 @@ class Chef
         body = @rest.run_request(
           :PUT,
           @rest.create_url("#{@new_resource.url}"),
-          {},
+          @new_resource.headers,
           message,
           10,
           false
         )
-        @new_resource.updated = true
+        @new_resource.updated_by_last_action(true)
         Chef::Log.info("#{@new_resource} PUT to #{@new_resource.url} successful")
         Chef::Log.debug("#{@new_resource} PUT request response: #{body}")
       end
@@ -66,12 +82,12 @@ class Chef
         body = @rest.run_request(
           :POST,
           @rest.create_url("#{@new_resource.url}"),
-          {},
+          @new_resource.headers,
           message,
           10,
           false
         )
-        @new_resource.updated = true
+        @new_resource.updated_by_last_action(true)
         Chef::Log.info("#{@new_resource} POST to #{@new_resource.url} message: #{message.inspect} successful")
         Chef::Log.debug("#{@new_resource} POST request response: #{body}")
       end
@@ -81,12 +97,12 @@ class Chef
         body = @rest.run_request(
           :DELETE,
           @rest.create_url("#{@new_resource.url}"),
-          {},
+          @new_resource.headers,
           false,
           10,
           false
         )
-        @new_resource.updated = true
+        @new_resource.updated_by_last_action(true)
         Chef::Log.info("#{@new_resource} DELETE to #{@new_resource.url} successful")
         Chef::Log.debug("#{@new_resource} DELETE request response: #{body}")
       end

data/lib/chef/provider/ifconfig.rb

@@ -80,7 +80,7 @@ class Chef
           run_command(
             :command => command
           )
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
 
         end
 
@@ -96,7 +96,7 @@ class Chef
           run_command(
             :command => command
           )
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         else
           Chef::Log.debug("Ifconfig #{@current_resource} does not exist")
         end

data/lib/chef/provider/link.rb

@@ -87,7 +87,7 @@ class Chef
           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)
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         end
       end
       
@@ -110,7 +110,7 @@ class Chef
           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)
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         end
       end
       
@@ -118,11 +118,16 @@ class Chef
         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
-            shell_out! "ln -nfs #{@new_resource.to} #{@new_resource.target_file}"
+            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
           elsif @new_resource.link_type == :hard
             ::File.link(@new_resource.to, @new_resource.target_file)
           end
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         end
         if @new_resource.link_type == :symbolic
           set_owner unless @new_resource.owner.nil?
@@ -135,7 +140,7 @@ class Chef
           if ::File.symlink?(@new_resource.target_file)
             Chef::Log.info("Deleting #{@new_resource} at #{@new_resource.target_file}")
             ::File.delete(@new_resource.target_file)
-            @new_resource.updated = true
+            @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
@@ -144,7 +149,7 @@ class Chef
              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)
-               @new_resource.updated = true
+               @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."
              end

data/lib/chef/provider/log.rb

@@ -39,6 +39,7 @@ class Chef
         # true:: Always return true
         def action_write
           Chef::Log.send(@new_resource.level, @new_resource.name)
+          @new_resource.updated_by_last_action(true)
         end
 
       end

data/lib/chef/provider/mdadm.rb

@@ -56,7 +56,7 @@ class Chef
           #pid, stdin, stdout, stderr = popen4(command)
           shell_out!(command)
           Chef::Log.info("Created mdadm raid device (#{@new_resource.raid_device})")
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         else
           Chef::Log.debug("mdadm raid device already exists, skipping create (#{@new_resource.raid_device})")
         end
@@ -68,7 +68,7 @@ class Chef
           Chef::Log.debug("mdadm command: #{command}")
           shell_out!(command)
           Chef::Log.info("Assembled mdadm raid device (#{@new_resource.raid_device})")
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         else
           Chef::Log.debug("mdadm raid device already exists, skipping assemble (#{@new_resource.raid_device})")
         end
@@ -80,7 +80,7 @@ class Chef
           Chef::Log.debug("mdadm command: #{command}")
           shell_out!(command)
           Chef::Log.info("Stopped mdadm raid device (#{@new_resource.raid_device})")
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         else
           Chef::Log.debug("mdadm raid device doesn't exist (#{@new_resource.raid_device})")
         end

data/lib/chef/provider/mount.rb

@@ -31,7 +31,7 @@ class Chef
           Chef::Log.debug("#{@new_resource}: attempting to mount")
           status = mount_fs()
           if status
-            @new_resource.updated = true            
+            @new_resource.updated_by_last_action(true)
             Chef::Log.info("#{@new_resource}: mounted successfully")
           end
         else
@@ -44,7 +44,7 @@ class Chef
           Chef::Log.debug("#{@new_resource}: attempting to unmount")
           status = umount_fs()
           if status
-            @new_resource.updated = true            
+            @new_resource.updated_by_last_action(true)
             Chef::Log.info("#{@new_resource}: unmounted successfully")
           end
         else
@@ -60,7 +60,7 @@ class Chef
             Chef::Log.debug("#{@new_resource}: attempting to remount")
             status = remount_fs()
             if status
-              @new_resource.updated = true            
+              @new_resource.updated_by_last_action(true)
               Chef::Log.info("#{@new_resource}: remounted successfully")
             end
           else
@@ -73,7 +73,7 @@ class Chef
         unless @current_resource.enabled
           status = enable_fs
           if status
-            @new_resource.updated = true            
+            @new_resource.updated_by_last_action(true)
             Chef::Log.info("#{@new_resource}: enabled successfully")
           else
             Chef::Log.debug("#{@new_resource}: not enabling, already enabled")
@@ -85,7 +85,7 @@ class Chef
         if @current_resource.enabled
           status = disable_fs
           if status
-            @new_resource.updated = true            
+            @new_resource.updated_by_last_action(true)            
             Chef::Log.info("#{@new_resource}: disabled successfully")
           else
             Chef::Log.debug("#{@new_resource}: not disabling, already disabled")