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

data/lib/chef/platform/rebooter.rb

@@ -38,7 +38,7 @@ class Chef
                 when Chef::Platform.windows?
                   # should this do /f as well? do we then need a minimum delay to let apps quit?
                   # Use explicit path to shutdown.exe, to protect against https://github.com/chef/chef/issues/5594
-                  windows_shutdown_path = "#{ENV['SYSTEMROOT']}/System32/shutdown.exe"
+                  windows_shutdown_path = "#{ENV["SYSTEMROOT"]}/System32/shutdown.exe"
                   "#{windows_shutdown_path} /r /t #{reboot_info[:delay_mins] * 60} /c \"#{reboot_info[:reason]}\""
                 when node["os"] == "solaris2"
                   # SysV-flavored shutdown

data/lib/chef/platform/service_helpers.rb

@@ -72,7 +72,7 @@ class Chef
           configs = []
 
           if file_exist?(Chef.path_to("/etc/init.d/#{service_name}"))
-            configs += [ :initd, :systemd ]
+            configs += %i{initd systemd}
           end
 
           if file_exist?(Chef.path_to("/etc/init/#{service_name}.conf"))
@@ -108,7 +108,7 @@ class Chef
         def has_systemd_service_unit?(svc_name)
           %w{ /etc /usr/lib /lib /run }.any? do |load_path|
             file_exist?(
-              Chef.path_to("#{load_path}/systemd/system/#{svc_name.gsub(/@.*$/, '@')}.service")
+              Chef.path_to("#{load_path}/systemd/system/#{svc_name.gsub(/@.*$/, "@")}.service")
             )
           end
         end

data/lib/chef/policy_builder/expand_node_object.rb

@@ -139,7 +139,7 @@ class Chef
         expand_run_list
 
         Chef::Log.info("Run List is [#{node.run_list}]")
-        Chef::Log.info("Run List expands to [#{@expanded_run_list_with_versions.join(', ')}]")
+        Chef::Log.info("Run List expands to [#{@expanded_run_list_with_versions.join(", ")}]")
 
         events.node_load_completed(node, @expanded_run_list_with_versions, Chef::Config)
         events.run_list_expanded(@run_list_expansion)
@@ -184,7 +184,7 @@ class Chef
         begin
           events.cookbook_resolution_start(@expanded_run_list_with_versions)
           cookbook_hash = api_service.post("environments/#{node.chef_environment}/cookbook_versions",
-                                           { run_list: @expanded_run_list_with_versions })
+            { run_list: @expanded_run_list_with_versions })
 
           cookbook_hash = cookbook_hash.inject({}) do |memo, (key, value)|
             memo[key] = Chef::CookbookVersion.from_hash(value)
@@ -235,7 +235,7 @@ class Chef
       def runlist_override_sanity_check!
         # Convert to array and remove whitespace
         if override_runlist.is_a?(String)
-          @override_runlist = override_runlist.split(",").map { |e| e.strip }
+          @override_runlist = override_runlist.split(",").map(&:strip)
         end
         @override_runlist = [override_runlist].flatten.compact
         override_runlist.map! do |item|
@@ -249,7 +249,7 @@ class Chef
 
       def api_service
         @api_service ||= Chef::ServerAPI.new(config[:chef_server_url],
-                                             { version_class: Chef::CookbookManifestVersions })
+          { version_class: Chef::CookbookManifestVersions })
       end
 
       def config

data/lib/chef/policy_builder/policyfile.rb

@@ -156,7 +156,7 @@ class Chef
         apply_policyfile_attributes
 
         Chef::Log.info("Run List is [#{run_list}]")
-        Chef::Log.info("Run List expands to [#{run_list_with_versions_for_display.join(', ')}]")
+        Chef::Log.info("Run List expands to [#{run_list_with_versions_for_display.join(", ")}]")
 
         events.node_load_completed(node, run_list_with_versions_for_display, Chef::Config)
         events.run_list_expanded(run_list_expansion_ish)
@@ -304,7 +304,7 @@ class Chef
         if named_run_list_requested?
           named_run_list || raise(ConfigurationError,
             "Policy '#{retrieved_policy_name}' revision '#{revision_id}' does not have named_run_list '#{named_run_list_name}'" +
-            "(available named_run_lists: [#{available_named_run_lists.join(', ')}])")
+            "(available named_run_lists: [#{available_named_run_lists.join(", ")}])")
         else
           policy["run_list"]
         end
@@ -340,7 +340,7 @@ class Chef
         unless policy.key?("cookbook_locks")
           errors << "Policyfile is missing cookbook_locks element"
         end
-        if run_list.kind_of?(Array)
+        if run_list.is_a?(Array)
           run_list_errors = run_list.select do |maybe_recipe_spec|
             validate_recipe_spec(maybe_recipe_spec)
           end
@@ -500,7 +500,7 @@ class Chef
       # @api private
       def api_service
         @api_service ||= Chef::ServerAPI.new(config[:chef_server_url],
-                                             { version_class: Chef::CookbookManifestVersions })
+          { version_class: Chef::CookbookManifestVersions })
       end
 
       # @api private

data/lib/chef/powershell.rb

@@ -35,11 +35,13 @@ class Chef
     # @return [Object] output
     def initialize(script)
       raise "Chef::PowerShell can only be used on the Windows platform." unless RUBY_PLATFORM =~ /mswin|mingw32|windows/
+
       exec(script)
     end
 
     def error?
       return true if errors.count > 0
+
       false
     end
 

data/lib/chef/property.rb

@@ -130,6 +130,7 @@ class Chef
         if options.key?(:name_property)
           raise ArgumentError, "name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property #{self}"
         end
+
         # replace name_property with name_attribute in place
         options = Hash[options.map { |k, v| k == :name_attribute ? [ :name_property, v ] : [ k, v ] }]
         @options = options
@@ -230,6 +231,7 @@ class Chef
     def default
       return options[:default] if options.key?(:default)
       return Chef::DelayedEvaluator.new { name } if name_property?
+
       nil
     end
 
@@ -259,7 +261,8 @@ class Chef
     # @return [Boolean]
     #
     def desired_state?
-      return true if !options.key?(:desired_state)
+      return true unless options.key?(:desired_state)
+
       options[:desired_state]
     end
 
@@ -319,7 +322,7 @@ class Chef
     #
     def validation_options
       @validation_options ||= options.reject do |k, v|
-        [:declared_in, :name, :instance_variable_name, :desired_state, :identity, :default, :name_property, :coerce, :required, :nillable, :sensitive, :description, :introduced, :deprecated, :default_description, :skip_docs].include?(k)
+        %i{declared_in name instance_variable_name desired_state identity default name_property coerce required nillable sensitive description introduced deprecated default_description skip_docs}.include?(k)
       end
     end
 
@@ -344,7 +347,7 @@ class Chef
     #   `get`, the non-lazy, coerced, validated value will always be returned.
     #
     def call(resource, value = NOT_PASSED)
-      if value == NOT_PASSED
+      if NOT_PASSED == value # see https://github.com/chef/chef/pull/8781 before changing this
         get(resource)
       else
         set(resource, value)
@@ -551,7 +554,7 @@ class Chef
     def emit_dsl
       # We don't create the getter/setter if it's a custom property; we will
       # be using the existing getter/setter to manipulate it instead.
-      return if !instance_variable_name
+      return unless instance_variable_name
 
       # Properties may override existing properties up the inheritance heirarchy, but
       # properties must not override inherited methods like Object#hash.  When the Resource is

data/lib/chef/provider.rb

@@ -135,8 +135,7 @@ class Chef
       new_resource.cookbook_name
     end
 
-    def check_resource_semantics!
-    end
+    def check_resource_semantics!; end
 
     # a simple placeholder method that will be called / raise if a resource tries to
     # use current_resource without defining a load_current_resource method.
@@ -144,11 +143,9 @@ class Chef
       raise Chef::Exceptions::Override, "You must override load_current_resource in #{self}"
     end
 
-    def define_resource_requirements
-    end
+    def define_resource_requirements; end
 
-    def cleanup_after_converge
-    end
+    def cleanup_after_converge; end
 
     # the :nothing action which is available on all resources by default
     def action_nothing
@@ -245,7 +242,7 @@ class Chef
       Chef::Runner.new(run_context).converge
       return_value
     ensure
-      if run_context.resource_collection.any? { |r| r.updated? }
+      if run_context.resource_collection.any?(&:updated?)
         new_resource.updated_by_last_action(true)
       end
       @run_context = old_run_context
@@ -269,12 +266,12 @@ class Chef
     # @return [Boolean] whether the block was executed.
     #
     def converge_if_changed(*properties, &converge_block)
-      if !converge_block
+      unless converge_block
         raise ArgumentError, "converge_if_changed must be passed a block!"
       end
 
-      properties = new_resource.class.state_properties.map { |p| p.name } if properties.empty?
-      properties = properties.map { |p| p.to_sym }
+      properties = new_resource.class.state_properties.map(&:name) if properties.empty?
+      properties = properties.map(&:to_sym)
       if current_resource
         # Collect the list of modified properties
         specified_properties = properties.select { |property| new_resource.property_is_set?(property) }
@@ -296,7 +293,7 @@ class Chef
         end
 
         # Print the pretty green text and run the block
-        property_size = modified.map { |p| p.size }.max
+        property_size = modified.map(&:size).max
         modified.map! do |p|
           properties_str = if new_resource.sensitive || new_resource.class.properties[p].sensitive?
                              "(suppressed sensitive property)"
@@ -310,7 +307,7 @@ class Chef
       else
         # The resource doesn't exist. Mark that we are *creating* this, and
         # write down any properties we are setting.
-        property_size = properties.map { |p| p.size }.max
+        property_size = properties.map(&:size).max
         created = properties.map do |property|
           default = " (default value)" unless new_resource.property_is_set?(property)
           properties_str = if new_resource.sensitive || new_resource.class.properties[property].sensitive?

data/lib/chef/provider/apt_preference.rb

@@ -28,8 +28,7 @@ class Chef
 
       APT_PREFERENCE_DIR = "/etc/apt/preferences.d".freeze
 
-      def load_current_resource
-      end
+      def load_current_resource; end
 
       action :add do
         preference = build_pref(

data/lib/chef/provider/apt_repository.rb

@@ -32,8 +32,7 @@ class Chef
 
       LIST_APT_KEY_FINGERPRINTS = %w{apt-key adv --list-public-keys --with-fingerprint --with-colons}.freeze
 
-      def load_current_resource
-      end
+      def load_current_resource; end
 
       action :add do
         if new_resource.key.nil?

data/lib/chef/provider/apt_update.rb

@@ -28,11 +28,10 @@ class Chef
       APT_CONF_DIR = "/etc/apt/apt.conf.d".freeze
       STAMP_DIR = "/var/lib/apt/periodic".freeze
 
-      def load_current_resource
-      end
+      def load_current_resource; end
 
       action :periodic do
-        if !apt_up_to_date?
+        unless apt_up_to_date?
           converge_by "update new lists of packages" do
             do_update
           end

data/lib/chef/provider/cookbook_file.rb

@@ -39,6 +39,7 @@ class Chef
       def managing_content?
         return true if new_resource.checksum
         return true if !new_resource.source.nil? && @action != :create_if_missing
+
         false
       end
 

data/lib/chef/provider/cron.rb

@@ -25,11 +25,11 @@ class Chef
 
       provides :cron, os: ["!aix", "!solaris2"]
 
-      SPECIAL_TIME_VALUES = [:reboot, :yearly, :annually, :monthly, :weekly, :daily, :midnight, :hourly].freeze
-      CRON_ATTRIBUTES = [:minute, :hour, :day, :month, :weekday, :time, :command, :mailto, :path, :shell, :home, :environment].freeze
-      WEEKDAY_SYMBOLS = [:sunday, :monday, :tuesday, :wednesday, :thursday, :friday, :saturday].freeze
+      SPECIAL_TIME_VALUES = %i{reboot yearly annually monthly weekly daily midnight hourly}.freeze
+      CRON_ATTRIBUTES = %i{minute hour day month weekday time command mailto path shell home environment}.freeze
+      WEEKDAY_SYMBOLS = %i{sunday monday tuesday wednesday thursday friday saturday}.freeze
 
-      CRON_PATTERN = /\A([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+|[a-zA-Z]{3})\s([-0-9*,\/]+|[a-zA-Z]{3})\s(.*)/.freeze
+      CRON_PATTERN = %r{\A([-0-9*,/]+)\s([-0-9*,/]+)\s([-0-9*,/]+)\s([-0-9*,/]+|[a-zA-Z]{3})\s([-0-9*,/]+|[a-zA-Z]{3})\s(.*)}.freeze
       SPECIAL_PATTERN = /\A(@(#{SPECIAL_TIME_VALUES.join('|')}))\s(.*)/.freeze
       ENV_PATTERN = /\A(\S+)=(\S*)/.freeze
       ENVIRONMENT_PROPERTIES = %w{MAILTO PATH SHELL HOME}.freeze
@@ -203,6 +203,7 @@ class Chef
       def read_crontab
         so = shell_out!("crontab -l -u #{new_resource.user}", returns: [0, 1])
         return nil if so.exitstatus == 1
+
         so.stdout
       rescue => e
         raise Chef::Exceptions::Cron, "Error determining state of #{new_resource.name}, error: #{e}"
@@ -218,7 +219,7 @@ class Chef
       def get_crontab_entry
         newcron = ""
         newcron << "# Chef Name: #{new_resource.name}\n"
-        [ :mailto, :path, :shell, :home ].each do |v|
+        %i{mailto path shell home}.each do |v|
           newcron << "#{v.to_s.upcase}=\"#{new_resource.send(v)}\"\n" if new_resource.send(v)
         end
         new_resource.environment.each do |name, value|

data/lib/chef/provider/cron/unix.rb

@@ -42,6 +42,7 @@ class Chef
             raise Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: #{status}"
           end
           return nil if status > 0
+
           crontab.stdout.chomp << "\n"
         end
 

data/lib/chef/provider/dsc_resource.rb

@@ -34,7 +34,7 @@ class Chef
       end
 
       def action_run
-        if ! test_resource
+        unless test_resource
           converge_by(generate_description) do
             result = set_resource
             reboot_if_required
@@ -42,8 +42,7 @@ class Chef
         end
       end
 
-      def load_current_resource
-      end
+      def load_current_resource; end
 
       def define_resource_requirements
         requirements.assert(:run) do |a|

data/lib/chef/provider/dsc_script.rb

@@ -41,7 +41,7 @@ class Chef
       end
 
       def action_run
-        if ! @resource_converged
+        unless @resource_converged
           converge_by(generate_description) do
             run_configuration(:set)
             logger.info("DSC resource configuration completed successfully")
@@ -162,7 +162,7 @@ class Chef
               # We ignore the last log message because it only contains the time it took, which looks weird
               cleaned_messages = resource.change_log[0..-2].map { |c| c.sub(/^#{Regexp.escape(resource.name)}/, "").strip }
               unless cleaned_messages.empty?
-                "converge DSC resource #{resource.name} by #{cleaned_messages.find_all { |c| c != '' }.join("\n")}"
+                "converge DSC resource #{resource.name} by #{cleaned_messages.find_all { |c| c != "" }.join("\n")}"
               else
                 "converge DSC resource #{resource.name}"
               end

data/lib/chef/provider/execute.rb

@@ -121,7 +121,7 @@ class Chef
 
       def sentinel_file
         Pathname.new(Chef::Util::PathHelper.cleanpath(
-           ( cwd && creates_relative? ) ? ::File.join(cwd, creates) : creates
+          ( cwd && creates_relative? ) ? ::File.join(cwd, creates) : creates
         ))
       end
 

data/lib/chef/provider/file.rb

@@ -90,7 +90,7 @@ class Chef
         @current_resource ||= Chef::Resource::File.new(new_resource.name)
         current_resource.path(new_resource.path)
 
-        if !needs_creating?
+        unless needs_creating?
           # we are updating an existing file
           if managing_content?
             logger.trace("#{new_resource} checksumming file at #{new_resource.path}.")
@@ -190,6 +190,7 @@ class Chef
       def managing_content?
         return true if new_resource.checksum
         return true if !new_resource.content.nil? && @action != :create_if_missing
+
         false
       end
 
@@ -339,8 +340,8 @@ class Chef
 
         if tempfile
           new_resource.verify.each do |v|
-            if ! v.verify(tempfile.path)
-              raise Chef::Exceptions::ValidationFailed.new "Proposed content for #{new_resource.path} failed verification #{new_resource.sensitive ? '[sensitive]' : v}"
+            unless v.verify(tempfile.path)
+              raise Chef::Exceptions::ValidationFailed.new "Proposed content for #{new_resource.path} failed verification #{new_resource.sensitive ? "[sensitive]" : v}"
             end
           end
         end
@@ -459,6 +460,7 @@ class Chef
           # reporting won't work for Windows.
           return
         end
+
         acl_scanner = ScanAccessControl.new(new_resource, resource)
         acl_scanner.set_all!
       end

data/lib/chef/provider/git.rb

@@ -51,12 +51,12 @@ class Chef
         end
 
         requirements.assert(:all_actions) do |a|
-          a.assertion { !(new_resource.revision =~ /^origin\//) }
+          a.assertion { !(new_resource.revision =~ %r{^origin/}) }
           a.failure_message Chef::Exceptions::InvalidRemoteGitReference,
-             "Deploying remote branches is not supported. " +
+            "Deploying remote branches is not supported. " +
             "Specify the remote branch as a local branch for " +
             "the git repository you're deploying from " +
-            "(ie: '#{new_resource.revision.gsub('origin/', '')}' rather than '#{new_resource.revision}')."
+            "(ie: '#{new_resource.revision.gsub("origin/", "")}' rather than '#{new_resource.revision}')."
         end
 
         requirements.assert(:all_actions) do |a|
@@ -111,6 +111,7 @@ class Chef
 
       def git_gem_version
         return @git_gem_version if defined?(@git_gem_version)
+
         output = git("--version").stdout
         match = GIT_VERSION_PATTERN.match(output)
         if match

data/lib/chef/provider/group.rb

@@ -66,7 +66,7 @@ class Chef
           if !new_resource.members.nil? && !new_resource.excluded_members.nil?
             common_members = new_resource.members & new_resource.excluded_members
             a.assertion { common_members.empty? }
-            a.failure_message(Chef::Exceptions::ConflictingMembersInGroup, "Attempting to both add and remove users from a group: '#{common_members.join(', ')}'")
+            a.failure_message(Chef::Exceptions::ConflictingMembersInGroup, "Attempting to both add and remove users from a group: '#{common_members.join(", ")}'")
             # No why-run alternative
           end
         end
@@ -88,11 +88,12 @@ class Chef
           missing_members = []
           new_resource.members.each do |member|
             next if has_current_group_member?(member)
+
             validate_member!(member)
             missing_members << member
           end
           unless missing_members.empty?
-            @change_desc << "add missing member(s): #{missing_members.join(', ')}"
+            @change_desc << "add missing member(s): #{missing_members.join(", ")}"
           end
 
           members_to_be_removed = []
@@ -102,7 +103,7 @@ class Chef
             end
           end
           unless members_to_be_removed.empty?
-            @change_desc << "remove existing member(s): #{members_to_be_removed.join(', ')}"
+            @change_desc << "remove existing member(s): #{members_to_be_removed.join(", ")}"
           end
         elsif new_resource.members != current_resource.members
           @change_desc << "replace group members with new list of members"
@@ -140,6 +141,7 @@ class Chef
 
       def action_remove
         return unless @group_exists
+
         converge_by("remove group #{new_resource.group_name}") do
           remove_group
           logger.info("#{new_resource} removed")
@@ -148,6 +150,7 @@ class Chef
 
       def action_manage
         return unless @group_exists && compare_group
+
         converge_by(["manage group #{new_resource.group_name}"] + change_desc) do
           manage_group
           logger.info("#{new_resource} managed")
@@ -156,6 +159,7 @@ class Chef
 
       def action_modify
         return unless compare_group
+
         converge_by(["modify group #{new_resource.group_name}"] + change_desc) do
           manage_group
           logger.info("#{new_resource} modified")