openvox 7.37.1 → 8.19.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package do
@@ -5,9 +7,9 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
 
   commands :pkg => "/usr/local/sbin/pkg"
 
-  confine :operatingsystem => [:freebsd, :dragonfly]
+  confine 'os.name' => [:freebsd, :dragonfly]
 
-  defaultfor :operatingsystem => [:freebsd, :dragonfly]
+  defaultfor 'os.name' => [:freebsd, :dragonfly]
 
   has_feature :versionable
   has_feature :upgradeable
@@ -22,7 +24,9 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
   end
 
   def self.cached_version_list
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     @version_list ||= get_version_list
+    # rubocop:enable Naming/MemoizedInstanceVariableName
   end
 
   def self.get_version_list
@@ -36,6 +40,7 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
       if ['!', '?'].include?(compare)
         return nil
       end
+
       latest_version = status.split(' ').last.split(')').first
       return latest_version
     end
@@ -44,22 +49,22 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
 
   def self.parse_pkg_query_line(line)
     name, version, origin = line.chomp.split(' ', 3)
-    latest_version  = get_latest_version(origin) || version
+    latest_version = get_latest_version(origin) || version
 
     {
-      :ensure   => version,
-      :name     => name,
+      :ensure => version,
+      :name => name,
       :provider => self.name,
-      :origin   => origin,
-      :version  => version,
-      :latest   => latest_version
+      :origin => origin,
+      :version => version,
+      :latest => latest_version
     }
   end
 
   def self.instances
     packages = []
     begin
-      info = self.get_query
+      info = get_query
       get_version_list
 
       unless info
@@ -71,16 +76,16 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
         packages << new(hash)
       end
 
-      return packages
+      packages
     rescue Puppet::ExecutionFailure
-      return []
+      []
     end
   end
 
   def self.prefetch(resources)
     packages = instances
     resources.each_key do |name|
-      provider = packages.find{|p| p.name == name or p.origin == name }
+      provider = packages.find { |p| p.name == name or p.origin == name }
       if provider
         resources[name].provider = provider
       end
@@ -91,6 +96,7 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
     # extract repo tag from URN: urn:freebsd:repo:<tag>
     match = /^urn:freebsd:repo:(.+)$/.match(urn)
     raise ArgumentError urn.inspect unless match
+
     match[1]
   end
 
@@ -107,14 +113,14 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
       # just 'curl'), drop the category prefix. pkgng doesn't support version
       # pinning with the origin syntax (pkg install curl-1.2.3 is valid, but
       # pkg install www/curl-1.2.3 is not).
-      if resource[:name] =~ /\//
+      if resource[:name] =~ %r{/}
         installname = resource[:name].split('/')[1] + '-' + resource[:ensure]
       else
         installname = resource[:name] + '-' + resource[:ensure]
       end
     end
 
-    if not source # install using default repo logic
+    if !source # install using default repo logic
       args = ['install', '-qy']
     elsif source.scheme == 'urn' # install from repo named in URN
       tag = repo_tag_from_urn(source.to_s)
@@ -169,5 +175,4 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
   def install_options
     join_options(@resource[:install_options])
   end
-
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Packaging using Peter Bonivart's pkgutil program.
 Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun do
   desc "Package management using Peter Bonivart's ``pkgutil`` command on Solaris."
@@ -7,25 +9,25 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
     pkgutil_bin = "/opt/csw/bin/pkgutil"
   end
 
-  confine :osfamily => :solaris
+  confine 'os.family' => :solaris
 
   has_command(:pkguti, pkgutil_bin) do
-    environment :HOME => ENV['HOME']
+    environment :HOME => ENV.fetch('HOME', nil)
   end
 
-  def self.healthcheck()
+  def self.healthcheck
     unless Puppet::FileSystem.exist?("/var/opt/csw/pkgutil/admin")
       Puppet.notice _("It is highly recommended you create '/var/opt/csw/pkgutil/admin'.")
       Puppet.notice _("See /var/opt/csw/pkgutil")
     end
 
     correct_wgetopts = false
-    [ "/opt/csw/etc/pkgutil.conf", "/etc/opt/csw/pkgutil.conf" ].each do |confpath|
+    ["/opt/csw/etc/pkgutil.conf", "/etc/opt/csw/pkgutil.conf"].each do |confpath|
       File.open(confpath) do |conf|
-        conf.each_line {|line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*(-nv|-q|--no-verbose|--quiet)/ }
+        conf.each_line { |line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*(-nv|-q|--no-verbose|--quiet)/ }
       end
     end
-    if ! correct_wgetopts
+    unless correct_wgetopts
       Puppet.notice _("It is highly recommended that you set 'wgetopts=-nv' in your pkgutil.conf.")
     end
   end
@@ -48,11 +50,11 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
 
       # Create a second instance with the alias if it's different
       pkgalias = aliases[pkg[:name]]
-      if pkgalias and pkg[:name] != pkgalias
-        apkg = pkg.dup
-        apkg[:name] = pkgalias
-        pkginsts << new(apkg)
-      end
+      next unless pkgalias and pkg[:name] != pkgalias
+
+      apkg = pkg.dup
+      apkg[:name] = pkgalias
+      pkginsts << new(apkg)
     end
 
     pkginsts
@@ -63,16 +65,16 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
   def self.availlist
     output = pkguti ["-a"]
 
-    output.split("\n").collect do |line|
-      next if line =~ /^common\s+package/  # header of package list
+    output.split("\n").filter_map do |line|
+      next if line =~ /^common\s+package/ # header of package list
       next if noise?(line)
 
       if line =~ /\s*(\S+)\s+(\S+)\s+(.*)/
-        { :alias => $1, :name => $2, :avail => $3 }
+        { :alias => Regexp.last_match(1), :name => Regexp.last_match(2), :avail => Regexp.last_match(3) }
       else
         Puppet.warning _("Cannot match %{line}") % { line: line }
       end
-    end.reject { |h| h.nil? }
+    end
   end
 
   # Turn our pkgutil -c listing into a hash for a single package.
@@ -92,32 +94,33 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
       return nil
     end
 
-    list = output.collect do |line|
-      next if line =~ /installed\s+catalog/  # header of package list
+    list = output.filter_map do |line|
+      next if line =~ /installed\s+catalog/ # header of package list
       next if noise?(line)
 
       pkgsplit(line)
-    end.reject { |h| h.nil? }
+    end
 
     if hash[:justme]
       # Single queries may have been for an alias so return the name requested
       if list.any?
         list[-1][:name] = hash[:justme]
-        return list[-1]
+        list[-1]
       end
     else
       list.reject! { |h| h[:ensure] == :absent }
-      return list
+      list
     end
   end
 
   # Identify common types of pkgutil noise as it downloads catalogs etc
   def self.noise?(line)
-    true if line =~ /^#/
-    true if line =~ /^Checking integrity / # use_gpg
-    true if line =~ /^gpg: /               # gpg verification
-    true if line =~ /^=+> /                # catalog fetch
-    true if line =~ /\d+:\d+:\d+ URL:/     # wget without -q
+    return true if line =~ /^#/
+    return true if line =~ /^Checking integrity / # use_gpg
+    return true if line =~ /^gpg: /               # gpg verification
+    return true if line =~ /^=+> /                # catalog fetch
+    return true if line =~ /\d+:\d+:\d+ URL:/     # wget without -q
+
     false
   end
 
@@ -125,25 +128,25 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
   def self.pkgsplit(line)
     if line =~ /\s*(\S+)\s+(\S+)\s+(.*)/
       hash = {}
-      hash[:name] = $1
-      hash[:ensure] = if $2 == "notinst"
-        :absent
-      else
-        $2
-      end
-      hash[:avail] = $3
+      hash[:name] = Regexp.last_match(1)
+      hash[:ensure] = if Regexp.last_match(2) == "notinst"
+                        :absent
+                      else
+                        Regexp.last_match(2)
+                      end
+      hash[:avail] = Regexp.last_match(3)
 
       if hash[:avail] =~ /^SAME\s*$/
         hash[:avail] = hash[:ensure]
       end
 
       # 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
 
@@ -152,7 +155,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
     # get passed to pkgutil via one or more -t options
     if resource[:source]
       sources = [resource[:source]].flatten
-      pkguti(*[sources.map{|src| [ "-t", src ]}, *args].flatten)
+      pkguti(*[sources.map { |src| ["-t", src] }, *args].flatten)
     else
       pkguti(*args.flatten)
     end
@@ -170,11 +173,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
 
   def query
     hash = pkgsingle(@resource)
-    if hash
-      hash
-    else
-      {:ensure => :absent}
-    end
+    hash || { :ensure => :absent }
   end
 
   def update

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 require 'fileutils'
 
@@ -20,51 +22,51 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     end
   end
 
-  confine :osfamily => :gentoo
+  confine 'os.family' => :gentoo
 
-  defaultfor :osfamily => :gentoo
+  defaultfor 'os.family' => :gentoo
 
   def self.instances
-    result_format = self.eix_result_format
-    result_fields = self.eix_result_fields
-
-    limit = self.eix_limit
-    version_format = self.eix_version_format
-    slot_versions_format = self.eix_slot_versions_format
-    installed_versions_format = self.eix_installed_versions_format
-    installable_versions_format = self.eix_install_versions_format
+    result_format = eix_result_format
+    result_fields = eix_result_fields
+
+    limit = eix_limit
+    version_format = eix_version_format
+    slot_versions_format = eix_slot_versions_format
+    installed_versions_format = eix_installed_versions_format
+    installable_versions_format = eix_install_versions_format
     begin
       eix_file = File.directory?('/var/cache/eix') ? '/var/cache/eix/portage.eix' : '/var/cache/eix'
-      update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+      update_eix unless FileUtils.uptodate?(eix_file, %w[/usr/bin/eix /usr/portage/metadata/timestamp])
 
       search_output = nil
       Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
-        search_output = eix(*(self.eix_search_arguments + ['--installed']))
+        search_output = eix(*(eix_search_arguments + ['--installed']))
       end
 
       packages = []
       search_output.each_line do |search_result|
         match = result_format.match(search_result)
 
-        if match
-          package = {}
-          result_fields.zip(match.captures) do |field, value|
-            package[field] = value unless !value or value.empty?
-          end
-          package[:provider] = :portage
-          packages << new(package)
+        next unless match
+
+        package = {}
+        result_fields.zip(match.captures) do |field, value|
+          package[field] = value unless !value or value.empty?
         end
+        package[:provider] = :portage
+        packages << new(package)
       end
 
-      return packages
+      packages
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error.new(detail)
+      raise Puppet::Error, detail
     end
   end
 
   def install
     should = @resource.should(:ensure)
-    cmd = %w{}
+    cmd = %w[]
     name = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
     name = qatom[:pfx] + name if qatom[:pfx]
     name = name + '-' + qatom[:pv] if qatom[:pv]
@@ -78,7 +80,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
 
   def uninstall
     should = @resource.should(:ensure)
-    cmd = %w{--rage-clean}
+    cmd = %w[--rage-clean]
     name = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
     name = qatom[:pfx] + name if qatom[:pfx]
     name = name + '-' + qatom[:pv] if qatom[:pv]
@@ -96,17 +98,17 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
   end
 
   def reinstall
-    self.install
+    install
   end
 
   def update
-    self.install
+    install
   end
 
   def qatom
-    output_format = self.qatom_output_format
-    result_format = self.qatom_result_format
-    result_fields = self.qatom_result_fields
+    output_format = qatom_output_format
+    result_format = qatom_result_format
+    result_fields = qatom_result_fields
     @atom ||= begin
       package_info = {}
       # do the search
@@ -117,9 +119,9 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
       when true, false, Symbol
         search = @resource[:name]
       else
-        search = '=' + @resource[:name] + '-' + "#{should}"
+        search = '=' + @resource[:name] + '-' + should.to_s
       end
-      search_output = qatom_bin(*([search, '--format', output_format]))
+      search_output = qatom_bin(*[search, '--format', output_format])
       # verify if the search found anything
       match = result_format.match(search_output)
       if match
@@ -136,7 +138,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
       end
       @atom = package_info
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error.new(detail)
+      raise Puppet::Error, detail
     end
   end
 
@@ -145,7 +147,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
   end
 
   def qatom_result_format
-    /^\"\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\](.*)\"$/
+    /^"\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\](.*)"$/
   end
 
   def qatom_result_fields
@@ -153,9 +155,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
   end
 
   def self.get_sets
-    @sets ||= begin
-      @sets = emerge(*(['--list-sets']))
-    end
+    @sets ||= @sets = emerge(*['--list-sets'])
   end
 
   def query
@@ -178,69 +178,71 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
       end
 
       if @resource[:name] =~ /^@/
-        if package_sets.include?(@resource[:name][1..-1].to_s)
-          return({:name => "#{@resource[:name]}", :ensure => '9999', :version_available => nil, :installed_versions => nil, :installable_versions => "9999,"})
+        if package_sets.include?(@resource[:name][1..].to_s)
+          return({ :name => (@resource[:name]).to_s, :ensure => '9999', :version_available => nil, :installed_versions => nil, :installable_versions => "9999," })
         end
       end
 
       eix_file = File.directory?('/var/cache/eix') ? '/var/cache/eix/portage.eix' : '/var/cache/eix'
-      update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+      update_eix unless FileUtils.uptodate?(eix_file, %w[/usr/bin/eix /usr/portage/metadata/timestamp])
 
       search_output = nil
       Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
-        search_output = eix(*(self.class.eix_search_arguments + ['--exact',search_field,search_value]))
+        search_output = eix(*(self.class.eix_search_arguments + ['--exact', search_field, search_value]))
       end
 
       packages = []
       search_output.each_line do |search_result|
         match = result_format.match(search_result)
 
-        if match
-          package = {}
-          result_fields.zip(match.captures) do |field, value|
-            package[field] = value unless !value or value.empty?
-          end
-          # dev-lang python [3.4.5] [3.5.2] [2.7.12:2.7,3.4.5:3.4] [2.7.12:2.7,3.4.5:3.4,3.5.2:3.5] https://www.python.org/ An interpreted, interactive, object-oriented programming language
-          # version_available is what we CAN install / update to
-          # ensure is what is currently installed
-          # This DOES NOT choose to install/upgrade or not, just provides current info
-          # prefer checking versions to slots as versions are finer grained
-          search = qatom[:pv]
-          search = search + '-' + qatom[:pr] if qatom[:pr]
-          if search
-            package[:version_available] = eix_get_version_for_versions(package[:installable_versions], search)
-            package[:ensure] = eix_get_version_for_versions(package[:installed_versions], search)
-          elsif qatom[:slot]
-            package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], qatom[:slot])
-            package[:ensure] = eix_get_version_for_slot(package[:installed_slots], qatom[:slot])
-          end
+        next unless match
 
-          package[:ensure] = package[:ensure] ? package[:ensure] : :absent
-          packages << package
+        package = {}
+        result_fields.zip(match.captures) do |field, value|
+          package[field] = value unless !value or value.empty?
         end
+        # dev-lang python [3.4.5] [3.5.2] [2.7.12:2.7,3.4.5:3.4] [2.7.12:2.7,3.4.5:3.4,3.5.2:3.5] https://www.python.org/ An interpreted, interactive, object-oriented programming language
+        # version_available is what we CAN install / update to
+        # ensure is what is currently installed
+        # This DOES NOT choose to install/upgrade or not, just provides current info
+        # prefer checking versions to slots as versions are finer grained
+        search = qatom[:pv]
+        search = search + '-' + qatom[:pr] if qatom[:pr]
+        if search
+          package[:version_available] = eix_get_version_for_versions(package[:installable_versions], search)
+          package[:ensure] = eix_get_version_for_versions(package[:installed_versions], search)
+        elsif qatom[:slot]
+          package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], qatom[:slot])
+          package[:ensure] = eix_get_version_for_slot(package[:installed_slots], qatom[:slot])
+        end
+
+        package[:ensure] = package[:ensure] || :absent
+        packages << package
       end
 
       case packages.size
-        when 0
-          raise Puppet::Error.new(_("No package found with the specified name [%{name}]") % { name: @resource[:name] })
-        when 1
-          @eix_result = packages[0]
-        else
-          raise Puppet::Error.new(_("More than one package with the specified name [%{search_value}], please use the category parameter to disambiguate") % { search_value: search_value })
+      when 0
+        raise Puppet::Error, _("No package found with the specified name [%{name}]") % { name: @resource[:name] }
+      when 1
+        @eix_result = packages[0]
+      else
+        raise Puppet::Error, _("More than one package with the specified name [%{search_value}], please use the category parameter to disambiguate") % { search_value: search_value }
       end
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error.new(detail)
+      raise Puppet::Error, detail
     end
   end
 
   def latest
-    self.query[:version_available]
+    query[:version_available]
   end
 
   private
+
   def eix_get_version_for_versions(versions, target)
     # [2.7.10-r1,2.7.12,3.4.3-r1,3.4.5,3.5.2] 3.5.2
     return nil if versions.nil?
+
     versions = versions.split(',')
     # [2.7.10-r1 2.7.12 3.4.3-r1 3.4.5 3.5.2]
     versions.find { |version| version == target }
@@ -248,9 +250,11 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
   end
 
   private
+
   def eix_get_version_for_slot(versions_and_slots, slot)
     # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5] 3.5
     return nil if versions_and_slots.nil?
+
     versions_and_slots = versions_and_slots.split(',')
     # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5]
     versions_and_slots.map! { |version_and_slot| version_and_slot.split(':') }
@@ -297,7 +301,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
   end
 
   def self.eix_search_arguments
-    ['--nocolor', '--pure-packages', '--format', self.eix_search_format]
+    ['--nocolor', '--pure-packages', '--format', eix_search_format]
   end
 
   def install_options

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

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :freebsd do
   desc "Support for FreeBSD's ports.  Note that this, too, mixes packages and ports."
 
   commands :portupgrade => "/usr/local/sbin/portupgrade",
-    :portversion => "/usr/local/sbin/portversion",
-    :portuninstall => "/usr/local/sbin/pkg_deinstall",
-    :portinfo => "/usr/sbin/pkg_info"
+           :portversion => "/usr/local/sbin/portversion",
+           :portuninstall => "/usr/local/sbin/pkg_deinstall",
+           :portinfo => "/usr/sbin/pkg_info"
 
-  %w{INTERACTIVE UNAME}.each do |var|
+  %w[INTERACTIVE UNAME].each do |var|
     ENV.delete(var) if ENV.include?(var)
   end
 
   def install
     # -N: install if the package is missing, otherwise upgrade
     # -M: yes, we're a batch, so don't ask any questions
-    cmd = %w{-N -M BATCH=yes} << @resource[:name]
+    cmd = %w[-N -M BATCH=yes] << @resource[:name]
 
     output = portupgrade(*cmd)
     if output =~ /\*\* No such /
@@ -27,8 +29,8 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
 
     begin
       output = portversion(*cmd)
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output, $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new(output, e)
     end
     line = output.split("\n").pop
 
@@ -37,16 +39,16 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
       return :latest
     end
 
-    pkgstuff = $1
-    match = $2
-    info = $3
+    pkgstuff = Regexp.last_match(1)
+    match = Regexp.last_match(2)
+    info = Regexp.last_match(3)
 
     unless pkgstuff =~ /^\S+-([^-\s]+)$/
       raise Puppet::Error,
-        _("Could not match package info '%{pkgstuff}'") % { pkgstuff: pkgstuff }
+            _("Could not match package info '%{pkgstuff}'") % { pkgstuff: pkgstuff }
     end
 
-    version = $1
+    version = Regexp.last_match(1)
 
     if match == "=" or match == ">"
       # we're up to date or more recent
@@ -57,10 +59,11 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
 
     unless info =~ /\((\w+) has (.+)\)/
       raise Puppet::Error,
-        _("Could not match version info '%{info}'") % { info: info }
+            _("Could not match version info '%{info}'") % { info: info }
     end
 
-    source, newversion = $1, $2
+    source = Regexp.last_match(1)
+    newversion = Regexp.last_match(2)
 
     debug "Newer version in #{source}"
     newversion
@@ -69,8 +72,8 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
   def query
     # support portorigin_glob such as "mail/postfix"
     name = self.name
-    if name =~ /\//
-      name = self.name.split(/\//).slice(1)
+    if name =~ %r{/}
+      name = self.name.split(%r{/}).slice(1)
     end
     self.class.instances.each do |instance|
       if instance.name == name