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

data/lib/chef/resource/chocolatey_source.rb

@@ -26,7 +26,7 @@ class Chef
                description: "An optional property to set the source name if it differs from the resource block's name."
 
       property :source, String,
-               description: "The source URL."
+        description: "The source URL."
 
       property :bypass_proxy, [TrueClass, FalseClass], default: false,
                description: "Whether or not to bypass the system's proxy settings to access the source."
@@ -62,7 +62,7 @@ class Chef
       def fetch_source_element(id)
         require "rexml/document" unless defined?(REXML::Document)
 
-        config_file = "#{ENV['ALLUSERSPROFILE']}\\chocolatey\\config\\chocolatey.config"
+        config_file = "#{ENV["ALLUSERSPROFILE"]}\\chocolatey\\config\\chocolatey.config"
         raise "Could not find the Chocolatey config at #{config_file}!" unless ::File.exist?(config_file)
 
         config_contents = REXML::Document.new(::File.read(config_file))
@@ -114,7 +114,7 @@ class Chef
         # @param [String] action the name of the action to perform
         # @return [String] the choco source command string
         def choco_cmd(action)
-          cmd = "#{ENV['ALLUSERSPROFILE']}\\chocolatey\\bin\\choco source #{action} -n \"#{new_resource.source_name}\""
+          cmd = "#{ENV["ALLUSERSPROFILE"]}\\chocolatey\\bin\\choco source #{action} -n \"#{new_resource.source_name}\""
           if action == "add"
             cmd << " -s #{new_resource.source} --priority=#{new_resource.priority}"
             cmd << " --bypassproxy" if new_resource.bypass_proxy

data/lib/chef/resource/cookbook_file.rb

@@ -33,12 +33,12 @@ class Chef
       description "Use the cookbook_file resource to transfer files from a sub-directory of COOKBOOK_NAME/files/ to a specified path located on a host that is running the #{Chef::Dist::CLIENT}. The file is selected according to file specificity, which allows different source files to be used based on the hostname, host platform (operating system, distro, or as appropriate), or platform version. Files that are located in the COOKBOOK_NAME/files/default sub-directory may be used on any platform.\n\nDuring a #{Chef::Dist::CLIENT} run, the checksum for each local file is calculated and then compared against the checksum for the same file as it currently exists in the cookbook on the Chef server. A file is not transferred when the checksums match. Only files that require an update are transferred from the Chef server to a node."
 
       property :source, [ String, Array ],
-                description: "The name of the file in COOKBOOK_NAME/files/default or the path to a file located in COOKBOOK_NAME/files. The path must include the file name and its extension. This can be used to distribute specific files depending upon the platform used.",
-                default: lazy { ::File.basename(name) }
+        description: "The name of the file in COOKBOOK_NAME/files/default or the path to a file located in COOKBOOK_NAME/files. The path must include the file name and its extension. This can be used to distribute specific files depending upon the platform used.",
+        default: lazy { ::File.basename(name) }
 
       property :cookbook, String,
-                description: "The cookbook in which a file is located (if it is not located in the current cookbook).",
-                desired_state: false
+        description: "The cookbook in which a file is located (if it is not located in the current cookbook).",
+        desired_state: false
 
       default_action :create
     end

data/lib/chef/resource/cron.rb

@@ -135,32 +135,32 @@ class Chef
       end
 
       property :time, Symbol,
-               description: "A time interval. Possible values: :annually, :daily, :hourly, :midnight, :monthly, :reboot, :weekly, or :yearly.",
-               equal_to: Chef::Provider::Cron::SPECIAL_TIME_VALUES
+        description: "A time interval. Possible values: :annually, :daily, :hourly, :midnight, :monthly, :reboot, :weekly, or :yearly.",
+        equal_to: Chef::Provider::Cron::SPECIAL_TIME_VALUES
 
       property :mailto, String,
-               description: "Set the MAILTO environment variable."
+        description: "Set the MAILTO environment variable."
 
       property :path, String,
-               description: "Set the PATH environment variable."
+        description: "Set the PATH environment variable."
 
       property :home, String,
-               description: "Set the HOME environment variable."
+        description: "Set the HOME environment variable."
 
       property :shell, String,
-               description: "Set the SHELL environment variable."
+        description: "Set the SHELL environment variable."
 
       property :command, String,
-               description: "The command to be run, or the path to a file that contains the command to be run.",
-               identity: true
+        description: "The command to be run, or the path to a file that contains the command to be run.",
+        identity: true
 
       property :user, String,
-               description: "The name of the user that runs the command. If the user property is changed, the original user for the crontab program continues to run until that crontab program is deleted. This property is not applicable on the AIX platform.",
-               default: "root"
+        description: "The name of the user that runs the command. If the user property is changed, the original user for the crontab program continues to run until that crontab program is deleted. This property is not applicable on the AIX platform.",
+        default: "root"
 
       property :environment, Hash,
-               description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}).",
-               default: lazy { Hash.new }
+        description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}).",
+        default: lazy { {} }
 
       private
 

data/lib/chef/resource/cron_access.rb

@@ -30,8 +30,8 @@ class Chef
       description "Use the cron_access resource to manage the /etc/cron.allow and /etc/cron.deny files."
 
       property :user, String,
-               description: "An optional property to set the user name if it differs from the resource block's name.",
-               name_property: true
+        description: "An optional property to set the user name if it differs from the resource block's name.",
+        name_property: true
 
       action :allow do
         description "Add the user to the cron.allow file."

data/lib/chef/resource/cron_d.rb

@@ -35,9 +35,11 @@ class Chef
       # @return [Boolean] valid or not?
       def self.validate_numeric(spec, min, max)
         return true if spec == "*"
+
         #  binding.pry
         if spec.respond_to? :to_int
           return false unless spec >= min && spec <= max
+
           return true
         end
 
@@ -45,6 +47,7 @@ class Chef
         spec.split(%r{\/|-|,}).each do |x|
           next if x == "*"
           return false unless x =~ /^\d+$/
+
           x = x.to_i
           return false unless x >= min && x <= max
         end
@@ -56,12 +59,14 @@ class Chef
       # @return [Boolean] valid or not?
       def self.validate_month(spec)
         return true if spec == "*"
+
         if spec.respond_to? :to_int
           validate_numeric(spec, 1, 12)
         elsif spec.respond_to? :to_str
           return true if spec == "*"
           # Named abbreviations are permitted but not as part of a range or with stepping
           return true if %w{jan feb mar apr may jun jul aug sep oct nov dec}.include? spec.downcase
+
           # 1-12 are legal for months
           validate_numeric(spec, 1, 12)
         else
@@ -74,12 +79,14 @@ class Chef
       # @return [Boolean] valid or not?
       def self.validate_dow(spec)
         return true if spec == "*"
+
         if spec.respond_to? :to_int
           validate_numeric(spec, 0, 7)
         elsif spec.respond_to? :to_str
           return true if spec == "*"
           # Named abbreviations are permitted but not as part of a range or with stepping
           return true if %w{sun mon tue wed thu fri sat}.include? spec.downcase
+
           # 0-7 are legal for days of week
           validate_numeric(spec, 0, 7)
         else
@@ -88,78 +95,78 @@ class Chef
       end
 
       property :cron_name, String,
-               description: "An optional property to set the cron name if it differs from the resource block's name.",
-               name_property: true
+        description: "An optional property to set the cron name if it differs from the resource block's name.",
+        name_property: true
 
       property :cookbook, String, desired_state: false
 
       property :predefined_value, String,
-               description: 'Schedule your cron job with one of the special predefined value instead of ** * pattern. This correspond to "@reboot", "@yearly", "@annually", "@monthly", "@weekly", "@daily", "@midnight" or "@hourly".',
-               equal_to: %w{ @reboot @yearly @annually @monthly @weekly @daily @midnight @hourly }
+        description: 'Schedule your cron job with one of the special predefined value instead of ** * pattern. This correspond to "@reboot", "@yearly", "@annually", "@monthly", "@weekly", "@daily", "@midnight" or "@hourly".',
+        equal_to: %w{ @reboot @yearly @annually @monthly @weekly @daily @midnight @hourly }
 
       property :minute, [Integer, String],
-               description: "The minute at which the cron entry should run (0 - 59).",
-               default: "*", callbacks: {
-                 "should be a valid minute spec" => ->(spec) { validate_numeric(spec, 0, 59) },
-               }
+        description: "The minute at which the cron entry should run (0 - 59).",
+        default: "*", callbacks: {
+          "should be a valid minute spec" => ->(spec) { validate_numeric(spec, 0, 59) },
+        }
 
       property :hour, [Integer, String],
-               description: "The hour at which the cron entry should run (0 - 23).",
-               default: "*", callbacks: {
-                 "should be a valid hour spec" => ->(spec) { validate_numeric(spec, 0, 23) },
-               }
+        description: "The hour at which the cron entry should run (0 - 23).",
+        default: "*", callbacks: {
+          "should be a valid hour spec" => ->(spec) { validate_numeric(spec, 0, 23) },
+        }
 
       property :day, [Integer, String],
-               description: "The day of month at which the cron entry should run (1 - 31).",
-               default: "*", callbacks: {
-                 "should be a valid day spec" => ->(spec) { validate_numeric(spec, 1, 31) },
-               }
+        description: "The day of month at which the cron entry should run (1 - 31).",
+        default: "*", callbacks: {
+          "should be a valid day spec" => ->(spec) { validate_numeric(spec, 1, 31) },
+        }
 
       property :month, [Integer, String],
-               description: "The month in the year on which a cron entry is to run (1 - 12, jan-dec, or *).",
-               default: "*", callbacks: {
-                 "should be a valid month spec" => ->(spec) { validate_month(spec) },
-               }
+        description: "The month in the year on which a cron entry is to run (1 - 12, jan-dec, or *).",
+        default: "*", callbacks: {
+          "should be a valid month spec" => ->(spec) { validate_month(spec) },
+        }
 
       property :weekday, [Integer, String],
-               description: "The day of the week on which this entry is to run (0-7, mon-sun, or *), where Sunday is both 0 and 7.",
-               default: "*", callbacks: {
-                 "should be a valid weekday spec" => ->(spec) { validate_dow(spec) },
-               }
+        description: "The day of the week on which this entry is to run (0-7, mon-sun, or *), where Sunday is both 0 and 7.",
+        default: "*", callbacks: {
+          "should be a valid weekday spec" => ->(spec) { validate_dow(spec) },
+        }
 
       property :command, String,
-               description: "The command to run.",
-               required: true
+        description: "The command to run.",
+        required: true
 
       property :user, String,
-               description: "The name of the user that runs the command.",
-               default: "root"
+        description: "The name of the user that runs the command.",
+        default: "root"
 
       property :mailto, String,
-               description: "Set the MAILTO environment variable in the cron.d file."
+        description: "Set the MAILTO environment variable in the cron.d file."
 
       property :path, String,
-               description: "Set the PATH environment variable in the cron.d file."
+        description: "Set the PATH environment variable in the cron.d file."
 
       property :home, String,
-               description: "Set the HOME environment variable in the cron.d file."
+        description: "Set the HOME environment variable in the cron.d file."
 
       property :shell, String,
-               description: "Set the SHELL environment variable in the cron.d file."
+        description: "Set the SHELL environment variable in the cron.d file."
 
       property :comment, String,
-               description: "A comment to place in the cron.d file."
+        description: "A comment to place in the cron.d file."
 
       property :environment, Hash,
-               description: "A Hash containing additional arbitrary environment variables under which the cron job will be run in the form of ``({'ENV_VARIABLE' => 'VALUE'})``.",
-               default: lazy { Hash.new }
+        description: "A Hash containing additional arbitrary environment variables under which the cron job will be run in the form of ``({'ENV_VARIABLE' => 'VALUE'})``.",
+        default: lazy { {} }
 
       property :mode, [String, Integer],
-               description: "The octal mode of the generated crontab file.",
-               default: "0600"
+        description: "The octal mode of the generated crontab file.",
+        default: "0600"
 
       property :random_delay, Integer,
-               description: "Set the RANDOM_DELAY environment variable in the cron.d file."
+        description: "Set the RANDOM_DELAY environment variable in the cron.d file."
 
       # warn if someone passes the deprecated cookbook property
       def after_created

data/lib/chef/resource/directory.rb

@@ -44,8 +44,8 @@ class Chef
                description: "The path to the directory. Using a fully qualified path is recommended, but is not always required."
 
       property :recursive, [ TrueClass, FalseClass ],
-               description: "Create or delete parent directories recursively. For the owner, group, and mode properties, the value of this property applies only to the leaf directory.",
-               default: false
+        description: "Create or delete parent directories recursively. For the owner, group, and mode properties, the value of this property applies only to the leaf directory.",
+        default: false
     end
   end
 end

data/lib/chef/resource/dmg_package.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Joshua Timberman (<jtimberman@chef.io>)
-# Copyright:: 2011-2018, Chef Software, Inc.
+# Copyright:: 2011-2019, Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,57 +27,57 @@ class Chef
       introduced "14.0"
 
       property :app, String,
-               description: "The name of the application as it appears in the /Volumes directory if it differs from the resource block's name.",
-               name_property: true
+        description: "The name of the application as it appears in the /Volumes directory if it differs from the resource block's name.",
+        name_property: true
 
       property :source, String,
-               description: "The remote URL that is used to download the .dmg file, if specified."
+        description: "The remote URL that is used to download the .dmg file, if specified."
 
       property :file, String,
-               description: "The full path to the .dmg file on the local system."
+        description: "The full path to the .dmg file on the local system."
 
       property :owner, [String, Integer],
-               description: "The user that should own the package installation."
+        description: "The user that should own the package installation."
 
       property :destination, String,
-               description: "The directory to copy the .app into.",
-               default: "/Applications"
+        description: "The directory to copy the .app into.",
+        default: "/Applications"
 
       property :checksum, String,
-               description: "The sha256 checksum of the .dmg file to download."
+        description: "The sha256 checksum of the .dmg file to download."
 
       property :volumes_dir, String,
-               description: "The directory under /Volumes where the dmg is mounted if it differs from the name of the .dmg file.",
-               default: lazy { |r| r.app }, default_description: "The value passed for the application name."
+        description: "The directory under /Volumes where the dmg is mounted if it differs from the name of the .dmg file.",
+        default: lazy { app }, default_description: "The value passed for the application name."
 
       property :dmg_name, String,
-               description: "The name of the .dmg file if it differs from that of the app, or if the name has spaces.",
-               desired_state: false,
-               default: lazy { |r| r.app }, default_description: "The value passed for the application name."
+        description: "The name of the .dmg file if it differs from that of the app, or if the name has spaces.",
+        desired_state: false,
+        default: lazy { app }, default_description: "The value passed for the application name."
 
       property :type, String,
-               description: "The type of package.",
-               equal_to: %w{app pkg mpkg},
-               default: "app", desired_state: false
+        description: "The type of package.",
+        equal_to: %w{app pkg mpkg},
+        default: "app", desired_state: false
 
       property :package_id, String,
-               description: "The package ID that is registered with pkgutil when a pkg or mpkg is installed."
+        description: "The package ID that is registered with pkgutil when a pkg or mpkg is installed."
 
       property :dmg_passphrase, String,
-               description: "Specify a passphrase to be used to decrypt the .dmg file during the mount process.",
-               desired_state: false
+        description: "Specify a passphrase to be used to decrypt the .dmg file during the mount process.",
+        desired_state: false
 
       property :accept_eula, [TrueClass, FalseClass],
-               description: "Specify whether to accept the EULA. Certain dmgs require acceptance of EULA before mounting.",
-               default: false, desired_state: false
+        description: "Specify whether to accept the EULA. Certain dmgs require acceptance of EULA before mounting.",
+        default: false, desired_state: false
 
       property :headers, Hash,
-               description: "Allows custom HTTP headers (like cookies) to be set on the remote_file resource.",
-               desired_state: false
+        description: "Allows custom HTTP headers (like cookies) to be set on the remote_file resource.",
+        desired_state: false
 
       property :allow_untrusted, [TrueClass, FalseClass],
-               description: "Allow installation of packages that do not have trusted certificates.",
-               default: false, desired_state: false
+        description: "Allow installation of packages that do not have trusted certificates.",
+        default: false, desired_state: false
 
       load_current_value do |new_resource|
         if ::File.directory?("#{new_resource.destination}/#{new_resource.app}.app")

data/lib/chef/resource/dnf_package.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2016-2017, Chef Software Inc.
+# Copyright:: Copyright 2016-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,32 +48,32 @@ class Chef
 
       # Install a specific arch
       property :arch, [String, Array],
-               description: "The architecture of the package to be installed or upgraded. This value can also be passed as part of the package name.",
-               coerce: proc { |x| [x].flatten }
+        description: "The architecture of the package to be installed or upgraded. This value can also be passed as part of the package name.",
+        coerce: proc { |x| [x].flatten }
 
       # Flush the in-memory available/installed cache, this does not flush the dnf caches on disk
       property :flush_cache, Hash,
-               description: "Flush the in-memory cache before or after a DNF operation that installs, upgrades, or removes a package. DNF automatically synchronizes remote metadata to a local cache. The #{Chef::Dist::CLIENT} creates a copy of the local cache, and then stores it in-memory during the #{Chef::Dist::CLIENT} run. The in-memory cache allows packages to be installed during the #{Chef::Dist::CLIENT} run without the need to continue synchronizing the remote metadata to the local cache while the #{Chef::Dist::CLIENT} run is in-progress.",
-               default: { before: false, after: false },
-               coerce: proc { |v|
-                         if v.is_a?(Hash)
-                           v
-                         elsif v.is_a?(Array)
-                           v.each_with_object({}) { |arg, obj| obj[arg] = true }
-                         elsif v.is_a?(TrueClass) || v.is_a?(FalseClass)
-                           { before: v, after: v }
-                         elsif v == :before
-                           { before: true, after: false }
-                         elsif v == :after
-                           { after: true, before: false }
-                         end
-                       }
+        description: "Flush the in-memory cache before or after a DNF operation that installs, upgrades, or removes a package. DNF automatically synchronizes remote metadata to a local cache. The #{Chef::Dist::CLIENT} creates a copy of the local cache, and then stores it in-memory during the #{Chef::Dist::CLIENT} run. The in-memory cache allows packages to be installed during the #{Chef::Dist::CLIENT} run without the need to continue synchronizing the remote metadata to the local cache while the #{Chef::Dist::CLIENT} run is in-progress.",
+        default: { before: false, after: false },
+        coerce: proc { |v|
+          if v.is_a?(Hash)
+            v
+          elsif v.is_a?(Array)
+            v.each_with_object({}) { |arg, obj| obj[arg] = true }
+          elsif v.is_a?(TrueClass) || v.is_a?(FalseClass)
+            { before: v, after: v }
+          elsif v == :before
+            { before: true, after: false }
+          elsif v == :after
+            { after: true, before: false }
+          end
+        }
 
       def allow_downgrade(arg = nil)
-        if !arg.nil?
+        unless arg.nil?
           Chef.deprecated(:dnf_package_allow_downgrade, "the allow_downgrade property on the dnf_package provider is not used, DNF supports downgrades by default.")
         end
-        false
+        true
       end
     end
   end

data/lib/chef/resource/dpkg_package.rb

@@ -27,15 +27,15 @@ class Chef
       description "Use the dpkg_package resource to manage packages for the dpkg platform. When a package is installed from a local file, it must be added to the node using the remote_file or cookbook_file resources."
 
       property :source, [ String, Array, nil ],
-               description: "The path to a package in the local file system."
+        description: "The path to a package in the local file system."
 
       property :response_file, String,
-               description: "The direct path to the file used to pre-seed a package.",
-               desired_state: false
+        description: "The direct path to the file used to pre-seed a package.",
+        desired_state: false
 
       property :response_file_variables, Hash,
-               description: "A Hash of response file variables in the form of {'VARIABLE' => 'VALUE'}.",
-               default: lazy { Hash.new }, desired_state: false
+        description: "A Hash of response file variables in the form of {'VARIABLE' => 'VALUE'}.",
+        default: lazy { {} }, desired_state: false
     end
   end
 end