chef 11.0.0.beta.0 → 11.0.0.beta.1

data/lib/chef/dsl/include_attribute.rb

@@ -56,5 +56,8 @@ class Chef
   end
 end
 
+# **DEPRECATED**
+# This used to be part of chef/mixin/language_include_attribute. Load the file to activate the deprecation code.
+require 'chef/mixin/language_include_attribute'
 
 

data/lib/chef/dsl/include_recipe.rb

@@ -39,4 +39,7 @@ class Chef
   end
 end
 
+# **DEPRECATED**
+# This used to be part of chef/mixin/language_include_recipe. Load the file to activate the deprecation code.
+require 'chef/mixin/language_include_recipe'
 

data/lib/chef/dsl/platform_introspection.rb

@@ -211,3 +211,8 @@ class Chef
     end
   end
 end
+
+# **DEPRECATED**
+# This used to be part of chef/mixin/language. Load the file to activate the deprecation code.
+require 'chef/mixin/language'
+

data/lib/chef/dsl/recipe.rb

@@ -20,7 +20,6 @@
 require 'chef/resource'
 require 'chef/resource_platform_map'
 require 'chef/mixin/convert_to_class_name'
-require 'chef/mixin/language'
 
 class Chef
   module DSL
@@ -82,3 +81,7 @@ class Chef
     end
   end
 end
+
+# **DEPRECATED**
+# This used to be part of chef/mixin/recipe_definition_dsl_core. Load the file to activate the deprecation code.
+require 'chef/mixin/recipe_definition_dsl_core'

data/lib/chef/exceptions.rb

@@ -96,6 +96,7 @@ class Chef
     class Win32APIFunctionNotImplemented < NotImplementedError; end
     # Attempting to run windows code on a not-windows node
     class Win32NotWindows < RuntimeError; end
+    class WindowsNotAdmin < RuntimeError; end
     class ObsoleteDependencySyntax < ArgumentError; end
     class InvalidDataBagPath < ArgumentError; end
 

data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb

@@ -50,6 +50,14 @@ class Chef
           if exception.respond_to?(:source_listing)
             error_description.section("Template Context:", "#{exception.source_location}\n#{exception.source_listing}")
           end
+
+          if Chef::Platform.windows?
+            require 'chef/win32/security'
+
+            if !Chef::ReservedNames::Win32::Security.has_admin_privileges?
+              error_description.section("Missing Windows Admin Privileges", "chef-client doesn't have administrator privileges. This can be a possible reason for the resource failure.")
+            end
+          end
         end
 
         def recipe_snippet

data/lib/chef/mixin/deep_merge.rb

@@ -110,6 +110,32 @@ class Chef
         dest
       end # deep_merge!
 
+      def hash_only_merge(merge_onto, merge_with)
+        hash_only_merge!(merge_onto.dup, merge_with.dup)
+      end
+
+      # Deep merge without Array merge.
+      # `merge_onto` is the object that will "lose" in case of conflict.
+      # `merge_with` is the object whose values will replace `merge_onto`s
+      # values when there is a conflict.
+      def hash_only_merge!(merge_onto, merge_with)
+        # If there are two Hashes, recursively merge.
+        if merge_onto.kind_of?(Hash) && merge_with.kind_of?(Hash)
+          merge_with.each do |key, merge_with_value|
+            merge_onto[key] = hash_only_merge!(merge_onto[key], merge_with_value)
+          end
+          merge_onto
+
+        # If merge_with is nil, don't replace merge_onto
+        elsif merge_with.nil?
+          merge_onto
+
+        # In all other cases, replace merge_onto with merge_with
+        else
+          merge_with
+        end
+      end
+
       # Checks for attempted use of subtractive merge, which was removed for
       # Chef 11.0. If subtractive merge use is detected, will raise an
       # InvalidSubtractiveMerge exception.

data/lib/chef/mixin/deprecation.rb

@@ -18,7 +18,42 @@
 
 class Chef
   module Mixin
+
+
+      def self.deprecated_constants
+        @deprecated_constants ||= {}
+      end
+
+      # Add a deprecated constant to the Chef::Mixin namespace.
+      # === Arguments
+      # * name: the constant name, as a relative symbol.
+      # * replacement: the constant to return instead.
+      # * message: A message telling the user what to do instead.
+      # === Example:
+      #   deprecate_constant(:RecipeDefinitionDSLCore, Chef::DSL::Recipe, <<-EOM)
+      #     Chef::Mixin::RecipeDefinitionDSLCore is deprecated, use Chef::DSL::Recipe instead.
+      #   EOM
+      def self.deprecate_constant(name, replacement, message)
+        deprecated_constants[name] = {:replacement => replacement, :message => message}
+      end
+
+      # Const missing hook to look up deprecated constants defined with
+      # deprecate_constant. Emits a warning to the logger and returns the
+      # replacement constant. Will call super, most likely causing an exception
+      # for the missing constant, if +name+ is not found in the
+      # deprecated_constants collection.
+      def self.const_missing(name)
+        if new_const = deprecated_constants[name]
+          Chef::Log.warn(new_const[:message])
+          Chef::Log.warn("Called from: \n#{caller[0...3].map {|l| "\t#{l}"}.join("\n")}")
+          new_const[:replacement]
+        else
+          super
+        end
+      end
+
     module Deprecation
+
       class DeprecatedObjectProxyBase
         KEEPERS = %w{__id__ __send__ instance_eval == equal? initialize object_id}
         instance_methods.each { |method_name| undef_method(method_name) unless KEEPERS.include?(method_name.to_s)}

data/lib/chef/mixin/language.rb

@@ -18,19 +18,31 @@
 
 require 'chef/dsl/platform_introspection'
 require 'chef/dsl/data_query'
+require 'chef/mixin/deprecation'
 
 class Chef
   module Mixin
 
-    # == [DEPRECATED] Chef::Mixin::Language
-    # This module is deprecated and remains only for backwards compatibility.
+    # == [DEPRECATED] Chef::Mixin::DeprecatedLanguageModule
+    # This module is a temporary replacement for the previous
+    # Chef::Mixin::Language. That module's functionality was split into two
+    # modules, Chef::DSL::PlatformIntrospection, and Chef::DSL::DataQuery.
     #
-    # See Chef::DSL::PlatformIntrospection and Chef::DSL::DataQuery
-    module Language
+    # This module includes both PlatformIntrospection and DataQuery to provide
+    # the same interfaces and behavior as the prior Mixin::Language.
+    #
+    # This module is loaded via const_missing hook when Chef::Mixin::Language
+    # is accessed. See chef/mixin/deprecation for details.
+    module DeprecatedLanguageModule
 
       include Chef::DSL::PlatformIntrospection
       include Chef::DSL::DataQuery
 
     end
+
+    deprecate_constant(:Language, DeprecatedLanguageModule, <<-EOM)
+Chef::Mixin::Language is deprecated. Use either (or both)
+Chef::DSL::PlatformIntrospection or Chef::DSL::DataQuery instead.
+EOM
   end
 end

data/lib/chef/mixin/language_include_attribute.rb

@@ -17,13 +17,19 @@
 #
 
 require 'chef/dsl/include_attribute'
+require 'chef/mixin/deprecation'
 
 class Chef
   module Mixin
 
     # DEPRECATED: This is just here for compatibility, use
     # Chef::DSL::IncludeAttribute instead.
-    LanguageIncludeAttribute = Chef::DSL::IncludeAttribute
+
+    deprecate_constant(:LanguageIncludeAttribute, Chef::DSL::IncludeAttribute, <<-EOM)
+Chef::Mixin::LanguageIncludeAttribute is deprecated. Use
+Chef::DSL::IncludeAttribute instead.
+EOM
+
   end
 end
 

data/lib/chef/mixin/language_include_recipe.rb

@@ -17,10 +17,16 @@
 #
 
 require 'chef/dsl/include_recipe'
+require 'chef/mixin/deprecation'
 
 class Chef
   module Mixin
-    LanguageIncludeRecipe = Chef::DSL::IncludeRecipe
+
+    deprecate_constant(:LanguageIncludeRecipe, Chef::DSL::IncludeRecipe, <<-EOM)
+Chef::Mixin::LanguageIncludeRecipe is deprecated, use Chef::DSL::Recipe
+instead.
+EOM
+
   end
 end
 

data/lib/chef/mixin/recipe_definition_dsl_core.rb

@@ -24,10 +24,12 @@
 # This constant (module name) will eventually be deprecated and then removed.
 ###
 
-require 'chef/dsl/recipe'
+require 'chef/mixin/deprecation'
 
 class Chef
   module Mixin
-    RecipeDefinitionDSLCore = Chef::DSL::Recipe
+    deprecate_constant(:RecipeDefinitionDSLCore, Chef::DSL::Recipe, <<-EOM)
+Chef::Mixin::RecipeDefinitionDSLCore is deprecated. Use Chef::DSL::Recipe instead.
+EOM
   end
 end

data/lib/chef/mixins.rb

@@ -1,5 +1,4 @@
 require 'chef/mixin/shell_out'
-require 'chef/mixin/check_helper'
 require 'chef/mixin/checksum'
 require 'chef/mixin/command'
 require 'chef/mixin/convert_to_class_name'
@@ -12,3 +11,4 @@ require 'chef/mixin/path_sanity'
 require 'chef/mixin/template'
 require 'chef/mixin/securable'
 require 'chef/mixin/xml_escape'
+

data/lib/chef/node.rb

@@ -22,7 +22,6 @@
 require 'forwardable'
 require 'chef/config'
 require 'chef/nil_argument'
-require 'chef/mixin/check_helper'
 require 'chef/mixin/params_validate'
 require 'chef/mixin/from_file'
 require 'chef/mixin/deep_merge'
@@ -57,7 +56,6 @@ class Chef
     include Chef::DSL::IncludeAttribute
     include Chef::DSL::PlatformIntrospection
 
-    include Chef::Mixin::CheckHelper
     include Chef::Mixin::ParamsValidate
 
     # Create a new Chef::Node object.

data/lib/chef/node/attribute.rb

@@ -284,32 +284,20 @@ class Chef
 
        def merged_attributes
          @merged_attributes ||= begin
-                                  resolved_attrs = COMPONENTS.inject(Mash.new) do |merged, component_ivar|
-                                    component_value = instance_variable_get(component_ivar)
-                                    Chef::Mixin::DeepMerge.merge(merged, component_value)
+                                  components = [merge_defaults, @normal, merge_overrides, @automatic]
+                                  resolved_attrs = components.inject(Mash.new) do |merged, component|
+                                    Chef::Mixin::DeepMerge.hash_only_merge(merged, component)
                                   end
                                   immutablize(resolved_attrs)
                                 end
        end
 
        def combined_override
-         @combined_override ||= begin
-                                  resolved_attrs = OVERRIDE_COMPONENTS.inject(Mash.new) do |merged, component_ivar|
-                                    component_value = instance_variable_get(component_ivar)
-                                    Chef::Mixin::DeepMerge.merge(merged, component_value)
-                                  end
-                                  immutablize(resolved_attrs)
-                                end
+         @combined_override ||= immutablize(merge_overrides)
        end
 
        def combined_default
-         @combined_default ||= begin
-                                  resolved_attrs = DEFAULT_COMPONENTS.inject(Mash.new) do |merged, component_ivar|
-                                    component_value = instance_variable_get(component_ivar)
-                                    Chef::Mixin::DeepMerge.merge(merged, component_value)
-                                  end
-                                  immutablize(resolved_attrs)
-                                end
+         @combined_default ||= immutablize(merge_defaults)
        end
 
        def [](key)
@@ -358,6 +346,23 @@ class Chef
          @set_unless_present
        end
 
+       private
+
+       def merge_defaults
+         DEFAULT_COMPONENTS.inject(Mash.new) do |merged, component_ivar|
+           component_value = instance_variable_get(component_ivar)
+           Chef::Mixin::DeepMerge.merge(merged, component_value)
+         end
+       end
+
+       def merge_overrides
+         OVERRIDE_COMPONENTS.inject(Mash.new) do |merged, component_ivar|
+           component_value = instance_variable_get(component_ivar)
+           Chef::Mixin::DeepMerge.merge(merged, component_value)
+         end
+       end
+
+
     end
 
   end

data/lib/chef/node/attribute_collections.rb

@@ -154,7 +154,14 @@ class Chef
       alias :attribute? :has_key?
 
       def method_missing(symbol, *args)
-        if args.empty?
+        # Calling `puts arg` implicitly calls #to_ary on `arg`. If `arg` does
+        # not implement #to_ary, ruby recognizes it as a single argument, and
+        # if it returns an Array, then ruby prints each element. If we don't
+        # account for that here, we'll auto-vivify a VividMash for the key
+        # :to_ary which creates an unwanted key and raises a TypeError.
+        if symbol == :to_ary
+          super
+        elsif args.empty?
           self[symbol]
         elsif symbol.to_s =~ /=$/
           key_to_set = symbol.to_s[/^(.+)=$/, 1]

data/lib/chef/platform.rb

@@ -476,6 +476,15 @@ class Chef
         end
       end
 
+      def windows_server_2003?
+        return false unless windows?
+
+        require 'ruby-wmi'
+
+        host = WMI::Win32_OperatingSystem.find(:first)
+        (host.version && host.version.start_with?("5.2"))
+      end
+
       private
 
         def explicit_provider(platform, version, resource_type)

data/lib/chef/provider/cookbook_file.rb

@@ -47,6 +47,7 @@ class Chef
               Chef::Log.debug("#{@new_resource} staging #{file_cache_location} to #{tempfile.path}")
               tempfile.close
               FileUtils.cp(file_cache_location, tempfile.path)
+              enforce_tempfile_inheritance(tempfile.path)              
             end
             update_new_file_state
             Chef::Log.info("#{@new_resource} created file #{@new_resource.path}")
@@ -80,6 +81,33 @@ class Chef
         ( ! ::File.exist?(@new_resource.path)) || ( ! compare_content)
       end
 
+      protected
+
+      def enforce_tempfile_inheritance(tempfile_path)
+        # On the Windows platform, files in the temp directory
+        # default to not inherit unless the new resource
+        # specifies rights of
+        # some sort. Here we ensure that even when no rights
+        # are
+        # specified, the dacl's inheritance flag is set.
+        if Chef::Platform.windows? &&
+            @new_resource.rights.nil? &&
+            @new_resource.group.nil? &&
+            @new_resource.owner.nil? &&
+            @new_resource.deny_rights.nil?
+
+          securable_tempfile = Chef::ReservedNames::Win32::Security::SecurableObject.new(tempfile_path)
+
+          # No rights were specified, so the dacl will have
+          # no explicit aces
+          default_dacl = Chef::ReservedNames::Win32::Security::ACL.create([])
+
+          # In setting this default dacl, set inheritance to
+          # true
+          securable_tempfile.set_dacl(default_dacl, true)
+        end
+      end      
+      
     end
   end
 end

data/lib/chef/resource.rb

@@ -18,8 +18,8 @@
 #
 
 require 'chef/mixin/params_validate'
-require 'chef/mixin/check_helper'
 require 'chef/dsl/platform_introspection'
+require 'chef/dsl/data_query'
 require 'chef/dsl/registry_helper'
 require 'chef/mixin/convert_to_class_name'
 require 'chef/resource/conditional'
@@ -120,7 +120,7 @@ F
     FORBIDDEN_IVARS = [:@run_context, :@node, :@not_if, :@only_if, :@enclosing_provider]
     HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@name, :@node, :@not_if, :@only_if, :@elapsed_time, :@enclosing_provider]
 
-    include Chef::Mixin::CheckHelper
+    include Chef::DSL::DataQuery
     include Chef::Mixin::ParamsValidate
     include Chef::DSL::PlatformIntrospection
     include Chef::DSL::RegistryHelper
@@ -324,17 +324,19 @@ F
     end
 
     def name(name=nil)
-      set_if_args(@name, name) do
+      if !name.nil?
         raise ArgumentError, "name must be a string!" unless name.kind_of?(String)
         @name = name
       end
+      @name
     end
 
     def noop(tf=nil)
-      set_if_args(@noop, tf) do
+      if !tf.nil?
         raise ArgumentError, "noop must be true or false!" unless tf == true || tf == false
         @noop = tf
       end
+      @noop
     end
 
     def ignore_failure(arg=nil)
@@ -536,10 +538,14 @@ F
     end
 
     def defined_at
+      # The following regexp should match these two sourceline formats:
+      #   /some/path/to/file.rb:80:in `wombat_tears'
+      #   C:/some/path/to/file.rb:80 in 1`wombat_tears'
+      # extracting the path to the source file and the line number.
+      (file, line_no) = source_line.match(/(.*):(\d+):?.*$/).to_a[1,2] if source_line
       if cookbook_name && recipe_name && source_line
-        "#{cookbook_name}::#{recipe_name} line #{source_line.split(':')[1]}"
+        "#{cookbook_name}::#{recipe_name} line #{line_no}"
       elsif source_line
-        file, line_no = source_line.split(':')
         "#{file} line #{line_no}"
       else
         "dynamically defined"