chef 15.1.36 → 15.2.20

data/lib/chef/node/attribute.rb

@@ -1,7 +1,7 @@
 #--
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: AJ Christensen (<aj@chef.io>)
-# Copyright:: Copyright 2008-2018, 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");
@@ -51,109 +51,109 @@ class Chef
 
       # List of the component attribute hashes, in order of precedence, low to
       # high.
-      COMPONENTS = [
-        :@default,
-        :@env_default,
-        :@role_default,
-        :@force_default,
-        :@normal,
-        :@override,
-        :@role_override,
-        :@env_override,
-        :@force_override,
-        :@automatic,
-      ].freeze
-
-      DEFAULT_COMPONENTS = [
-        :@default,
-        :@env_default,
-        :@role_default,
-        :@force_default,
-      ].freeze
-
-      OVERRIDE_COMPONENTS = [
-        :@override,
-        :@role_override,
-        :@env_override,
-        :@force_override,
-      ].freeze
-
-      ENUM_METHODS = [
-        :all?,
-        :any?,
-        :assoc,
-        :chunk,
-        :collect,
-        :collect_concat,
-        :compare_by_identity,
-        :compare_by_identity?,
-        :count,
-        :cycle,
-        :detect,
-        :drop,
-        :drop_while,
-        :each,
-        :each_cons,
-        :each_entry,
-        :each_key,
-        :each_pair,
-        :each_slice,
-        :each_value,
-        :each_with_index,
-        :each_with_object,
-        :empty?,
-        :entries,
-        :except,
-        :fetch,
-        :find,
-        :find_all,
-        :find_index,
-        :first,
-        :flat_map,
-        :flatten,
-        :grep,
-        :group_by,
-        :has_value?,
-        :include?,
-        :index,
-        :inject,
-        :invert,
-        :key,
-        :keys,
-        :length,
-        :map,
-        :max,
-        :max_by,
-        :merge,
-        :min,
-        :min_by,
-        :minmax,
-        :minmax_by,
-        :none?,
-        :one?,
-        :partition,
-        :rassoc,
-        :reduce,
-        :reject,
-        :reverse_each,
-        :select,
-        :size,
-        :slice_before,
-        :sort,
-        :sort_by,
-        :store,
-        :symbolize_keys,
-        :take,
-        :take_while,
-        :to_a,
-        :to_h,
-        :to_hash,
-        :to_set,
-        :value?,
-        :values,
-        :values_at,
-        :zip,
-      ].freeze
+      COMPONENTS = %i{
+        @default
+        @env_default
+        @role_default
+        @force_default
+        @normal
+        @override
+        @role_override
+        @env_override
+        @force_override
+        @automatic
+      }.freeze
+
+      DEFAULT_COMPONENTS = %i{
+        @default
+        @env_default
+        @role_default
+        @force_default
+      }.freeze
+
+      OVERRIDE_COMPONENTS = %i{
+        @override
+        @role_override
+        @env_override
+        @force_override
+      }.freeze
+
+      ENUM_METHODS = %i{
+        all?
+        any?
+        assoc
+        chunk
+        collect
+        collect_concat
+        compare_by_identity
+        compare_by_identity?
+        count
+        cycle
+        detect
+        drop
+        drop_while
+        each
+        each_cons
+        each_entry
+        each_key
+        each_pair
+        each_slice
+        each_value
+        each_with_index
+        each_with_object
+        empty?
+        entries
+        except
+        fetch
+        find
+        find_all
+        find_index
+        first
+        flat_map
+        flatten
+        grep
+        group_by
+        has_value?
+        include?
+        index
+        inject
+        invert
+        key
+        keys
+        length
+        map
+        max
+        max_by
+        merge
+        min
+        min_by
+        minmax
+        minmax_by
+        none?
+        one?
+        partition
+        rassoc
+        reduce
+        reject
+        reverse_each
+        select
+        size
+        slice_before
+        sort
+        sort_by
+        store
+        symbolize_keys
+        take
+        take_while
+        to_a
+        to_h
+        to_hash
+        to_set
+        value?
+        values
+        values_at
+        zip
+      }.freeze
 
       ENUM_METHODS.each do |delegated_method|
         define_method(delegated_method) do |*args, &block|
@@ -341,6 +341,7 @@ class Chef
       def with_deep_merged_return_value(obj, *path, last)
         hash = obj.read(*path)
         return nil unless hash.is_a?(Hash)
+
         ret = hash[last]
         yield
         ret
@@ -357,6 +358,7 @@ class Chef
       # - this API autovivifies (and cannot trainwreck)
       def default!(*args)
         return Decorator::Unchain.new(self, :default!) unless args.length > 0
+
         write(:default, *args)
       end
 
@@ -365,6 +367,7 @@ class Chef
       # - this API autovivifies (and cannot trainwreck)
       def normal!(*args)
         return Decorator::Unchain.new(self, :normal!) unless args.length > 0
+
         write(:normal, *args)
       end
 
@@ -373,6 +376,7 @@ class Chef
       # - this API autovivifies (and cannot trainwreck)
       def override!(*args)
         return Decorator::Unchain.new(self, :override!) unless args.length > 0
+
         write(:override, *args)
       end
 
@@ -381,6 +385,7 @@ class Chef
       # - this API autovivifies (and cannot trainwreck)
       def force_default!(*args)
         return Decorator::Unchain.new(self, :force_default!) unless args.length > 0
+
         value = args.pop
         rm_default(*args)
         write(:force_default, *args, value)
@@ -389,6 +394,7 @@ class Chef
       # clears from all override precedence levels and then sets force_override
       def force_override!(*args)
         return Decorator::Unchain.new(self, :force_override!) unless args.length > 0
+
         value = args.pop
         rm_override(*args)
         write(:force_override, *args, value)
@@ -417,16 +423,19 @@ class Chef
 
       def normal_unless(*args)
         return Decorator::Unchain.new(self, :normal_unless) unless args.length > 0
+
         write(:normal, *args) if normal.read(*args[0...-1]).nil?
       end
 
       def default_unless(*args)
         return Decorator::Unchain.new(self, :default_unless) unless args.length > 0
+
         write(:default, *args) if default.read(*args[0...-1]).nil?
       end
 
       def override_unless(*args)
         return Decorator::Unchain.new(self, :override_unless) unless args.length > 0
+
         write(:override, *args) if override.read(*args[0...-1]).nil?
       end
 
@@ -478,7 +487,7 @@ class Chef
       end
 
       def inspect
-        "#<#{self.class} " << (COMPONENTS + [:@merged_attributes, :@properties]).map do |iv|
+        "#<#{self.class} " << (COMPONENTS + %i{@merged_attributes @properties}).map do |iv|
           "#{iv}=#{instance_variable_get(iv).inspect}"
         end.join(", ") << ">"
       end
@@ -573,7 +582,7 @@ class Chef
 
       # needed for __path__
       def convert_key(key)
-        key.kind_of?(Symbol) ? key.to_s : key
+        key.is_a?(Symbol) ? key.to_s : key
       end
 
       NIL = Object.new
@@ -581,7 +590,7 @@ class Chef
       # @api private
       def deep_merge!(merge_onto, merge_with)
         # If there are two Hashes, recursively merge.
-        if merge_onto.kind_of?(Hash) && merge_with.kind_of?(Hash)
+        if merge_onto.is_a?(Hash) && merge_with.is_a?(Hash)
           merge_with.each do |key, merge_with_value|
             value =
               if merge_onto.key?(key)
@@ -595,7 +604,7 @@ class Chef
           end
           merge_onto
 
-        elsif merge_onto.kind_of?(Array) && merge_with.kind_of?(Array)
+        elsif merge_onto.is_a?(Array) && merge_with.is_a?(Array)
           merge_onto |= merge_with
 
         # If merge_with is NIL, don't replace merge_onto
@@ -604,9 +613,9 @@ class Chef
 
         # In all other cases, replace merge_onto with merge_with
         else
-          if merge_with.kind_of?(Hash)
+          if merge_with.is_a?(Hash)
             Chef::Node::ImmutableMash.new(merge_with)
-          elsif merge_with.kind_of?(Array)
+          elsif merge_with.is_a?(Array)
             Chef::Node::ImmutableArray.new(merge_with)
           else
             merge_with
@@ -617,7 +626,7 @@ class Chef
       # @api private
       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)
+        if merge_onto.is_a?(Hash) && merge_with.is_a?(Hash)
           merge_with.each do |key, merge_with_value|
             value =
               if merge_onto.key?(key)
@@ -637,9 +646,9 @@ class Chef
 
         # In all other cases, replace merge_onto with merge_with
         else
-          if merge_with.kind_of?(Hash)
+          if merge_with.is_a?(Hash)
             Chef::Node::ImmutableMash.new(merge_with)
-          elsif merge_with.kind_of?(Array)
+          elsif merge_with.is_a?(Array)
             Chef::Node::ImmutableArray.new(merge_with)
           else
             merge_with

data/lib/chef/node/attribute_collections.rb

@@ -106,7 +106,7 @@ class Chef
       # Methods that mutate a VividMash. Each of them is overridden so that it
       # also invalidates the cached merged_attributes on the root Attribute
       # object.
-      MUTATOR_METHODS = Chef::Node::Mixin::ImmutablizeHash::DISALLOWED_MUTATOR_METHODS - [ :write, :write!, :unlink, :unlink! ]
+      MUTATOR_METHODS = Chef::Node::Mixin::ImmutablizeHash::DISALLOWED_MUTATOR_METHODS - %i{write write! unlink unlink!}
 
       # For all of the mutating methods on Mash, override them so that they
       # also invalidate the cached `merged_attributes` on the root Attribute

data/lib/chef/node/common_api.rb

@@ -36,7 +36,7 @@ class Chef
         last = args.pop
         prev_memo = prev_key = nil
         chain = args.inject(self) do |memo, key|
-          if !valid_container?(memo, key)
+          unless valid_container?(memo, key)
             prev_memo[prev_key] = {}
             memo = prev_memo[prev_key]
           end
@@ -44,7 +44,7 @@ class Chef
           prev_key = key
           memo[key]
         end
-        if !valid_container?(chain, last)
+        unless valid_container?(chain, last)
           prev_memo[prev_key] = {}
           chain = prev_memo[prev_key]
         end
@@ -59,9 +59,11 @@ class Chef
         last = args.pop
         obj = args.inject(self) do |memo, key|
           raise Chef::Exceptions::AttributeTypeMismatch unless valid_container?(memo, key)
+
           memo[key]
         end
         raise Chef::Exceptions::AttributeTypeMismatch unless valid_container?(obj, last)
+
         obj[last] = value
       end
 
@@ -71,6 +73,7 @@ class Chef
       def exist?(*path)
         path.inject(self) do |memo, key|
           return false unless valid_container?(memo, key)
+
           if memo.is_a?(Hash)
             if memo.key?(key)
               memo[key]
@@ -98,6 +101,7 @@ class Chef
       # non-autovivifying reader that throws an exception if the attribute does not exist
       def read!(*path)
         raise Chef::Exceptions::NoSuchAttribute unless exist?(*path)
+
         path.inject(self) do |memo, key|
           memo[key]
         end
@@ -108,11 +112,13 @@ class Chef
       def unlink(*path, last)
         hash = path.empty? ? self : read(*path)
         return nil unless hash.is_a?(Hash) || hash.is_a?(Array)
+
         hash.delete(last)
       end
 
       def unlink!(*path)
         raise Chef::Exceptions::NoSuchAttribute unless exist?(*path)
+
         unlink(*path)
       end
 

data/lib/chef/node/immutable_collections.rb

@@ -151,7 +151,7 @@ class Chef
       end
 
       def to_h
-        h = Hash.new
+        h = {}
         each_pair do |k, v|
           h[k] =
             case v

data/lib/chef/node/mixin/immutablize_array.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright:: Copyright 2016-2018, Chef Software Inc.
+# Copyright:: Copyright 2016-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,150 +21,150 @@ class Chef
       module ImmutablizeArray
         # Allowed methods that MUST NOT mutate the object
         # (if any of these methods mutate the underlying object that is a bug that needs to be fixed)
-        ALLOWED_METHODS = [
-          :&,
-          :*,
-          :+,
-          :-,
-          :[],
-          :abbrev,
-          :all?,
-          :any?,
-          :assoc,
-          :at,
-          :bsearch,
-          :bsearch_index,
-          :chain,
-          :chunk,
-          :chunk_while,
-          :collect,
-          :collect_concat,
-          :combination,
-          :compact,
-          :count,
-          :cycle,
-          :detect,
-          :difference,
-          :dig,
-          :drop,
-          :drop_while,
-          :each,
-          :each_cons,
-          :each_entry,
-          :each_index,
-          :each_slice,
-          :each_with_index,
-          :each_with_object,
-          :empty?,
-          :entries,
-          :fetch,
-          :filter,
-          :find,
-          :find_all,
-          :find_index,
-          :first,
-          :flat_map,
-          :flatten,
-          :grep,
-          :grep_v,
-          :group_by,
-          :include?,
-          :index,
-          :inject,
-          :join,
-          :last,
-          :lazy,
-          :length,
-          :map,
-          :max,
-          :max_by,
-          :member?,
-          :min,
-          :min_by,
-          :minmax,
-          :minmax_by,
-          :none?,
-          :one?,
-          :pack,
-          :partition,
-          :permutation,
-          :product,
-          :rassoc,
-          :reduce,
-          :reject,
-          :repeated_combination,
-          :repeated_permutation,
-          :reverse,
-          :reverse_each,
-          :rindex,
-          :rotate,
-          :sample,
-          :save_plist,
-          :select,
-          :shelljoin,
-          :shuffle,
-          :size,
-          :slice,
-          :slice_after,
-          :slice_before,
-          :slice_when,
-          :sort,
-          :sort_by,
-          :sum,
-          :take,
-          :take_while,
-          :to_a,
-          :to_ary,
-          :to_csv,
-          :to_h,
-          :to_plist,
-          :to_set,
-          :transpose,
-          :union,
-          :uniq,
-          :values_at,
-          :zip,
-          :|,
-        ].freeze
+        ALLOWED_METHODS = %i{
+          &
+          *
+          +
+          -
+          []
+          abbrev
+          all?
+          any?
+          assoc
+          at
+          bsearch
+          bsearch_index
+          chain
+          chunk
+          chunk_while
+          collect
+          collect_concat
+          combination
+          compact
+          count
+          cycle
+          detect
+          difference
+          dig
+          drop
+          drop_while
+          each
+          each_cons
+          each_entry
+          each_index
+          each_slice
+          each_with_index
+          each_with_object
+          empty?
+          entries
+          fetch
+          filter
+          find
+          find_all
+          find_index
+          first
+          flat_map
+          flatten
+          grep
+          grep_v
+          group_by
+          include?
+          index
+          inject
+          join
+          last
+          lazy
+          length
+          map
+          max
+          max_by
+          member?
+          min
+          min_by
+          minmax
+          minmax_by
+          none?
+          one?
+          pack
+          partition
+          permutation
+          product
+          rassoc
+          reduce
+          reject
+          repeated_combination
+          repeated_permutation
+          reverse
+          reverse_each
+          rindex
+          rotate
+          sample
+          save_plist
+          select
+          shelljoin
+          shuffle
+          size
+          slice
+          slice_after
+          slice_before
+          slice_when
+          sort
+          sort_by
+          sum
+          take
+          take_while
+          to_a
+          to_ary
+          to_csv
+          to_h
+          to_plist
+          to_set
+          transpose
+          union
+          uniq
+          values_at
+          zip
+          |
+        }.freeze
         # A list of methods that mutate Array. Each of these is overridden to
         # raise an error, making this instances of this class more or less
         # immutable.
-        DISALLOWED_MUTATOR_METHODS = [
-          :<<,
-          :[]=,
-          :append,
-          :clear,
-          :collect!,
-          :compact!,
-          :concat,
-          :default=,
-          :default_proc=,
-          :delete,
-          :delete_at,
-          :delete_if,
-          :fill,
-          :filter!,
-          :flatten!,
-          :insert,
-          :keep_if,
-          :map!,
-          :merge!,
-          :pop,
-          :prepend,
-          :push,
-          :reject!,
-          :replace,
-          :reverse!,
-          :rotate!,
-          :select!,
-          :shift,
-          :shuffle!,
-          :slice!,
-          :sort!,
-          :sort_by!,
-          :uniq!,
-          :unshift,
-        ].freeze
+        DISALLOWED_MUTATOR_METHODS = %i{
+          <<
+          []=
+          append
+          clear
+          collect!
+          compact!
+          concat
+          default=
+          default_proc=
+          delete
+          delete_at
+          delete_if
+          fill
+          filter!
+          flatten!
+          insert
+          keep_if
+          map!
+          merge!
+          pop
+          prepend
+          push
+          reject!
+          replace
+          reverse!
+          rotate!
+          select!
+          shift
+          shuffle!
+          slice!
+          sort!
+          sort_by!
+          uniq!
+          unshift
+        }.freeze
 
         # Redefine all of the methods that mutate a Hash to raise an error when called.
         # This is the magic that makes this object "Immutable"