chef 11.18.12 → 12.0.0.alpha.0

data/lib/chef/mixin/file_class.rb

@@ -18,16 +18,13 @@
 # limitations under the License.
 #
 
-if Chef::Platform.windows?
-  require 'chef/win32/file'
-end
-
 class Chef
   module Mixin
     module FileClass
 
       def file_class
         @host_os_file ||= if Chef::Platform.windows?
+          require 'chef/win32/file'
           Chef::ReservedNames::Win32::File
         else
           ::File

data/lib/chef/mixin/shell_out.rb

@@ -44,6 +44,21 @@ class Chef
         cmd
       end
 
+      # environment['LC_ALL'] should be nil or what the user specified
+      def shell_out_with_systems_locale(*command_args)
+        args = command_args.dup
+        if args.last.is_a?(Hash)
+          options = args.last
+          env_key = options.has_key?(:env) ? :env : :environment
+          options[env_key] ||= {}
+          options[env_key]['LC_ALL'] ||= nil
+        else
+          args << { :environment => { 'LC_ALL' => nil } }
+        end
+
+        shell_out(*args)
+      end
+
       DEPRECATED_OPTIONS =
         [ [:command_log_level,   :log_level],
           [:command_log_prepend, :log_tag] ]

data/lib/chef/mixin/windows_architecture_helper.rb

@@ -41,22 +41,6 @@ class Chef
           is_i386_process_on_x86_64_windows?
       end
 
-      def with_os_architecture(node)
-        wow64_redirection_state = nil
-
-        if wow64_architecture_override_required?(node, node_windows_architecture(node))
-          wow64_redirection_state = disable_wow64_file_redirection(node)
-        end
-
-        begin
-          yield
-        ensure
-          if wow64_redirection_state
-            restore_wow64_file_redirection(node, wow64_redirection_state)
-          end
-        end
-      end
-
       def node_supports_windows_architecture?(node, desired_architecture)
         assert_valid_windows_architecture!(desired_architecture)
         return (node_windows_architecture(node) == :x86_64 ||

data/lib/chef/node.rb

@@ -416,7 +416,7 @@ class Chef
 
     # Serialize this object as a hash
     def to_json(*a)
-      Chef::JSONCompat.to_json(for_json, *a)
+      for_json.to_json(*a)
     end
 
     def for_json

data/lib/chef/platform/query_helpers.rb

@@ -45,11 +45,7 @@ class Chef
 
         is_server_2003
       end
-
-      def supports_dsc?(node)
-        node[:languages] && node[:languages][:powershell] &&
-          node[:languages][:powershell][:version].to_i >= 4
-      end
     end
+
   end
 end

data/lib/chef/policy_builder/expand_node_object.rb

@@ -176,6 +176,9 @@ class Chef
         end
 
         synchronizer = Chef::CookbookSynchronizer.new(cookbook_hash, events)
+        if temporary_policy?
+          synchronizer.remove_obsoleted_files = false
+        end
         synchronizer.sync_cookbooks
 
         # register the file cache path in the cookbook path so that CookbookLoader actually picks up the synced cookbooks

data/lib/chef/provider.rb

@@ -22,11 +22,13 @@ require 'chef/mixin/convert_to_class_name'
 require 'chef/dsl/recipe'
 require 'chef/mixin/enforce_ownership_and_permissions'
 require 'chef/mixin/why_run'
+require 'chef/mixin/shell_out'
 
 class Chef
   class Provider
     include Chef::DSL::Recipe
     include Chef::Mixin::WhyRun
+    include Chef::Mixin::ShellOut
 
     attr_accessor :new_resource
     attr_accessor :current_resource

data/lib/chef/provider/cookbook_file.rb

@@ -49,4 +49,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/provider/deploy.rb

@@ -174,7 +174,6 @@ class Chef
         restart
       end
 
-
       def callback(what, callback_code=nil)
         @collection = Chef::ResourceCollection.new
         case callback_code

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

@@ -97,7 +97,7 @@ class Chef
         end
 
         def save_cache(cache)
-          Chef::FileCache.store("revision-deploys/#{new_resource.name}", Chef::JSONCompat.to_json(cache))
+          Chef::FileCache.store("revision-deploys/#{new_resource.name}", cache.to_json)
           cache
         end
 

data/lib/chef/provider/env.rb

@@ -58,22 +58,20 @@ class Chef
       # ==== Returns
       # <true>:: If a change is required
       # <false>:: If a change is not required
-      def requires_modify_or_create?
+      def compare_value
         if @new_resource.delim
           #e.g. check for existing value within PATH
-          not new_values.all? do |val|
-            current_values.include? val
+          not @current_resource.value.split(@new_resource.delim).any? do |val|
+            val == @new_resource.value
           end
         else
           @new_resource.value != @current_resource.value
         end
       end
 
-      alias_method :compare_value, :requires_modify_or_create?
-
       def action_create
         if @key_exists
-          if requires_modify_or_create?
+          if compare_value
             modify_env
             Chef::Log.info("#{@new_resource} altered")
             @new_resource.updated_by_last_action(true)
@@ -93,14 +91,13 @@ class Chef
       #           after we removed the element.
       def delete_element
         return false unless @new_resource.delim #no delim: delete the key
-        needs_delete = new_values.any? { |v| current_values.include?(v) }
-        if !needs_delete
+        if compare_value
           Chef::Log.debug("#{@new_resource} element '#{@new_resource.value}' does not exist")
           return true #do not delete the key
         else
           new_value =
-            current_values.select { |item|
-              not new_values.include?(item)
+            @current_resource.value.split(@new_resource.delim).select { |item|
+            item != @new_resource.value
           }.join(@new_resource.delim)
 
           if new_value.empty?
@@ -125,7 +122,7 @@ class Chef
 
       def action_modify
         if @key_exists
-          if requires_modify_or_create?
+          if compare_value
             modify_env
             Chef::Log.info("#{@new_resource} modified")
             @new_resource.updated_by_last_action(true)
@@ -145,23 +142,11 @@ class Chef
 
       def modify_env
         if @new_resource.delim
-          values = new_values.reject do |v|
-            current_values.include?(v)
-          end
-          @new_resource.value((values + [@current_resource.value]).join(@new_resource.delim))
+          #e.g. add to PATH
+          @new_resource.value << @new_resource.delim << @current_resource.value
         end
         create_env
       end
-
-      # Returns the current values to split by delimiter
-      def current_values
-        @current_values ||= @current_resource.value.split(@new_resource.delim)
-      end
-
-      # Returns the new values to split by delimiter
-      def new_values
-        @new_values ||= @new_resource.value.split(@new_resource.delim)
-      end
      end
   end
 end

data/lib/chef/provider/env/windows.rb

@@ -16,13 +16,13 @@
 # limitations under the License.
 #
 
-require 'chef/mixin/windows_env_helper'
+require 'chef/win32/api/system' if RUBY_PLATFORM =~ /mswin|mingw32|windows/
 
 class Chef
   class Provider
     class Env
       class Windows < Chef::Provider::Env
-        include Chef::Mixin::WindowsEnvHelper
+        include Chef::ReservedNames::Win32::API::System if RUBY_PLATFORM =~ /mswin|mingw32|windows/
 
         def create_env
           obj = env_obj(@new_resource.key_name)
@@ -33,9 +33,7 @@ class Chef
           end
           obj.variablevalue = @new_resource.value
           obj.put_
-          value = @new_resource.value
-          value = expand_path(value) if @new_resource.key_name.upcase == 'PATH'
-          ENV[@new_resource.key_name] = value
+          ENV[@new_resource.key_name] = @new_resource.value
           broadcast_env_change
         end
 
@@ -53,15 +51,30 @@ class Chef
           return obj ? obj.variablevalue : nil
         end
 
+        def find_env(environment_variables, key_name)
+          environment_variables.find do | environment_variable |
+            environment_variable['name'].downcase == key_name
+          end
+        end
+
         def env_obj(key_name)
           wmi = WmiLite::Wmi.new
-          # Note that by design this query is case insensitive with regard to key_name
-          environment_variables = wmi.query("select * from Win32_Environment where name = '#{key_name}'")
-          if environment_variables && environment_variables.length > 0
-            environment_variables[0].wmi_ole_object
-          end
+          environment_variables = wmi.instances_of('Win32_Environment')
+          existing_variable = find_env(environment_variables, key_name)
+          existing_variable.nil? ? nil : existing_variable.wmi_ole_object
         end
 
+        #see: http://msdn.microsoft.com/en-us/library/ms682653%28VS.85%29.aspx
+        HWND_BROADCAST = 0xffff
+        WM_SETTINGCHANGE = 0x001A
+        SMTO_BLOCK = 0x0001
+        SMTO_ABORTIFHUNG = 0x0002
+        SMTO_NOTIMEOUTIFNOTHUNG = 0x0008
+
+        def broadcast_env_change
+          flags = SMTO_BLOCK | SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG
+          SendMessageTimeoutA(HWND_BROADCAST, WM_SETTINGCHANGE, 0, FFI::MemoryPointer.from_string('Environment').address, flags, 5000, nil)
+        end
       end
     end
   end

data/lib/chef/provider/execute.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require 'chef/mixin/shell_out'
 require 'chef/log'
 require 'chef/provider'
 
@@ -24,8 +23,6 @@ class Chef
   class Provider
     class Execute < Chef::Provider
 
-      include Chef::Mixin::ShellOut
-
       def load_current_resource
         true
       end

data/lib/chef/provider/file.rb

@@ -25,7 +25,6 @@ require 'etc'
 require 'fileutils'
 require 'chef/scan_access_control'
 require 'chef/mixin/checksum'
-require 'chef/mixin/shell_out'
 require 'chef/mixin/file_class'
 require 'chef/util/backup'
 require 'chef/util/diff'
@@ -48,7 +47,6 @@ class Chef
     class File < Chef::Provider
       include Chef::Mixin::EnforceOwnershipAndPermissions
       include Chef::Mixin::Checksum
-      include Chef::Mixin::ShellOut
       include Chef::Util::Selinux
       include Chef::Mixin::FileClass
 
@@ -247,7 +245,6 @@ class Chef
           "Assuming symlink source would be created by a previous resource" ]
       end
 
-
       def content
         @content ||= begin
           load_current_resource if @current_resource.nil?

data/lib/chef/provider/git.rb

@@ -16,19 +16,15 @@
 # limitations under the License.
 #
 
-
 require 'chef/exceptions'
 require 'chef/log'
 require 'chef/provider'
-require 'chef/mixin/shell_out'
 require 'fileutils'
 
 class Chef
   class Provider
     class Git < Chef::Provider
 
-      include Chef::Mixin::ShellOut
-
       def whyrun_supported?
         true
       end
@@ -51,7 +47,6 @@ class Chef
             "Cannot clone #{@new_resource} to #{@new_resource.destination}, the enclosing directory #{dirname} does not exist")
         end
 
-
         requirements.assert(:all_actions) do |a|
           a.assertion { !(@new_resource.revision =~ /^origin\//) }
           a.failure_message Chef::Exceptions::InvalidRemoteGitReference,
@@ -107,7 +102,6 @@ class Chef
         end
       end
 
-
       def existing_git_clone?
         ::File.exist?(::File.join(@new_resource.destination, ".git"))
       end

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

@@ -39,33 +39,11 @@ class Chef
           return result[2]
         end
 
-        def load_current_resource
-          @current_resource = Chef::Resource::Group.new(@new_resource.name)
-          @current_resource.group_name(@new_resource.name)
-          group_info = nil
-          begin
-            group_info = safe_dscl("read /Groups/#{@new_resource.name}")
-          rescue Chef::Exceptions::Group
-            @group_exists = false
-            Chef::Log.debug("#{@new_resource} group does not exist")
-          end
-
-          if group_info
-            group_info.each_line do |line|
-              key, val = line.split(': ')
-              val.strip! if val
-              case key.downcase
-              when 'primarygroupid'
-                @new_resource.gid(val) unless @new_resource.gid
-                @current_resource.gid(val)
-              when 'groupmembership'
-                @current_resource.members(val.split(' '))
-              end
-            end
-          end
-
-          @current_resource
-        end
+        # This is handled in providers/group.rb by Etc.getgrnam()
+        # def group_exists?(group)
+        #   groups = safe_dscl("list /Groups")
+        #   !! ( groups =~ Regexp.new("\n#{group}\n") )
+        # end
 
         # get a free GID greater than 200
         def get_free_gid(search_limit=1000)
@@ -137,6 +115,10 @@ class Chef
           end
         end
 
+        def load_current_resource
+          super
+        end
+
         def create_group
           dscl_create_group
           set_gid

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

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

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

@@ -16,15 +16,11 @@
 # limitations under the License.
 #
 
-require 'chef/mixin/shell_out'
-
 class Chef
   class Provider
     class Group
       class Groupmod < Chef::Provider::Group
 
-        include Chef::Mixin::ShellOut
-
         def load_current_resource
           super
           [ "group", "user" ].each do |binary|

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

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