chef 12.6.0-universal-mingw32 → 12.7.2-universal-mingw32

data/lib/chef/provider/package/windows.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Bryan McLellan <btm@loftninjas.org>
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-require 'chef/mixin/uris'
-require 'chef/resource/windows_package'
-require 'chef/provider/package'
-require 'chef/util/path_helper'
-require 'chef/mixin/checksum'
+require "chef/mixin/uris"
+require "chef/resource/windows_package"
+require "chef/provider/package"
+require "chef/util/path_helper"
+require "chef/mixin/checksum"
 
 class Chef
   class Provider
@@ -32,17 +32,24 @@ class Chef
         provides :package, os: "windows"
         provides :windows_package, os: "windows"
 
-        require 'chef/provider/package/windows/registry_uninstall_entry.rb'
+        require "chef/provider/package/windows/registry_uninstall_entry.rb"
+
+        def define_resource_requirements
+          requirements.assert(:install) do |a|
+            a.assertion { new_resource.source unless package_provider == :msi }
+            a.failure_message Chef::Exceptions::NoWindowsPackageSource, "Source for package #{new_resource.name} must be specified in the resource's source property for package to be installed because the package_name property is used to test for the package installation state for this package type."
+          end
+        end
 
         # load_current_resource is run in Chef::Provider#run_action when not in whyrun_mode?
         def load_current_resource
-          @current_resource = Chef::Resource::WindowsPackage.new(@new_resource.name)
+          @current_resource = Chef::Resource::WindowsPackage.new(new_resource.name)
           if downloadable_file_missing?
             Chef::Log.debug("We do not know the version of #{new_resource.source} because the file is not downloaded")
             current_resource.version(:unknown.to_s)
           else
             current_resource.version(package_provider.installed_version)
-            new_resource.version(package_provider.package_version)
+            new_resource.version(package_provider.package_version) if package_provider.package_version
           end
 
           current_resource
@@ -52,12 +59,12 @@ class Chef
           @package_provider ||= begin
             case installer_type
             when :msi
-              Chef::Log.debug("#{@new_resource} is MSI")
-              require 'chef/provider/package/windows/msi'
+              Chef::Log.debug("#{new_resource} is MSI")
+              require "chef/provider/package/windows/msi"
               Chef::Provider::Package::Windows::MSI.new(resource_for_provider, uninstall_registry_entries)
             else
-              Chef::Log.debug("#{@new_resource} is EXE with type '#{installer_type}'")
-              require 'chef/provider/package/windows/exe'
+              Chef::Log.debug("#{new_resource} is EXE with type '#{installer_type}'")
+              require "chef/provider/package/windows/exe"
               Chef::Provider::Package::Windows::Exe.new(resource_for_provider, installer_type, uninstall_registry_entries)
             end
           end
@@ -69,11 +76,11 @@ class Chef
           # binary to determine the installer type for the user. Since the file
           # must be on disk to do so, we have to make this choice in the provider.
           @installer_type ||= begin
-            if @new_resource.installer_type
-              @new_resource.installer_type
+            if new_resource.installer_type
+              new_resource.installer_type
             elsif source_location.nil?
-                inferred_registry_type
-            else    
+              inferred_registry_type
+            else
               basename = ::File.basename(source_location)
               file_extension = basename.split(".").last.downcase
 
@@ -81,7 +88,7 @@ class Chef
                 :msi
               else
                 # search the binary file for installer type
-                ::Kernel.open(::File.expand_path(source_location), 'rb') do |io|
+                ::Kernel.open(::File.expand_path(source_location), "rb") do |io|
                   filesize = io.size
                   bufsize = 4096 # read 4K buffers
                   overlap = 16 # bytes to overlap between buffer reads
@@ -102,13 +109,13 @@ class Chef
                       io.seek(io.tell() - overlap)
                     end
                   end
-                 end
+                end
 
                 # if file is named 'setup.exe' assume installshield
-                if basename == 'setup.exe'
+                if basename == "setup.exe"
                   :installshield
                 else
-                  fail Chef::Exceptions::CannotDetermineWindowsInstallerType, "Installer type for Windows Package '#{@new_resource.name}' not specified and cannot be determined from file extension '#{file_extension}'"
+                  raise Chef::Exceptions::CannotDetermineWindowsInstallerType, "Installer type for Windows Package '#{new_resource.name}' not specified and cannot be determined from file extension '#{file_extension}'"
                 end
               end
             end
@@ -144,12 +151,12 @@ class Chef
 
         # @return [String] candidate_version
         def candidate_version
-          @candidate_version ||= (@new_resource.version || 'latest')
+          @candidate_version ||= (new_resource.version || "latest")
         end
 
         # @return [Array] current_version(s) as an array
         # this package provider does not support package arrays
-        # However, There may be multiple versions for a single 
+        # However, There may be multiple versions for a single
         # package so the first element may be a nested array
         def current_version_array
           [ current_resource.version ]
@@ -160,7 +167,7 @@ class Chef
         #
         # @return [Boolean] true if new_version is equal to or included in current_version
         def target_version_already_installed?(current_version, new_version)
-          Chef::Log.debug("Checking if #{@new_resource} version '#{new_version}' is already installed. #{current_version} is currently installed")
+          Chef::Log.debug("Checking if #{new_resource} version '#{new_version}' is already installed. #{current_version} is currently installed")
           if current_version.is_a?(Array)
             current_version.include?(new_version)
           else
@@ -175,7 +182,7 @@ class Chef
         private
 
         def uninstall_registry_entries
-          @uninstall_registry_entries ||= Chef::Provider::Package::Windows::RegistryUninstallEntry.find_entries(new_resource.name)
+          @uninstall_registry_entries ||= Chef::Provider::Package::Windows::RegistryUninstallEntry.find_entries(new_resource.package_name)
         end
 
         def inferred_registry_type
@@ -188,7 +195,7 @@ class Chef
         end
 
         def downloadable_file_missing?
-          uri_scheme?(new_resource.source) && !::File.exists?(source_location)
+          !new_resource.source.nil? && uri_scheme?(new_resource.source) && !::File.exists?(source_location)
         end
 
         def resource_for_provider
@@ -203,7 +210,7 @@ class Chef
 
         def download_source_file
           source_resource.run_action(:create)
-          Chef::Log.debug("#{@new_resource} fetched source file to #{source_resource.path}")
+          Chef::Log.debug("#{new_resource} fetched source file to #{source_resource.path}")
         end
 
         def source_resource
@@ -213,7 +220,7 @@ class Chef
             r.backup(false)
 
             if new_resource.remote_file_attributes
-              new_resource.remote_file_attributes.each do |(k,v)|
+              new_resource.remote_file_attributes.each do |(k, v)|
                 r.send(k.to_sym, v)
               end
             end
@@ -228,7 +235,9 @@ class Chef
         end
 
         def source_location
-          if uri_scheme?(new_resource.source)
+          if new_resource.source.nil?
+            nil
+          elsif uri_scheme?(new_resource.source)
             source_resource.path
           else
             new_source = Chef::Util::PathHelper.cleanpath(new_resource.source)

data/lib/chef/provider/package/windows/exe.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
 # Author:: Matt Wrock <matt@mattwrock.com>
-# Copyright:: Copyright (c) 2011, 2015 Chef Software, Inc.
+# Copyright:: Copyright 2011-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'chef/mixin/shell_out'
+require "chef/mixin/shell_out"
 
 class Chef
   class Provider
@@ -48,7 +48,7 @@ class Chef
           end
 
           def package_version
-            new_resource.version || install_file_version
+            new_resource.version
           end
 
           def install_package
@@ -61,7 +61,7 @@ class Chef
                 "\"#{new_resource.source}\"",
                 unattended_flags,
                 expand_options(new_resource.options),
-                "& exit %%%%ERRORLEVEL%%%%"
+                "& exit %%%%ERRORLEVEL%%%%",
               ].join(" "), timeout: new_resource.timeout, returns: new_resource.returns
             )
           end
@@ -86,7 +86,7 @@ class Chef
               ::File.basename(uninstall_string),
               expand_options(new_resource.options),
               " ",
-              unattended_flags
+              unattended_flags,
             ].join
             %Q{start "" /wait #{uninstall_string} & exit %%%%ERRORLEVEL%%%%}
           end
@@ -97,29 +97,17 @@ class Chef
             end
           end
 
-          def install_file_version
-            @install_file_version ||= begin
-              if ::File.exist?(@new_resource.source)
-                version_info = Chef::ReservedNames::Win32::File.version_info(new_resource.source)
-                file_version = version_info.FileVersion || version_info.ProductVersion
-                file_version == '' ? nil : file_version
-              else
-                nil
-              end
-            end
-          end
-
           # http://unattended.sourceforge.net/installers.php
           def unattended_flags
             case installer_type
             when :installshield
-              '/s /sms'
+              "/s /sms"
             when :nsis
-              '/S /NCRC'
+              "/S /NCRC"
             when :inno
-              '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART'
+              "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART"
             when :wise
-              '/s'
+              "/s"
             end
           end
         end

data/lib/chef/provider/package/windows/msi.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Bryan McLellan <btm@loftninjas.org>
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +18,8 @@
 
 # TODO: Allow @new_resource.source to be a Product Code as a GUID for uninstall / network install
 
-require 'chef/win32/api/installer' if (RUBY_PLATFORM =~ /mswin|mingw32|windows/) && Chef::Platform.supports_msi?
-require 'chef/mixin/shell_out'
+require "chef/win32/api/installer" if (RUBY_PLATFORM =~ /mswin|mingw32|windows/) && Chef::Platform.supports_msi?
+require "chef/mixin/shell_out"
 
 class Chef
   class Provider
@@ -44,7 +44,7 @@ class Chef
 
           # Returns a version if the package is installed or nil if it is not.
           def installed_version
-            if ::File.exist?(new_resource.source)
+            if !new_resource.source.nil? && ::File.exist?(new_resource.source)
               Chef::Log.debug("#{new_resource} getting product code for package at #{new_resource.source}")
               product_code = get_product_property(new_resource.source, "ProductCode")
               Chef::Log.debug("#{new_resource} checking package status and version for #{product_code}")
@@ -58,7 +58,7 @@ class Chef
 
           def package_version
             return new_resource.version if new_resource.version
-            if ::File.exist?(new_resource.source)
+            if !new_resource.source.nil? && ::File.exist?(new_resource.source)
               Chef::Log.debug("#{new_resource} getting product version for package at #{new_resource.source}")
               get_product_property(new_resource.source, "ProductVersion")
             end
@@ -67,22 +67,22 @@ class Chef
           def install_package
             # We could use MsiConfigureProduct here, but we'll start off with msiexec
             Chef::Log.debug("#{new_resource} installing MSI package '#{new_resource.source}'")
-            shell_out!("msiexec /qn /i \"#{new_resource.source}\" #{expand_options(new_resource.options)}", {:timeout => new_resource.timeout, :returns => new_resource.returns})
+            shell_out!("msiexec /qn /i \"#{new_resource.source}\" #{expand_options(new_resource.options)}", { :timeout => new_resource.timeout, :returns => new_resource.returns })
           end
 
           def remove_package
             # We could use MsiConfigureProduct here, but we'll start off with msiexec
-            if ::File.exist?(new_resource.source)
+            if !new_resource.source.nil? && ::File.exist?(new_resource.source)
               Chef::Log.debug("#{new_resource} removing MSI package '#{new_resource.source}'")
-              shell_out!("msiexec /qn /x \"#{new_resource.source}\" #{expand_options(new_resource.options)}", {:timeout => new_resource.timeout, :returns => new_resource.returns})
+              shell_out!("msiexec /qn /x \"#{new_resource.source}\" #{expand_options(new_resource.options)}", { :timeout => new_resource.timeout, :returns => new_resource.returns })
             else
               uninstall_version = new_resource.version || installed_version
               uninstall_entries.select { |entry| [uninstall_version].flatten.include?(entry.display_version) }
                 .map { |version| version.uninstall_string }.uniq.each do |uninstall_string|
-                  Chef::Log.debug("#{new_resource} removing MSI package version using '#{uninstall_string}'")
-                  uninstall_string += expand_options(new_resource.options)
-                  uninstall_string += " /Q" unless uninstall_string =~ / \/Q\b/
-                  shell_out!(uninstall_string, {:timeout => new_resource.timeout, :returns => new_resource.returns})
+                Chef::Log.debug("#{new_resource} removing MSI package version using '#{uninstall_string}'")
+                uninstall_string += expand_options(new_resource.options)
+                uninstall_string += " /Q" unless uninstall_string =~ / \/Q\b/
+                shell_out!(uninstall_string, { :timeout => new_resource.timeout, :returns => new_resource.returns })
               end
             end
           end

data/lib/chef/provider/package/windows/registry_uninstall_entry.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
 # Author:: Matt Wrock <matt@mattwrock.com>
-# Copyright:: Copyright (c) 2011, 2015 Chef Software, Inc.
+# Copyright:: Copyright 2011-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'win32/registry' if (RUBY_PLATFORM =~ /mswin|mingw32|windows/)
+require "win32/registry" if (RUBY_PLATFORM =~ /mswin|mingw32|windows/)
 
 class Chef
   class Provider
@@ -31,7 +31,7 @@ class Chef
             [
               [::Win32::Registry::HKEY_LOCAL_MACHINE, (::Win32::Registry::Constants::KEY_READ | 0x0100)],
               [::Win32::Registry::HKEY_LOCAL_MACHINE, (::Win32::Registry::Constants::KEY_READ | 0x0200)],
-              [::Win32::Registry::HKEY_CURRENT_USER]
+              [::Win32::Registry::HKEY_CURRENT_USER],
             ].each do |hkey|
               desired = hkey.length > 1 ? hkey[1] : ::Win32::Registry::Constants::KEY_READ
               begin
@@ -39,7 +39,7 @@ class Chef
                   reg.each_key do |key, _wtime|
                     begin
                       entry = reg.open(key, desired)
-                      display_name = read_registry_property(entry, 'DisplayName')
+                      display_name = read_registry_property(entry, "DisplayName")
                       if display_name == package_name
                         entries.push(RegistryUninstallEntry.new(hkey, key, entry))
                       end
@@ -67,9 +67,9 @@ class Chef
             @hive = hive
             @key = key
             @data = registry_data
-            @display_name = RegistryUninstallEntry.read_registry_property(registry_data, 'DisplayName')
-            @display_version = RegistryUninstallEntry.read_registry_property(registry_data, 'DisplayVersion')
-            @uninstall_string = RegistryUninstallEntry.read_registry_property(registry_data, 'UninstallString')
+            @display_name = RegistryUninstallEntry.read_registry_property(registry_data, "DisplayName")
+            @display_version = RegistryUninstallEntry.read_registry_property(registry_data, "DisplayVersion")
+            @uninstall_string = RegistryUninstallEntry.read_registry_property(registry_data, "UninstallString")
           end
 
           attr_reader :hive

data/lib/chef/provider/package/yum-dump.py

@@ -1,6 +1,6 @@
 #
 # Author:: Matthew Kent (<mkent@magoazul.com>)
-# Copyright:: Copyright (c) 2009, 2011 Matthew Kent
+# Copyright:: Copyright 2009-2016, Matthew Kent
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/provider/package/yum.rb

@@ -1,6 +1,6 @@
 
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2008-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,19 +16,19 @@
 # limitations under the License.
 #
 
-require 'chef/config'
-require 'chef/provider/package'
-require 'chef/mixin/which'
-require 'chef/resource/package'
-require 'singleton'
-require 'chef/mixin/get_source_from_package'
+require "chef/config"
+require "chef/provider/package"
+require "chef/mixin/which"
+require "chef/resource/package"
+require "singleton"
+require "chef/mixin/get_source_from_package"
 
 class Chef
   class Provider
     class Package
       class Yum < Chef::Provider::Package
 
-        provides :package, platform_family: %w(rhel fedora)
+        provides :package, platform_family: %w{rhel fedora}
         provides :yum_package, os: "linux"
 
         class RPMUtils
@@ -63,7 +63,7 @@ class Chef
                 end
               end
 
-              version = evr[lead,tail]
+              version = evr[lead, tail]
               if version.empty?
                 version = nil
               end
@@ -159,12 +159,12 @@ class Chef
                   end
                   # copy the segment but not the unmatched character that x_seg_pos will
                   # refer to
-                  x_comp = x[x_pos,x_seg_pos - x_pos]
+                  x_comp = x[x_pos, x_seg_pos - x_pos]
 
                   while (y_seg_pos <= y_pos_max) and isdigit(y[y_seg_pos])
                     y_seg_pos += 1
                   end
-                  y_comp = y[y_pos,y_seg_pos - y_pos]
+                  y_comp = y[y_pos, y_seg_pos - y_pos]
                 else
                   # we are comparing strings
                   x_seg_is_num = false
@@ -172,12 +172,12 @@ class Chef
                   while (x_seg_pos <= x_pos_max) and isalpha(x[x_seg_pos])
                     x_seg_pos += 1
                   end
-                  x_comp = x[x_pos,x_seg_pos - x_pos]
+                  x_comp = x[x_pos, x_seg_pos - x_pos]
 
                   while (y_seg_pos <= y_pos_max) and isalpha(y[y_seg_pos])
                     y_seg_pos += 1
                   end
-                  y_comp = y[y_pos,y_seg_pos - y_pos]
+                  y_comp = y[y_pos, y_seg_pos - y_pos]
                 end
 
                 # if y_seg_pos didn't advance in the above loop it means the segments are
@@ -240,7 +240,7 @@ class Chef
               @r = args[2]
             else
               raise ArgumentError, "Expecting either 'epoch-version-release' or 'epoch, " +
-                                   "version, release'"
+                "version, release'"
             end
           end
           attr_reader :e, :v, :r
@@ -286,7 +286,7 @@ class Chef
           # 2:1.2-1 == 2:1.2
           # 2:1.2-1 == 2:
           #
-          def compare_versions(y, partial=false)
+          def compare_versions(y, partial = false)
             x = self
 
             # compare epoch
@@ -344,12 +344,12 @@ class Chef
               e = args[1].to_i
               v = args[2]
               r = args[3]
-              @version = RPMVersion.new(e,v,r)
+              @version = RPMVersion.new(e, v, r)
               @a = args[4]
               @provides = args[5]
             else
               raise ArgumentError, "Expecting either 'name, epoch-version-release, arch, provides' " +
-                                   "or 'name, epoch, version, release, arch, provides'"
+                "or 'name, epoch, version, release, arch, provides'"
             end
 
             # We always have one, ourselves!
@@ -429,11 +429,11 @@ class Chef
               e = args[1].to_i
               v = args[2]
               r = args[3]
-              @version = RPMVersion.new(e,v,r)
+              @version = RPMVersion.new(e, v, r)
               @flag = args[4] || :==
             else
               raise ArgumentError, "Expecting either 'name, epoch-version-release, flag' or " +
-                                   "'name, epoch, version, release, flag'"
+                "'name, epoch, version, release, flag'"
             end
           end
           attr_reader :name, :version, :flag
@@ -690,15 +690,15 @@ class Chef
             when :installed
               reset_installed
               # fast
-              opts=" --installed"
+              opts = " --installed"
             when :all
               reset
               # medium
-              opts=" --options --installed-provides"
+              opts = " --options --installed-provides"
             when :provides
               reset
               # slow!
-              opts=" --options --all-provides"
+              opts = " --options --all-provides"
             else
               raise ArgumentError, "Unexpected value in next_refresh: #{@next_refresh}"
             end
@@ -712,7 +712,7 @@ class Chef
             one_line = false
             error = nil
 
-            helper = ::File.join(::File.dirname(__FILE__), 'yum-dump.py')
+            helper = ::File.join(::File.dirname(__FILE__), "yum-dump.py")
             status = nil
 
             begin
@@ -797,12 +797,12 @@ class Chef
           end
 
           def extract_interpreter(file)
-            ::File.open(file, 'r', &:readline)[2..-1].strip
+            ::File.open(file, "r", &:readline)[2..-1].strip
           end
 
           # dnf based systems have a yum shim that has /bin/bash as the interpreter. Don't use this.
           def shabang_or_fallback(interpreter)
-            if interpreter == '/bin/bash'
+            if interpreter == "/bin/bash"
               Chef::Log.warn("Yum executable interpreter is /bin/bash. Falling back to default python.")
               "/usr/bin/python"
             else
@@ -811,7 +811,7 @@ class Chef
           end
 
           def shabang?(file)
-            ::File.open(file, 'r') do |f|
+            ::File.open(file, "r") do |f|
               f.read(2) == '#!'
             end
           rescue Errno::ENOENT
@@ -870,7 +870,7 @@ class Chef
           end
 
           # Check if a package-version.arch is available to install
-          def version_available?(package_name, desired_version, arch=nil)
+          def version_available?(package_name, desired_version, arch = nil)
             version(package_name, arch, true, false) do |v|
               return true if desired_version == v
             end
@@ -879,7 +879,7 @@ class Chef
           end
 
           # Return the source repository for a package-version.arch
-          def package_repository(package_name, desired_version, arch=nil)
+          def package_repository(package_name, desired_version, arch = nil)
             package(package_name, arch, true, false) do |pkg|
               return pkg.repoid if desired_version == pkg.version.to_s
             end
@@ -888,13 +888,13 @@ class Chef
           end
 
           # Return the latest available version for a package.arch
-          def available_version(package_name, arch=nil)
+          def available_version(package_name, arch = nil)
             version(package_name, arch, true, false)
           end
           alias :candidate_version :available_version
 
           # Return the currently installed version for a package.arch
-          def installed_version(package_name, arch=nil)
+          def installed_version(package_name, arch = nil)
             version(package_name, arch, false, true)
           end
 
@@ -922,7 +922,7 @@ class Chef
 
           private
 
-          def version(package_name, arch=nil, is_available=false, is_installed=false)
+          def version(package_name, arch = nil, is_available = false, is_installed = false)
             package(package_name, arch, is_available, is_installed) do |pkg|
               if block_given?
                 yield pkg.version.to_s
@@ -939,7 +939,7 @@ class Chef
             end
           end
 
-          def package(package_name, arch=nil, is_available=false, is_installed=false)
+          def package(package_name, arch = nil, is_available = false, is_installed = false)
             refresh
             packages = @rpmdb[package_name]
             if packages
@@ -1049,7 +1049,7 @@ class Chef
         def yum_command(command)
           command = "#{yum_binary} #{command}"
           Chef::Log.debug("#{@new_resource}: yum command: \"#{command}\"")
-          status = shell_out_with_timeout(command, {:timeout => Chef::Config[:yum_timeout]})
+          status = shell_out_with_timeout(command, { :timeout => Chef::Config[:yum_timeout] })
 
           # This is fun: rpm can encounter errors in the %post/%postun scripts which aren't
           # considered fatal - meaning the rpm is still successfully installed. These issue
@@ -1066,7 +1066,7 @@ class Chef
               if l =~ %r{^error: %(post|postun)\(.*\) scriptlet failed, exit status \d+$}
                 Chef::Log.warn("#{@new_resource} caught non-fatal scriptlet issue: \"#{l}\". Can't trust yum exit status " +
                                "so running install again to verify.")
-                status = shell_out_with_timeout(command, {:timeout => Chef::Config[:yum_timeout]})
+                status = shell_out_with_timeout(command, { :timeout => Chef::Config[:yum_timeout] })
                 break
               end
             end
@@ -1126,7 +1126,6 @@ class Chef
             end
           end
 
-
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @current_resource.package_name(@new_resource.package_name)
 
@@ -1225,7 +1224,7 @@ class Chef
                   else
                     # we bail like yum when the package is older
                     raise Chef::Exceptions::Package, "Installed package #{n}-#{current_version_array[idx]} is newer " +
-                                                     "than candidate package #{n}-#{v}"
+                      "than candidate package #{n}-#{v}"
                   end
                 end
               end
@@ -1245,7 +1244,7 @@ class Chef
             as_array(name).zip(as_array(version)).each do |n, v|
               idx = package_name_array.index(n)
               a = arch_for_name(n)
-              s = ''
+              s = ""
               unless v == current_version_array[idx]
                 s = "#{n}-#{v}#{yum_arch(a)}"
                 repo = @yum.package_repository(n, v, a)
@@ -1253,12 +1252,12 @@ class Chef
                 pkg_string_bits << s
               end
             end
-            pkg_string = pkg_string_bits.join(' ')
+            pkg_string = pkg_string_bits.join(" ")
             Chef::Log.info("#{@new_resource} #{log_method} #{repos.join(' ')}")
             yum_command("-d0 -e0 -y#{expand_options(@new_resource.options)} #{method} #{pkg_string}")
           else
             raise Chef::Exceptions::Package, "Version #{version} of #{name} not found. Did you specify both version " +
-                                             "and release? (version-release, e.g. 1.84-10.fc6)"
+              "and release? (version-release, e.g. 1.84-10.fc6)"
           end
         end
 
@@ -1305,12 +1304,12 @@ class Chef
             remove_str = as_array(name).zip(as_array(version)).map do |n, v|
               a = arch_for_name(n)
               "#{[n, v].join('-')}#{yum_arch(a)}"
-            end.join(' ')
+            end.join(" ")
           else
             remove_str = as_array(name).map do |n|
               a = arch_for_name(n)
               "#{n}#{yum_arch(a)}"
-            end.join(' ')
+            end.join(" ")
           end
           yum_command("-d0 -e0 -y#{expand_options(@new_resource.options)} remove #{remove_str}")
 
@@ -1359,7 +1358,7 @@ class Chef
         # matching them up with an actual package so the standard resource handling can apply.
         #
         # There is currently no support for filename matching.
-        def parse_dependency(name,version)
+        def parse_dependency(name, version)
           # Transform the package_name into a requirement
 
           # If we are passed a version or a version constraint we have to assume it's a requirement first. If it can't be
@@ -1412,7 +1411,7 @@ class Chef
               new_package_version = nil
             end
 
-            [new_package_name,new_package_version]
+            [new_package_name, new_package_version]
           end
         end