puppet 8.4.0-x64-mingw32 → 8.5.1-x64-mingw32

data/lib/puppet/provider/exec/posix.rb

@@ -55,7 +55,7 @@ Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
 
   def run(command, check = false)
     if resource[:umask]
-      Puppet::Util::withumask(resource[:umask]) { super(command, check) }
+      Puppet::Util.withumask(resource[:umask]) { super(command, check) }
     else
       super(command, check)
     end

data/lib/puppet/provider/exec.rb

@@ -29,7 +29,7 @@ class Puppet::Provider::Exec < Puppet::Provider
       end
 
       if value.nil? || value.empty?
-        msg = _("Empty environment setting '%{var}'") % {var: var}
+        msg = _("Empty environment setting '%{var}'") % { var: var }
         Puppet.warn_once('undefined_variables', "empty_env_var_#{var}", msg, resource.file, resource.line)
       end
 
@@ -45,14 +45,14 @@ class Puppet::Provider::Exec < Puppet::Provider
 
     checkexe(command)
 
-    debug "Executing#{check ? " check": ""} '#{sensitive ? '[redacted]' : command}'"
+    debug "Executing#{check ? " check" : ""} '#{sensitive ? '[redacted]' : command}'"
 
     # Ruby 2.1 and later interrupt execution in a way that bypasses error
     # handling by default. Passing Timeout::Error causes an exception to be
     # raised that can be rescued inside of the block by cleanup routines.
     #
     # This is backwards compatible all the way to Ruby 1.8.7.
-    Timeout::timeout(resource[:timeout], Timeout::Error) do
+    Timeout.timeout(resource[:timeout], Timeout::Error) do
       cwd = resource[:cwd]
       # It's ok if cwd is nil. In that case Puppet::Util::Execution.execute() simply will not attempt to
       # change the working directory, which is exactly the right behavior when no cwd parameter is

data/lib/puppet/provider/file/windows.rb

@@ -86,7 +86,7 @@ Puppet::Type.type(:file).provide :windows do
   end
 
   def validate
-    if [:owner, :group, :mode].any?{|p| resource[p]} and !supports_acl?(resource[:path])
+    if [:owner, :group, :mode].any? { |p| resource[p] } and !supports_acl?(resource[:path])
       resource.fail(_("Can only manage owner, group, and mode on filesystems that support Windows ACLs, such as NTFS"))
     end
   end
@@ -124,12 +124,12 @@ Puppet::Type.type(:file).provide :windows do
           # Since the group is LocalSystem, and the permissions are FullControl,
           # replace the value returned with the value expected. This will treat
           # this specific situation as "insync"
-          current = ( (current.to_i(8) & mode_part['remove_mask']) | mode_part['should_mask'] ).to_s(8).rjust(4, '0')
+          current = ((current.to_i(8) & mode_part['remove_mask']) | mode_part['should_mask']).to_s(8).rjust(4, '0')
         else
           # If the SYSTEM account does _not_ have FullControl in this scenario, we should
           # force the resource out of sync no matter what.
           # TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-          Puppet.debug { _("%{resource_name}: %{mode_part_type} set to SYSTEM. SYSTEM permissions cannot be set below FullControl ('7')") % { resource_name: resource[:name], mode_part_type: mode_part['type']} }
+          Puppet.debug { _("%{resource_name}: %{mode_part_type} set to SYSTEM. SYSTEM permissions cannot be set below FullControl ('7')") % { resource_name: resource[:name], mode_part_type: mode_part['type'] } }
           return nil
         end
       end

data/lib/puppet/provider/group/groupadd.rb

@@ -127,7 +127,7 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
   end
 
   def members_to_s(current)
-    return '' if current.nil? || !current.kind_of?(Array)
+    return '' if current.nil? || !current.is_a?(Array)
 
     current.join(',')
   end
@@ -150,7 +150,7 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
       @groups = []
       Puppet::FileSystem.each_line(group_file) do |line|
         group = line.chomp.split(':')
-        @groups << Hash[group_keys.zip(group)]
+        @groups << group_keys.zip(group).to_h
       end
     end
 

data/lib/puppet/provider/group/pw.rb

@@ -50,4 +50,3 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
     super(param, value)
   end
 end
-

data/lib/puppet/provider/group/windows_adsi.rb

@@ -11,7 +11,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
 
   has_features :manages_members
 
-  def initialize(value={})
+  def initialize(value = {})
     super(value)
     @deleted = false
   end
@@ -40,7 +40,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
   end
 
   def members_to_s(users)
-    return '' if users.nil? or !users.kind_of?(Array)
+    return '' if users.nil? or !users.is_a?(Array)
 
     users = users.map do |user_name|
       sid = Puppet::Util::Windows::SID.name_to_principal(user_name)
@@ -61,7 +61,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
   end
 
   def member_valid?(user_name)
-    ! Puppet::Util::Windows::SID.name_to_principal(user_name).nil?
+    !Puppet::Util::Windows::SID.name_to_principal(user_name).nil?
   end
 
   def group

data/lib/puppet/provider/ldap.rb

@@ -84,7 +84,7 @@ class Puppet::Provider::Ldap < Puppet::Provider
 
     super
 
-    @property_hash = @property_hash.inject({}) do |result, ary|
+    @property_hash = @property_hash.each_with_object({}) do |ary, result|
       param, values = ary
 
       # Skip any attributes we don't manage.
@@ -104,7 +104,6 @@ class Puppet::Provider::Ldap < Puppet::Provider
       else
         result[param] = values
       end
-      result
     end
 
     # Make a duplicate, so that we have a copy for comparison
@@ -120,7 +119,7 @@ class Puppet::Provider::Ldap < Puppet::Provider
   # Return (and look up if necessary) the desired state.
   def properties
     if @property_hash.empty?
-      @property_hash = query || {:ensure => :absent}
+      @property_hash = query || { :ensure => :absent }
       @property_hash[:ensure] = :absent if @property_hash.empty?
     end
     @property_hash.dup

data/lib/puppet/provider/nameservice/directoryservice.rb

@@ -181,7 +181,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     #     This method spits out proper DSCL commands for us.
     #     We EXPECT name to be @resource[:name] when called from an instance object.
 
-    command_vector = [ command(:dscl), "-plist", "." ]
+    command_vector = [command(:dscl), "-plist", "."]
 
     # JJM: The actual action to perform. See "man dscl".
     #      Common actions: -create, -delete, -merge, -append, -passwd
@@ -226,7 +226,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
         converted_hash_plist = convert_binary_to_hash(password_hash_plist)
       else
         users_plist['ShadowHashData'] = ''.dup
-        converted_hash_plist = {'SALTED-SHA512' => ''.dup}
+        converted_hash_plist = { 'SALTED-SHA512' => ''.dup }
       end
 
       # converted_hash_plist['SALTED-SHA512'] expects a Base64 encoded
@@ -234,7 +234,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       # hex value. We need to convert the provided hex value to a Base64
       # encoded string to nest it in the converted hash plist.
       converted_hash_plist['SALTED-SHA512'] = \
-        password_hash.unpack('a2'*(password_hash.size/2)).collect { |i| i.hex.chr }.join
+        password_hash.unpack('a2' * (password_hash.size / 2)).collect { |i| i.hex.chr }.join
 
       # Finally, we can convert the nested plist back to binary, embed it
       # into the user's plist, and convert the resultant plist back to
@@ -286,11 +286,12 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
   # for automatically assigning uids and gids to accounts, so we set up these
   # methods for consumption by functionality like --mkusers
   # By default we restrict to a reasonably sane range for system accounts
-  def self.next_system_id(id_type, min_id=20)
+  def self.next_system_id(id_type, min_id = 20)
     dscl_args = ['.', '-list']
-    if id_type == 'uid'
+    case id_type
+    when 'uid'
       dscl_args << '/Users' << 'uid'
-    elsif id_type == 'gid'
+    when 'gid'
       dscl_args << '/Groups' << 'gid'
     else
       fail(_("Invalid id_type %{id_type}. Only 'uid' and 'gid' supported") % { id_type: id_type })
@@ -298,11 +299,11 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     dscl_out = dscl(dscl_args)
     # We're ok with throwing away negative uids here.
     ids = dscl_out.split.compact.collect { |l| l.to_i if l =~ /^\d+$/ }
-    ids.compact!.sort! { |a,b| a.to_f <=> b.to_f }
+    ids.compact!.sort_by!(&:to_f)
     # We're just looking for an unused id in our sorted array.
     ids.each_index do |i|
       next_id = ids[i] + 1
-      return next_id if ids[i+1] != next_id and next_id >= min_id
+      return next_id if ids[i + 1] != next_id and next_id >= min_id
     end
   end
 
@@ -485,7 +486,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     #      This method returns and sets @infohash
     # I'm not re-factoring the name "getinfo" because this method will be
     # most likely called by nameservice.rb, which I didn't write.
-    if refresh or (! defined?(@property_value_cache_hash) or ! @property_value_cache_hash)
+    if refresh or (!defined?(@property_value_cache_hash) or !@property_value_cache_hash)
       # JJM 2007-07-24: OK, there's a bit of magic that's about to
       # happen... Let's see how strong my grip has become... =)
       #
@@ -510,7 +511,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       # list, then report on the remaining list. Pretty whacky, ehh?
       type_properties = [:name] + self.class.resource_type.validproperties
       type_properties.delete(:ensure) if type_properties.include? :ensure
-      type_properties << :guid  # append GeneratedUID so we just get the report here
+      type_properties << :guid # append GeneratedUID so we just get the report here
       @property_value_cache_hash = self.class.single_report(@resource[:name], *type_properties)
       [:uid, :gid].each do |param|
         @property_value_cache_hash[param] = @property_value_cache_hash[param].to_i if @property_value_cache_hash and @property_value_cache_hash.include?(param)
@@ -519,4 +520,3 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     @property_value_cache_hash
   end
 end
-

data/lib/puppet/provider/nameservice/pw.rb

@@ -20,4 +20,3 @@ class Puppet::Provider::NameService
     end
   end
 end
-

data/lib/puppet/provider/nameservice.rb

@@ -62,7 +62,7 @@ class Puppet::Provider::NameService < Puppet::Provider
       @resource_type.validproperties.each do |prop|
         next if prop == :ensure
 
-        define_method(prop) { get(prop) || :absent} unless public_method_defined?(prop)
+        define_method(prop) { get(prop) || :absent } unless public_method_defined?(prop)
         define_method(prop.to_s + "=") { |*vals| set(prop, *vals) } unless public_method_defined?(prop.to_s + "=")
       end
     end
@@ -92,7 +92,7 @@ class Puppet::Provider::NameService < Puppet::Provider
 
     def verify(name, error, &block)
       name = name.intern if name.is_a? String
-      @checks[name] = {:error => error, :block => block}
+      @checks[name] = { :error => error, :block => block }
     end
 
     private
@@ -106,7 +106,7 @@ class Puppet::Provider::NameService < Puppet::Provider
   # with DirectoryServices
   def autogen(field)
     field = field.intern
-    id_generators = {:user => :uid, :group => :gid}
+    id_generators = { :user => :uid, :group => :gid }
     if id_generators[@resource.class.name] == field
       return self.class.autogen_id(field, @resource.class.name)
     else
@@ -141,8 +141,8 @@ class Puppet::Provider::NameService < Puppet::Provider
       # other, more convenient enumerator for these, so we fake one with this
       # loop.  Thanks, Ruby, for your awesome abstractions. --daniel 2012-03-23
       highest = []
-      Puppet::Etc.send(database) {|entry| highest << entry.send(method) }
-      highest = highest.reject {|x| x > 65000 }.max
+      Puppet::Etc.send(database) { |entry| highest << entry.send(method) }
+      highest = highest.reject { |x| x > 65000 }.max
 
       @prevauto = highest || 1000
     end
@@ -160,9 +160,9 @@ class Puppet::Provider::NameService < Puppet::Provider
 
     begin
       sensitive = has_sensitive_data?
-      execute(self.addcmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment, :sensitive => sensitive})
+      execute(self.addcmd, { :failonfail => true, :combine => true, :custom_environment => @custom_environment, :sensitive => sensitive })
       if feature?(:manages_password_age) && (cmd = passcmd)
-        execute(cmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment, :sensitive => sensitive})
+        execute(cmd, { :failonfail => true, :combine => true, :custom_environment => @custom_environment, :sensitive => sensitive })
       end
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, _("Could not create %{resource} %{name}: %{detail}") % { resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
@@ -177,7 +177,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     end
 
     begin
-      execute(self.deletecmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment})
+      execute(self.deletecmd, { :failonfail => true, :combine => true, :custom_environment => @custom_environment })
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, _("Could not delete %{resource} %{name}: %{detail}") % { resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
     end
@@ -269,7 +269,7 @@ class Puppet::Provider::NameService < Puppet::Provider
 
     sensitive = has_sensitive_data?(param)
     begin
-      execute(cmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment, :sensitive => sensitive})
+      execute(cmd, { :failonfail => true, :combine => true, :custom_environment => @custom_environment, :sensitive => sensitive })
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, _("Could not set %{param} on %{resource}[%{name}]: %{detail}") % { param: param, resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
     end
@@ -295,4 +295,3 @@ class Puppet::Provider::NameService < Puppet::Provider
     current == desired.force_encoding(current.encoding)
   end
 end
-

data/lib/puppet/provider/package/aix.rb

@@ -26,7 +26,7 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
   # AIX supports versionable packages with and without a NIM server
   has_feature :versionable
 
-  confine 'os.name' => [ :aix ]
+  confine 'os.name' => [:aix]
   defaultfor 'os.name' => :aix
 
   attr_accessor :latest_info
@@ -41,7 +41,7 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
   }.freeze
 
   def self.srclistcmd(source)
-    [ command(:installp), "-L", "-d", source ]
+    [command(:installp), "-L", "-d", source]
   end
 
   def self.prefetch(packages)
@@ -99,7 +99,7 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
 
     pkg = @resource[:name]
 
-    pkg += " #{@resource.should(:ensure)}" if (! @resource.should(:ensure).is_a? Symbol) and useversion
+    pkg += " #{@resource.should(:ensure)}" if (!@resource.should(:ensure).is_a? Symbol) and useversion
 
     output = installp "-acgwXY", "-d", source, pkg
 
@@ -124,7 +124,7 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
     end
 
     begin
-      list = execute(cmd).scan(/^[^#][^:]*:([^:]*):([^:]*):[^:]*:[^:]*:([^:])/).collect { |n,e,s|
+      list = execute(cmd).scan(/^[^#][^:]*:([^:]*):([^:]*):[^:]*:[^:]*:([^:])/).collect { |n, e, s|
         e = :absent if [:broken, :inconsistent].include?(STATE_CODE[s])
         { :name => n, :ensure => e, :status => STATE_CODE[s], :provider => self.name }
       }

data/lib/puppet/provider/package/appdmg.rb

@@ -70,7 +70,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
 
       File.open(cached_source) do |dmg|
         xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-mountrandom", "/tmp", dmg.path
-        ptable = Puppet::Util::Plist::parse_plist(xml_str)
+        ptable = Puppet::Util::Plist.parse_plist(xml_str)
         # JJM Filter out all mount-paths into a single array, discard the rest.
         mounts = ptable['system-entities'].collect { |entity|
           entity['mount-point']
@@ -96,7 +96,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
   end
 
   def query
-    Puppet::FileSystem.exist?("/var/db/.puppet_appdmg_installed_#{@resource[:name]}") ? {:name => @resource[:name], :ensure => :present} : nil
+    Puppet::FileSystem.exist?("/var/db/.puppet_appdmg_installed_#{@resource[:name]}") ? { :name => @resource[:name], :ensure => :present } : nil
   end
 
   def install
@@ -108,6 +108,6 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
     unless name
       self.fail _("Mac OS X PKG DMGs must specify a package name.")
     end
-    self.class.installpkgdmg(source,name)
+    self.class.installpkgdmg(source, name)
   end
 end

data/lib/puppet/provider/package/apple.rb

@@ -35,7 +35,7 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package
   end
 
   def query
-    Puppet::FileSystem.exist?("/Library/Receipts/#{@resource[:name]}.pkg") ? {:name => @resource[:name], :ensure => :present} : nil
+    Puppet::FileSystem.exist?("/Library/Receipts/#{@resource[:name]}.pkg") ? { :name => @resource[:name], :ensure => :present } : nil
   end
 
   def install

data/lib/puppet/provider/package/apt.rb

@@ -52,7 +52,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     hash
   end
 
-  def initialize(value={})
+  def initialize(value = {})
     super(value)
     @property_flush = {}
   end
@@ -78,6 +78,8 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
   # Debian boxes, and the only thing that differs is that it can
   # install packages from remote sites.
 
+  # Double negation confuses Rubocop's Layout cops
+  # rubocop:disable Layout
   def checkforcdrom
     have_cdrom = begin
                    !!(File.read("/etc/apt/sources.list") =~ /^[^#]*cdrom:/)
@@ -85,10 +87,10 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
                    # This is basically pathological...
                    false
                  end
+  # rubocop:enable Layout
 
     if have_cdrom and @resource[:allowcdrom] != :true
-      raise Puppet::Error,
-            _("/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure.")
+      raise Puppet::Error, _("/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure.")
     end
   end
 
@@ -155,11 +157,13 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     cmd += install_options if @resource[:install_options]
     cmd << :install
 
+    # rubocop:disable Style/RedundantCondition
     if source
       cmd << source
     else
       cmd << str
     end
+    # rubocop:enable Style/RedundantCondition
 
     self.unhold if self.properties[:mark] == :hold
     begin

data/lib/puppet/provider/package/aptrpm.rb

@@ -12,6 +12,9 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
   commands :aptcache => "apt-cache"
   commands :rpm => "rpm"
 
+  # Mixing confine statements, control expressions, and exception handling
+  # confuses Rubocop's Layout cops, so we disable them entirely.
+  # rubocop:disable Layout
   if command('rpm')
     confine :true => begin
       rpm('-ql', 'rpm')
@@ -21,6 +24,7 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
         true
       end
   end
+  # rubocop:enable Layout
 
   # Install a package using 'apt-get'.  This function needs to support
   # installing a specific version.
@@ -48,16 +52,14 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
 
     if output =~ /Versions:\s*\n((\n|.)+)^$/
       versions = $1
-      available_versions = versions.split(/\n/).collect { |version|
+      available_versions = versions.split(/\n/).filter_map { |version|
         if version =~ /^([^\(]+)\(/
           $1
         else
           self.warning _("Could not match version '%{version}'") % { version: version }
           nil
         end
-      }.reject { |vers| vers.nil? }.sort { |a,b|
-        versioncmp(a,b)
-      }
+      }.sort { |a, b| versioncmp(a, b) }
 
       if available_versions.length == 0
         self.debug "No latest version"

data/lib/puppet/provider/package/blastwave.rb

@@ -41,13 +41,13 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
 
     output = Puppet::Util.withenv(:PAGER => "/usr/bin/cat") { pkgget command }
 
-    list = output.split("\n").collect do |line|
+    list = output.split("\n").filter_map do |line|
       next if line =~ /^#/
       next if line =~ /^WARNING/
       next if line =~ /localrev\s+remoterev/
 
       blastsplit(line)
-    end.reject { |h| h.nil? }
+    end
 
     if hash[:justme]
       return list[0]
@@ -98,7 +98,7 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
     if hash
       hash
     else
-      {:ensure => :absent}
+      { :ensure => :absent }
     end
   end
 

data/lib/puppet/provider/package/dnf.rb

@@ -20,6 +20,10 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do
   # never try to use RPM on a machine without it. We think this
   # has probably become obsolete with the way `commands` work, so
   # we should investigate removing it at some point.
+  #
+  # Mixing confine statements, control expressions, and exception handling
+  # confuses Rubocop's Layout cops, so we disable them entirely.
+  # rubocop:disable Layout
   if command('rpm')
     confine :true => begin
       rpm('--version')
@@ -29,6 +33,7 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do
         true
       end
   end
+  # rubocop:enable Layout
 
   defaultfor 'os.name' => :fedora
   notdefaultfor 'os.name' => :fedora, 'os.release.major' => (19..21).to_a

data/lib/puppet/provider/package/dnfmodule.rb

@@ -122,7 +122,7 @@ Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do
 
   def uninstall
     execute([command(:dnf), 'module', 'remove', '-d', '0', '-e', self.class.error_level, '-y', @resource[:name]])
-    reset  # reset module to the default stream
+    reset # reset module to the default stream
   end
 
   def disable(args = @resource[:name])

data/lib/puppet/provider/package/dpkg.rb

@@ -49,7 +49,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
   self::DPKG_QUERY_PROVIDES_FORMAT_STRING = %Q{'${Status} ${Package} ${Version} [${Provides}]\\n'}
   self::FIELDS_REGEX = %r{^'?(\S+) +(\S+) +(\S+) (\S+) (\S*)$}
   self::FIELDS_REGEX_WITH_PROVIDES = %r{^'?(\S+) +(\S+) +(\S+) (\S+) (\S*) \[.*\]$}
-  self::FIELDS= [:desired, :error, :status, :name, :ensure]
+  self::FIELDS = [:desired, :error, :status, :name, :ensure]
 
   def self.defaultto_allow_virtual
     false
@@ -58,14 +58,14 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
   # @param line [String] one line of dpkg-query output
   # @return [Hash,nil] a hash of FIELDS or nil if we failed to match
   # @api private
-  def self.parse_line(line, regex=self::FIELDS_REGEX)
+  def self.parse_line(line, regex = self::FIELDS_REGEX)
     hash = nil
 
     match = regex.match(line)
     if match
       hash = {}
 
-      self::FIELDS.zip(match.captures) do |field,value|
+      self::FIELDS.zip(match.captures) do |field, value|
         hash[field] = value
       end
 
@@ -121,7 +121,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
     end
     output = dpkg_deb "--show", source
     matches = /^(\S+)\t(\S+)$/.match(output).captures
-    warning _("source doesn't contain named package, but %{name}") % { name: matches[0] } unless matches[0].match( Regexp.escape(@resource[:name]) )
+    warning _("source doesn't contain named package, but %{name}") % { name: matches[0] } unless matches[0].match(Regexp.escape(@resource[:name]))
     matches[1]
   end
 
@@ -137,9 +137,9 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
           self.class::DPKG_QUERY_PROVIDES_FORMAT_STRING
           # the regex searches for the resource[:name] in the dpkquery result in which the Provides field is also available
           # it will search for the packages only in the brackets ex: [rubygems]
-        ).lines.find {|package| package.match(/[\[ ](#{Regexp.escape(@resource[:name])})[\],]/)}
+        ).lines.find { |package| package.match(/[\[ ](#{Regexp.escape(@resource[:name])})[\],]/) }
         if output
-          hash = self.class.parse_line(output,self.class::FIELDS_REGEX_WITH_PROVIDES)
+          hash = self.class.parse_line(output, self.class::FIELDS_REGEX_WITH_PROVIDES)
           Puppet.info("Package #{@resource[:name]} is virtual, defaulting to #{hash[:name]}")
           @resource[:name] = hash[:name]
         end
@@ -153,10 +153,10 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
       hash = self.class.parse_line(output)
     rescue Puppet::ExecutionFailure
       # dpkg-query exits 1 if the package is not found.
-      return {:ensure => :purged, :status => 'missing', :name => @resource[:name], :error => 'ok'}
+      return { :ensure => :purged, :status => 'missing', :name => @resource[:name], :error => 'ok' }
     end
 
-    hash ||= {:ensure => :absent, :status => 'missing', :name => @resource[:name], :error => 'ok'}
+    hash ||= { :ensure => :absent, :status => 'missing', :name => @resource[:name], :error => 'ok' }
 
     if hash[:error] != "ok"
       raise Puppet::Error.new(

data/lib/puppet/provider/package/gem.rb

@@ -77,13 +77,13 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
     validate_command(command)
     cmd = [command] << command_options
 
-    custom_environment = {'HOME'=>ENV['HOME']}.merge(custom_environment)
+    custom_environment = { 'HOME' => ENV.fetch('HOME', nil) }.merge(custom_environment)
 
     if Puppet::Util::Platform.windows?
       custom_environment[:PATH] = windows_path_without_puppet_bin
     end
 
-    execute(cmd, {:failonfail => true, :combine => true, :custom_environment => custom_environment})
+    execute(cmd, { :failonfail => true, :combine => true, :custom_environment => custom_environment })
   end
 
   def self.instances(target_command = nil)
@@ -120,8 +120,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
 
     begin
       list = execute_gem_command(options[:command], command_options).lines
-        .map {|set| gemsplit(set) }
-        .reject {|x| x.nil? }
+                                                                    .filter_map { |set| gemsplit(set) }
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, _("Could not list gems: %{detail}") % { detail: detail }, detail.backtrace
     end
@@ -145,7 +144,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
       versions = $2.sub('default: ', '').split(/,\s*/)
       {
         :name => gem_name,
-        :ensure => versions.map{|v| v.split[0]},
+        :ensure => versions.map { |v| v.split[0] },
         :provider => name
       }
     else
@@ -213,8 +212,8 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
 
     if Puppet::Util::Platform.windows?
       command_options << "-v" << %Q["#{should}"] if useversion && !should.is_a?(Symbol)
-    else
-      command_options << "-v" << should if useversion && !should.is_a?(Symbol)
+    elsif useversion && !should.is_a?(Symbol)
+      command_options << "-v" << should
     end
 
     if Puppet::Util::Package.versioncmp(rubygem_version(command), '2.0.0') == -1

data/lib/puppet/provider/package/hpux.rb

@@ -30,9 +30,9 @@ Puppet::Type.type(:package).provide :hpux, :parent => Puppet::Provider::Package
 
   def query
     swlist resource[:name]
-    {:ensure => :present}
+    { :ensure => :present }
   rescue
-    {:ensure => :absent}
+    { :ensure => :absent }
   end
 
   def uninstall