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

data/lib/chef/resource/dsc_resource.rb

@@ -42,7 +42,7 @@ class Chef
                        end
             "#{property}=>#{obj_text}"
           end
-          "{#{descriptions.join(', ')}}"
+          "{#{descriptions.join(", ")}}"
         end
       end
 
@@ -73,11 +73,11 @@ class Chef
       end
 
       property :module_version, String,
-               introduced: "12.21",
-               description: "The version number of the module to use. PowerShell 5.0.10018.0 (or higher) supports having multiple versions of a module installed. This should be specified along with the module_name."
+        introduced: "12.21",
+        description: "The version number of the module to use. PowerShell 5.0.10018.0 (or higher) supports having multiple versions of a module installed. This should be specified along with the module_name."
 
       def property(property_name, value = nil)
-        if not property_name.is_a?(Symbol)
+        unless property_name.is_a?(Symbol)
           raise TypeError, "A property name of type Symbol must be specified, '#{property_name}' of type #{property_name.class} was given"
         end
 
@@ -99,13 +99,13 @@ class Chef
       # If the set method of the DSC resource indicate that a reboot
       # is necessary, reboot_action provides the mechanism for a reboot to
       # be requested.
-      property :reboot_action, Symbol, default: :nothing, equal_to: [:nothing, :reboot_now, :request_reboot],
+      property :reboot_action, Symbol, default: :nothing, equal_to: %i{nothing reboot_now request_reboot},
                 introduced: "12.6",
                 description: "Use to request an immediate reboot or to queue a reboot using the :reboot_now (immediate reboot) or :request_reboot (queued reboot) actions built into the reboot resource."
 
       property :timeout, Integer,
-               introduced: "12.6",
-               description: "The amount of time (in seconds) a command is to wait before timing out."
+        introduced: "12.6",
+        description: "The amount of time (in seconds) a command is to wait before timing out."
 
       private
 

data/lib/chef/resource/dsc_script.rb

@@ -45,6 +45,7 @@ class Chef
         if arg && configuration_name
           raise ArgumentError, "The 'code' and 'command' properties may not be used together"
         end
+
         set_or_return(
           :code,
           arg,
@@ -56,6 +57,7 @@ class Chef
         if arg && code
           raise ArgumentError, "Property `configuration_name` may not be set if `code` is set"
         end
+
         set_or_return(
           :configuration_name,
           arg,
@@ -67,6 +69,7 @@ class Chef
         if arg && code
           raise ArgumentError, "The 'code' and 'command' properties may not be used together"
         end
+
         set_or_return(
           :command,
           arg,
@@ -78,6 +81,7 @@ class Chef
         if arg && configuration_data_script
           raise ArgumentError, "The 'configuration_data' and 'configuration_data_script' properties may not be used together"
         end
+
         set_or_return(
           :configuration_data,
           arg,
@@ -89,6 +93,7 @@ class Chef
         if arg && configuration_data
           raise ArgumentError, "The 'configuration_data' and 'configuration_data_script' properties may not be used together"
         end
+
         set_or_return(
           :configuration_data_script,
           arg,
@@ -110,16 +115,16 @@ class Chef
       end
 
       property :flags, Hash,
-               description: "Pass parameters to the DSC script that is specified by the command property. Parameters are defined as key-value pairs, where the value of each key is the parameter to pass. This property may not be used in the same recipe as the code property."
+        description: "Pass parameters to the DSC script that is specified by the command property. Parameters are defined as key-value pairs, where the value of each key is the parameter to pass. This property may not be used in the same recipe as the code property."
 
       property :cwd, String,
-               description: "The current working directory."
+        description: "The current working directory."
 
       property :environment, Hash,
-               description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}). (These variables must exist for a command to be run successfully)."
+        description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}). (These variables must exist for a command to be run successfully)."
 
       property :timeout, Integer,
-               description: "The amount of time (in seconds) a command is to wait before timing out."
+        description: "The amount of time (in seconds) a command is to wait before timing out."
     end
   end
 end

data/lib/chef/resource/execute.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Tyler Cloke (<tyler@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");
@@ -48,23 +48,23 @@ class Chef
       end
 
       property :command, [ String, Array ],
-               name_property: true, identity: true,
-               description: "An optional property to set the command to be executed if it differs from the resource block's name."
+        name_property: true, identity: true,
+        description: "An optional property to set the command to be executed if it differs from the resource block's name."
 
       property :umask, [ String, Integer ],
-               description: "The file mode creation mask, or umask."
+        description: "The file mode creation mask, or umask."
 
       property :creates, String,
-               description: "Prevent a command from creating a file when that file already exists."
+        description: "Prevent a command from creating a file when that file already exists."
 
       property :cwd, String,
-               description: "The current working directory from which the command will be run."
+        description: "The current working directory from which the command will be run."
 
       property :environment, Hash,
-               description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'})."
+        description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'})."
 
       property :group, [ String, Integer ],
-               description: "The group name or group ID that must be changed before running a command."
+        description: "The group name or group ID that must be changed before running a command."
 
       property :live_stream, [ TrueClass, FalseClass ], default: false,
                description: "Send the output of the command run by this execute resource block to the #{Chef::Dist::CLIENT} event stream."
@@ -78,14 +78,14 @@ class Chef
                description: "The return value for a command. This may be an array of accepted values. An exception is raised when the return value(s) do not match."
 
       property :timeout, [ Integer, Float ],
-               description: "The amount of time (in seconds) a command is to wait before timing out."
+        description: "The amount of time (in seconds) a command is to wait before timing out."
 
       property :user, [ String, Integer ],
-               description: "The user name of the user identity with which to launch the new process. The user name may optionally be specifed with a domain, i.e. domainuser or user@my.dns.domain.com via Universal Principal Name (UPN)format. It can also be specified without a domain simply as user if the domain is instead specified using the domain property. On Windows only, if this property is specified, the password property must be specified."
+        description: "The user name of the user identity with which to launch the new process. The user name may optionally be specifed with a domain, i.e. domainuser or user@my.dns.domain.com via Universal Principal Name (UPN)format. It can also be specified without a domain simply as user if the domain is instead specified using the domain property. On Windows only, if this property is specified, the password property must be specified."
 
       property :domain, String,
-               introduced: "12.21",
-               description: "Windows only: The domain of the user user specified by the user property. If not specified, the user name and password specified by the user and password properties will be used to resolve that user against the domain in which the system running #{Chef::Dist::PRODUCT} is joined, or if that system is not joined to a domain it will resolve the user as a local account on that system. An alternative way to specify the domain is to leave this property unspecified and specify the domain as part of the user property."
+        introduced: "12.21",
+        description: "Windows only: The domain of the user user specified by the user property. If not specified, the user name and password specified by the user and password properties will be used to resolve that user against the domain in which the system running #{Chef::Dist::PRODUCT} is joined, or if that system is not joined to a domain it will resolve the user as a local account on that system. An alternative way to specify the domain is to leave this property unspecified and specify the domain as part of the user property."
 
       property :password, String, sensitive: true,
                introduced: "12.21",
@@ -93,8 +93,8 @@ class Chef
 
       # lazy used to set default value of sensitive to true if password is set
       property :sensitive, [ TrueClass, FalseClass ],
-               description: "Ensure that sensitive resource data is not logged by the #{Chef::Dist::CLIENT}.",
-               default: lazy { |r| r.password ? true : false }, default_description: "True if the password property is set. False otherwise."
+        description: "Ensure that sensitive resource data is not logged by the #{Chef::Dist::CLIENT}.",
+        default: lazy { password ? true : false }, default_description: "True if the password property is set. False otherwise."
 
       property :elevated, [ TrueClass, FalseClass ], default: false,
                description: "Determines whether the script will run with elevated permissions to circumvent User Access Control (UAC) interactively blocking the process.\nThis will cause the process to be run under a batch login instead of an interactive login. The user running #{Chef::Dist::CLIENT} needs the “Replace a process level token” and “Adjust Memory Quotas for a process” permissions. The user that is running the command needs the “Log on as a batch job” permission.\nBecause this requires a login, the user and password properties are required.",

data/lib/chef/resource/file.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Seth Chisamore (<schisamo@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");
@@ -55,14 +55,14 @@ class Chef
       property :path, String, name_property: true, identity: true,
                description: "The full path to the file, including the file name and its extension. For example: /files/file.txt. Default value: the name of the resource block. Microsoft Windows: A path that begins with a forward slash (/) will point to the root of the current working directory of the #{Chef::Dist::CLIENT} process. This path can vary from system to system. Therefore, using a path that begins with a forward slash (/) is not recommended."
 
-      property :atomic_update, [ TrueClass, FalseClass ], desired_state: false, default: lazy { |r| r.docker? && r.special_docker_files?(r.path) ? false : Chef::Config[:file_atomic_update] },
+      property :atomic_update, [ TrueClass, FalseClass ], desired_state: false, default: lazy { docker? && special_docker_files?(path) ? false : Chef::Config[:file_atomic_update] },
                description: "Perform atomic file updates on a per-resource basis. Set to true for atomic file updates. Set to false for non-atomic file updates. This setting overrides file_atomic_update, which is a global setting found in the client.rb file."
 
       property :backup, [ Integer, FalseClass ], desired_state: false, default: 5,
                description: "The number of backups to be kept in /var/chef/backup (for UNIX- and Linux-based platforms) or C:/chef/backup (for the Microsoft Windows platform). Set to false to prevent backups from being kept."
 
       property :checksum, [ /^[a-zA-Z0-9]{64}$/, nil ],
-               description: "The SHA-256 checksum of the file. Use to ensure that a specific file is used. If the checksum does not match, the file is not used."
+        description: "The SHA-256 checksum of the file. Use to ensure that a specific file is used. If the checksum does not match, the file is not used."
 
       property :content, [ String, nil ], desired_state: false,
                description: "A string that is written to the file. The contents of this property replace any previous content when this property has something other than the default value. The default behavior will not modify content."
@@ -78,7 +78,7 @@ class Chef
       property :verifications, Array, default: lazy { [] }
 
       def verify(command = nil, opts = {}, &block)
-        if ! (command.nil? || [String, Symbol].include?(command.class))
+        unless command.nil? || [String, Symbol].include?(command.class)
           raise ArgumentError, "verify requires either a string, symbol, or a block"
         end
 

data/lib/chef/resource/file/verification.rb

@@ -77,6 +77,7 @@ class Chef
           if c.nil?
             raise Chef::Exceptions::VerificationNotFound.new "No file verification for #{name} found."
           end
+
           c
         end
 
@@ -113,6 +114,7 @@ class Chef
           if @command.include?("%{file}")
             raise ArgumentError, "The %{file} expansion for verify commands has been removed. Please use %{path} instead."
           end
+
           command = @command % { path: path }
           interpreter = Chef::GuardInterpreter.for_resource(@parent_resource, command, @command_opts)
           interpreter.evaluate

data/lib/chef/resource/file/verification/systemd_unit.rb

@@ -46,6 +46,7 @@ class Chef
 
           def verify(path, opts = {})
             return true unless systemd_analyze_path
+
             Dir.mktmpdir("chef-systemd-unit") do |dir|
               temp = "#{dir}/#{::File.basename(@parent_resource.path)}"
               ::FileUtils.cp(path, temp)

data/lib/chef/resource/gem_package.rb

@@ -38,22 +38,22 @@ class Chef
       # FIXME? the array form of installing paths most likely does not work?
       #
       property :source, [ String, Array ],
-               description: "Optional. The URL, or list of URLs, at which the gem package is located. This list is added to the source configured in Chef::Config[:rubygems_url] (see also include_default_source) to construct the complete list of rubygems sources. Users in an 'airgapped' environment should set Chef::Config[:rubygems_url] to their local RubyGems mirror."
+        description: "Optional. The URL, or list of URLs, at which the gem package is located. This list is added to the source configured in Chef::Config[:rubygems_url] (see also include_default_source) to construct the complete list of rubygems sources. Users in an 'airgapped' environment should set Chef::Config[:rubygems_url] to their local RubyGems mirror."
 
       property :clear_sources, [ TrueClass, FalseClass ],
-               description: "Set to 'true' to download a gem from the path specified by the source property (and not from RubyGems).",
-               default: lazy { Chef::Config[:clear_gem_sources] }, desired_state: false
+        description: "Set to 'true' to download a gem from the path specified by the source property (and not from RubyGems).",
+        default: lazy { Chef::Config[:clear_gem_sources] }, desired_state: false
 
       property :gem_binary, String, desired_state: false,
                description: "The path of a gem binary to use for the installation. By default, the same version of Ruby that is used by the #{Chef::Dist::CLIENT} will be installed."
 
       property :include_default_source, [ TrueClass, FalseClass ],
-               description: "Set to 'false' to not include 'Chef::Config[:rubygems_url]'' in the sources.",
-               default: true, introduced: "13.0"
+        description: "Set to 'false' to not include 'Chef::Config[:rubygems_url]'' in the sources.",
+        default: true, introduced: "13.0"
 
       property :options, [ String, Hash, Array, nil ],
-               description: "Options for the gem install, either a Hash or a String. When a hash is given, the options are passed to Gem::DependencyInstaller.new, and the gem will be installed via the gems API. When a String is given, the gem will be installed by shelling out to the gem command. Using a Hash of options with an explicit gem_binary will result in undefined behavior.",
-               desired_state: false
+        description: "Options for the gem install, either a Hash or a String. When a hash is given, the options are passed to Gem::DependencyInstaller.new, and the gem will be installed via the gems API. When a String is given, the gem will be installed by shelling out to the gem command. Using a Hash of options with an explicit gem_binary will result in undefined behavior.",
+        desired_state: false
     end
   end
 end

data/lib/chef/resource/git.rb

@@ -24,8 +24,8 @@ class Chef
       description "Use the git resource to manage source control resources that exist in a git repository. git version 1.6.5 (or higher) is required to use all of the functionality in the git resource."
 
       property :additional_remotes, Hash,
-               description: "A Hash of additional remotes that are added to the git repository configuration.",
-               default: lazy { Hash.new }
+        description: "A Hash of additional remotes that are added to the git repository configuration.",
+        default: lazy { {} }
 
       alias :branch :revision
       alias :reference :revision

data/lib/chef/resource/group.rb

@@ -28,11 +28,11 @@ class Chef
       default_action :create
 
       property :group_name, String,
-               name_property: true, identity: true,
-               description: "The name of the group."
+        name_property: true, identity: true,
+        description: "The name of the group."
 
       property :gid, [ String, Integer ],
-               description: "The identifier for the group."
+        description: "The identifier for the group."
 
       property :members, [String, Array], default: lazy { [] },
                coerce: proc { |arg| arg.is_a?(String) ? arg.split(/\s*,\s*/) : arg },
@@ -52,8 +52,8 @@ class Chef
                description: "Allow gid duplication. May only be used with the Groupadd provider."
 
       property :comment, String,
-               introduced: "14.9",
-               description: "Specifies a comment to associate with the local group."
+        introduced: "14.9",
+        description: "Specifies a comment to associate with the local group."
 
       alias_method :users, :members
     end

data/lib/chef/resource/homebrew_cask.rb

@@ -32,25 +32,25 @@ class Chef
       include Chef::Mixin::HomebrewUser
 
       property :cask_name, String,
-               description: "An optional property to set the cask name if it differs from the resource block's name.",
-               regex: %r{^[\w/-]+$},
-               validation_message: "The provided Homebrew cask name is not valid. Cask names can contain alphanumeric characters, _, -, or / only!",
-               name_property: true
+        description: "An optional property to set the cask name if it differs from the resource block's name.",
+        regex: %r{^[\w/-]+$},
+        validation_message: "The provided Homebrew cask name is not valid. Cask names can contain alphanumeric characters, _, -, or / only!",
+        name_property: true
 
       property :options, String,
-               description: "Options to pass to the brew command during installation."
+        description: "Options to pass to the brew command during installation."
 
       property :install_cask, [TrueClass, FalseClass],
-               description: "Automatically install the Homebrew cask tap, if necessary.",
-               default: true
+        description: "Automatically install the Homebrew cask tap, if necessary.",
+        default: true
 
       property :homebrew_path, String,
-               description: "The path to the homebrew binary.",
-               default: "/usr/local/bin/brew"
+        description: "The path to the homebrew binary.",
+        default: "/usr/local/bin/brew"
 
       property :owner, [String, Integer],
-               description: "The owner of the Homebrew installation.",
-               default: lazy { find_homebrew_username }
+        description: "The owner of the Homebrew installation.",
+        default: lazy { find_homebrew_username }
 
       action :install do
         description "Install an application packaged as a Homebrew cask."
@@ -60,9 +60,9 @@ class Chef
         unless casked?
           converge_by("install cask #{new_resource.cask_name} #{new_resource.options}") do
             shell_out!("#{new_resource.homebrew_path} cask install #{new_resource.cask_name} #{new_resource.options}",
-                user: new_resource.owner,
-                env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
-                cwd: ::Dir.home(new_resource.owner))
+              user: new_resource.owner,
+              env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
+              cwd: ::Dir.home(new_resource.owner))
           end
         end
       end
@@ -75,9 +75,9 @@ class Chef
         if casked?
           converge_by("uninstall cask #{new_resource.cask_name}") do
             shell_out!("#{new_resource.homebrew_path} cask uninstall #{new_resource.cask_name}",
-                user: new_resource.owner,
-                env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
-                cwd: ::Dir.home(new_resource.owner))
+              user: new_resource.owner,
+              env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
+              cwd: ::Dir.home(new_resource.owner))
           end
         end
       end

data/lib/chef/resource/homebrew_package.rb

@@ -32,7 +32,7 @@ class Chef
       introduced "12.0"
 
       property :homebrew_user, [ String, Integer ],
-               description: "The name of the Homebrew owner to be used by the #{Chef::Dist::CLIENT} when executing a command."
+        description: "The name of the Homebrew owner to be used by the #{Chef::Dist::CLIENT} when executing a command."
 
     end
   end

data/lib/chef/resource/homebrew_tap.rb

@@ -32,35 +32,35 @@ class Chef
       include Chef::Mixin::HomebrewUser
 
       property :tap_name, String,
-               description: "An optional property to set the tap name if it differs from the resource block's name.",
-               validation_message: "Homebrew tap names must be in the form REPO/TAP format!",
-               regex: %r{^[\w-]+(?:\/[\w-]+)+$},
-               name_property: true
+        description: "An optional property to set the tap name if it differs from the resource block's name.",
+        validation_message: "Homebrew tap names must be in the form REPO/TAP format!",
+        regex: %r{^[\w-]+(?:\/[\w-]+)+$},
+        name_property: true
 
       property :url, String,
-               description: "The URL of the tap."
+        description: "The URL of the tap."
 
       property :full, [TrueClass, FalseClass],
-               description: "Perform a full clone on the tap, as opposed to a shallow clone.",
-               default: false
+        description: "Perform a full clone on the tap, as opposed to a shallow clone.",
+        default: false
 
       property :homebrew_path, String,
-               description: "The path to the Homebrew binary.",
-               default: "/usr/local/bin/brew"
+        description: "The path to the Homebrew binary.",
+        default: "/usr/local/bin/brew"
 
       property :owner, String,
-               description: "The owner of the Homebrew installation.",
-               default: lazy { find_homebrew_username }
+        description: "The owner of the Homebrew installation.",
+        default: lazy { find_homebrew_username }
 
       action :tap do
         description "Add a Homebrew tap."
 
         unless tapped?(new_resource.tap_name)
           converge_by("tap #{new_resource.tap_name}") do
-            shell_out!("#{new_resource.homebrew_path} tap #{new_resource.full ? '--full' : ''} #{new_resource.tap_name} #{new_resource.url || ''}",
-                user: new_resource.owner,
-                env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
-                cwd: ::Dir.home(new_resource.owner))
+            shell_out!("#{new_resource.homebrew_path} tap #{new_resource.full ? "--full" : ""} #{new_resource.tap_name} #{new_resource.url || ""}",
+              user: new_resource.owner,
+              env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
+              cwd: ::Dir.home(new_resource.owner))
           end
         end
       end
@@ -71,9 +71,9 @@ class Chef
         if tapped?(new_resource.tap_name)
           converge_by("untap #{new_resource.tap_name}") do
             shell_out!("#{new_resource.homebrew_path} untap #{new_resource.tap_name}",
-                user: new_resource.owner,
-                env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
-                cwd: ::Dir.home(new_resource.owner))
+              user: new_resource.owner,
+              env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
+              cwd: ::Dir.home(new_resource.owner))
           end
         end
       end

data/lib/chef/resource/hostname.rb

@@ -27,24 +27,24 @@ class Chef
       introduced "14.0"
 
       property :hostname, String,
-               description: "An optional property to set the hostname if it differs from the resource block's name.",
-               name_property: true
+        description: "An optional property to set the hostname if it differs from the resource block's name.",
+        name_property: true
 
       property :compile_time, [ TrueClass, FalseClass ],
-               description: "Determines whether or not the resource should be run at compile time.",
-               default: true, desired_state: false
+        description: "Determines whether or not the resource should be run at compile time.",
+        default: true, desired_state: false
 
       property :ipaddress, String,
-               description: "The IP address to use when configuring the hosts file.",
-               default: lazy { node["ipaddress"] }, default_description: "The node's IP address as determined by Ohai."
+        description: "The IP address to use when configuring the hosts file.",
+        default: lazy { node["ipaddress"] }, default_description: "The node's IP address as determined by Ohai."
 
       property :aliases, [ Array, nil ],
-               description: "An array of hostname aliases to use when configuring the hosts file.",
-               default: nil
+        description: "An array of hostname aliases to use when configuring the hosts file.",
+        default: nil
 
       property :windows_reboot, [ TrueClass, FalseClass ],
-               description: "Determines whether or not Windows should be reboot after changing the hostname, as this is required for the change to take effect.",
-               default: true
+        description: "Determines whether or not Windows should be reboot after changing the hostname, as this is required for the change to take effect.",
+        default: true
 
       action_class do
         def append_replacing_matching_lines(path, regex, string)
@@ -203,7 +203,7 @@ class Chef
             declare_resource(:execute, "svccfg -s system/identity:node setprop config/nodename=\'#{new_resource.hostname}\'") do
               notifies :run, "execute[svcadm refresh]", :immediately
               notifies :run, "execute[svcadm restart]", :immediately
-              not_if { shell_out!("svccfg -s system/identity:node listprop config/nodename").stdout.chomp =~ /config\/nodename\s+astring\s+#{new_resource.hostname}/ }
+              not_if { shell_out!("svccfg -s system/identity:node listprop config/nodename").stdout.chomp =~ %r{config/nodename\s+astring\s+#{new_resource.hostname}} }
             end
             declare_resource(:execute, "svcadm refresh") do
               command "svcadm refresh system/identity:node"