puppet 8.5.1-universal-darwin → 8.7.0-universal-darwin

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

@@ -11,17 +11,26 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
 
   commands :add => "groupadd", :delete => "groupdel", :modify => "groupmod"
 
-  has_feature :system_groups unless %w{HP-UX Solaris}.include? Puppet.runtime[:facter].value('os.name')
+  has_feature :system_groups unless %w[HP-UX Solaris].include? Puppet.runtime[:facter].value('os.name')
 
   verify :gid, _("GID must be an integer") do |value|
     value.is_a? Integer
   end
 
-  optional_commands :localadd => "lgroupadd", :localdelete => "lgroupdel", :localmodify => "lgroupmod"
+  optional_commands :localadd => "lgroupadd", :localdelete => "lgroupdel", :localmodify => "lgroupmod", :purgemember => "usermod"
 
-  has_feature :manages_local_users_and_groups, :manages_members if Puppet.features.libuser?
+  has_feature :manages_local_users_and_groups if Puppet.features.libuser?
+  has_feature :manages_members if Puppet.features.libuser? ||
+                                  (Puppet.runtime[:facter].value('os.name') == "Fedora" &&
+                                  Puppet.runtime[:facter].value('os.release.major').to_i >= 40)
 
-  options :members, :flag => '-M', :method => :mem
+  # Libuser's modify command 'lgroupmod' requires '-M' flag for member additions.
+  # 'groupmod' command requires the '-aU' flags for it.
+  if Puppet.features.libuser?
+    options :members, :flag => '-M', :method => :mem
+  else
+    options :members, :flag => '-aU', :method => :mem
+  end
 
   def exists?
     return !!localgid if @resource.forcelocal?
@@ -47,11 +56,11 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
     # because by default duplicates are allowed.  This check is
     # to ensure consistent behaviour of the useradd provider when
     # using both useradd and luseradd
-    if not @resource.allowdupe? and @resource.forcelocal?
+    if !@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
-    elsif @resource.allowdupe? and not @resource.forcelocal?
+    elsif @resource.allowdupe? and !@resource.forcelocal?
       return ["-o"]
     end
     []
@@ -63,7 +72,8 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
   end
 
   def addcmd
-    if @resource.forcelocal?
+    # The localadd command (lgroupadd) must only be called when libuser is supported.
+    if Puppet.features.libuser? && @resource.forcelocal?
       cmd = [command(:localadd)]
       @custom_environment = Puppet::Util::Libuser.getenv
     else
@@ -91,7 +101,8 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
   end
 
   def modifycmd(param, value)
-    if @resource.forcelocal? || @resource[:members]
+    # The localmodify command (lgroupmod) must only be called when libuser is supported.
+    if Puppet.features.libuser? && (@resource.forcelocal? || @resource[:members])
       cmd = [command(:localmodify)]
       @custom_environment = Puppet::Util::Libuser.getenv
     else
@@ -114,7 +125,8 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
   end
 
   def deletecmd
-    if @resource.forcelocal?
+    # The localdelete command (lgroupdel) must only be called when libuser is supported.
+    if Puppet.features.libuser? && @resource.forcelocal?
       @custom_environment = Puppet::Util::Libuser.getenv
       [command(:localdelete), @resource[:name]]
     else
@@ -133,7 +145,16 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
   end
 
   def purge_members
-    localmodify('-m', members_to_s(members), @resource.name)
+    # The groupadd provider doesn't have the ability currently to remove members from a group, libuser does.
+    # Use libuser's lgroupmod command to achieve purging members if libuser is supported.
+    # Otherwise use the 'usermod' command.
+    if Puppet.features.libuser?
+      localmodify('-m', members_to_s(members), @resource.name)
+    else
+      members.each do |member|
+        purgemember('-rG', @resource.name, member)
+      end
+    end
   end
 
   private
@@ -144,7 +165,7 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
 
     unless @groups
       unless Puppet::FileSystem.exist?(group_file)
-        raise Puppet::Error.new("Forcelocal set for group resource '#{resource[:name]}', but #{group_file} does not exist")
+        raise Puppet::Error, "Forcelocal set for group resource '#{resource[:name]}', but #{group_file} does not exist"
       end
 
       @groups = []

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

@@ -44,7 +44,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
 
     users = users.map do |user_name|
       sid = Puppet::Util::Windows::SID.name_to_principal(user_name)
-      if !sid
+      unless sid
         resource.debug("#{user_name} (unresolvable to SID)")
         next user_name
       end
@@ -57,7 +57,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
       resource.debug("#{sid.domain}\\#{account} (#{sid.sid})")
       sid.domain ? "#{sid.domain}\\#{account}" : account
     end
-    return users.join(',')
+    users.join(',')
   end
 
   def member_valid?(user_name)

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

@@ -79,7 +79,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     # Create a new instance of this Puppet::Type for each object present
     #    on the system.
     list_all_present.collect do |name_string|
-      self.new(single_report(name_string, *type_property_array))
+      new(single_report(name_string, *type_property_array))
     end
   end
 
@@ -119,7 +119,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     attribute_hash = {}
     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])
+      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]
@@ -144,7 +144,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     # stored in the user record. It is stored at a path that involves the
     # UUID of the user record for non-Mobile local accounts.
     # Mobile Accounts are out of scope for this provider for now
-    attribute_hash[:password] = self.get_password(attribute_hash[:guid], attribute_hash[:name]) if @resource_type.validproperties.include?(:password) and Puppet.features.root?
+    attribute_hash[:password] = get_password(attribute_hash[:guid], attribute_hash[:name]) if @resource_type.validproperties.include?(:password) and Puppet.features.root?
     attribute_hash
   end
 
@@ -168,9 +168,9 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       fail(_("Could not get report.  command execution failed."))
     end
 
-    dscl_plist = self.parse_dscl_plist_data(dscl_output)
+    dscl_plist = parse_dscl_plist_data(dscl_output)
 
-    self.generate_attribute_hash(dscl_plist, *type_properties)
+    generate_attribute_hash(dscl_plist, *type_properties)
   end
 
   def self.get_exec_preamble(ds_action, resource_name = nil)
@@ -264,8 +264,8 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
         # string. The password_hash provided as a resource attribute is a
         # hex value. We need to convert the Base64 encoded string to a
         # hex value and provide it back to Puppet.
-        password_hash = converted_hash_plist['SALTED-SHA512'].unpack("H*")[0]
-        password_hash
+        converted_hash_plist['SALTED-SHA512'].unpack1("H*")
+
       end
     end
   end
@@ -325,7 +325,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
         else
           value = autogen(name)
           if value
-            self.send(name.to_s + "=", value)
+            send(name.to_s + "=", value)
           else
             next
           end
@@ -361,7 +361,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       # If we are meant to be authoritative for the group membership
       # then remove all existing members who haven't been specified
       # in the manifest.
-      remove_unwanted_members(current_members, value) if @resource[:auth_membership] and not current_members.nil?
+      remove_unwanted_members(current_members, value) if @resource[:auth_membership] and !current_members.nil?
 
       # if they're not a member, make them one.
       add_members(current_members, value)
@@ -395,7 +395,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     # requiring people install a UUID library that doesn't come with the system.
     # This should be revisited if Puppet starts managing UUIDs for other platform
     # user records.
-    guid = %x{/usr/bin/uuidgen}.chomp
+    guid = %x(/usr/bin/uuidgen).chomp
 
     exec_arg_vector = self.class.get_exec_preamble("-create", @resource[:name])
     exec_arg_vector << ns_to_ds_attribute_map[:guid] << guid
@@ -421,7 +421,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       if property == :uid and value.nil?
         value = self.class.next_system_id('uid')
       end
-      if value != "" and not value.nil?
+      if value != "" and !value.nil?
         if property == :members
           add_members(nil, value)
         else
@@ -442,19 +442,19 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
 
   def remove_unwanted_members(current_members, new_members)
     current_members.each do |member|
-      if not new_members.flatten.include?(member)
-        cmd = [:dseditgroup, "-o", "edit", "-n", ".", "-d", member, @resource[:name]]
+      next if new_members.flatten.include?(member)
+
+      cmd = [:dseditgroup, "-o", "edit", "-n", ".", "-d", member, @resource[:name]]
+      begin
+        execute(cmd)
+      rescue Puppet::ExecutionFailure
+        # TODO: We're falling back to removing the member using dscl due to rdar://8481241
+        # This bug causes dseditgroup to fail to remove a member if that member doesn't exist
+        cmd = [:dscl, ".", "-delete", "/Groups/#{@resource.name}", "GroupMembership", member]
         begin
           execute(cmd)
-        rescue Puppet::ExecutionFailure
-          # TODO: We're falling back to removing the member using dscl due to rdar://8481241
-          # This bug causes dseditgroup to fail to remove a member if that member doesn't exist
-          cmd = [:dscl, ".", "-delete", "/Groups/#{@resource.name}", "GroupMembership", member]
-          begin
-            execute(cmd)
-          rescue Puppet::ExecutionFailure => detail
-            fail(_("Could not remove %{member} from group: %{resource}, %{detail}") % { member: member, resource: @resource.name, detail: detail })
-          end
+        rescue Puppet::ExecutionFailure => detail
+          fail(_("Could not remove %{member} from group: %{resource}, %{detail}") % { member: member, resource: @resource.name, detail: detail })
         end
       end
     end
@@ -462,13 +462,13 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
 
   def add_members(current_members, new_members)
     new_members.flatten.each do |new_member|
-      if current_members.nil? or not current_members.include?(new_member)
-        cmd = [:dseditgroup, "-o", "edit", "-n", ".", "-a", new_member, @resource[:name]]
-        begin
-          execute(cmd)
-        rescue Puppet::ExecutionFailure => detail
-          fail(_("Could not add %{new_member} to group: %{name}, %{detail}") % { new_member: new_member, name: @resource.name, detail: detail })
-        end
+      next unless current_members.nil? or !current_members.include?(new_member)
+
+      cmd = [:dseditgroup, "-o", "edit", "-n", ".", "-a", new_member, @resource[:name]]
+      begin
+        execute(cmd)
+      rescue Puppet::ExecutionFailure => detail
+        fail(_("Could not add %{new_member} to group: %{name}, %{detail}") % { new_member: new_member, name: @resource.name, detail: detail })
       end
     end
   end

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

@@ -15,10 +15,8 @@ class Puppet::Provider::NameService
     end
 
     def posixmethod(name)
-      name   = name.intern if name.is_a? String
-      method = self.class.option(name, :method) || name
-
-      method
+      name = name.intern if name.is_a? String
+      self.class.option(name, :method) || name
     end
   end
 end

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

@@ -9,14 +9,13 @@ class Puppet::Provider::NameService
     end
 
     def modifycmd(param, value)
-      cmd = [
+      [
         command(:pw),
         "#{@resource.class.name}mod",
         @resource[:name],
         flag(param),
         munge(param, value)
       ]
-      cmd
     end
   end
 end

data/lib/puppet/provider/nameservice.rb

@@ -98,7 +98,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     private
 
     def op(property)
-      @ops[property.name] || ("-#{property.name}")
+      @ops[property.name] || "-#{property.name}"
     end
   end
 
@@ -108,15 +108,15 @@ class Puppet::Provider::NameService < Puppet::Provider
     field = field.intern
     id_generators = { :user => :uid, :group => :gid }
     if id_generators[@resource.class.name] == field
-      return self.class.autogen_id(field, @resource.class.name)
+      self.class.autogen_id(field, @resource.class.name)
     else
       value = self.class.autogen_default(field)
       if value
-        return value
+        value
       elsif respond_to?("autogen_#{field}")
-        return send("autogen_#{field}")
+        send("autogen_#{field}")
       else
-        return nil
+        nil
       end
     end
   end
@@ -142,7 +142,7 @@ class Puppet::Provider::NameService < Puppet::Provider
       # 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
+      highest = highest.reject { |x| x > 65_000 }.max
 
       @prevauto = highest || 1000
     end
@@ -160,7 +160,7 @@ 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(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 })
       end
@@ -177,7 +177,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     end
 
     begin
-      execute(self.deletecmd, { :failonfail => true, :combine => true, :custom_environment => @custom_environment })
+      execute(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

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

@@ -53,21 +53,21 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
 
     updates = {}
     sources.each do |source|
-      execute(self.srclistcmd(source)).each_line do |line|
-        if line =~ /^[^#][^:]*:([^:]*):([^:]*)/
-          current = {}
-          current[:name]    = $1
-          current[:version] = $2
-          current[:source]  = source
+      execute(srclistcmd(source)).each_line do |line|
+        next unless line =~ /^[^#][^:]*:([^:]*):([^:]*)/
 
-          if updates.key?(current[:name])
-            previous = updates[current[:name]]
+        current = {}
+        current[:name]    = Regexp.last_match(1)
+        current[:version] = Regexp.last_match(2)
+        current[:source]  = source
 
-            updates[current[:name]] = current unless Puppet::Util::Package.versioncmp(previous[:version], current[:version]) == 1
+        if updates.key?(current[:name])
+          previous = updates[current[:name]]
 
-          else
-            updates[current[:name]] = current
-          end
+          updates[current[:name]] = current unless Puppet::Util::Package.versioncmp(previous[:version], current[:version]) == 1
+
+        else
+          updates[current[:name]] = current
         end
       end
     end
@@ -137,9 +137,9 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
     end
 
     if hash[:pkgname]
-      return list.shift
+      list.shift
     else
-      return list
+      list
     end
   end
 
@@ -152,12 +152,12 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
   def latest
     upd = latest_info
 
-    unless upd.nil?
-      return "#{upd[:version]}"
-    else
+    if upd.nil?
       raise Puppet::DevError, _("Tried to get latest on a missing package") if properties[:ensure] == :absent
 
-      return properties[:ensure]
+      properties[:ensure]
+    else
+      (upd[:version]).to_s
     end
   end
 
@@ -166,6 +166,6 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
   end
 
   def update
-    self.install(false)
+    install(false)
   end
 end

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

@@ -57,7 +57,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
     cached_source = source
     tmpdir = Dir.mktmpdir
     begin
-      if %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ cached_source
+      if %r{\A[A-Za-z][A-Za-z0-9+\-.]*://} =~ cached_source
         cached_source = File.join(tmpdir, name)
         begin
           curl "-o", cached_source, "-C", "-", "-L", "-s", "--url", source
@@ -85,7 +85,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
               installapp("#{fspath}/#{pkg}", name, source)
             end
           end
-          Puppet.debug "Unable to find .app in .appdmg. #{name} will not be installed." if !found_app
+          Puppet.debug "Unable to find .app in .appdmg. #{name} will not be installed." unless found_app
         ensure
           hdiutil "eject", mounts[0]
         end

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

@@ -15,7 +15,7 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package
 
   def self.instances
     instance_by_name.collect do |name|
-      self.new(
+      new(
         :name => name,
         :provider => :apple,
         :ensure => :installed

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

@@ -45,7 +45,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
   def query
     hash = super
 
-    if !%i(absent purged).include?(hash[:ensure]) && aptmark('showmanual', @resource[:name]).strip == @resource[:name]
+    if !%i[absent purged].include?(hash[:ensure]) && aptmark('showmanual', @resource[:name]).strip == @resource[:name]
       hash[:mark] = :manual
     end
 
@@ -108,7 +108,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
       end
     end
 
-    return versions.sort.last if versions.any?
+    return versions.max if versions.any?
 
     Puppet.debug("No available version for package #{@resource[:name]} is included in range #{should_range}")
     should_range
@@ -117,7 +117,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
   # Install a package using 'apt-get'.  This function needs to support
   # installing a specific version.
   def install
-    self.run_preseed if @resource[:responsefile]
+    run_preseed if @resource[:responsefile]
     should = @resource[:ensure]
 
     if should.is_a?(String)
@@ -133,7 +133,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     end
 
     checkforcdrom
-    cmd = %w{-q -y}
+    cmd = %w[-q -y]
 
     config = @resource[:configfiles]
     if config
@@ -165,17 +165,17 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     end
     # rubocop:enable Style/RedundantCondition
 
-    self.unhold if self.properties[:mark] == :hold
+    unhold if properties[:mark] == :hold
     begin
       aptget(*cmd)
     ensure
-      self.hold if @resource[:mark] == :hold
+      hold if @resource[:mark] == :hold
     end
 
     # If a source file was specified, we must make sure the expected version was installed from specified file
-    if source && !%i(present installed).include?(should)
-      is = self.query
-      raise Puppet::Error, _("Could not find package %{name}") % { name: self.name } unless is
+    if source && !%i[present installed].include?(should)
+      is = query
+      raise Puppet::Error, _("Could not find package %{name}") % { name: name } unless is
 
       version = is[:ensure]
 
@@ -189,10 +189,10 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     output = aptcache :policy, @resource[:name]
 
     if output =~ /Candidate:\s+(\S+)\s/
-      return $1
+      Regexp.last_match(1)
     else
-      self.err _("Could not find latest version")
-      return nil
+      err _("Could not find latest version")
+      nil
     end
   end
 
@@ -202,26 +202,26 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
   def run_preseed
     response = @resource[:responsefile]
     if response && Puppet::FileSystem.exist?(response)
-      self.info(_("Preseeding %{response} to debconf-set-selections") % { response: response })
+      info(_("Preseeding %{response} to debconf-set-selections") % { response: response })
 
       preseed response
     else
-      self.info _("No responsefile specified or non existent, not preseeding anything")
+      info _("No responsefile specified or non existent, not preseeding anything")
     end
   end
 
   def uninstall
-    self.run_preseed if @resource[:responsefile]
+    run_preseed if @resource[:responsefile]
     args = ['-y', '-q']
-    args << '--allow-change-held-packages' if self.properties[:mark] == :hold
+    args << '--allow-change-held-packages' if properties[:mark] == :hold
     args << :remove << @resource[:name]
     aptget(*args)
   end
 
   def purge
-    self.run_preseed if @resource[:responsefile]
+    run_preseed if @resource[:responsefile]
     args = ['-y', '-q']
-    args << '--allow-change-held-packages' if self.properties[:mark] == :hold
+    args << '--allow-change-held-packages' if properties[:mark] == :hold
     args << :remove << '--purge' << @resource[:name]
     aptget(*args)
     # workaround a "bug" in apt, that already removed packages are not purged

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

@@ -19,9 +19,7 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg
 
     # Yay, stupid aptitude doesn't throw an error when the package is missing.
     if args.include?(:install) and output.to_s =~ /Couldn't find any package/
-      raise Puppet::Error.new(
-        _("Could not find package %{name}") % { name: self.name }
-      )
+      raise Puppet::Error, _("Could not find package %{name}") % { name: name }
     end
   end
 

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

@@ -39,7 +39,7 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
       # Add the package version
       str += "=#{should}"
     end
-    cmd = %w{-q -y}
+    cmd = %w[-q -y]
 
     cmd << 'install' << str
 
@@ -51,30 +51,30 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
     output = aptcache :showpkg, @resource[:name]
 
     if output =~ /Versions:\s*\n((\n|.)+)^$/
-      versions = $1
+      versions = Regexp.last_match(1)
       available_versions = versions.split(/\n/).filter_map { |version|
-        if version =~ /^([^\(]+)\(/
-          $1
+        if version =~ /^([^(]+)\(/
+          Regexp.last_match(1)
         else
-          self.warning _("Could not match version '%{version}'") % { version: version }
+          warning _("Could not match version '%{version}'") % { version: version }
           nil
         end
       }.sort { |a, b| versioncmp(a, b) }
 
       if available_versions.length == 0
-        self.debug "No latest version"
+        debug "No latest version"
         print output if Puppet[:debug]
       end
 
       # Get the latest and greatest version number
-      return available_versions.pop
+      available_versions.pop
     else
-      self.err _("Could not match string")
+      err _("Could not match string")
     end
   end
 
   def update
-    self.install
+    install
   end
 
   def uninstall

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

@@ -50,12 +50,12 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
     end
 
     if hash[:justme]
-      return list[0]
+      list[0]
     else
       list.reject! { |h|
         h[:ensure] == :absent
       }
-      return list
+      list
     end
   end
 
@@ -63,23 +63,23 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
   def self.blastsplit(line)
     if line =~ /\s*(\S+)\s+((\[Not installed\])|(\S+))\s+(\S+)/
       hash = {}
-      hash[:name] = $1
-      hash[:ensure] = if $2 == "[Not installed]"
+      hash[:name] = Regexp.last_match(1)
+      hash[:ensure] = if Regexp.last_match(2) == "[Not installed]"
                         :absent
                       else
-                        $2
+                        Regexp.last_match(2)
                       end
-      hash[:avail] = $5
+      hash[:avail] = Regexp.last_match(5)
 
       hash[:avail] = hash[:ensure] if hash[:avail] == "SAME"
 
       # Use the name method, so it works with subclasses.
-      hash[:provider] = self.name
+      hash[:provider] = name
 
-      return hash
+      hash
     else
       Puppet.warning _("Cannot match %{line}") % { line: line }
-      return nil
+      nil
     end
   end
 
@@ -95,11 +95,7 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
 
   def query
     hash = self.class.blastlist(:justme => @resource[:name])
-    if hash
-      hash
-    else
-      { :ensure => :absent }
-    end
+    hash || { :ensure => :absent }
   end
 
   # Remove the old package, and install the new one