puppet 6.4.5-universal-darwin → 6.5.0-universal-darwin

data/lib/puppet/pops/types/types.rb

@@ -340,7 +340,7 @@ class PAnyType < TypedModelObject
   # @raises ArgumentError
   #
   def self.new_function(type)
-    raise ArgumentError.new("Creation of new instance of type '#{type}' is not supported")
+    raise ArgumentError.new("Creation of new instance of type '#{type.to_s}' is not supported")
   end
 
   # Answers the question if instances of this type can represent themselves as a string that
@@ -1268,7 +1268,7 @@ class PFloatType < PNumericType
         else
           begin
             # support a binary as float
-            if from[0] == '0' && from[1].casecmp('b').zero?
+            if from[0] == '0' && from[1].downcase == 'b'
               from = Integer(from)
             end
             Float(from)
@@ -1686,10 +1686,11 @@ class PRegexpType < PScalarType
     @new_function ||= Puppet::Functions.create_loaded_function(:new_float, type.loader) do
       dispatch :from_string do
         param 'String', :pattern
+        optional_param 'Boolean', :escape
       end
 
-      def from_string(pattern)
-        Regexp.new(pattern)
+      def from_string(pattern, escape = false)
+        Regexp.new(escape ? Regexp.escape(pattern) : pattern)
       end
     end
   end
@@ -1699,7 +1700,7 @@ class PRegexpType < PScalarType
   # @param regexp [Regexp] the regular expression
   # @return [String] the Regexp as a slash delimited string with slashes escaped
   def self.regexp_to_s_with_delimiters(regexp)
-    regexp.options == 0 ? regexp.inspect : "/#{regexp}/"
+    regexp.options == 0 ? regexp.inspect : "/#{regexp.to_s}/"
   end
 
   # @param regexp [Regexp] the regular expression

data/lib/puppet/property.rb

@@ -209,7 +209,7 @@ class Puppet::Property < Puppet::Parameter
       else
         return "#{name} changed #{is_to_s(current_value)} to #{should_to_s(newvalue)}"
       end
-    rescue Puppet::Error
+    rescue Puppet::Error, Puppet::DevError
       raise
     rescue => detail
       message = _("Could not convert change '%{name}' to string: %{detail}") % { name: name, detail: detail }

data/lib/puppet/property/ensure.rb

@@ -56,7 +56,7 @@ class Puppet::Property::Ensure < Puppet::Property
       else
         return _('%{name} changed %{is} to %{should}') % { name: name, is: is_to_s(currentvalue), should: should_to_s(newvalue) }
       end
-    rescue Puppet::Error
+    rescue Puppet::Error, Puppet::DevError
       raise
     rescue => detail
       raise Puppet::DevError, _("Could not convert change %{name} to string: %{detail}") % { name: self.name, detail: detail }, detail.backtrace

data/lib/puppet/provider/exec.rb

@@ -52,11 +52,7 @@ class Puppet::Provider::Exec < Puppet::Provider
     # This is backwards compatible all the way to Ruby 1.8.7.
     Timeout::timeout(resource[:timeout], Timeout::Error) do
       cwd = resource[:cwd]
-      # It's ok if cwd is nil. In that case Puppet::Util::Execution.execute() simply will not attempt to
-      # change the working directory, which is exactly the right behavior when no cwd parameter is
-      # expressed on the resource.  Moreover, attempting to change to the directory that is already
-      # the working directory can fail under some circumstances, so avoiding the directory change attempt
-      # is preferable to defaulting cwd to that directory.
+      cwd ||= Dir.pwd
 
       # note that we are passing "false" for the "override_locale" parameter, which ensures that the user's
       # default/system locale will be respected.  Callers may override this behavior by setting locale-related
@@ -97,6 +93,6 @@ class Puppet::Provider::Exec < Puppet::Provider
   def validatecmd(command)
     exe = extractexe(command)
     # if we're not fully qualified, require a path
-    self.fail _("'%{exe}' is not qualified and no path was specified. Please qualify the command or specify a path.") % { exe: exe } if !absolute_path?(exe) and resource[:path].nil?
+    self.fail _("'%{command}' is not qualified and no path was specified. Please qualify the command or specify a path.") % { command: command } if !absolute_path?(exe) and resource[:path].nil?
   end
 end

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

@@ -8,11 +8,6 @@ Puppet::Type.type(:file).provide :posix do
   include Puppet::Util::Warnings
 
   require 'etc'
-  require 'puppet/util/selinux'
-
-  def self.post_resource_eval
-    Selinux.matchpathcon_fini if Puppet::Util::SELinux.selinux_support?
-  end
 
   def uid2name(id)
     return id.to_s if id.is_a?(Symbol) or id.is_a?(String)

data/lib/puppet/provider/nameservice.rb

@@ -172,10 +172,9 @@ class Puppet::Provider::NameService < Puppet::Provider
     end
 
     begin
-      sensitive = has_sensitive_data?
-      execute(self.addcmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment, :sensitive => sensitive})
+      execute(self.addcmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment})
       if feature?(:manages_password_age) && (cmd = passcmd)
-        execute(cmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment, :sensitive => sensitive})
+        execute(cmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment})
       end
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, _("Could not create %{resource} %{name}: %{detail}") % { resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
@@ -277,19 +276,13 @@ 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})
+      execute(cmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment})
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, _("Could not set %{param} on %{resource}[%{name}]: %{detail}") % { param: param, resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
     end
   end
 
-  #Derived classes can override to declare sensitive data so a flag can be passed to execute
-  def has_sensitive_data?(property = nil)
-    false
-  end
-
   # From overriding Puppet::Property#insync? Ruby Etc::getpwnam < 2.1.0 always
   # returns a struct with binary encoded string values, and >= 2.1.0 will return
   # binary encoded strings for values incompatible with current locale charset,

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

@@ -289,7 +289,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     end
     dscl_out = dscl(dscl_args)
     # We're ok with throwing away negative uids here.
-    ids = dscl_out.split.compact.collect { |l| l.to_i if l =~ /^\d+$/ }
+    ids = dscl_out.split.compact.collect { |l| l.to_i if l.match(/^\d+$/) }
     ids.compact!.sort! { |a,b| a.to_f <=> b.to_f }
     # We're just looking for an unused id in our sorted array.
     ids.each_index do |i|

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

@@ -3,13 +3,13 @@ require 'puppet/provider/nameservice/objectadd'
 class Puppet::Provider::NameService
   class PW < ObjectAdd
     def deletecmd
-      [command(:pw), "#{@resource.class.name}del", @resource[:name]]
+      [command(:pw), "#{@resource.class.name.to_s}del", @resource[:name]]
     end
 
     def modifycmd(param, value)
       cmd = [
           command(:pw),
-          "#{@resource.class.name}mod",
+          "#{@resource.class.name.to_s}mod",
           @resource[:name],
           flag(param),
           munge(param, value)

data/lib/puppet/provider/package.rb

@@ -1,5 +1,3 @@
-require 'puppet/provider'
-
 class Puppet::Provider::Package < Puppet::Provider
   # Prefetch our package list, yo.
   def self.prefetch(packages)

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

@@ -8,7 +8,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
     These options should be specified as an array where each element is either a
      string or a hash."
 
-  has_feature :versionable, :install_options, :virtual_packages
+  has_feature :versionable, :install_options
 
   commands :aptget => "/usr/bin/apt-get"
   commands :aptcache => "/usr/bin/apt-cache"
@@ -22,10 +22,6 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
   ENV['APT_LISTBUGS_FRONTEND'] = "none"
   ENV['APT_LISTCHANGES_FRONTEND'] = "none"
 
-  def self.defaultto_allow_virtual
-    false
-  end
-
   # A derivative of DPKG; this is how most people actually manage
   # Debian boxes, and the only thing that differs is that it can
   # install packages from remote sites.

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

@@ -9,7 +9,7 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do
   These options should be specified as an array where each element is either
    a string or a hash."
 
-  has_feature :install_options, :versionable, :virtual_packages, :install_only
+  has_feature :install_options, :versionable, :virtual_packages
 
   commands :cmd => "dnf", :rpm => "rpm"
 

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

@@ -5,7 +5,8 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
     and not `apt`, you must specify the source of any packages you want
     to manage."
 
-  has_feature :holdable, :virtual_packages
+  has_feature :holdable
+
   commands :dpkg => "/usr/bin/dpkg"
   commands :dpkg_deb => "/usr/bin/dpkg-deb"
   commands :dpkgquery => "/usr/bin/dpkg-query"
@@ -43,23 +44,16 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
   # Note: self:: is required here to keep these constants in the context of what will
   # eventually become this Puppet::Type::Package::ProviderDpkg class.
   self::DPKG_QUERY_FORMAT_STRING = %Q{'${Status} ${Package} ${Version}\\n'}
-  self::DPKG_QUERY_PROVIDES_FORMAT_STRING = %Q{'${Status} ${Package} ${Version} [${Provides}]\\n'}
   self::FIELDS_REGEX = %r{^(\S+) +(\S+) +(\S+) (\S+) (\S*)$}
-  self::FIELDS_REGEX_WITH_PROVIDES = %r{^(\S+) +(\S+) +(\S+) (\S+) (\S*) \[.*\]$}
   self::FIELDS= [:desired, :error, :status, :name, :ensure]
 
-  def self.defaultto_allow_virtual
-    false
-  end
-
   # @param line [String] one line of dpkg-query output
   # @return [Hash,nil] a hash of FIELDS or nil if we failed to match
   # @api private
-  def self.parse_line(line, regex=self::FIELDS_REGEX)
+  def self.parse_line(line)
     hash = nil
 
-    match = regex.match(line)
-    if match
+    if match = self::FIELDS_REGEX.match(line)
       hash = {}
 
       self::FIELDS.zip(match.captures) do |field,value|
@@ -84,8 +78,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
   public
 
   def install
-    file = @resource[:source]
-    unless file
+    unless file = @resource[:source]
       raise ArgumentError, _("You cannot install dpkg packages without a source")
     end
     args = []
@@ -109,11 +102,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
 
   # Return the version from the package.
   def latest
-    source = @resource[:source]
-    unless source
-      @resource.fail _("Could not update: You cannot install dpkg packages without a source")
-    end
-    output = dpkg_deb "--show", source
+    output = dpkg_deb "--show", @resource[:source]
     matches = /^(\S+)\t(\S+)$/.match(output).captures
     warning _("source doesn't contain named package, but %{name}") % { name: matches[0] } unless matches[0].match( Regexp.escape(@resource[:name]) )
     matches[1]
@@ -124,20 +113,6 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
 
     # list out our specific package
     begin
-      if @resource.allow_virtual?
-        output = dpkgquery(
-          "-W",
-          "--showformat",
-          self.class::DPKG_QUERY_PROVIDES_FORMAT_STRING
-          #the regex searches for the resource[:name] in the dpkquery result in which the Provides field is also available
-          #it will search for the packages only in the brackets ex: [rubygems]
-        ).lines.find {|package| package.match(/[\[ ](#{Regexp.escape(@resource[:name])})[\],]/)}
-        if output
-          hash = self.class.parse_line(output,self.class::FIELDS_REGEX_WITH_PROVIDES)
-          Puppet.info("Package #{@resource[:name]} is virtual, defaulting to #{hash[:name]}")
-          @resource[:name] = hash[:name]
-        end
-      end
       output = dpkgquery(
         "-W",
         "--showformat",
@@ -170,7 +145,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
   end
 
   def hold
-    if package_not_installed?
+    if package_not_installed?(@resource[:name])
       self.install
     end
     Tempfile.open('puppet_dpkg_set_selection') do |tmpfile|
@@ -188,7 +163,16 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
     end
   end
 
-  def package_not_installed?
-    query[:status] != "installed"
+  def package_not_installed?(name)
+    if !name.nil? && !name.empty?
+      begin
+       dpkgquery("-W", "--showformat", self.class::DPKG_QUERY_FORMAT_STRING, name)
+      rescue Puppet::ExecutionFailure
+        # return true if exception is generated because package is not found
+        return true
+      end
+      return false
+    end
+    raise ArgumentError.new("Package name is nil or empty")
   end
 end

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

@@ -180,7 +180,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
       # If :ensure contains a version, use that instead of looking it up.
       # This allows for installing packages with the same stem, but multiple
       # version such as openldap-server.
-      if @resource[:ensure].to_s =~ /(\d[^-]*)$/
+      if /(\d[^-]*)$/.match(@resource[:ensure].to_s)
         use_version = @resource[:ensure]
       else
         use_version = get_version

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

@@ -1,6 +1,7 @@
 # Puppet package provider for Python's `pip` package management frontend.
 # <http://pip.pypa.io/>
 
+require 'puppet/provider/package'
 require 'puppet/provider/package_targetable'
 require 'puppet/util/http_proxy'
 
@@ -35,25 +36,16 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
     if Puppet::Util::Platform.windows?
       ["pip.exe"]
     else
-      ["pip", "pip-python", "pip2", "pip-2"]
+      ["pip", "pip-python"]
     end
   end
 
   def self.pip_version(command)
-    version = nil
-    execpipe [quote(command), '--version'] do |process|
+    execpipe [command, '--version'] do |process|
       process.collect do |line|
-        md = line.strip.match(/^pip (\d+\.\d+\.?\d*).*$/)
-        if md
-          version = md[1]
-          break
-        end
+        return line.strip.match(/^pip (\d+\.\d+\.?\d*).*$/)[1]
       end
     end
-
-    raise Puppet::Error, _("Cannot resolve pip version") unless version
-
-    version
   end
 
   # Return an array of structured information about every installed package
@@ -95,9 +87,9 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
   end
 
   # Parse lines of output from `pip freeze`, which are structured as:
-  # _package_==_version_ or _package_===_version_
+  # _package_==_version_
   def self.parse(line)
-    if line.chomp =~ /^([^=]+)===?([^=]+)$/
+    if line.chomp =~ /^([^=]+)==([^=]+)$/
       {:ensure => $2, :name => $1, :provider => name}
     end
   end
@@ -110,7 +102,7 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
     self.class.validate_command(command)
 
     self.class.instances(command).each do |pkg|
-      return pkg.properties if @resource[:name].casecmp(pkg.name).zero?
+      return pkg.properties if @resource[:name].downcase == pkg.name.downcase
     end
     return nil
   end
@@ -122,7 +114,7 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
     command = resource_or_provider_command
     self.class.validate_command(command)
 
-    command_version = self.class.pip_version(command)
+    command_version = self.pip_version(command)
     if Puppet::Util::Package.versioncmp(command_version, '1.5.4') == -1
       latest_with_old_pip
     else
@@ -130,17 +122,14 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
     end
   end
 
-  # Less resource-intensive approach for pip version 1.5.4 and newer.
-
   def latest_with_new_pip
     command = resource_or_provider_command
     self.class.validate_command(command)
 
-    command_and_options = [command, 'install', "#{@resource[:name]}==versionplease"]
-    command_and_options << install_options if @resource[:install_options]
-    execpipe command_and_options do |process|
+    # Less resource intensive approach for pip version 1.5.4 and above
+    execpipe [command, "install", "#{@resource[:name]}==versionplease"] do |process|
       process.collect do |line|
-        # PIP OUTPUT: Could not find a version that satisfies the requirement example==versionplease (from versions: 1.2.3, 4.5.6)
+        # PIP OUTPUT: Could not find a version that satisfies the requirement Django==versionplease (from versions: 1.1.3, 1.8rc1)
         if line =~ /from versions: /
           textAfterLastMatch = $'.chomp(")\n")
           versionList = textAfterLastMatch.split(', ').sort do |x,y|
@@ -153,18 +142,14 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
     end
   end
 
-  # More resource-intensive approach for pip version 1.5.3 and older.
-
   def latest_with_old_pip
     command = resource_or_provider_command
     self.class.validate_command(command)
 
     Dir.mktmpdir("puppet_pip") do |dir|
-      command_and_options = [command, 'install', "#{@resource[:name]}", '-d', "#{dir}", '-v']
-      command_and_options << install_options if @resource[:install_options]
-      execpipe command_and_options do |process|
+      execpipe [command, "install", "#{@resource[:name]}", "-d", "#{dir}", "-v"] do |process|
         process.collect do |line|
-          # PIP OUTPUT: Using version 0.10.1 (newest of versions: 1.2.3, 4.5.6)
+          # PIP OUTPUT: Using version 0.10.1 (newest of versions: 0.10.1, 0.10, 0.9, 0.8.1, 0.8, 0.7.2, 0.7.1, 0.7, 0.6.1, 0.6, 0.5.2, 0.5.1, 0.5, 0.4, 0.3.1, 0.3, 0.2, 0.1)
           if line =~ /Using version (.+?) \(newest of versions/
             return $1
           end
@@ -224,13 +209,4 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
   def install_options
     join_options(@resource[:install_options])
   end
-
-  def self.quote(path)
-    if path.include?(" ")
-      "\"#{path}\""
-    else
-      path
-    end
-  end
-  private_class_method :quote
 end

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

@@ -69,7 +69,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     name = qatom[:pfx] + name if qatom[:pfx]
     name = name + '-' + qatom[:pv] if qatom[:pv]
     name = name + '-' + qatom[:pr] if qatom[:pr]
-    name = name + ':' + qatom[:slot] if qatom[:slot]
+    name = name + qatom[:slot] if qatom[:slot]
     cmd << '--update' if [:latest].include?(should)
     cmd += install_options if @resource[:install_options]
     cmd << name
@@ -83,7 +83,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     name = qatom[:pfx] + name if qatom[:pfx]
     name = name + '-' + qatom[:pv] if qatom[:pv]
     name = name + '-' + qatom[:pr] if qatom[:pr]
-    name = name + ':' + qatom[:slot] if qatom[:slot]
+    name = name + qatom[:slot] if qatom[:slot]
     cmd += uninstall_options if @resource[:uninstall_options]
     cmd << name
     if [:purged].include?(should)
@@ -177,7 +177,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
         package_sets << package_set.to_s.strip
       end
 
-      if @resource[:name] =~ /^@/
+      if @resource[:name].match(/^@/)
         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,"})
         end
@@ -257,7 +257,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     # [2.7.12: 2.7
     #  3.4.5:  3.4
     #  3.5.2:  3.5]
-    version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot }
+    version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot[1..-1] }
     # [3.5.2:  3.5]
     version_for_slot.first if version_for_slot
     # 3.5.2