chef 11.18.12-x86-mingw32 → 12.0.0.alpha.0-x86-mingw32

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

@@ -17,15 +17,12 @@
 #
 
 require 'chef/provider/group/groupadd'
-require 'chef/mixin/shell_out'
 
 class Chef
   class Provider
     class Group
       class Usermod < Chef::Provider::Group::Groupadd
 
-        include Chef::Mixin::ShellOut
-
         def load_current_resource
           super
         end

data/lib/chef/provider/link.rb

@@ -18,7 +18,6 @@
 
 require 'chef/config'
 require 'chef/log'
-require 'chef/mixin/shell_out'
 require 'chef/mixin/file_class'
 require 'chef/resource/link'
 require 'chef/provider'
@@ -29,7 +28,6 @@ class Chef
     class Link < Chef::Provider
 
       include Chef::Mixin::EnforceOwnershipAndPermissions
-      include Chef::Mixin::ShellOut
       include Chef::Mixin::FileClass
 
       def negative_complement(big)
@@ -89,11 +87,30 @@ class Chef
       end
 
       def action_create
+        # current_resource is the symlink that currently exists
+        # new_resource is the symlink we need to create
+        #   to - the location to link to
+        #   target_file - the name of the link
+
         if @current_resource.to != canonicalize(@new_resource.to) ||
            @current_resource.link_type != @new_resource.link_type
-          if @current_resource.to # nil if target_file does not exist
-            converge_by("unlink existing file at #{@new_resource.target_file}") do
-              ::File.unlink(@new_resource.target_file)
+          # Handle the case where the symlink already exists and is pointing at a valid to_file
+          if @current_resource.to
+            # On Windows, to fix a symlink already pointing at a directory we must first
+            # ::Dir.unlink the symlink (not the directory), while if we have a symlink
+            # pointing at file we must use ::File.unlink on the symlink.
+            # However if the new symlink will point to a file and the current symlink is pointing at a
+            # directory we want to throw an exception and calling ::File.unlink on the directory symlink
+            # will throw the correct ones.
+            if Chef::Platform.windows? && ::File.directory?(@new_resource.to) &&
+               ::File.directory?(@current_resource.target_file)
+              converge_by("unlink existing windows symlink to dir at #{@new_resource.target_file}") do
+                ::Dir.unlink(@new_resource.target_file)
+              end
+            else
+              converge_by("unlink existing symlink to file at #{@new_resource.target_file}") do
+                ::File.unlink(@new_resource.target_file)
+              end
             end
           end
           if @new_resource.link_type == :symbolic

data/lib/chef/provider/log.rb

@@ -25,6 +25,9 @@ class Chef
       # Chef log provider, allows logging to chef's logs from recipes
       class ChefLog < Chef::Provider
 
+        # ordered array of the log levels
+        @@levels = [ :debug, :info, :warn, :error, :fatal ]
+
         # No concept of a 'current' resource for logs, this is a no-op
         #
         # === Return
@@ -39,7 +42,18 @@ class Chef
         # true:: Always return true
         def action_write
           Chef::Log.send(@new_resource.level, @new_resource.message)
-          @new_resource.updated_by_last_action(true)
+
+          # resolve the integers for the current log levels
+          global_level = Mixlib::Log::LEVELS.fetch(Chef::Log.level)
+          resource_level = Mixlib::Log::LEVELS.fetch(@new_resource.level)
+
+          # If the resource level is greater than or the same os the global
+          # level, then it should have been written to the log.  Mark the
+          # resource as updated.
+          if resource_level >= global_level
+            @new_resource.updated_by_last_action(true)
+          end
+
         end
 
       end
@@ -49,6 +63,3 @@ class Chef
   end
 
 end
-
-
-

data/lib/chef/provider/mdadm.rb

@@ -17,15 +17,12 @@
 #
 
 require 'chef/log'
-require 'chef/mixin/shell_out'
 require 'chef/provider'
 
 class Chef
   class Provider
     class Mdadm < Chef::Provider
 
-      include Chef::Mixin::ShellOut
-
       def popen4
         raise Exception, "deprecated"
       end

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

@@ -18,13 +18,11 @@
 
 require 'chef/provider/mount'
 require 'chef/log'
-require 'chef/mixin/shell_out'
 
 class Chef
   class Provider
     class Mount
       class Mount < Chef::Provider::Mount
-        include Chef::Mixin::ShellOut
 
         def initialize(new_resource, run_context)
           super

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

@@ -20,14 +20,12 @@
 
 require 'chef/provider/mount'
 require 'chef/log'
-require 'chef/mixin/shell_out'
 require 'forwardable'
 
 class Chef
   class Provider
     class Mount
       class Solaris < Chef::Provider::Mount
-        include Chef::Mixin::ShellOut
         extend Forwardable
 
         VFSTAB = "/etc/vfstab".freeze

data/lib/chef/provider/package.rb

@@ -198,7 +198,6 @@ class Chef
 
         Chef::Log.debug("#{@new_resource} fetching preseed file to #{cache_seed_to}")
 
-
         if template_available?(@new_resource.response_file)
           Chef::Log.debug("#{@new_resource} fetching preseed file via Template")
           remote_file = Chef::Resource::Template.new(cache_seed_to, run_context)

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

@@ -19,15 +19,12 @@
 require 'chef/provider/package'
 require 'chef/mixin/command'
 require 'chef/resource/package'
-require 'chef/mixin/shell_out'
-
 
 class Chef
   class Provider
     class Package
       class Apt < Chef::Provider::Package
 
-        include Chef::Mixin::ShellOut
         attr_accessor :is_virtual_package
 
         def load_current_resource

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

@@ -31,7 +31,6 @@ class Chef
         DPKG_VERSION = /^Version: (.+)$/
 
         include Chef::Mixin::GetSourceFromPackage
-        include Chef::Mixin::ShellOut
 
         def define_resource_requirements
           super

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

@@ -18,17 +18,13 @@
 
 require 'chef/provider/package'
 require 'chef/mixin/command'
-require 'chef/mixin/shell_out'
 require 'chef/resource/package'
-require 'chef/mixin/shell_out'
 
 class Chef
   class Provider
     class Package
       class EasyInstall < Chef::Provider::Package
 
-        include Chef::Mixin::ShellOut
-
         def install_check(name)
           check = false
 

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

@@ -21,7 +21,6 @@
 
 require 'chef/resource/package'
 require 'chef/provider/package'
-require 'chef/mixin/shell_out'
 require 'chef/mixin/get_source_from_package'
 
 class Chef
@@ -63,9 +62,7 @@ class Chef
           end
         end
 
-
         class Base < Chef::Provider::Package
-          include Chef::Mixin::ShellOut
           include Chef::Mixin::GetSourceFromPackage
 
           def initialize(*args)

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

@@ -52,8 +52,6 @@ class Chef
             @new_resource.source ? file_candidate_version : repo_candidate_version
           end
 
-
-
           private
 
           def file_candidate_version

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

@@ -54,8 +54,6 @@ class Chef
             super(@new_resource.package_name)
           end
 
-
-
           private
 
           def supports_pkgng?

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

@@ -21,14 +21,12 @@ require 'open3'
 require 'chef/provider/package'
 require 'chef/mixin/command'
 require 'chef/resource/package'
-require 'chef/mixin/shell_out'
 
 class Chef
   class Provider
     class Package
       class Ips < Chef::Provider::Package
 
-        include Chef::Mixin::ShellOut
         attr_accessor :virtual
 
         def define_resource_requirements
@@ -98,4 +96,3 @@ class Chef
     end
   end
 end
-

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

@@ -18,15 +18,12 @@
 
 require 'chef/provider/package'
 require 'chef/resource/package'
-require 'chef/mixin/shell_out'
 
 class Chef
   class Provider
     class Package
       class Paludis < Chef::Provider::Package
 
-        include Chef::Mixin::ShellOut
-
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.package_name)
           @current_resource.package_name(@new_resource.package_name)
@@ -87,5 +84,3 @@ class Chef
     end
   end
 end
-
-

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

@@ -55,7 +55,6 @@ class Chef
           @current_resource
         end
 
-
         def parse_emerge(package, txt)
           availables = {}
           found_package_name = nil
@@ -103,7 +102,6 @@ class Chef
 
         end
 
-
         def install_package(name, version)
           pkg = "=#{name}-#{version}"
 

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

@@ -60,7 +60,7 @@ class Chef
             status = popen4("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@new_resource.source}") do |pid, stdin, stdout, stderr|
               stdout.each do |line|
                 case line
-                when /^([\w\d+_.-]+)\s([\w\d_.-]+)$/
+                when /([\w\d+_.-]+)\s([\w\d_.-]+)/
                   @current_resource.package_name($1)
                   @new_resource.version($2)
                   @candidate_version = $2
@@ -78,14 +78,13 @@ class Chef
           @rpm_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_.-]+)$/
+              when /([\w\d+_.-]+)\s([\w\d_.-]+)/
                 Chef::Log.debug("#{@new_resource} current version is #{$2}")
                 @current_resource.version($2)
               end
             end
           end
 
-
           @current_resource
         end
 
@@ -119,4 +118,3 @@ class Chef
     end
   end
 end
-

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

@@ -273,8 +273,6 @@ class Chef
             @platform_cache ||= {}
           end
 
-          include Chef::Mixin::ShellOut
-
           attr_reader :gem_binary_location
 
           def initialize(gem_binary_location)
@@ -352,8 +350,6 @@ class Chef
 
         end
 
-        include Chef::Mixin::ShellOut
-
         attr_reader :gem_env
         attr_reader :cleanup_gem_env
 

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

@@ -20,7 +20,6 @@
 #
 
 require 'chef/provider/package'
-require 'chef/mixin/shell_out'
 require 'chef/resource/package'
 require 'chef/mixin/get_source_from_package'
 
@@ -28,10 +27,8 @@ class Chef
   class Provider
     class Package
       class SmartOS < Chef::Provider::Package
-        include Chef::Mixin::ShellOut
         attr_accessor :is_virtual_package
 
-
         def load_current_resource
           Chef::Log.debug("#{@new_resource} loading current resource")
           @current_resource = Chef::Resource::Package.new(@new_resource.name)

data/lib/chef/provider/package/windows/msi.rb

@@ -18,7 +18,6 @@
 
 # TODO: Allow @new_resource.source to be a Product Code as a GUID for uninstall / network install
 
-require 'chef/mixin/shell_out'
 require 'chef/win32/api/installer' if RUBY_PLATFORM =~ /mswin|mingw32|windows/
 
 class Chef
@@ -27,7 +26,6 @@ class Chef
       class Windows
         class MSI
           include Chef::ReservedNames::Win32::API::Installer if RUBY_PLATFORM =~ /mswin|mingw32|windows/
-          include Chef::Mixin::ShellOut
 
           def initialize(resource)
             @new_resource = resource

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

@@ -19,12 +19,10 @@
 require 'chef/config'
 require 'chef/provider/package'
 require 'chef/mixin/command'
-require 'chef/mixin/shell_out'
 require 'chef/resource/package'
 require 'singleton'
 require 'chef/mixin/get_source_from_package'
 
-
 class Chef
   class Provider
     class Package
@@ -647,7 +645,6 @@ class Chef
         # Cache for our installed and available packages, pulled in from yum-dump.py
         class YumCache
           include Chef::Mixin::Command
-          include Chef::Mixin::ShellOut
           include Singleton
 
           def initialize
@@ -949,7 +946,6 @@ class Chef
         end # YumCache
 
         include Chef::Mixin::GetSourceFromPackage
-        include Chef::Mixin::ShellOut
 
         def initialize(new_resource, run_context)
           super

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

@@ -22,7 +22,6 @@
 require 'chef/provider/package'
 require 'chef/mixin/command'
 require 'chef/resource/package'
-require 'chef/mixin/shell_out'
 require 'singleton'
 
 class Chef
@@ -30,8 +29,6 @@ class Chef
     class Package
       class Zypper < Chef::Provider::Package
 
-        include Chef::Mixin::ShellOut
-
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @current_resource.package_name(@new_resource.package_name)

data/lib/chef/provider/registry_key.rb

@@ -25,7 +25,6 @@ require 'chef/provider'
 require 'etc'
 require 'fileutils'
 require 'chef/scan_access_control'
-require 'chef/mixin/shell_out'
 require 'chef/win32/registry'
 
 class Chef
@@ -33,7 +32,6 @@ class Chef
   class Provider
     class RegistryKey < Chef::Provider
       include Chef::Mixin::Checksum
-      include Chef::Mixin::ShellOut
 
       def whyrun_supported?
         true

data/lib/chef/provider/remote_directory.rb

@@ -40,7 +40,6 @@ class Chef
                                    name !~ /(?:^|#{Regexp.escape(::File::SEPARATOR)})\.\.?$/
                                  end)
 
-
         files_to_transfer.each do |cookbook_file_relative_path|
           create_cookbook_file(cookbook_file_relative_path)
           # the file is removed from the purge list