chef 0.10.8 → 0.10.10.beta.1

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

@@ -26,7 +26,6 @@ class Chef
         def release_slug
           Time.now.utc.strftime("%Y%m%d%H%M%S")
         end
-        
       end
     end
   end

data/lib/chef/provider/directory.rb

@@ -48,9 +48,7 @@ class Chef
           @new_resource.updated_by_last_action(true)
           Chef::Log.info("#{@new_resource} created directory #{@new_resource.path}")
         end
-        set_owner if @new_resource.owner != nil
-        set_group if @new_resource.group != nil
-        set_mode if @new_resource.mode != nil
+        enforce_ownership_and_permissions
       end
 
       def action_delete

data/lib/chef/provider/execute.rb

@@ -49,8 +49,8 @@ class Chef
         opts[:group] = @new_resource.group if @new_resource.group
         opts[:cwd] = @new_resource.cwd if @new_resource.cwd
         opts[:umask] = @new_resource.umask if @new_resource.umask
-        opts[:command_log_level] = :info
-        opts[:command_log_prepend] = @new_resource.to_s
+        opts[:log_level] = :info
+        opts[:log_tag] = @new_resource.to_s
         if STDOUT.tty? && !Chef::Config[:daemon] && Chef::Log.info?
           opts[:live_stream] = STDOUT
         end

data/lib/chef/provider/file.rb

@@ -46,12 +46,6 @@ class Chef
         @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)
-          @current_resource.owner(cstats.uid)
-          @current_resource.group(cstats.gid)
-          @current_resource.mode(octal_mode(cstats.mode))
-        end
         @current_resource
       end
 
@@ -70,72 +64,6 @@ class Chef
         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
-          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
-          @set_user_id = negative_complement(@set_user_id)
-          ::File.chown(@set_user_id, nil, @new_resource.path)
-          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 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
-          @set_group_id = negative_complement(@set_group_id)
-          ::File.chown(nil, @set_group_id, @new_resource.path)
-          Chef::Log.info("#{@new_resource} group changed to #{@set_group_id}")
-          @new_resource.updated_by_last_action(true)
-        end
-      end
-
-      def compare_mode
-        case @new_resource.mode
-        when /^\d+$/, Integer
-          octal_mode(@new_resource.mode) == octal_mode(@current_resource.mode)
-        else
-          false
-        end
-      end
-
-      def set_mode
-        unless compare_mode && @new_resource.mode != nil
-          # 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)
-          Chef::Log.info("#{@new_resource} mode changed to #{sprintf("%o" % octal_mode(@new_resource.mode))}")
-          @new_resource.updated_by_last_action(true)
-        end
-      end
-
       def action_create
         assert_enclosing_directory_exists!
         unless ::File.exists?(@new_resource.path)
@@ -145,9 +73,7 @@ class Chef
         else
           set_content unless @new_resource.content.nil?
         end
-        set_owner unless @new_resource.owner.nil?
-        set_group unless @new_resource.group.nil?
-        set_mode unless @new_resource.mode.nil?
+        enforce_ownership_and_permissions
       end
 
       def action_create_if_missing

data/lib/chef/provider/git.rb

@@ -21,6 +21,7 @@ require 'chef/log'
 require 'chef/provider'
 require 'chef/mixin/shell_out'
 require 'fileutils'
+require 'shellwords'
 
 class Chef
   class Provider
@@ -104,7 +105,7 @@ class Chef
           @new_resource.additional_remotes.each_pair do |remote_name, remote_url|
             Chef::Log.info "#{@new_resource} adding git remote #{remote_name} = #{remote_url}"
             command = "git remote add #{remote_name} #{remote_url}"
-            if shell_out(command, run_options(:cwd => @new_resource.destination, :command_log_level => :info)).exitstatus != 0
+            if shell_out(command, run_options(:cwd => @new_resource.destination, :log_level => :info)).exitstatus != 0
               @new_resource.updated_by_last_action(true)
             end
           end
@@ -120,8 +121,8 @@ class Chef
 
         Chef::Log.info "#{@new_resource} cloning repo #{@new_resource.repository} to #{@new_resource.destination}"
 
-        clone_cmd = "git clone #{args.join(' ')} #{@new_resource.repository} #{@new_resource.destination}"
-        shell_out!(clone_cmd, run_options(:command_log_level => :info))
+        clone_cmd = "git clone #{args.join(' ')} #{@new_resource.repository} #{Shellwords.escape @new_resource.destination}"
+        shell_out!(clone_cmd, run_options(:log_level => :info))
       end
 
       def checkout
@@ -134,8 +135,9 @@ class Chef
       def enable_submodules
         if @new_resource.enable_submodules
           Chef::Log.info "#{@new_resource} enabling git submodules"
-          command = "git submodule init && git submodule update"
-          shell_out!(command, run_options(:cwd => @new_resource.destination, :command_log_level => :info))
+          # the --recursive flag means we require git 1.6.5+ now, see CHEF-1827
+          command = "git submodule update --init --recursive"
+          shell_out!(command, run_options(:cwd => @new_resource.destination, :log_level => :info))
         end
       end
 
@@ -144,7 +146,7 @@ class Chef
 
         # since we're in a local branch already, just reset to specified revision rather than merge
         fetch_command = "git fetch #{@new_resource.remote} && git fetch #{@new_resource.remote} --tags && git reset --hard #{target_revision}"
-        Chef::Log.debug "Fetching updates from #{new_resource.remote} and resetting to revison #{target_revision}"
+        Chef::Log.debug "Fetching updates from #{new_resource.remote} and resetting to revision #{target_revision}"
         shell_out!(fetch_command, run_options(:cwd => @new_resource.destination))
       end
 
@@ -195,9 +197,9 @@ class Chef
         run_opts[:user] = @new_resource.user if @new_resource.user
         run_opts[:group] = @new_resource.group if @new_resource.group
         run_opts[:environment] = {"GIT_SSH" => @new_resource.ssh_wrapper} if @new_resource.ssh_wrapper
-        run_opts[:command_log_prepend] = @new_resource.to_s
-        run_opts[:command_log_level] ||= :debug
-        if run_opts[:command_log_level] == :info
+        run_opts[:log_tag] = @new_resource.to_s
+        run_opts[:log_level] ||= :debug
+        if run_opts[:log_level] == :info
           if STDOUT.tty? && !Chef::Config[:daemon] && Chef::Log.info?
             run_opts[:live_stream] = STDOUT
           end

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

@@ -33,19 +33,24 @@ class Chef
         end
 
         def modify_group_members
-          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}")
-                shell_out!("gpasswd -a #{member} #{@new_resource.group_name}")
+              unless @new_resource.members.empty?
+                @new_resource.members.each do |member|
+                  Chef::Log.debug("#{@new_resource} appending member #{member} to group #{@new_resource.group_name}")
+                  shell_out!("gpasswd -a #{member} #{@new_resource.group_name}")
+                end
+              else
+                Chef::Log.debug("#{@new_resource} not changing group members, the group has no members to add")
               end
             else
-              Chef::Log.debug("#{@new_resource} setting group members to #{@new_resource.members.join(', ')}")
-              shell_out!("gpasswd -M #{@new_resource.members.join(',')} #{@new_resource.group_name}")
+              unless @new_resource.members.empty?
+                Chef::Log.debug("#{@new_resource} setting group members to #{@new_resource.members.join(', ')}")
+                shell_out!("gpasswd -M #{@new_resource.members.join(',')} #{@new_resource.group_name}")
+              else
+                Chef::Log.debug("#{@new_resource} setting group members to: none")
+                shell_out!("gpasswd -M \"\" #{@new_resource.group_name}")
+              end
             end
-          else
-            Chef::Log.debug("#{@new_resource} not changing group members, the group has no members")
-          end
         end
       end
     end

data/lib/chef/provider/link.rb

@@ -26,7 +26,15 @@ class Chef
   class Provider
     class Link < Chef::Provider
       include Chef::Mixin::ShellOut
-      #include Chef::Mixin::Command
+
+      def file_class
+        @host_os_file ||= if Chef::Platform.windows?
+          require 'chef/win32/file'
+          Chef::Win32::File
+        else
+          ::File
+        end
+      end
 
       def negative_complement(big)
         if big > 1073741823 # Fixnum max
@@ -42,9 +50,9 @@ class Chef
         @current_resource.target_file(@new_resource.target_file)
         @current_resource.link_type(@new_resource.link_type)
         if @new_resource.link_type == :symbolic
-          if ::File.exists?(@current_resource.target_file) && ::File.symlink?(@current_resource.target_file)
+          if ::File.exists?(@current_resource.target_file) && file_class.symlink?(@current_resource.target_file)
             @current_resource.to(
-              ::File.expand_path(::File.readlink(@current_resource.target_file))
+              ::File.expand_path(file_class.readlink(@current_resource.target_file))
             )
             cstats = ::File.lstat(@current_resource.target_file)
             @current_resource.owner(cstats.uid)
@@ -66,81 +74,32 @@ class Chef
         @current_resource
       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
-                         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
-          @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
-          @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)
           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)
+            unless (file_class.symlink?(@new_resource.target_file) && file_class.readlink(@new_resource.target_file) == @new_resource.to)
+              if file_class.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)
+              file_class.symlink(@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
           elsif @new_resource.link_type == :hard
-            ::File.link(@new_resource.to, @new_resource.target_file)
+            file_class.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
         if @new_resource.link_type == :symbolic
-          set_owner unless @new_resource.owner.nil?
-          set_group unless @new_resource.group.nil?
+          enforce_ownership_and_permissions
         end
       end
 
       def action_delete
         if @new_resource.link_type == :symbolic
-          if ::File.symlink?(@new_resource.target_file)
+          if file_class.symlink?(@new_resource.target_file)
             ::File.delete(@new_resource.target_file)
             Chef::Log.info("#{@new_resource} deleted")
             @new_resource.updated_by_last_action(true)
@@ -149,7 +108,7 @@ class Chef
           end
         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
+             if ::File.exists?(@new_resource.to) && (file_class.stat(@current_resource.target_file).ino == file_class.stat(@new_resource.to).ino)
                ::File.delete(@new_resource.target_file)
                Chef::Log.info("#{@new_resource} deleted")
                @new_resource.updated_by_last_action(true)
@@ -160,5 +119,15 @@ class Chef
         end
       end
     end
+
+    # private
+    # def hardlink?(target, to)
+    #   s = file_class()
+    #   if file_class.respond_to?(:hardlink?)
+    #     file_class.hardlink?(target)
+    #   else
+    #     ::File.stat(target).ino == ::File.stat(to).ino
+    #   end
+    # end
   end
 end

data/lib/chef/provider/mdadm.rb

@@ -26,7 +26,7 @@ class Chef
 
       #include Chef::Mixin::Command
       include Chef::Mixin::ShellOut
-      
+
       def popen4
         raise Exception, "deprecated, bitches"
       end
@@ -51,7 +51,7 @@ 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(" ")}"
+          command = "yes | mdadm --create #{@new_resource.raid_device} --chunk=#{@new_resource.chunk} --level #{@new_resource.level} --metadata=#{@new_resource.metadata} --raid-devices #{@new_resource.devices.length} #{@new_resource.devices.join(" ")}"
           Chef::Log.debug("#{@new_resource} mdadm command: #{command}")
           #pid, stdin, stdout, stderr = popen4(command)
           shell_out!(command)

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

@@ -173,7 +173,7 @@ class Chef
         end
 
         def device_should_exist?
-          @new_resource.device !~ /:/ && @new_resource.device !~ /\/\// && @new_resource.device != "tmpfs" && @new_resource.fstype != 'fuse'
+          @new_resource.device !~ /:/ && @new_resource.device !~ /\/\// && @new_resource.fstype != "tmpfs" && @new_resource.fstype != 'fuse'
         end
 
         private

data/lib/chef/provider/package.rb

@@ -19,7 +19,6 @@
 require 'chef/mixin/command'
 require 'chef/log'
 require 'chef/file_cache'
-require 'chef/resource/remote_file'
 require 'chef/platform'
 
 class Chef
@@ -65,15 +64,20 @@ class Chef
       end
 
       def action_upgrade
-        if @current_resource.version != candidate_version
+        # Can't upgrade what we don't have
+        if @current_resource.version.nil? && candidate_version.nil?
+          raise(Chef::Exceptions::Package, "No candidate version available for #{@new_resource.package_name}")
+        elsif candidate_version.nil?
+          Chef::Log.debug("#{@new_resource} no candidate version - nothing to do")
+        elsif @current_resource.version == candidate_version
+          Chef::Log.debug("#{@new_resource} is at the latest version - nothing to do")
+        else
           orig_version = @current_resource.version || "uninstalled"
           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
 
@@ -186,11 +190,11 @@ class Chef
           remote_file.cookbook_name = @new_resource.cookbook_name
           remote_file.source(@new_resource.response_file)
           remote_file.backup(false)
-        end      
+        end
 
         remote_file
       end
-      
+
       def expand_options(options)
         options ? " #{options}" : ""
       end

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

@@ -40,8 +40,10 @@ class Chef
         def check_package_state(package)
           Chef::Log.debug("#{@new_resource} checking package status for #{package}")
           installed = false
+          # Use apt cache release option only if provider was explicitly defined
+          aptcache_options = "-o APT::Default-Release=#{@new_resource.default_release}" if @new_resource.provider && @new_resource.default_release
 
-          shell_out!("apt-cache policy #{package}").stdout.each_line do |line|
+          shell_out!("apt-cache#{expand_options(aptcache_options)} policy #{package}").stdout.each_line do |line|
             case line
             when /^\s{2}Installed: (.+)$/
               installed_version = $1