puppet 8.3.1 → 8.4.0

data/lib/puppet/provider/exec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/provider'
 require_relative '../../puppet/util/execution'
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:file).provide :posix do
   desc "Uses POSIX functionality to manage file ownership and permissions."
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:file).provide :windows do
   desc "Uses Microsoft Windows functionality to manage file ownership and permissions."
 
@@ -37,6 +38,7 @@ Puppet::Type.type(:file).provide :windows do
 
   def owner
     return :absent unless resource.stat
+
     get_owner(resource[:path])
   end
 
@@ -50,6 +52,7 @@ Puppet::Type.type(:file).provide :windows do
 
   def group
     return :absent unless resource.stat
+
     get_group(resource[:path])
   end
 
@@ -80,7 +83,6 @@ Puppet::Type.type(:file).provide :windows do
       error.set_backtrace detail.backtrace
       raise error
     end
-    :file_changed
   end
 
   def validate
@@ -101,16 +103,16 @@ Puppet::Type.type(:file).provide :windows do
   def munge_windows_system_group(current, should)
     [
       {
-        'type'        => 'group',
-        'resource'    => resource[:group],
+        'type' => 'group',
+        'resource' => resource[:group],
         'set_to_user' => group,
         'fullcontrol' => "070".to_i(8),
         'remove_mask' => "707".to_i(8),
         'should_mask' => (should[0].to_i(8) & "070".to_i(8)),
       },
       {
-        'type'        => 'owner',
-        'resource'    => resource[:owner],
+        'type' => 'owner',
+        'resource' => resource[:owner],
         'set_to_user' => owner,
         'fullcontrol' => "700".to_i(8),
         'remove_mask' => "077".to_i(8),
@@ -126,7 +128,7 @@ Puppet::Type.type(:file).provide :windows do
         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
+          # 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']} }
           return nil
         end
@@ -136,7 +138,9 @@ Puppet::Type.type(:file).provide :windows do
   end
 
   attr_reader :file
+
   private
+
   def file
     @file ||= Puppet::FileSystem.pathname(resource[:path])
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Group Puppet provider for AIX. It uses standard commands to manage groups:
 #  mkgroup, rmgroup, lsgroup, chgroup
 require_relative '../../../puppet/provider/aix_object'

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/nameservice/directoryservice'
 
 Puppet::Type.type(:group).provide :directoryservice, :parent => Puppet::Provider::NameService::DirectoryService do
@@ -19,5 +20,4 @@ Puppet::Type.type(:group).provide :directoryservice, :parent => Puppet::Provider
       return current.sort.uniq == should.sort.uniq
     end
   end
-
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/nameservice/objectadd'
 require_relative '../../../puppet/util/libuser'
 
@@ -24,17 +25,20 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
 
   def exists?
     return !!localgid if @resource.forcelocal?
+
     super
   end
 
   def gid
     return localgid if @resource.forcelocal?
+
     get(:gid)
   end
 
   def localgid
     group = findgroup(:group_name, resource[:name])
     return group[:gid] if group
+
     false
   end
 
@@ -44,11 +48,11 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
     # to ensure consistent behaviour of the useradd provider when
     # using both useradd and luseradd
     if not @resource.allowdupe? and @resource.forcelocal?
-       if @resource.should(:gid) and findgroup(:gid, @resource.should(:gid).to_s)
-           raise(Puppet::Error, _("GID %{resource} already exists, use allowdupe to force group creation") % { resource: @resource.should(:gid).to_s })
-       end
+      if @resource.should(:gid) and findgroup(:gid, @resource.should(:gid).to_s)
+        raise(Puppet::Error, _("GID %{resource} already exists, use allowdupe to force group creation") % { resource: @resource.should(:gid).to_s })
+      end
     elsif @resource.allowdupe? and not @resource.forcelocal?
-       return ["-o"]
+      return ["-o"]
     end
     []
   end
@@ -124,6 +128,7 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
 
   def members_to_s(current)
     return '' if current.nil? || !current.kind_of?(Array)
+
     current.join(',')
   end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/ldap'
 
 Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do
@@ -30,6 +31,7 @@ Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do
       existing.each do |hash|
         value = hash[:gid]
         next unless value
+
         num = value[0].to_i
         largest = num if num > largest
       end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/nameservice/pw'
 
 Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService::PW do

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/windows'
 
 Puppet::Type.type(:group).provide :windows_adsi do
@@ -40,6 +41,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
 
   def members_to_s(users)
     return '' if users.nil? or !users.kind_of?(Array)
+
     users = users.map do |user_name|
       sid = Puppet::Util::Windows::SID.name_to_principal(user_name)
       if !sid

data/lib/puppet/provider/ldap.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/provider'
 
 # The base class for LDAP providers.
@@ -80,6 +81,7 @@ class Puppet::Provider::Ldap < Puppet::Provider
   def initialize(*args)
     raise(Puppet::DevError, _("No LDAP Configuration defined for %{class_name}") % { class_name: self.class }) unless self.class.manager
     raise(Puppet::DevError, _("Invalid LDAP Configuration defined for %{class_name}") % { class_name: self.class }) unless self.class.manager.valid?
+
     super
 
     @property_hash = @property_hash.inject({}) do |result, ary|

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet'
 require_relative '../../../puppet/provider/nameservice'
 require_relative '../../../puppet/util/plist' if Puppet.features.cfpropertylist?
@@ -20,7 +21,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
   commands :dseditgroup => "/usr/sbin/dseditgroup"
   commands :sw_vers => "/usr/bin/sw_vers"
   confine 'os.name' => :darwin
-  confine :feature         => :cfpropertylist
+  confine :feature => :cfpropertylist
   defaultfor 'os.name' => :darwin
 
   # There is no generalized mechanism for provider cache management, but we can
@@ -37,6 +38,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
   #     be actively maintained.  There may also be collisions with different
   #     types (Users, Groups, Mounts, Hosts, etc...)
   def ds_to_ns_attribute_map; self.class.ds_to_ns_attribute_map; end
+
   def self.ds_to_ns_attribute_map
     {
       'RecordName' => :name,
@@ -47,14 +49,15 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       'RealName' => :comment,
       'Password' => :password,
       'GeneratedUID' => :guid,
-      'IPAddress'    => :ip_address,
-      'ENetAddress'  => :en_address,
+      'IPAddress' => :ip_address,
+      'ENetAddress' => :en_address,
       'GroupMembership' => :members,
     }
   end
 
   # JJM The same table as above, inverted.
   def ns_to_ds_attribute_map; self.class.ns_to_ds_attribute_map end
+
   def self.ns_to_ds_attribute_map
     @ns_to_ds_attribute_map ||= ds_to_ns_attribute_map.invert
   end
@@ -86,6 +89,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     #      with a group type, this will be /Groups.
     #   @ds_path is an attribute of the class itself.
     return @ds_path if defined?(@ds_path)
+
     # JJM: "Users" or "Groups" etc ...  (Based on the Puppet::Type)
     #       Remember this is a class method, so self.class is Class
     #       Also, @resource_type seems to be the reference to the
@@ -94,7 +98,9 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
   end
 
   def self.list_all_present
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     @all_present ||= begin
+      # rubocop:enable Naming/MemoizedInstanceVariableName
       # JJM: List all objects of this Puppet::Type already present on the system.
       begin
         dscl_output = execute(get_exec_preamble("-list"))
@@ -114,21 +120,22 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     input_hash.each_key do |key|
       ds_attribute = key.sub("dsAttrTypeStandard:", "")
       next unless (ds_to_ns_attribute_map.keys.include?(ds_attribute) and type_properties.include? ds_to_ns_attribute_map[ds_attribute])
+
       ds_value = input_hash[key]
       case ds_to_ns_attribute_map[ds_attribute]
-        when :members
-          ds_value = ds_value # only members uses arrays so far
-        when :gid, :uid
-          # OS X stores objects like uid/gid as strings.
-          # Try casting to an integer for these cases to be
-          # consistent with the other providers and the group type
-          # validation
-          begin
-            ds_value = Integer(ds_value[0])
-          rescue ArgumentError
-            ds_value = ds_value[0]
-          end
-        else ds_value = ds_value[0]
+      when :members
+        # do nothing, only members uses arrays so far
+      when :gid, :uid
+        # OS X stores objects like uid/gid as strings.
+        # Try casting to an integer for these cases to be
+        # consistent with the other providers and the group type
+        # validation
+        begin
+          ds_value = Integer(ds_value[0])
+        rescue ArgumentError
+          ds_value = ds_value[0]
+        end
+      else ds_value = ds_value[0]
       end
       attribute_hash[ds_to_ns_attribute_map[ds_attribute]] = ds_value
     end
@@ -197,7 +204,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     # zeroes. If someone attempts to use a password hash that worked with
     # a previous version of OS X, we will fail early and warn them.
     if password_hash.length != 136
-      #TRANSLATORS 'OS X 10.7' is an operating system and should not be translated, 'Salted SHA512' is the name of a hashing algorithm
+      # TRANSLATORS 'OS X 10.7' is an operating system and should not be translated, 'Salted SHA512' is the name of a hashing algorithm
       fail(_("OS X 10.7 requires a Salted SHA512 hash password of 136 characters.") +
            ' ' + _("Please check your password and try again."))
     end
@@ -299,7 +306,6 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     end
   end
 
-
   def ensure=(ensure_value)
     super
     # We need to loop over all valid properties for the type we're
@@ -308,6 +314,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     if ensure_value == :present
       @resource.class.validproperties.each do |name|
         next if name == :ensure
+
         # LAK: We use property.sync here rather than directly calling
         # the settor method because the properties might do some kind
         # of conversion.  In particular, the user gid property might
@@ -405,6 +412,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     # Now we create all the standard properties
     Puppet::Type.type(@resource.class.name).validproperties.each do |property|
       next if property == :ensure
+
       value = @resource.should(property)
       if property == :gid and value.nil?
         value = self.class.next_system_id('gid')
@@ -418,7 +426,8 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
         else
           exec_arg_vector = self.class.get_exec_preamble("-create", @resource[:name])
           exec_arg_vector << ns_to_ds_attribute_map[property.intern]
-          next if property == :password  # skip setting the password here
+          next if property == :password # skip setting the password here
+
           exec_arg_vector << value.to_s
           begin
             execute(exec_arg_vector)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/nameservice'
 
 class Puppet::Provider::NameService

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/nameservice/objectadd'
 
 class Puppet::Provider::NameService
@@ -9,11 +10,11 @@ class Puppet::Provider::NameService
 
     def modifycmd(param, value)
       cmd = [
-          command(:pw),
-          "#{@resource.class.name}mod",
-          @resource[:name],
-          flag(param),
-          munge(param, value)
+        command(:pw),
+        "#{@resource.class.name}mod",
+        @resource[:name],
+        flag(param),
+        munge(param, value)
       ]
       cmd
     end

data/lib/puppet/provider/nameservice.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet'
 
 # This is the parent class of all NSS classes.  They're very different in
@@ -27,7 +28,7 @@ class Puppet::Provider::NameService < Puppet::Provider
       objects = []
       begin
         method = Puppet::Etc.method(:"get#{section}ent")
-        while ent = method.call #rubocop:disable Lint/AssignmentInCondition
+        while ent = method.call # rubocop:disable Lint/AssignmentInCondition
           objects << new(:name => ent.name, :canonical_name => ent.canonical_name, :ensure => :present)
         end
       ensure
@@ -45,6 +46,7 @@ class Puppet::Provider::NameService < Puppet::Provider
       unless resource_type.valid_parameter?(name)
         raise Puppet::DevError, _("%{name} is not a valid attribute for %{resource_type}") % { name: name, resource_type: resource_type.name }
       end
+
       @options ||= {}
       @options[name] ||= {}
 
@@ -59,6 +61,7 @@ class Puppet::Provider::NameService < Puppet::Provider
       super
       @resource_type.validproperties.each do |prop|
         next if prop == :ensure
+
         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
@@ -69,7 +72,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     def section
       unless resource_type
         raise Puppet::DevError,
-          "Cannot determine Etc section without a resource type"
+              "Cannot determine Etc section without a resource type"
       end
 
       if @resource_type.name == :group
@@ -127,7 +130,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     when :user;   database = :passwd;  method = :uid
     when :group;  database = :group;   method = :gid
     else
-      #TRANSLATORS "autogen_id()" is a method name and should not be translated
+      # TRANSLATORS "autogen_id()" is a method name and should not be translated
       raise Puppet::DevError, _("autogen_id() does not support auto generation of id for resource type %{resource_type}") % { resource_type: resource_type }
     end
 
@@ -263,6 +266,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     self.class.validate(param, value)
     cmd = modifycmd(param, munge(param, value))
     raise Puppet::DevError, _("Nameservice command must be an array") unless cmd.is_a?(Array)
+
     sensitive = has_sensitive_data?(param)
     begin
       execute(cmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment, :sensitive => sensitive})
@@ -271,7 +275,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     end
   end
 
-  #Derived classes can override to declare sensitive data so a flag can be passed to execute
+  # Derived classes can override to declare sensitive data so a flag can be passed to execute
   def has_sensitive_data?(property = nil)
     false
   end

data/lib/puppet/provider/network_device.rb

@@ -2,7 +2,6 @@
 
 # This is the base class of all prefetched network device provider
 class Puppet::Provider::NetworkDevice < Puppet::Provider
-
   def self.device(url)
     raise "This provider doesn't implement the necessary device method"
   end
@@ -24,7 +23,7 @@ class Puppet::Provider::NetworkDevice < Puppet::Provider
     end
   rescue => detail
     # Preserving behavior introduced in #6907
-    #TRANSLATORS "prefetch" is a program name and should not be translated
+    # TRANSLATORS "prefetch" is a program name and should not be translated
     Puppet.log_exception(detail, _("Could not perform network device prefetch: %{detail}") % { detail: detail })
   end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 require_relative '../../../puppet/util/package'
 
@@ -25,10 +26,10 @@ 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
+  attr_accessor :latest_info
 
   STATE_CODE = {
     'A' => :applied,
@@ -46,9 +47,9 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
   def self.prefetch(packages)
     raise Puppet::Error, _("The aix provider can only be used by root") if Process.euid != 0
 
-    return unless packages.detect { |name, package| package.should(:ensure) == :latest }
+    return unless packages.detect { |_name, package| package.should(:ensure) == :latest }
 
-    sources = packages.collect { |name, package| package[:source] }.uniq.compact
+    sources = packages.collect { |_name, package| package[:source] }.uniq.compact
 
     updates = {}
     sources.each do |source|

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Jeff McCune <mccune.jeff@gmail.com>
 # Changed to app.dmg by: Udo Waechter <root@zoide.net>
 # Mac OS X Package Installer which handles application (.app)
@@ -19,7 +20,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
   desc "Package management which copies application bundles to a target."
 
   confine 'os.name' => :darwin
-  confine :feature         => :cfpropertylist
+  confine :feature => :cfpropertylist
 
   commands :hdiutil => "/usr/bin/hdiutil"
   commands :curl => "/usr/bin/curl"
@@ -67,27 +68,27 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
         end
       end
 
-      open(cached_source) do |dmg|
+      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)
-          # JJM Filter out all mount-paths into a single array, discard the rest.
-          mounts = ptable['system-entities'].collect { |entity|
-            entity['mount-point']
-          }.select { |mountloc|; mountloc }
-          begin
-            found_app = false
-            mounts.each do |fspath|
-              Dir.entries(fspath).select { |f|
-                f =~ /\.app$/i
-              }.each do |pkg|
-                found_app = true
-                installapp("#{fspath}/#{pkg}", name, source)
-              end
+        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']
+        }.select { |mountloc|; mountloc }
+        begin
+          found_app = false
+          mounts.each do |fspath|
+            Dir.entries(fspath).select { |f|
+              f =~ /\.app$/i
+            }.each do |pkg|
+              found_app = true
+              installapp("#{fspath}/#{pkg}", name, source)
             end
-            Puppet.debug "Unable to find .app in .appdmg. #{name} will not be installed." if !found_app
-          ensure
-            hdiutil "eject", mounts[0]
           end
+          Puppet.debug "Unable to find .app in .appdmg. #{name} will not be installed." if !found_app
+        ensure
+          hdiutil "eject", mounts[0]
+        end
       end
     ensure
       FileUtils.remove_entry_secure(tmpdir, true)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 
 # OS X Packaging sucks.  We can install packages, but that's about it.
@@ -15,9 +16,9 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package
   def self.instances
     instance_by_name.collect do |name|
       self.new(
-        :name     => name,
+        :name => name,
         :provider => :apple,
-        :ensure   => :installed
+        :ensure => :installed
       )
     end
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/package/version/range'
 require_relative '../../../puppet/util/package/version/debian'
 
@@ -87,7 +88,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
 
     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.")
+            _("/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure.")
     end
   end
 
@@ -177,12 +178,11 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
       raise Puppet::Error, _("Failed to update to version %{should}, got version %{version} instead") % { should: should, version: version } unless
         insync?(version)
     end
-
   end
 
   # What's the latest package version available?
   def latest
-    output = aptcache :policy,  @resource[:name]
+    output = aptcache :policy, @resource[:name]
 
     if output =~ /Candidate:\s+(\S+)\s/
       return $1
@@ -234,7 +234,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
 
     return false unless is && is != :absent
 
-    #if 'should' is a range and 'is' a debian version we should check if 'should' includes 'is'
+    # if 'should' is a range and 'is' a debian version we should check if 'should' includes 'is'
     should = @resource[:ensure]
 
     return false unless is.is_a?(String) && should.is_a?(String)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg do
   desc "Package management via `aptitude`."
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
   # Provide sorting functionality
   include Puppet::Util::Package
@@ -43,7 +44,7 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
 
   # What's the latest package version available?
   def latest
-    output = aptcache :showpkg,  @resource[:name]
+    output = aptcache :showpkg, @resource[:name]
 
     if output =~ /Versions:\s*\n((\n|.)+)^$/
       versions = $1

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Packaging using Blastwave's pkg-get program.
 Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun do
   desc "Package management using Blastwave.org's `pkg-get` command on Solaris."
@@ -16,7 +17,7 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
   def self.extended(mod)
     unless command(:pkgget) != "pkg-get"
       raise Puppet::Error,
-        _("The pkg-get command is missing; blastwave packaging unavailable")
+            _("The pkg-get command is missing; blastwave packaging unavailable")
     end
 
     unless Puppet::FileSystem.exist?("/var/pkg-get/admin")
@@ -56,7 +57,6 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
       }
       return list
     end
-
   end
 
   # Split the different lines into hashes.
@@ -65,10 +65,10 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
       hash = {}
       hash[:name] = $1
       hash[:ensure] = if $2 == "[Not installed]"
-        :absent
-      else
-        $2
-      end
+                        :absent
+                      else
+                        $2
+                      end
       hash[:avail] = $5
 
       hash[:avail] = hash[:ensure] if hash[:avail] == "SAME"