chef 12.9.41-universal-mingw32 → 12.10.24-universal-mingw32

data/lib/chef/http/json_input.rb

@@ -33,7 +33,7 @@ class Chef
 
       def handle_request(method, url, headers = {}, data = false)
         if data && should_encode_as_json?(headers)
-          headers.delete_if { |key, _value| key.downcase == "content-type" }
+          headers.delete_if { |key, _value| key.casecmp("content-type").zero? }
           headers["Content-Type"] = "application/json"
           json_opts = {}
           json_opts[:validate_utf8] = opts[:validate_utf8] if opts.has_key?(:validate_utf8)
@@ -64,7 +64,7 @@ class Chef
         # ruby/Net::HTTP don't enforce capitalized headers (it normalizes them
         # for you before sending the request), so we have to account for all
         # the variations we might find
-        requested_content_type = headers.find { |k, v| k.downcase == "content-type" }
+        requested_content_type = headers.find { |k, v| k.casecmp("content-type").zero? }
         requested_content_type.nil? || requested_content_type.last.include?("json")
       end
 

data/lib/chef/knife.rb

@@ -145,7 +145,7 @@ class Chef
     end
 
     def self.subcommand_class_from(args)
-      if args.size == 1 && args[0].strip.downcase == "rehash"
+      if args.size == 1 && args[0].strip.casecmp("rehash").zero?
         # To prevent issues with the rehash file not pointing to the correct plugins,
         # we always use the glob loader when regenerating the rehash file
         @subcommand_loader = Chef::Knife::SubcommandLoader.gem_glob_loader(chef_config_dir)

data/lib/chef/mixin/shell_out.rb

@@ -28,26 +28,15 @@ class Chef
 
       # we use 'en_US.UTF-8' by default because we parse localized strings in English as an API and
       # generally must support UTF-8 unicode.
-      def shell_out(*command_args)
-        args = command_args.dup
-        if args.last.is_a?(Hash)
-          options = args.pop.dup
-          env_key = options.has_key?(:env) ? :env : :environment
-          options[env_key] ||= {}
-          options[env_key] = options[env_key].dup
-          options[env_key]["LC_ALL"] ||= Chef::Config[:internal_locale] unless options[env_key].has_key?("LC_ALL")
-          options[env_key]["LANGUAGE"] ||= Chef::Config[:internal_locale] unless options[env_key].has_key?("LANGUAGE")
-          options[env_key]["LANG"] ||= Chef::Config[:internal_locale] unless options[env_key].has_key?("LANG")
-          args << options
-        else
-          args << { :environment => {
-            "LC_ALL" => Chef::Config[:internal_locale],
-            "LANGUAGE" => Chef::Config[:internal_locale],
-            "LANG" => Chef::Config[:internal_locale],
-          } }
-        end
-
-        shell_out_command(*args)
+      def shell_out(*args, **options)
+        options = options.dup
+        env_key = options.has_key?(:env) ? :env : :environment
+        options[env_key] = {
+          "LC_ALL" => Chef::Config[:internal_locale],
+          "LANGUAGE" => Chef::Config[:internal_locale],
+          "LANG" => Chef::Config[:internal_locale],
+        }.update(options[env_key] || {})
+        shell_out_command(*args, **options)
       end
 
       # call shell_out (using en_US.UTF-8) and raise errors
@@ -99,7 +88,7 @@ class Chef
       end
 
       def deprecate_option(old_option, new_option)
-        Chef::Log.logger.warn "DEPRECATION: Chef::Mixin::ShellOut option :#{old_option} is deprecated. Use :#{new_option}"
+        Chef.log_deprecation "DEPRECATION: Chef::Mixin::ShellOut option :#{old_option} is deprecated. Use :#{new_option}"
       end
 
       def io_for_live_stream

data/lib/chef/property.rb

@@ -72,6 +72,9 @@ class Chef
     #     property defaults to the same value as `name`. Equivalent to
     #     `default: lazy { name }`, except that #property_is_set? will
     #     return `true` if the property is set *or* if `name` is set.
+    #   @option options [Boolean] :nillable `true` opt-in to Chef-13 style behavior where
+    #     attempting to set a nil value will really set a nil value instead of issuing
+    #     a warning and operating like a getter
     #   @option options [Object] :default The value this property
     #     will return if the user does not set one. If this is `lazy`, it will
     #     be run in the context of the instance (and able to access other
@@ -233,7 +236,7 @@ class Chef
     #
     def validation_options
       @validation_options ||= options.reject { |k, v|
-        [:declared_in, :name, :instance_variable_name, :desired_state, :identity, :default, :name_property, :coerce, :required].include?(k)
+        [:declared_in, :name, :instance_variable_name, :desired_state, :identity, :default, :name_property, :coerce, :required, :nillable].include?(k)
       }
     end
 
@@ -262,7 +265,7 @@ class Chef
         return get(resource)
       end
 
-      if value.nil?
+      if value.nil? && !nillable?
         # In Chef 12, value(nil) does a *get* instead of a set, so we
         # warn if the value would have been changed. In Chef 13, it will be
         # equivalent to value = nil.
@@ -670,5 +673,9 @@ class Chef
 
       result
     end
+
+    def nillable?
+      !!options[:nillable]
+    end
   end
 end

data/lib/chef/provider.rb

@@ -32,6 +32,14 @@ class Chef
   class Provider
     require "chef/mixin/why_run"
     require "chef/mixin/provides"
+
+    attr_accessor :new_resource
+    attr_accessor :current_resource
+    attr_accessor :run_context
+
+    attr_reader :recipe_name
+    attr_reader :cookbook_name
+
     include Chef::Mixin::WhyRun
     extend Chef::Mixin::Provides
 
@@ -43,13 +51,6 @@ class Chef
       true
     end
 
-    attr_accessor :new_resource
-    attr_accessor :current_resource
-    attr_accessor :run_context
-
-    attr_reader :recipe_name
-    attr_reader :cookbook_name
-
     #--
     # TODO: this should be a reader, and the action should be passed in the
     # constructor; however, many/most subclasses override the constructor so

data/lib/chef/provider/apt_repository.rb

@@ -239,13 +239,15 @@ class Chef
 
         uri = '"' + uri + '"' unless uri.start_with?("'", '"')
         components = Array(components).join(" ")
-        options = ""
-        options << "arch=#{arch} " if arch
+        options = []
+        options << "arch=#{arch}" if arch
         options << "trusted=yes" if trusted
-        options = "[#{options}]" unless options.empty?
-        info = "#{options} #{uri} #{distribution} #{components}\n".lstrip
-        repo =  "deb      #{info}"
-        repo << "deb-src  #{info}" if add_src
+        optstr = unless options.empty?
+                   "[" + options.join(" ") + "]"
+                 end
+        info = [ optstr, uri, distribution, components ].compact.join(" ")
+        repo =  "deb      #{info}\n"
+        repo << "deb-src  #{info}\n" if add_src
         repo
       end
     end

data/lib/chef/provider/directory.rb

@@ -50,7 +50,21 @@ class Chef
           # Make sure the parent dir exists, or else fail.
           # for why run, print a message explaining the potential error.
           parent_directory = ::File.dirname(@new_resource.path)
-          a.assertion { @new_resource.recursive || ::File.directory?(parent_directory) }
+          a.assertion do
+            if @new_resource.recursive
+              does_parent_exist = lambda do |base_dir|
+                base_dir = ::File.dirname(base_dir)
+                if ::File.exist?(base_dir)
+                  ::File.directory?(base_dir)
+                else
+                  does_parent_exist.call(base_dir)
+                end
+              end
+              does_parent_exist.call(@new_resource.path)
+            else
+              ::File.directory?(parent_directory)
+            end
+          end
           a.failure_message(Chef::Exceptions::EnclosingDirectoryDoesNotExist, "Parent directory #{parent_directory} does not exist, cannot create #{@new_resource.path}")
           a.whyrun("Assuming directory #{parent_directory} would have been created")
         end

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

@@ -36,7 +36,7 @@ class Chef
           obj.variablevalue = @new_resource.value
           obj.put_
           value = @new_resource.value
-          value = expand_path(value) if @new_resource.key_name.upcase == "PATH"
+          value = expand_path(value) if @new_resource.key_name.casecmp("PATH").zero?
           ENV[@new_resource.key_name] = value
           broadcast_env_change
         end

data/lib/chef/provider/mdadm.rb

@@ -51,6 +51,7 @@ class Chef
             command << " --chunk=#{@new_resource.chunk}" unless @new_resource.level == 1
             command << " --metadata=#{@new_resource.metadata}"
             command << " --bitmap=#{@new_resource.bitmap}" if @new_resource.bitmap
+            command << " --layout=#{@new_resource.layout}" if @new_resource.layout
             command << " --raid-devices #{@new_resource.devices.length} #{@new_resource.devices.join(" ")}"
             Chef::Log.debug("#{@new_resource} mdadm command: #{command}")
             shell_out!(command)

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

@@ -112,6 +112,7 @@ class Chef
         end
 
         def install_package(name, version)
+          Chef.log_deprecation("The easy_install package provider is deprecated and will be removed in Chef 13.")
           run_command(:command => "#{easy_install_binary_path}#{expand_options(@new_resource.options)} \"#{name}==#{version}\"")
         end
 
@@ -120,6 +121,7 @@ class Chef
         end
 
         def remove_package(name, version)
+          Chef.log_deprecation("The easy_install package provider is deprecated and will be removed in Chef 13.")
           run_command(:command => "#{easy_install_binary_path }#{expand_options(@new_resource.options)} -m #{name}")
         end
 

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

@@ -517,7 +517,9 @@ class Chef
               install_via_gem_command(name, version)
             end
           elsif @new_resource.gem_binary.nil?
-            @gem_env.install(@new_resource.source)
+            # domain is used by Gem::DependencyInstaller rather than by Chef code
+            # domain can be :local, :remote or :both
+            @gem_env.install(@new_resource.source, domain: :local)
           else
             install_via_gem_command(name, version)
           end
@@ -531,6 +533,7 @@ class Chef
         def install_via_gem_command(name, version)
           if @new_resource.source =~ /\.gem$/i
             name = @new_resource.source
+            src = " --local" unless source_is_remote?
           elsif @new_resource.clear_sources
             src = " --clear-sources"
             src << (@new_resource.source && " --source=#{@new_resource.source}" || "")

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

@@ -260,7 +260,7 @@ class Chef
           if source_location.nil?
             inferred_registry_type == :msi
           else
-            ::File.extname(source_location).downcase == ".msi"
+            ::File.extname(source_location).casecmp(".msi").zero?
           end
         end
       end

data/lib/chef/recipe.rb

@@ -34,14 +34,13 @@ class Chef
   # == Chef::Recipe
   # A Recipe object is the context in which Chef recipes are evaluated.
   class Recipe
+    attr_accessor :cookbook_name, :recipe_name, :recipe, :params, :run_context
 
     include Chef::DSL::Recipe
 
     include Chef::Mixin::FromFile
     include Chef::Mixin::Deprecation
 
-    attr_accessor :cookbook_name, :recipe_name, :recipe, :params, :run_context
-
     # Parses a potentially fully-qualified recipe name into its
     # cookbook name and recipe short name.
     #

data/lib/chef/resource/apt_repository.rb

@@ -26,17 +26,17 @@ class Chef
 
       property :repo_name, String, name_property: true
       property :uri, String
-      property :distribution, String, default: lazy { node["lsb"]["codename"] }
+      property :distribution, [ String, nil, false ], default: lazy { node["lsb"]["codename"] }, nillable: true, coerce: proc { |x| x ? x : nil }
       property :components, Array, default: []
-      property :arch, [String, nil], default: nil
+      property :arch, [String, nil, false], default: nil, nillable: true, coerce: proc { |x| x ? x : nil }
       property :trusted, [TrueClass, FalseClass], default: false
       # whether or not to add the repository as a source repo, too
       property :deb_src, [TrueClass, FalseClass], default: false
-      property :keyserver, [String, nil], default: "keyserver.ubuntu.com"
-      property :key, [String, nil], default: nil
-      property :key_proxy, [String, nil], default: nil
+      property :keyserver, [String, nil, false], default: "keyserver.ubuntu.com", nillable: true, coerce: proc { |x| x ? x : nil }
+      property :key, [String, nil, false], default: nil, nillable: true, coerce: proc { |x| x ? x : nil }
+      property :key_proxy, [String, nil, false], default: nil, nillable: true, coerce: proc { |x| x ? x : nil }
 
-      property :cookbook, [String, nil], default: nil, desired_state: false
+      property :cookbook, [String, nil, false], default: nil, desired_state: false, nillable: true, coerce: proc { |x| x ? x : nil }
       property :cache_rebuild, [TrueClass, FalseClass], default: true, desired_state: false
       property :sensitive, [TrueClass, FalseClass], default: false, desired_state: false
 

data/lib/chef/resource/mdadm.rb

@@ -40,6 +40,7 @@ class Chef
         @metadata = "0.90"
         @bitmap = nil
         @raid_device = name
+        @layout = nil
       end
 
       def chunk(arg = nil)
@@ -98,6 +99,14 @@ class Chef
         )
       end
 
+      def layout(arg = nil)
+        set_or_return(
+          :layout,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
     end
   end
 end

data/lib/chef/resource_collection.rb

@@ -59,6 +59,11 @@ class Chef
       end
     end
 
+    def delete(key)
+      resource_list.delete(key)
+      resource_set.delete(key)
+    end
+
     # @deprecated
     def []=(index, resource)
       Chef::Log.warn("`[]=` is deprecated, use `insert` (which only inserts at the end)")

data/lib/chef/resource_collection/resource_list.rb

@@ -67,6 +67,16 @@ class Chef
         end
       end
 
+      def delete(key)
+        raise ArgumentError, "Must pass a Chef::Resource or String to delete" unless key.is_a?(String) || key.is_a?(Chef::Resource)
+        key = key.to_s
+        ret = @resources.reject! { |r| r.to_s == key }
+        if ret.nil?
+          raise Chef::Exceptions::ResourceNotFound, "Cannot find a resource matching #{key} (did you define it first?)"
+        end
+        ret
+      end
+
       # @deprecated - can be removed when it is removed from resource_collection.rb
       def []=(index, resource)
         @resources[index] = resource

data/lib/chef/resource_collection/resource_set.rb

@@ -49,18 +49,22 @@ class Chef
       end
 
       def lookup(key)
-        case
-          when key.kind_of?(String)
-            lookup_by = key
-          when key.kind_of?(Chef::Resource)
-            lookup_by = create_key(key.resource_name, key.name)
-          else
-            raise ArgumentError, "Must pass a Chef::Resource or String to lookup"
+        raise ArgumentError, "Must pass a Chef::Resource or String to lookup" unless key.is_a?(String) || key.is_a?(Chef::Resource)
+        key = key.to_s
+        res = @resources_by_key[key]
+        unless res
+          raise Chef::Exceptions::ResourceNotFound, "Cannot find a resource matching #{key} (did you define it first?)"
         end
+        res
+      end
 
-        res = @resources_by_key[lookup_by]
-        unless res
-          raise Chef::Exceptions::ResourceNotFound, "Cannot find a resource matching #{lookup_by} (did you define it first?)"
+      def delete(key)
+        raise ArgumentError, "Must pass a Chef::Resource or String to delete" unless key.is_a?(String) || key.is_a?(Chef::Resource)
+        key = key.to_s
+        res = @resources_by_key.delete(key)
+
+        if res == @resources_by_key.default
+          raise Chef::Exceptions::ResourceNotFound, "Cannot find a resource matching #{key} (did you define it first?)"
         end
         res
       end
@@ -164,7 +168,6 @@ class Chef
         end
         return results
       end
-
     end
   end
 end

data/lib/chef/version.rb

@@ -21,7 +21,7 @@
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "12.9.41"
+  VERSION = "12.10.24"
 end
 
 #

data/spec/functional/resource/git_spec.rb

@@ -83,10 +83,8 @@ E
   after(:each) do
     Chef::Config[:file_cache_path] = @old_file_cache_path
     FileUtils.remove_entry_secure deploy_directory if File.exist?(deploy_directory)
+    FileUtils.remove_entry_secure base_dir_path
     FileUtils.remove_entry_secure file_cache_path
-  end
-
-  after(:all) do
     FileUtils.remove_entry_secure origin_repo_dir
   end
 

data/spec/functional/resource/group_spec.rb

@@ -81,7 +81,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte
 
     if user && domain != "."
       computer_name = ENV["computername"]
-      domain.downcase != computer_name.downcase
+      !domain.casecmp(computer_name.downcase).zero?
     end
   end
 
@@ -269,12 +269,12 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte
     describe "when removing members" do
       it "does not raise an error for a non well-formed domain name" do
         group_resource.excluded_members [invalid_domain_user_name]
-        expect { group_resource.run_action(tested_action) }.to_not raise_error Chef::Exceptions::Win32APIError
+        expect { group_resource.run_action(tested_action) }.to_not raise_error
       end
 
       it "does not raise an error for a nonexistent domain" do
         group_resource.excluded_members [nonexistent_domain_user_name]
-        expect { group_resource.run_action(tested_action) }.to_not raise_error Chef::Exceptions::Win32APIError
+        expect { group_resource.run_action(tested_action) }.to_not raise_error
       end
     end
   end
@@ -368,7 +368,7 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" }
 
     describe "when there is no group" do
       it "should raise an error" do
-        expect { group_resource.run_action(:modify) }.to raise_error
+        expect { group_resource.run_action(:modify) }.to raise_error(Chef::Exceptions::Group)
       end
     end
 
@@ -401,7 +401,7 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" }
       end
 
       it "raises an error on modify" do
-        expect { group_resource.run_action(:modify) }.to raise_error
+        expect { group_resource.run_action(:modify) }.to raise_error(Chef::Exceptions::Group)
       end
 
       it "does not raise an error on manage" do