openvox 7.37.1 → 8.19.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 require_relative '../../../puppet/util/package'
 
@@ -24,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  :operatingsystem => [ :aix ]
-  defaultfor :operatingsystem => :aix
+  confine 'os.name' => [:aix]
+  defaultfor 'os.name' => :aix
 
-  attr_accessor   :latest_info
+  attr_accessor :latest_info
 
   STATE_CODE = {
     'A' => :applied,
@@ -39,33 +41,33 @@ 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)
     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|
-      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 =~ /^[^#][^:]*:([^:]*):([^:]*)/
+
+        current = {}
+        current[:name]    = Regexp.last_match(1)
+        current[:version] = Regexp.last_match(2)
+        current[:source]  = source
 
-          if updates.key?(current[:name])
-            previous = updates[current[:name]]
+        if updates.key?(current[:name])
+          previous = updates[current[:name]]
 
-            updates[current[:name]] = current unless Puppet::Util::Package.versioncmp(previous[:version], current[:version]) == 1
+          updates[current[:name]] = current unless Puppet::Util::Package.versioncmp(previous[:version], current[:version]) == 1
 
-          else
-            updates[current[:name]] = current
-          end
+        else
+          updates[current[:name]] = current
         end
       end
     end
@@ -97,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
 
@@ -122,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 }
       }
@@ -135,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
 
@@ -150,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
 
@@ -164,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

@@ -1,3 +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)
@@ -17,8 +19,8 @@ require_relative '../../../puppet/util/plist' if Puppet.features.cfpropertylist?
 Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Package) do
   desc "Package management which copies application bundles to a target."
 
-  confine :operatingsystem => :darwin
-  confine :feature         => :cfpropertylist
+  confine 'os.name' => :darwin
+  confine :feature => :cfpropertylist
 
   commands :hdiutil => "/usr/bin/hdiutil"
   commands :curl => "/usr/bin/curl"
@@ -55,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
@@ -68,25 +70,25 @@ 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)
-          # 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." unless found_app
+        ensure
+          hdiutil "eject", mounts[0]
+        end
       end
     ensure
       FileUtils.remove_entry_secure(tmpdir, true)
@@ -94,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
@@ -106,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 
 # OS X Packaging sucks.  We can install packages, but that's about it.
@@ -8,15 +10,15 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package
     automatically add the `.pkg` extension, so leave that off when specifying
     the package name."
 
-  confine :operatingsystem => :darwin
+  confine 'os.name' => :darwin
   commands :installer => "/usr/sbin/installer"
 
   def self.instances
     instance_by_name.collect do |name|
-      self.new(
-        :name     => name,
+      new(
+        :name => name,
         :provider => :apple,
-        :ensure   => :installed
+        :ensure => :installed
       )
     end
   end
@@ -33,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/util/package/version/range'
 require_relative '../../../puppet/util/package/version/debian'
 
@@ -19,7 +21,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
   commands :aptmark => "/usr/bin/apt-mark"
   commands :preseed => "/usr/bin/debconf-set-selections"
 
-  defaultfor :osfamily => :debian
+  defaultfor 'os.family' => :debian
 
   ENV['DEBIAN_FRONTEND'] = "noninteractive"
 
@@ -43,14 +45,14 @@ 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
 
     hash
   end
 
-  def initialize(value={})
+  def initialize(value = {})
     super(value)
     @property_flush = {}
   end
@@ -76,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:/)
@@ -83,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
 
@@ -104,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
@@ -113,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)
@@ -129,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
@@ -159,35 +163,34 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
       cmd << str
     end
 
-    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]
 
       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
+      Regexp.last_match(1)
     else
-      self.err _("Could not find latest version")
-      return nil
+      err _("Could not find latest version")
+      nil
     end
   end
 
@@ -197,26 +200,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
@@ -233,7 +236,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,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg do
   desc "Package management via `aptitude`."
 
@@ -17,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
   # Provide sorting functionality
   include Puppet::Util::Package
@@ -10,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')
@@ -19,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.
@@ -33,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
 
@@ -42,35 +48,33 @@ 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
-      available_versions = versions.split(/\n/).collect { |version|
-        if version =~ /^([^\(]+)\(/
-          $1
+      versions = Regexp.last_match(1)
+      available_versions = versions.split(/\n/).filter_map { |version|
+        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
-      }.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"
+        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

@@ -1,10 +1,12 @@
+# 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."
   pkgget = "pkg-get"
   pkgget = "/opt/csw/bin/pkg-get" if FileTest.executable?("/opt/csw/bin/pkg-get")
 
-  confine :osfamily => :solaris
+  confine 'os.family' => :solaris
 
   commands :pkgget => pkgget
 
@@ -15,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")
@@ -39,46 +41,45 @@ 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]
+      list[0]
     else
       list.reject! { |h|
         h[:ensure] == :absent
       }
-      return list
+      list
     end
-
   end
 
   # Split the different lines into hashes.
   def self.blastsplit(line)
     if line =~ /\s*(\S+)\s+((\[Not installed\])|(\S+))\s+(\S+)/
       hash = {}
-      hash[:name] = $1
-      hash[:ensure] = if $2 == "[Not installed]"
-        :absent
-      else
-        $2
-      end
-      hash[:avail] = $5
+      hash[:name] = Regexp.last_match(1)
+      hash[:ensure] = if Regexp.last_match(2) == "[Not installed]"
+                        :absent
+                      else
+                        Regexp.last_match(2)
+                      end
+      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
 
@@ -94,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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :dnf, :parent => :yum do
   desc "Support via `dnf`.
 
@@ -18,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')
@@ -27,12 +33,13 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do
         true
       end
   end
+  # rubocop:enable Layout
 
-  defaultfor :operatingsystem => :fedora
-  notdefaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => (19..21).to_a
-  defaultfor :osfamily => :redhat
-  notdefaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
-  defaultfor :operatingsystem => :amazon, :operatingsystemmajrelease => ["2023"]
+  defaultfor 'os.name' => :fedora
+  notdefaultfor 'os.name' => :fedora, 'os.release.major' => (19..21).to_a
+  defaultfor 'os.family' => :redhat
+  notdefaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
+  defaultfor 'os.name' => :amazon, 'os.release.major' => ["2023"]
 
   def self.update_command
     # In DNF, update is deprecated for upgrade