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

data/lib/chef/application/windows_service.rb

@@ -40,7 +40,7 @@ class Chef
       option :config_file,
         short: "-c CONFIG",
         long: "--config CONFIG",
-        default: "#{ENV['SYSTEMDRIVE']}/chef/client.rb",
+        default: "#{ENV["SYSTEMDRIVE"]}/chef/client.rb",
         description: "The configuration file to use for #{Chef::Dist::PRODUCT} runs."
 
       option :log_location,
@@ -60,7 +60,7 @@ class Chef
         description: "Set the number of seconds to wait between #{Chef::Dist::PRODUCT} runs.",
         proc: lambda { |s| s.to_i }
 
-      DEFAULT_LOG_LOCATION ||= "#{ENV['SYSTEMDRIVE']}/chef/client.log".freeze
+      DEFAULT_LOG_LOCATION ||= "#{ENV["SYSTEMDRIVE"]}/chef/client.log".freeze
 
       def service_init
         @service_action_mutex = Mutex.new
@@ -307,7 +307,7 @@ class Chef
 
         begin
           case config[:config_file]
-          when /^(http|https):\/\//
+          when %r{^(http|https)://}
             Chef::HTTP.new("").streaming_request(config[:config_file]) { |f| apply_config(f.path) }
           else
             ::File.open(config[:config_file]) { |f| apply_config(f.path) }

data/lib/chef/application/windows_service_manager.rb

@@ -46,7 +46,7 @@ class Chef
       option :config_file,
         short: "-c CONFIG",
         long: "--config CONFIG",
-        default: "#{ENV['SYSTEMDRIVE']}/chef/client.rb",
+        default: "#{ENV["SYSTEMDRIVE"]}/chef/client.rb",
         description: "The configuration file to use for #{Chef::Dist::PRODUCT} runs."
 
       option :log_location,
@@ -78,10 +78,10 @@ class Chef
 
         raise ArgumentError, "Service definition is not provided" if service_options.nil?
 
-        required_options = [:service_name, :service_display_name, :service_description, :service_file_path]
+        required_options = %i{service_name service_display_name service_description service_file_path}
 
         required_options.each do |req_option|
-          if !service_options.key?(req_option)
+          unless service_options.key?(req_option)
             raise ArgumentError, "Service definition doesn't contain required option #{req_option}"
           end
         end

data/lib/chef/blacklist.rb

@@ -68,7 +68,7 @@ class Chef
     # assumed to contain exact keys (that is, Array elements will not be split
     # by "/").
     def self.to_array(item)
-      return item if item.kind_of? Array
+      return item if item.is_a? Array
 
       parts = item.split("/")
       parts.shift if !parts.empty? && parts[0].empty?

data/lib/chef/chef_fs/chef_fs_data_store.rb

@@ -246,7 +246,7 @@ class Chef
           end
 
         else
-          if !data.is_a?(String)
+          unless data.is_a?(String)
             raise "set only works with strings"
           end
 
@@ -279,6 +279,7 @@ class Chef
           if !policy_group["policies"] || !policy_group["policies"][path[3]]
             raise ChefZero::DataStore::DataNotFoundError.new(path, entry)
           end
+
           # The policy group looks like:
           # {
           #   "policies": {
@@ -361,7 +362,7 @@ class Chef
         if use_memory_store?(path)
           @memory_store.set(path, data, *options)
         else
-          if !data.is_a?(String)
+          unless data.is_a?(String)
             raise "set only works with strings: #{path} = #{data.inspect}"
           end
 
@@ -401,6 +402,7 @@ class Chef
             unless group["policies"] && group["policies"].key?(path[3])
               raise ChefZero::DataStore::DataNotFoundError.new(path)
             end
+
             group["policies"].delete(path[3])
             group
           end
@@ -413,6 +415,7 @@ class Chef
             if result.size == members.size
               raise ChefZero::DataStore::DataNotFoundError.new(path)
             end
+
             result
           end
 
@@ -424,6 +427,7 @@ class Chef
             if result.size == invitations.size
               raise ChefZero::DataStore::DataNotFoundError.new(path)
             end
+
             result
           end
 
@@ -457,11 +461,12 @@ class Chef
             policies.children.each do |policy|
               # We want to delete just the ones that == POLICY
               next unless policy.name.rpartition("-")[0] == path[1]
+
               policy.delete(false)
               FileSystemCache.instance.delete!(policy.file_path)
               found_policy = true
             end
-            raise ChefZero::DataStore::DataNotFoundError.new(path) if !found_policy
+            raise ChefZero::DataStore::DataNotFoundError.new(path) unless found_policy
           end
 
         else
@@ -502,6 +507,7 @@ class Chef
               revisions << revision if name == path[1]
             end
             raise ChefZero::DataStore::DataNotFoundError.new(path) if revisions.empty?
+
             revisions
           end
 
@@ -525,7 +531,7 @@ class Chef
                 # /cookbooks/name-version -> /cookbooks/name
                 entry.children.map { |child| split_name_version(child.name)[0] }.uniq
               else
-                entry.children.map { |child| child.name }
+                entry.children.map(&:name)
               end
             rescue Chef::ChefFS::FileSystem::NotFoundError
               # If the cookbooks dir doesn't exist, we have no cookbooks (not 404)
@@ -538,12 +544,13 @@ class Chef
             result = with_entry([ path[0] ]) do |entry|
               # list /cookbooks/name = filter /cookbooks/name-version down to name
               entry.children.map { |child| split_name_version(child.name) }
-              .select { |name, version| name == path[1] }
-              .map { |name, version| version }
+                .select { |name, version| name == path[1] }
+                .map { |name, version| version }
             end
             if result.empty?
               raise ChefZero::DataStore::DataNotFoundError.new(path)
             end
+
             result
           else
             # list /cookbooks/name = <single version>
@@ -638,7 +645,7 @@ class Chef
 
         # Create the .uploaded-cookbook-version.json
         cookbooks = chef_fs.child(cookbook_type)
-        if !cookbooks.exists?
+        unless cookbooks.exists?
           cookbooks = chef_fs.create_child(cookbook_type)
         end
         # We are calling a cookbooks-specific API, so get multiplexed_dirs out of the way if it is there
@@ -846,6 +853,7 @@ class Chef
 
       def ensure_dir(entry)
         return entry if entry.exists?
+
         parent = entry.parent
         if parent
           ensure_dir(parent)

data/lib/chef/chef_fs/command_line.rb

@@ -44,6 +44,7 @@ class Chef
 
           when :directory_to_file
             next if diff_filter && diff_filter !~ /T/
+
             if output_mode == :name_only
               yield "#{new_path}\n"
             elsif output_mode == :name_status
@@ -54,6 +55,7 @@ class Chef
 
           when :file_to_directory
             next if diff_filter && diff_filter !~ /T/
+
             if output_mode == :name_only
               yield "#{new_path}\n"
             elsif output_mode == :name_status
@@ -71,6 +73,7 @@ class Chef
               new_path += File.extname(old_path)
             end
             next if diff_filter && diff_filter !~ /D/
+
             if output_mode == :name_only
               yield "#{new_path}\n"
             elsif output_mode == :name_status
@@ -86,6 +89,7 @@ class Chef
 
           when :added
             next if diff_filter && diff_filter !~ /A/
+
             if output_mode == :name_only
               yield "#{new_path}\n"
             elsif output_mode == :name_status
@@ -101,6 +105,7 @@ class Chef
 
           when :modified
             next if diff_filter && diff_filter !~ /M/
+
             if output_mode == :name_only
               yield "#{new_path}\n"
             elsif output_mode == :name_status
@@ -127,7 +132,7 @@ class Chef
             end
           end
         end
-        if !found_match
+        unless found_match
           ui.error "#{pattern}: No such file or directory on remote or local" if ui
           error = true
         end

data/lib/chef/chef_fs/config.rb

@@ -150,7 +150,7 @@ class Chef
               hosted_everything or allow repo_mode to default}
         end
         # Default to getting *everything* from the server.
-        if !@chef_config[:repo_mode]
+        unless @chef_config[:repo_mode]
           if is_hosted?
             @chef_config[:repo_mode] = "hosted_everything"
           else
@@ -164,7 +164,7 @@ class Chef
       attr_reader :cookbook_version
 
       def is_hosted?
-        @chef_config[:chef_server_url] =~ /\/+organizations\/.+/
+        @chef_config[:chef_server_url] =~ %r{/+organizations/.+}
       end
 
       def chef_fs
@@ -272,6 +272,7 @@ class Chef
             # cookbooks -> cookbook_path
             singular_name = INFLECTIONS[object_name]
             raise "Unknown object name #{object_name}" unless singular_name
+
             variable_name = "#{singular_name}_path"
             paths = Array(@chef_config[variable_name]).flatten
             result[object_name] = paths.map { |path| File.expand_path(path) }

data/lib/chef/chef_fs/data_handler/container_data_handler.rb

@@ -24,7 +24,7 @@ class Chef
         def verify_integrity(object, entry)
           base_name = remove_dot_json(entry.name)
           if object["containername"] != base_name
-            yield("Name in #{entry.path_for_printing} must be '#{base_name}' (is '#{object['containername']}')")
+            yield("Name in #{entry.path_for_printing} must be '#{base_name}' (is '#{object["containername"]}')")
           end
         end
 

data/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb

@@ -54,7 +54,7 @@ class Chef
         def verify_integrity(object, entry)
           base_name = remove_dot_json(entry.name)
           if object["raw_data"]["id"] != base_name
-            yield("ID in #{entry.path_for_printing} must be '#{base_name}' (is '#{object['raw_data']['id']}')")
+            yield("ID in #{entry.path_for_printing} must be '#{base_name}' (is '#{object["raw_data"]["id"]}')")
           elsif entry.parent.name =~ RESERVED_NAMES
             yield("Data bag name ('#{entry.parent.name}') must not match #{RESERVED_NAMES.inspect}")
           end

data/lib/chef/chef_fs/data_handler/data_handler_base.rb

@@ -197,7 +197,7 @@ class Chef
         def verify_integrity(object, entry)
           base_name = remove_file_extension(entry.name)
           if object["name"] != base_name
-            yield("Name must be '#{base_name}' (is '#{object['name']}')")
+            yield("Name must be '#{base_name}' (is '#{object["name"]}')")
           end
         end
 

data/lib/chef/chef_fs/data_handler/organization_data_handler.rb

@@ -27,7 +27,7 @@ class Chef
         # @yieldparam [s<string>] error message
         def verify_integrity(object, entry)
           if entry.org != object["name"]
-            yield("Name must be '#{entry.org}' (is '#{object['name']}')")
+            yield("Name must be '#{entry.org}' (is '#{object["name"]}')")
           end
         end
       end

data/lib/chef/chef_fs/data_handler/policy_data_handler.rb

@@ -35,11 +35,11 @@ class Chef
         def verify_integrity(object_data, entry)
           name, revision = name_and_revision(entry.name)
           if object_data["name"] != name
-            yield("Object name '#{object_data['name']}' doesn't match entry '#{name}'.")
+            yield("Object name '#{object_data["name"]}' doesn't match entry '#{name}'.")
           end
 
           if object_data["revision_id"] != revision
-            yield("Object revision ID '#{object_data['revision_id']}' doesn't match entry '#{revision}'.")
+            yield("Object revision ID '#{object_data["revision_id"]}' doesn't match entry '#{revision}'.")
           end
         end
       end

data/lib/chef/chef_fs/file_pattern.rb

@@ -74,6 +74,7 @@ class Chef
 
         argument_is_absolute = Chef::ChefFS::PathUtils.is_absolute?(path)
         return false if is_absolute != argument_is_absolute
+
         path = path[1, path.length - 1] if argument_is_absolute
 
         path_parts = Chef::ChefFS::PathUtils.split(path)
@@ -81,6 +82,7 @@ class Chef
         return false if regexp_parts.length <= path_parts.length && !has_double_star
         # If the path doesn't match up to this point, children won't match either.
         return false if path_parts.zip(regexp_parts).any? { |part, regexp| !regexp.nil? && !regexp.match(part) }
+
         # Otherwise, it's possible we could match: the path matches to this point, and the pattern is longer than the path.
         # TODO There is one edge case where the double star comes after some characters like abc**def--we could check whether the next
         # bit of path starts with abc in that case.
@@ -114,6 +116,7 @@ class Chef
         path = path[1, path.length - 1] if Chef::ChefFS::PathUtils.is_absolute?(path)
         dirs_in_path = Chef::ChefFS::PathUtils.split(path).length
         return nil if exact_parts.length <= dirs_in_path
+
         exact_parts[dirs_in_path]
       end
 
@@ -123,7 +126,8 @@ class Chef
       #   abc/*def.exact_path == 'abc/def'
       #   abc/x\\yz.exact_path == 'abc/xyz'
       def exact_path
-        return nil if has_double_star || exact_parts.any? { |part| part.nil? }
+        return nil if has_double_star || exact_parts.any?(&:nil?)
+
         result = Chef::ChefFS::PathUtils.join(*exact_parts)
         is_absolute ? Chef::ChefFS::PathUtils.join("", result) : result
       end
@@ -151,6 +155,7 @@ class Chef
       def match?(path)
         argument_is_absolute = Chef::ChefFS::PathUtils.is_absolute?(path)
         return false if is_absolute != argument_is_absolute
+
         path = path[1, path.length - 1] if argument_is_absolute
         !!regexp.match(path)
       end
@@ -183,7 +188,7 @@ class Chef
       end
 
       def calculate
-        if !@regexp
+        unless @regexp
           @is_absolute = Chef::ChefFS::PathUtils.is_absolute?(@pattern)
 
           full_regexp_parts = []
@@ -213,9 +218,10 @@ class Chef
                 if has_double_star_prev
                   raise ArgumentError, ".. overlapping a ** is unsupported"
                 end
+
                 full_regexp_parts.pop
                 normalized_parts.pop
-                if !@has_double_star
+                unless @has_double_star
                   @regexp_parts.pop
                   @exact_parts.pop
                 end
@@ -226,7 +232,7 @@ class Chef
             # Build up the regexp
             full_regexp_parts << regexp
             normalized_parts << part
-            if !@has_double_star
+            unless @has_double_star
               @regexp_parts << Regexp.new("^#{regexp}$")
               @exact_parts << exact
             end
@@ -259,7 +265,7 @@ class Chef
         pattern.split(pattern_special_characters).each_with_index do |part, index|
           # Odd indexes from the split are symbols.  Even are normal bits.
           if index.even?
-            exact << part if !exact.nil?
+            exact << part unless exact.nil?
             regexp << part
           else
             case part
@@ -277,7 +283,7 @@ class Chef
             else
               if part[0, 1] == '\\' && part.length == 2
                 # backslash escapes are only supported on Unix, and are handled here by leaving the escape on (it means the same thing in a regex)
-                exact << part[1, 1] if !exact.nil?
+                exact << part[1, 1] unless exact.nil?
                 if regexp_escape_characters.include?(part[1, 1])
                   regexp << part
                 else
@@ -288,7 +294,7 @@ class Chef
                 exact = nil
                 regexp << part
               else
-                exact += part if !exact.nil?
+                exact += part unless exact.nil?
                 regexp << "\\#{part}"
               end
             end

data/lib/chef/chef_fs/file_system.rb

@@ -94,6 +94,7 @@ class Chef
       def self.resolve_path(entry, path)
         return entry if path.length == 0
         return resolve_path(entry.root, path) if path[0, 1] == "/" && entry.root != entry
+
         if path[0, 1] == "/"
           path = path[1, path.length - 1]
         end
@@ -194,7 +195,7 @@ class Chef
           # Check the outer regex pattern to see if it matches anything on the
           # filesystem that isn't on the server
           Chef::ChefFS::FileSystem.list(b_root, pattern).each do |b|
-            if !found_paths.include?(b.display_path)
+            unless found_paths.include?(b.display_path)
               a = Chef::ChefFS::FileSystem.resolve_path(a_root, b.display_path)
               yield [ a, b ]
             end
@@ -228,7 +229,7 @@ class Chef
 
         # Check b for children that aren't in a
         b.children.each do |b_child|
-          if !a_children_names.include?(b_child.bare_name)
+          unless a_children_names.include?(b_child.bare_name)
             result << [ a.child(b_child.bare_name), b_child ]
           end
         end

data/lib/chef/chef_fs/file_system/base_fs_object.rb

@@ -32,6 +32,7 @@ class Chef
             if name != ""
               raise ArgumentError, "Name of root object must be empty string: was '#{name}' instead"
             end
+
             @path = "/"
           end
         end
@@ -107,13 +108,15 @@ class Chef
 
         # Override children to report your *actual* list of children as an array.
         def children
-          raise NotFoundError.new(self) if !exists?
+          raise NotFoundError.new(self) unless exists?
+
           []
         end
 
         # Expand this entry into a chef object (Chef::Role, ::Node, etc.)
         def chef_object
-          raise NotFoundError.new(self) if !exists?
+          raise NotFoundError.new(self) unless exists?
+
           nil
         end
 
@@ -124,14 +127,16 @@ class Chef
         # your entry class, and will be called without actually reading the
         # file_contents.  This is used for knife upload /cookbooks/cookbookname.
         def create_child(name, file_contents)
-          raise NotFoundError.new(self) if !exists?
+          raise NotFoundError.new(self) unless exists?
+
           raise OperationNotAllowedError.new(:create_child, self)
         end
 
         # Delete this item, possibly recursively.  Entries MUST NOT delete a
         # directory unless recurse is true.
         def delete(recurse)
-          raise NotFoundError.new(self) if !exists?
+          raise NotFoundError.new(self) unless exists?
+
           raise OperationNotAllowedError.new(:delete, self)
         end
 
@@ -166,13 +171,15 @@ class Chef
 
         # Read the contents of this file entry.
         def read
-          raise NotFoundError.new(self) if !exists?
+          raise NotFoundError.new(self) unless exists?
+
           raise OperationNotAllowedError.new(:read, self)
         end
 
         # Write the contents of this file entry.
         def write(file_contents)
-          raise NotFoundError.new(self) if !exists?
+          raise NotFoundError.new(self) unless exists?
+
           raise OperationNotAllowedError.new(:write, self)
         end