chef 15.1.36-universal-mingw32 → 15.2.20-universal-mingw32

data/lib/chef/resource_builder.rb

@@ -47,6 +47,7 @@ class Chef
       if resource.resource_name.nil?
         raise Chef::Exceptions::InvalidResourceSpecification, "#{resource}.resource_name is `nil`!  Did you forget to put `provides :blah` or `resource_name :blah` in your resource class?"
       end
+
       resource.source_line = created_at
       resource.declared_type = type
 

data/lib/chef/resource_collection.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Christopher Walters (<cw@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -87,9 +87,9 @@ class Chef
     # Read-only methods are simple to delegate - doing that below
 
     resource_list_methods = Enumerable.instance_methods +
-      [:iterator, :all_resources, :[], :each, :execute_each_resource, :each_index, :empty?] -
+      %i{iterator all_resources [] each execute_each_resource each_index empty?} -
       [:find] # find overridden below
-    resource_set_methods = [:resources, :keys, :validate_lookup_spec!]
+    resource_set_methods = %i{resources keys validate_lookup_spec!}
 
     def_delegators :resource_list, *resource_list_methods
     def_delegators :resource_set, *resource_set_methods
@@ -119,7 +119,7 @@ class Chef
     end
 
     def self.from_hash(o)
-      collection = new()
+      collection = new
       { "@resource_list" => "ResourceList", "@resource_set" => "ResourceSet" }.each_pair do |name, klass|
         obj = Chef::ResourceCollection.const_get(klass).from_hash(o["instance_vars"].delete(name))
         collection.instance_variable_set(name.to_sym, obj)
@@ -134,6 +134,7 @@ class Chef
       rc.resource_collection.resource_set.lookup(key)
     rescue Chef::Exceptions::ResourceNotFound
       raise if rc.parent_run_context.nil?
+
       lookup_recursive(rc.parent_run_context, key)
     end
 
@@ -141,6 +142,7 @@ class Chef
       rc.resource_collection.resource_set.find(*args)
     rescue Chef::Exceptions::ResourceNotFound
       raise if rc.parent_run_context.nil?
+
       find_recursive(rc.parent_run_context, *args)
     end
   end

data/lib/chef/resource_collection/resource_collection_serialization.rb

@@ -23,7 +23,7 @@ class Chef
     module ResourceCollectionSerialization
       # Serialize this object as a hash
       def to_h
-        instance_vars = Hash.new
+        instance_vars = {}
         instance_variables.each do |iv|
           instance_vars[iv] = instance_variable_get(iv)
         end
@@ -45,7 +45,7 @@ class Chef
 
       module ClassMethods
         def from_hash(o)
-          collection = new()
+          collection = new
           o["instance_vars"].each do |k, v|
             collection.instance_variable_set(k.to_sym, v)
           end
@@ -58,9 +58,10 @@ class Chef
       end
 
       def is_chef_resource!(arg)
-        unless arg.kind_of?(Chef::Resource)
+        unless arg.is_a?(Chef::Resource)
           raise ArgumentError, "Cannot insert a #{arg.class} into a resource collection: must be a subclass of Chef::Resource"
         end
+
         true
       end
     end

data/lib/chef/resource_collection/resource_list.rb

@@ -36,11 +36,11 @@ class Chef
       private :resources
       # Delegate direct access methods to the @resources array
       # 4 extra methods here are not included in the Enumerable's instance methods
-      direct_access_methods = Enumerable.instance_methods + [ :[], :each, :each_index, :empty? ]
+      direct_access_methods = Enumerable.instance_methods + %i{[] each each_index empty?}
       def_delegators :resources, *(direct_access_methods)
 
       def initialize
-        @resources = Array.new
+        @resources = []
         @insert_after_idx = nil
       end
 
@@ -69,11 +69,13 @@ class Chef
 
       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
 
@@ -96,7 +98,7 @@ class Chef
       end
 
       def self.from_hash(o)
-        collection = new()
+        collection = new
         resources = o["instance_vars"]["@resources"].map { |r| Chef::Resource.from_hash(r) }
         collection.instance_variable_set(:@resources, resources)
         collection

data/lib/chef/resource_collection/resource_set.rb

@@ -36,7 +36,7 @@ class Chef
       NAMELESS_RESOURCE_MATCH = /^([^\[\]\s]+)$/.freeze
 
       def initialize
-        @resources_by_key = Hash.new
+        @resources_by_key = {}
       end
 
       def keys
@@ -53,22 +53,26 @@ class Chef
 
       def lookup(key)
         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
 
       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
 
@@ -85,7 +89,7 @@ class Chef
       # Raises an ArgumentError if you feed it bad lookup information
       # Raises a Runtime Error if it can't find the resources you are looking for.
       def find(*args)
-        results = Array.new
+        results = []
         args.each do |arg|
           case arg
             when Hash
@@ -127,16 +131,16 @@ class Chef
             true
           when String
             raise Chef::Exceptions::InvalidResourceSpecification,
-                  "The string `#{query_object}' is not valid for resource collection lookup. Correct syntax is `resource_type[resource_name]'"
+              "The string `#{query_object}' is not valid for resource collection lookup. Correct syntax is `resource_type[resource_name]'"
           else
             raise Chef::Exceptions::InvalidResourceSpecification,
-                  "The object `#{query_object.inspect}' is not valid for resource collection lookup. " +
+              "The object `#{query_object.inspect}' is not valid for resource collection lookup. " +
               "Use a String like `resource_type[resource_name]' or a Chef::Resource object"
         end
       end
 
       def self.from_hash(o)
-        collection = new()
+        collection = new
         rl = o["instance_vars"]["@resources_by_key"]
         resources = rl.merge(rl) { |k, r| Chef::Resource.from_hash(r) }
         collection.instance_variable_set(:@resources_by_key, resources)
@@ -150,9 +154,9 @@ class Chef
       end
 
       def find_resource_by_hash(arg)
-        results = Array.new
+        results = []
         arg.each do |resource_type, name_list|
-          instance_names = name_list.kind_of?(Array) ? name_list : [ name_list ]
+          instance_names = name_list.is_a?(Array) ? name_list : [ name_list ]
           instance_names.each do |instance_name|
             results << lookup(create_key(resource_type, instance_name))
           end
@@ -170,7 +174,7 @@ class Chef
         rescue Chef::Exceptions::ResourceNotFound => e
           if arg =~ MULTIPLE_RESOURCE_MATCH
             begin
-              results = Array.new
+              results = []
               resource_type = $1
               arg =~ /^.+\[(.+)\]$/
               resource_list = $1

data/lib/chef/resource_collection/stepable_iterator.rb

@@ -82,6 +82,7 @@ class Chef
 
       def step
         return nil if @position == size
+
         call_iterator_block
         @position += 1
       end

data/lib/chef/resource_definition.rb

@@ -29,20 +29,22 @@ class Chef
 
     def initialize(node = nil)
       @name = nil
-      @params = Hash.new
+      @params = {}
       @recipe = nil
       @node = node
     end
 
     def define(resource_name, prototype_params = nil, &block)
-      unless resource_name.kind_of?(Symbol)
+      unless resource_name.is_a?(Symbol)
         raise ArgumentError, "You must use a symbol when defining a new resource!"
       end
+
       @name = resource_name
       if prototype_params
-        unless prototype_params.kind_of?(Hash)
+        unless prototype_params.is_a?(Hash)
           raise ArgumentError, "You must pass a hash as the prototype parameters for a definition."
         end
+
         @params = prototype_params
       end
       if Kernel.block_given?

data/lib/chef/resource_definition_list.rb

@@ -26,7 +26,7 @@ class Chef
     attr_accessor :defines
 
     def initialize
-      @defines = Hash.new
+      @defines = {}
     end
 
     def define(resource_name, prototype_params = nil, &block)

data/lib/chef/resource_inspector.rb

@@ -25,7 +25,7 @@ require_relative "json_compat"
 
 module ResourceInspector
   def self.get_default(default)
-    if default.kind_of?(Chef::DelayedEvaluator)
+    if default.is_a?(Chef::DelayedEvaluator)
       # ideally we'd get the block we pass to `lazy`, but the best we can do
       # is to get the source location, which then results in reparsing the source
       # code for the resource ourselves and just no

data/lib/chef/resource_reporter.rb

@@ -35,7 +35,7 @@ class Chef
       as_hash["id"]       = new_resource.identity.to_s
       as_hash["after"]    = new_resource.state_for_resource_reporter
       as_hash["before"]   = current_resource ? current_resource.state_for_resource_reporter : {}
-      as_hash["duration"] = ( action_record.elapsed_time * 1000 ).to_i
+      as_hash["duration"] = ( action_record.elapsed_time * 1000 ).to_i.to_s
       as_hash["delta"]    = new_resource.diff if new_resource.respond_to?("diff")
       as_hash["delta"]    = "" if as_hash["delta"].nil?
 

data/lib/chef/role.rb

@@ -91,7 +91,7 @@ class Chef
 
     # Per environment run lists
     def env_run_lists(env_run_lists = nil)
-      if !env_run_lists.nil?
+      unless env_run_lists.nil?
         unless env_run_lists.key?("_default")
           msg = "_default key is required in env_run_lists.\n"
           msg << "(env_run_lists: #{env_run_lists.inspect})"
@@ -106,7 +106,7 @@ class Chef
     alias :env_run_list :env_run_lists
 
     def env_run_lists_add(env_run_lists = nil)
-      if !env_run_lists.nil?
+      unless env_run_lists.nil?
         env_run_lists.each { |k, v| @env_run_lists[k] = Chef::RunList.new(*Array(v)) }
       end
       @env_run_lists
@@ -143,9 +143,9 @@ class Chef
 
         # Render to_json correctly for run_list items (both run_list and evn_run_lists)
         # so malformed json does not result
-        "run_list" => run_list.run_list.map { |item| item.to_s },
+        "run_list" => run_list.run_list.map(&:to_s),
         "env_run_lists" => env_run_lists_without_default.inject({}) do |accumulator, (k, v)|
-          accumulator[k] = v.map { |x| x.to_s }
+          accumulator[k] = v.map(&:to_s)
           accumulator
         end,
       }
@@ -192,7 +192,7 @@ class Chef
     # Get the list of all roles from the API.
     def self.list(inflate = false)
       if inflate
-        response = Hash.new
+        response = {}
         Chef::Search::Query.new.search(:role) do |n|
           response[n.name] = n unless n.nil?
         end
@@ -226,6 +226,7 @@ class Chef
         chef_server_rest.put("roles/#{@name}", self)
       rescue Net::HTTPClientException => e
         raise e unless e.response.code == "404"
+
         chef_server_rest.post("roles", self)
       end
       self
@@ -248,11 +249,12 @@ class Chef
       paths = Array(Chef::Config[:role_path])
       paths.each do |path|
         roles_files = Dir.glob(File.join(Chef::Util::PathHelper.escape_glob_dir(path), "**", "**"))
-        js_files = roles_files.select { |file| file.match(/\/#{name}\.json$/) }
-        rb_files = roles_files.select { |file| file.match(/\/#{name}\.rb$/) }
+        js_files = roles_files.select { |file| file.match(%r{/#{name}\.json$}) }
+        rb_files = roles_files.select { |file| file.match(%r{/#{name}\.rb$}) }
         if js_files.count > 1 || rb_files.count > 1
           raise Chef::Exceptions::DuplicateRole, "Multiple roles of same type found named #{name}"
         end
+
         js_path, rb_path = js_files.first, rb_files.first
 
         if js_path && File.exists?(js_path)

data/lib/chef/run_context.rb

@@ -185,7 +185,7 @@ class Chef
       @logger = logger || Chef::Log.with_child
       @cookbook_collection = cookbook_collection
       self.node = node if node
-      @definitions = Hash.new
+      @definitions = {}
       @loaded_recipes_hash = {}
       @loaded_attributes_hash = {}
       @reboot_info = {}
@@ -313,7 +313,7 @@ class Chef
     # @see DSL::IncludeRecipe#include_recipe
     #
     def include_recipe(*recipe_names, current_cookbook: nil)
-      result_recipes = Array.new
+      result_recipes = []
       recipe_names.flatten.each do |recipe_name|
         if result = load_recipe(recipe_name, current_cookbook: current_cookbook)
           result_recipes << result
@@ -373,7 +373,7 @@ class Chef
     # @raise [Chef::Exceptions::RecipeNotFound] If the file does not exist.
     #
     def load_recipe_file(recipe_file)
-      if !File.exist?(recipe_file)
+      unless File.exist?(recipe_file)
         raise Chef::Exceptions::RecipeNotFound, "could not find recipe file #{recipe_file}"
       end
 
@@ -705,12 +705,12 @@ class Chef
         resource_collection=
         runner
         runner=
-      }.map { |x| x.to_sym }
+      }.map(&:to_sym)
 
       # Verify that we didn't miss any methods
       unless @__skip_method_checking # hook specifically for compat_resource
         missing_methods = superclass.instance_methods(false) - instance_methods(false) - CHILD_STATE
-        if !missing_methods.empty?
+        unless missing_methods.empty?
           raise "ERROR: not all methods of RunContext accounted for in ChildRunContext! All methods must be marked as child methods with CHILD_STATE or delegated to the parent_run_context. Missing #{missing_methods.join(", ")}."
         end
       end

data/lib/chef/run_context/cookbook_compiler.rb

@@ -207,6 +207,7 @@ class Chef
 
         list_of_attr_files.each do |filename|
           next unless File.extname(filename) == ".rb"
+
           load_attribute_file(cookbook_name.to_s, filename)
         end
       end
@@ -223,6 +224,7 @@ class Chef
       def load_libraries_from_cookbook(cookbook_name)
         files_in_cookbook_by_segment(cookbook_name, :libraries).each do |filename|
           next unless File.extname(filename) == ".rb"
+
           begin
             logger.trace("Loading cookbook #{cookbook_name}'s library file: #{filename}")
             Kernel.require(filename)
@@ -237,10 +239,12 @@ class Chef
       def load_lwrps_from_cookbook(cookbook_name)
         files_in_cookbook_by_segment(cookbook_name, :providers).each do |filename|
           next unless File.extname(filename) == ".rb"
+
           load_lwrp_provider(cookbook_name, filename)
         end
         files_in_cookbook_by_segment(cookbook_name, :resources).each do |filename|
           next unless File.extname(filename) == ".rb"
+
           load_lwrp_resource(cookbook_name, filename)
         end
       end
@@ -327,7 +331,7 @@ class Chef
       # +cookbook_name+ in lexical sort order.
       def each_cookbook_dep(cookbook_name, &block)
         cookbook = cookbook_collection[cookbook_name]
-        cookbook.metadata.dependencies.keys.sort.map { |x| x.to_sym }.each(&block)
+        cookbook.metadata.dependencies.keys.sort.map(&:to_sym).each(&block)
       end
 
       # Given a +recipe_name+, finds the file associated with the recipe.

data/lib/chef/run_list.rb

@@ -70,10 +70,11 @@ class Chef
     alias :add :<<
 
     def ==(other)
-      if other.kind_of?(Chef::RunList)
+      if other.is_a?(Chef::RunList)
         other.run_list_items == @run_list_items
       else
         return false unless other.respond_to?(:size) && (other.size == @run_list_items.size)
+
         other_run_list_items = other.dup
 
         other_run_list_items.map! { |item| coerce_to_run_list_item(item) }
@@ -86,7 +87,7 @@ class Chef
     end
 
     def for_json
-      to_a.map { |item| item.to_s }
+      to_a.map(&:to_s)
     end
 
     def to_json(*a)
@@ -122,7 +123,7 @@ class Chef
     def reset!(*args)
       @run_list_items.clear
       args.flatten.each do |item|
-        if item.kind_of?(Chef::RunList)
+        if item.is_a?(Chef::RunList)
           item.each { |r| self << r }
         else
           self << item
@@ -152,7 +153,7 @@ class Chef
     end
 
     def coerce_to_run_list_item(item)
-      item.kind_of?(RunListItem) ? item : parse_entry(item)
+      item.is_a?(RunListItem) ? item : parse_entry(item)
     end
 
     def expansion_for_data_source(environment, data_source, opts = {})

data/lib/chef/run_list/run_list_expansion.rb

@@ -64,7 +64,7 @@ class Chef
 
       def initialize(environment, run_list_items, source = nil)
         @environment = environment
-        @missing_roles_with_including_role = Array.new
+        @missing_roles_with_including_role = []
 
         @run_list_items = run_list_items.dup
         @source = source
@@ -102,6 +102,7 @@ class Chef
       # nil         if the role does not exist
       def inflate_role(role_name, included_by)
         return false if applied_role?(role_name) # Prevent infinite loops
+
         applied_role(role_name)
         fetch_role(role_name, included_by)
       end
@@ -140,7 +141,7 @@ class Chef
       end
 
       def errors
-        @missing_roles_with_including_role.map { |item| item.first }
+        @missing_roles_with_including_role.map(&:first)
       end
 
       def to_json(*a)