chef-dk 4.1.7 → 4.2.0

data/lib/chef-dk/policyfile/dsl.rb

@@ -27,7 +27,7 @@ module ChefDK
   module Policyfile
     class DSL
 
-      RUN_LIST_ITEM_COMPONENT = %r{^[.[:alnum:]_-]+$}.freeze
+      RUN_LIST_ITEM_COMPONENT = /^[.[:alnum:]_-]+$/.freeze
 
       include StorageConfigDelegation
 
@@ -86,6 +86,7 @@ module ChefDK
 
       def default_source(source_type = nil, source_argument = nil, &block)
         return @default_source if source_type.nil?
+
         case source_type
         when :community, :supermarket
           set_default_community_source(source_argument, &block)
@@ -252,7 +253,8 @@ module ChefDK
         default_source.combination(2).each do |source_a, source_b|
           conflicting_preferences = source_a.preferred_cookbooks & source_b.preferred_cookbooks
           next if conflicting_preferences.empty?
-          conflicting_source_messages << "#{source_a.desc} and #{source_b.desc} are both set as the preferred source for cookbook(s) '#{conflicting_preferences.join(', ')}'"
+
+          conflicting_source_messages << "#{source_a.desc} and #{source_b.desc} are both set as the preferred source for cookbook(s) '#{conflicting_preferences.join(", ")}'"
         end
         unless conflicting_source_messages.empty?
           msg = "Multiple sources are marked as the preferred source for some cookbooks. Only one source can be preferred for a cookbook.\n"

data/lib/chef-dk/policyfile/git_lock_fetcher.rb

@@ -98,7 +98,7 @@ module ChefDK
           acc
         end
         source_options.merge!(options)
-        raise ChefDK::InvalidLockfile, "Invalid source_options provided from lock data: #{options_from_lock_file.inspect}" if !valid?
+        raise ChefDK::InvalidLockfile, "Invalid source_options provided from lock data: #{options_from_lock_file.inspect}" unless valid?
       end
 
       # @return [Hash] of the policyfile lock data
@@ -126,7 +126,7 @@ module ChefDK
                   # as a git repo and not a local directory. Git also doesn't like paths
                   # prefixed with `./` and cannot use relative paths outside the repo.
                   # http://rubular.com/r/JYpdYHT19p
-                  pattern = /(^..\/)|(^.\/)/
+                  pattern = %r{(^../)|(^./)}
                   opt["rel"] = opt[name].gsub(pattern, "")
                 end
 

data/lib/chef-dk/policyfile/included_policies_cookbook_source.rb

@@ -69,7 +69,7 @@ module ChefDK
       end
 
       def ==(other)
-        other.kind_of?(self.class) && other.included_policy_location_specs == included_policy_location_specs
+        other.is_a?(self.class) && other.included_policy_location_specs == included_policy_location_specs
       end
 
       # Calls the slurp_metadata! helper once to calculate the @universe_graph

data/lib/chef-dk/policyfile/lister.rb

@@ -184,8 +184,8 @@ module ChefDK
 
       def http_client
         @http_client ||= Chef::ServerAPI.new(config.chef_server_url,
-                                                       signing_key_filename: config.client_key,
-                                                       client_name: config.node_name)
+          signing_key_filename: config.client_key,
+          client_name: config.node_name)
       end
 
       # @api private

data/lib/chef-dk/policyfile/local_lock_fetcher.rb

@@ -80,7 +80,7 @@ module ChefDK
           validate_revision_id(data["revision_id"], source_options)
           data["cookbook_locks"].each do |cookbook_name, cookbook_lock|
             cookbook_path = cookbook_lock["source_options"]["path"]
-            if !cookbook_path.nil?
+            unless cookbook_path.nil?
               cookbook_lock["source_options"]["path"] = transform_path(cookbook_path)
             end
           end
@@ -110,14 +110,16 @@ module ChefDK
           path = abs_path
           if path.directory?
             path = path.join("#{name}.lock.json")
-            if !path.file?
+            unless path.file?
               raise ChefDK::LocalPolicyfileLockNotFound.new(
-                "Expected to find file #{name}.lock.json inside #{source_options[:path]}. If the file name is different than this, provide the file name as part of the path.")
+                "Expected to find file #{name}.lock.json inside #{source_options[:path]}. If the file name is different than this, provide the file name as part of the path."
+              )
             end
           else
-            if !path.file?
+            unless path.file?
               raise ChefDK::LocalPolicyfileLockNotFound.new(
-                "The provided path #{source_options[:path]} does not exist.")
+                "The provided path #{source_options[:path]} does not exist."
+              )
             end
           end
           path

data/lib/chef-dk/policyfile/lock_applier.rb

@@ -67,7 +67,7 @@ module ChefDK
         end
 
         policyfile_compiler.included_policies.each do |policy|
-          if !unlocked_policies.include?(policy.name)
+          unless unlocked_policies.include?(policy.name)
             lock = policyfile_lock.included_policy_locks.find do |policy_lock|
               policy_lock["name"] == policy.name
             end

data/lib/chef-dk/policyfile/null_cookbook_source.rb

@@ -21,8 +21,7 @@ module ChefDK
   module Policyfile
     class NullCookbookSource
 
-      def initialize(_uri = nil)
-      end
+      def initialize(_uri = nil); end
 
       def universe_graph
         {}

data/lib/chef-dk/policyfile/policyfile_location_specification.rb

@@ -38,7 +38,7 @@ module ChefDK
       attr_reader :chef_config
       attr_reader :ui
 
-      LOCATION_TYPES = [:path, :remote, :server, :git].freeze
+      LOCATION_TYPES = %i{path remote server git}.freeze
 
       # Initialize a location spec
       #
@@ -92,9 +92,9 @@ module ChefDK
         error_messages = []
 
         if LOCATION_TYPES.all? { |l| source_options[l].nil? }
-          error_messages << "include_policy must use one of the following sources: #{LOCATION_TYPES.join(', ')}"
+          error_messages << "include_policy must use one of the following sources: #{LOCATION_TYPES.join(", ")}"
         else
-          if !fetcher.nil?
+          unless fetcher.nil?
             error_messages += fetcher.errors
           end
         end

data/lib/chef-dk/policyfile/remote_lock_fetcher.rb

@@ -79,7 +79,7 @@ module ChefDK
           validate_revision_id(data["revision_id"], source_options)
           data["cookbook_locks"].each do |cookbook_name, cookbook_lock|
             cookbook_path = cookbook_lock["source_options"]["path"]
-            if !cookbook_path.nil?
+            unless cookbook_path.nil?
               raise ChefDK::InvalidLockfile, "Invalid cookbook path: #{cookbook_path}. Remote Policyfiles should only use remote cookbooks."
             end
           end

data/lib/chef-dk/policyfile/solution_dependencies.rb

@@ -45,7 +45,7 @@ module ChefDK
         end
 
         def eql?(other)
-          other.kind_of?(self.class) &&
+          other.is_a?(self.class) &&
             other.name == name &&
             other.version == version
         end
@@ -127,6 +127,7 @@ module ChefDK
         until to_explore.empty?
           ck_name = to_explore.shift
           next unless deps.add?(ck_name) # explore each ck only once
+
           my_deps = find_cookbook_dep_by_name(ck_name)
           dep_names = my_deps[1].map(&:first)
           to_explore += dep_names
@@ -158,6 +159,7 @@ module ChefDK
       def assert_cookbook_deps_valid!(cookbook_name, version)
         dependency_conflicts = cookbook_deps_conflicts_for(cookbook_name, version)
         return false if dependency_conflicts.empty?
+
         message = "Cookbook #{cookbook_name} (#{version}) has dependency constraints that cannot be met by the existing cookbook set:\n"
         full_message = message + dependency_conflicts.join("\n")
         raise DependencyConflict, full_message
@@ -218,7 +220,7 @@ module ChefDK
       def set_policyfile_deps_from_lock_data(lock_data)
         policyfile_deps_data = lock_data["Policyfile"]
 
-        unless policyfile_deps_data.kind_of?(Array)
+        unless policyfile_deps_data.is_a?(Array)
           msg = "lockfile solution_dependencies Policyfile dependencies must be an array of cookbooks and constraints (got: #{policyfile_deps_data.inspect})"
           raise InvalidLockfile, msg
         end
@@ -229,19 +231,19 @@ module ChefDK
       end
 
       def add_policyfile_dep_from_lock_data(entry)
-        unless entry.kind_of?(Array) && entry.size == 2
+        unless entry.is_a?(Array) && entry.size == 2
           msg = %Q{lockfile solution_dependencies Policyfile dependencies entry must be like [ "$COOKBOOK_NAME", "$CONSTRAINT" ] (got: #{entry.inspect})}
           raise InvalidLockfile, msg
         end
 
         cookbook_name, constraint = entry
 
-        unless cookbook_name.kind_of?(String) && !cookbook_name.empty?
+        unless cookbook_name.is_a?(String) && !cookbook_name.empty?
           msg = "lockfile solution_dependencies Policyfile dependencies entry. Cookbook name portion must be a string (got: #{entry.inspect})"
           raise InvalidLockfile, msg
         end
 
-        unless constraint.kind_of?(String) && !constraint.empty?
+        unless constraint.is_a?(String) && !constraint.empty?
           msg = "malformed lockfile solution_dependencies Policyfile dependencies entry. Version constraint portion must be a string (got: #{entry.inspect})"
           raise InvalidLockfile, msg
         end
@@ -254,7 +256,7 @@ module ChefDK
       def set_cookbook_deps_from_lock_data(lock_data)
         cookbook_dependencies_data = lock_data["dependencies"]
 
-        unless cookbook_dependencies_data.kind_of?(Hash)
+        unless cookbook_dependencies_data.is_a?(Hash)
           msg = "lockfile solution_dependencies dependencies entry must be a Hash (JSON object) of dependencies (got: #{cookbook_dependencies_data.inspect})"
           raise InvalidLockfile, msg
         end
@@ -265,7 +267,7 @@ module ChefDK
       end
 
       def add_cookbook_dep_from_lock_data(name_and_version, deps_list)
-        unless name_and_version.kind_of?(String)
+        unless name_and_version.is_a?(String)
           show = "#{name_and_version.inspect} => #{deps_list.inspect}"
           msg = %Q{lockfile cookbook_dependencies entries must be of the form "$COOKBOOK_NAME ($VERSION)" => [ $dependency, ...] (got: #{show}) }
           raise InvalidLockfile, msg
@@ -276,26 +278,26 @@ module ChefDK
           raise InvalidLockfile, msg
         end
 
-        unless deps_list.kind_of?(Array)
+        unless deps_list.is_a?(Array)
           msg = %Q{lockfile cookbook_dependencies entry values must be an Array like [ [ "$COOKBOOK_NAME", "$CONSTRAINT" ], ... ] (got: #{deps_list.inspect}) }
           raise InvalidLockfile, msg
         end
 
         deps_list.each do |entry|
 
-          unless entry.kind_of?(Array) && entry.size == 2
+          unless entry.is_a?(Array) && entry.size == 2
             msg = %Q{lockfile solution_dependencies dependencies entry must be like [ "$COOKBOOK_NAME", "$CONSTRAINT" ] (got: #{entry.inspect})}
             raise InvalidLockfile, msg
           end
 
           dep_name, constraint = entry
 
-          unless dep_name.kind_of?(String) && !dep_name.empty?
+          unless dep_name.is_a?(String) && !dep_name.empty?
             msg = "malformed lockfile solution_dependencies dependencies entry. Cookbook name portion must be a string (got: #{entry.inspect})"
             raise InvalidLockfile, msg
           end
 
-          unless constraint.kind_of?(String) && !constraint.empty?
+          unless constraint.is_a?(String) && !constraint.empty?
             msg = "malformed lockfile solution_dependencies dependencies entry. Version constraint portion must be a string (got: #{entry.inspect})"
             raise InvalidLockfile, msg
           end

data/lib/chef-dk/policyfile/storage_config.rb

@@ -54,6 +54,7 @@ module ChefDK
         unless policyfile_filename.end_with?(".rb")
           raise InvalidPolicyfileFilename, "Policyfile filenames must end with `.rb' extension (you gave: `#{policyfile_filename}')"
         end
+
         @policyfile_filename = policyfile_filename
         @policyfile_lock_filename = policyfile_filename.sub(/\.rb\Z/, ".lock.json")
         @relative_paths_root = File.dirname(policyfile_filename)

data/lib/chef-dk/policyfile/undo_record.rb

@@ -52,7 +52,7 @@ module ChefDK
       end
 
       def ==(other)
-        other.kind_of?(UndoRecord) &&
+        other.is_a?(UndoRecord) &&
           other.policy_groups == policy_groups &&
           other.policy_revisions == policy_revisions
       end
@@ -68,29 +68,31 @@ module ChefDK
       def load(data)
         reset!
 
-        unless data.kind_of?(Hash)
+        unless data.is_a?(Hash)
           raise InvalidUndoRecord, "Undo data is incorrectly formatted. Must be a Hash, got '#{data}'."
         end
+
         missing_fields = %w{ format_version description backup_data }.select { |key| !data.key?(key) }
         unless missing_fields.empty?
-          raise InvalidUndoRecord, "Undo data is missing mandatory field(s) #{missing_fields.join(', ')}. Undo data: '#{data}'"
+          raise InvalidUndoRecord, "Undo data is missing mandatory field(s) #{missing_fields.join(", ")}. Undo data: '#{data}'"
         end
 
         @description = data["description"]
 
         policy_data = data["backup_data"]
-        unless policy_data.kind_of?(Hash)
+        unless policy_data.is_a?(Hash)
           raise InvalidUndoRecord, "'backup_data' in the undo record is incorrectly formatted. Must be a Hash, got '#{policy_data}'"
         end
+
         missing_policy_data_fields = %w{ policy_groups policy_revisions }.select { |key| !policy_data.key?(key) }
         unless missing_policy_data_fields.empty?
           raise InvalidUndoRecord,
-            "'backup_data' in the undo record is missing mandatory field(s) #{missing_policy_data_fields.join(', ')}. Backup data: #{policy_data}"
+            "'backup_data' in the undo record is missing mandatory field(s) #{missing_policy_data_fields.join(", ")}. Backup data: #{policy_data}"
         end
 
         policy_groups = policy_data["policy_groups"]
 
-        unless policy_groups.kind_of?(Array)
+        unless policy_groups.is_a?(Array)
           raise InvalidUndoRecord,
             "'policy_groups' data in the undo record is incorrectly formatted. Must be an Array, got '#{policy_groups}'"
         end
@@ -98,13 +100,13 @@ module ChefDK
         @policy_groups = policy_groups
 
         policy_revisions = policy_data["policy_revisions"]
-        unless policy_revisions.kind_of?(Array)
+        unless policy_revisions.is_a?(Array)
           raise InvalidUndoRecord,
             "'policy_revisions' data in the undo record is incorrectly formatted. Must be an Array, got '#{policy_revisions}'"
         end
 
         policy_revisions.each do |revision|
-          unless revision.kind_of?(Hash)
+          unless revision.is_a?(Hash)
             raise InvalidUndoRecord,
               "Invalid item in 'policy_revisions' in the undo record. Must be a Hash, got '#{revision}'"
           end

data/lib/chef-dk/policyfile/uploader.rb

@@ -52,7 +52,7 @@ module ChefDK
       def upload
         ui.msg("Uploading policy #{policy_name} (#{short_revision_id}) to policy group #{policy_group}")
 
-        if !using_policy_document_native_api?
+        unless using_policy_document_native_api?
           ui.msg(<<~DRAGONS)
             WARN: Uploading policy to policy group #{policy_group} in compatibility mode.
             Cookbooks will be uploaded with very large version numbers, which may be picked
@@ -152,6 +152,7 @@ module ChefDK
       # the policyfile lock requires.
       def cookbook_versions_for_policy
         return @cookbook_versions_for_policy if @cookbook_versions_for_policy
+
         policyfile_lock.validate_cookbooks!
         @cookbook_versions_for_policy =
           if using_policy_document_native_api?
@@ -215,6 +216,7 @@ module ChefDK
         http_client.put("data/#{COMPAT_MODE_DATA_BAG_NAME}/#{policy_id}", data_item)
       rescue Net::HTTPServerException => e
         raise e unless e.response.code == "404"
+
         http_client.post("data/#{COMPAT_MODE_DATA_BAG_NAME}", data_item)
       end
     end

data/lib/chef-dk/policyfile_compiler.rb

@@ -39,7 +39,7 @@ module ChefDK
     DEFAULT_DEMAND_CONSTRAINT = ">= 0.0.0".freeze
 
     # Cookbooks from these sources lock that cookbook to exactly one version
-    SOURCE_TYPES_WITH_FIXED_VERSIONS = [:git, :path].freeze
+    SOURCE_TYPES_WITH_FIXED_VERSIONS = %i{git path}.freeze
 
     def self.evaluate(policyfile_string, policyfile_filename, ui: nil, chef_config: nil)
       compiler = new(ui: ui, chef_config: chef_config)
@@ -144,18 +144,20 @@ module ChefDK
 
     def default_attributes
       check_for_default_attribute_conflicts!
-      included_policies.map { |p| p.policyfile_lock }.inject(
-        dsl.node_attributes.combined_default.to_hash) do |acc, lock|
-          Chef::Mixin::DeepMerge.merge(acc, lock.default_attributes)
-        end
+      included_policies.map(&:policyfile_lock).inject(
+        dsl.node_attributes.combined_default.to_hash
+      ) do |acc, lock|
+        Chef::Mixin::DeepMerge.merge(acc, lock.default_attributes)
+      end
     end
 
     def override_attributes
       check_for_override_attribute_conflicts!
-      included_policies.map { |p| p.policyfile_lock }.inject(
-        dsl.node_attributes.combined_override.to_hash) do |acc, lock|
-          Chef::Mixin::DeepMerge.merge(acc, lock.override_attributes)
-        end
+      included_policies.map(&:policyfile_lock).inject(
+        dsl.node_attributes.combined_override.to_hash
+      ) do |acc, lock|
+        Chef::Mixin::DeepMerge.merge(acc, lock.override_attributes)
+      end
     end
 
     def lock
@@ -225,6 +227,7 @@ module ChefDK
 
     def graph_solution
       return @solution if @solution
+
       cache_fixed_version_cookbooks
       @solution = Solve.it!(graph, graph_demands)
     end
@@ -322,7 +325,7 @@ module ChefDK
     end
 
     def cookbooks_in_run_list
-      recipes = combined_run_lists.map { |recipe| recipe.name }
+      recipes = combined_run_lists.map(&:name)
       recipes.map { |r| r[/^([^:]+)/, 1] }
     end
 
@@ -443,7 +446,7 @@ module ChefDK
       deps_by_version = source.universe_graph[cookbook_name]
 
       dep_cookbook_names = deps_by_version.values.inject(Set.new) do |names, constraint_list|
-        names.merge(constraint_list.map { |c| c.first })
+        names.merge(constraint_list.map(&:first))
       end
 
       dep_cookbook_names.each do |dep_cookbook_name|
@@ -504,7 +507,7 @@ module ChefDK
     def handle_included_policies_preferred_cookbook_conflicts(included_policies_source)
       # All cookbooks in the included policies are preferred.
       conflicting_source_messages = []
-      dsl.default_source.reject { |s| s.null? }.each do |source_b|
+      dsl.default_source.reject(&:null?).each do |source_b|
         conflicting_preferences = included_policies_source.preferred_cookbooks & source_b.preferred_cookbooks
         next if conflicting_preferences.empty?
         next if conflicting_preferences.all? do |cookbook_name|
@@ -515,7 +518,8 @@ module ChefDK
             false
           end
         end
-        conflicting_source_messages << "#{source_b.desc} sets a preferred for cookbook(s) #{conflicting_preferences.join(', ')}. This conflicts with an included policy."
+
+        conflicting_source_messages << "#{source_b.desc} sets a preferred for cookbook(s) #{conflicting_preferences.join(", ")}. This conflicts with an included policy."
       end
       unless conflicting_source_messages.empty?
         msg = "You may not override the cookbook sources for any cookbooks required by included policies.\n"

data/lib/chef-dk/policyfile_lock.rb

@@ -321,9 +321,10 @@ module ChefDK
     # Recursive, so absurd nesting levels could cause a SystemError. Invalid
     # input will cause an InvalidPolicyfileAttribute exception.
     def canonicalize(attributes)
-      unless attributes.kind_of?(Hash)
+      unless attributes.is_a?(Hash)
         raise "Top level attributes must be a Hash (you gave: #{attributes})"
       end
+
       canonicalize_elements(attributes)
     end
 
@@ -355,6 +356,7 @@ module ChefDK
         unless item.finite?
           raise InvalidPolicyfileAttribute, "Floating point numbers cannot be infinite or NaN. You gave #{item.inspect}"
         end
+
         # Support for floats assumes that any implementation of our JSON
         # canonicalization routine will use IEEE-754 doubles. In decimal terms,
         # doubles give 15-17 digits of precision, so we err on the safe side
@@ -392,7 +394,7 @@ module ChefDK
     end
 
     def validate_attr_key(key)
-      unless key.kind_of?(String)
+      unless key.is_a?(String)
         raise InvalidPolicyfileAttribute,
           "Attribute keys must be Strings (other types are not allowed in JSON). You gave: #{key.inspect} (#{key.class})"
       end
@@ -403,7 +405,7 @@ module ChefDK
 
       raise InvalidLockfile, "lockfile does not have a `name' attribute" if name_attribute.nil?
 
-      unless name_attribute.kind_of?(String)
+      unless name_attribute.is_a?(String)
         raise InvalidLockfile, "lockfile's name attribute must be a String (got: #{name_attribute.inspect})"
       end
 
@@ -419,7 +421,7 @@ module ChefDK
 
       raise InvalidLockfile, "lockfile does not have a run_list attribute" if run_list_attribute.nil?
 
-      unless run_list_attribute.kind_of?(Array)
+      unless run_list_attribute.is_a?(Array)
         raise InvalidLockfile, "lockfile's run_list must be an array of run list items (got: #{run_list_attribute.inspect})"
       end
 
@@ -438,17 +440,17 @@ module ChefDK
 
       lock_data_named_run_lists = lock_data["named_run_lists"]
 
-      unless lock_data_named_run_lists.kind_of?(Hash)
+      unless lock_data_named_run_lists.is_a?(Hash)
         msg = "lockfile's named_run_lists must be a Hash (JSON object). (got: #{lock_data_named_run_lists.inspect})"
         raise InvalidLockfile, msg
       end
 
       lock_data_named_run_lists.each do |name, run_list|
-        unless name.kind_of?(String)
+        unless name.is_a?(String)
           msg = "Keys in lockfile's named_run_lists must be Strings. (got: #{name.inspect})"
           raise InvalidLockfile, msg
         end
-        unless run_list.kind_of?(Array)
+        unless run_list.is_a?(Array)
           msg = "Values in lockfile's named_run_lists must be Arrays. (got: #{run_list.inspect})"
           raise InvalidLockfile, msg
         end
@@ -468,7 +470,7 @@ module ChefDK
         raise InvalidLockfile, "lockfile does not have a cookbook_locks attribute"
       end
 
-      unless cookbook_lock_data.kind_of?(Hash)
+      unless cookbook_lock_data.is_a?(Hash)
         raise InvalidLockfile, "lockfile's cookbook_locks attribute must be a Hash (JSON object). (got: #{cookbook_lock_data.inspect})"
       end
 
@@ -484,7 +486,7 @@ module ChefDK
         raise InvalidLockfile, "lockfile does not have a cookbook_locks attribute"
       end
 
-      unless cookbook_lock_data.kind_of?(Hash)
+      unless cookbook_lock_data.is_a?(Hash)
         raise InvalidLockfile, "lockfile's cookbook_locks attribute must be a Hash (JSON object). (got: #{cookbook_lock_data.inspect})"
       end
 
@@ -500,7 +502,7 @@ module ChefDK
         raise InvalidLockfile, "lockfile does not have a `default_attributes` attribute"
       end
 
-      unless default_attr_data.kind_of?(Hash)
+      unless default_attr_data.is_a?(Hash)
         raise InvalidLockfile, "lockfile's `default_attributes` attribute must be a Hash (JSON object). (got: #{default_attr_data.inspect})"
       end
 
@@ -510,7 +512,7 @@ module ChefDK
         raise InvalidLockfile, "lockfile does not have a `override_attributes` attribute"
       end
 
-      unless override_attr_data.kind_of?(Hash)
+      unless override_attr_data.is_a?(Hash)
         raise InvalidLockfile, "lockfile's `override_attributes` attribute must be a Hash (JSON object). (got: #{override_attr_data.inspect})"
       end
 
@@ -525,7 +527,7 @@ module ChefDK
         raise InvalidLockfile, "lockfile does not have a solution_dependencies attribute"
       end
 
-      unless soln_deps.kind_of?(Hash)
+      unless soln_deps.is_a?(Hash)
         raise InvalidLockfile, "lockfile's solution_dependencies attribute must be a Hash (JSON object). (got: #{soln_deps.inspect})"
       end
 
@@ -539,7 +541,7 @@ module ChefDK
         @included_policy_locks = []
       else
         locks.each do |lock_info|
-          if !(%w{revision_id name source_options}.all? { |key| !lock_info[key].nil? })
+          unless %w{revision_id name source_options}.all? { |key| !lock_info[key].nil? }
             raise InvalidLockfile, "lockfile included policy missing one of the required keys"
           end
         end
@@ -548,7 +550,7 @@ module ChefDK
     end
 
     def build_cookbook_lock_from_lock_data(name, lock_info)
-      unless lock_info.kind_of?(Hash)
+      unless lock_info.is_a?(Hash)
         raise InvalidLockfile, "lockfile cookbook_locks entries must be a Hash (JSON object). (got: #{lock_info.inspect})"
       end
 
@@ -560,7 +562,7 @@ module ChefDK
     end
 
     def build_cookbook_lock_as_archive_from_lock_data(name, lock_info)
-      unless lock_info.kind_of?(Hash)
+      unless lock_info.is_a?(Hash)
         raise InvalidLockfile, "lockfile cookbook_locks entries must be a Hash (JSON object). (got: #{lock_info.inspect})"
       end