puppet 5.5.22-x86-mingw32 → 6.0.0-x86-mingw32

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

@@ -102,7 +102,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
       if source =~ /\.dmg$/i
         # If you fix this to use open-uri again, you must update the docs above. -NF
         File.open(cached_source) do |dmg|
-          xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-mountrandom", "/tmp", dmg.path
+          xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", dmg.path
           hdiutil_info = Puppet::Util::Plist.parse_plist(xml_str)
           raise Puppet::Error.new(_("No disk entities returned by mount at %{path}") % { path: dmg.path }) unless hdiutil_info.has_key?("system-entities")
           mounts = hdiutil_info["system-entities"].collect { |entity|

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

@@ -11,7 +11,6 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
 
   has_feature :versionable
   has_feature :upgradeable
-  has_feature :install_options
 
   def self.get_query
     pkg(['query', '-a', '%n %v %o'])
@@ -23,11 +22,7 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
 
   def self.get_latest_version(origin, version_list)
     if latest_version = version_list.lines.find { |l| l =~ /^#{origin} / }
-      _name, compare, status = latest_version.chomp.split(' ', 3)
-      if ['!', '?'].include?(compare)
-        return nil
-      end
-      latest_version = status.split(' ').last.split(')').first
+      latest_version = latest_version.split(' ').last.split(')').first
       return latest_version
     end
     nil
@@ -102,16 +97,13 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
     end
 
     if not source # install using default repo logic
-      args = ['install', '-qy']
+      args = ['install', '-qy', installname]
     elsif source.scheme == 'urn' # install from repo named in URN
       tag = repo_tag_from_urn(source.to_s)
-      args = ['install', '-qy', '-r', tag]
+      args = ['install', '-qy', '-r', tag, installname]
     else # add package located at URL
-      args = ['add', '-q']
-      installname = source.to_s
+      args = ['add', '-q', source.to_s]
     end
-    args += install_options if @resource[:install_options]
-    args << installname
 
     pkg(args)
   end
@@ -148,8 +140,4 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
     @property_hash[:origin]
   end
 
-  def install_options
-    join_options(@resource[:install_options])
-  end
-
 end

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

@@ -70,7 +70,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
@@ -84,7 +84,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)
@@ -117,7 +117,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
       if match
         result_fields.zip(match.captures) do |field, value|
           # some fields can be empty or (null) (if we are not passed a category in the package name for instance)
-          if value == '(null)' || value == '<unset>'
+          if value == '(null)'
             package_info[field] = nil
           elsif !value or value.empty?
             package_info[field] = nil
@@ -133,7 +133,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
   end
 
   def qatom_output_format
-    '"[%[CATEGORY]] [%[PN]] [%[PV]] [%[PR]] [%[SLOT]] [%[pfx]] [%[sfx]]"'
+    '"[%{CATEGORY}] [%{PN}] [%{PV}] [%[PR]] [%[SLOT]] [%[pfx]] [%[sfx]]"'
   end
 
   def qatom_result_format
@@ -169,7 +169,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
@@ -247,7 +247,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

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/package/gem'
+require 'puppet/provider/package'
 
 Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do
   desc "Puppet Ruby Gem support. This provider is useful for managing
@@ -6,7 +6,7 @@ Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do
 
   has_feature :versionable, :install_options, :uninstall_options
 
-  if Puppet.features.microsoft_windows?
+  if Puppet::Util::Platform.windows?
     # On windows, we put our ruby ahead of anything that already
     # existed on the system PATH. This means that we do not need to
     # sort out the absolute path.
@@ -14,9 +14,4 @@ Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do
   else
     commands :gemcmd => "/opt/puppetlabs/puppet/bin/gem"
   end
-
-  def self.execute_gem_command(command, command_options, custom_environment = {})
-    custom_environment['PKG_CONFIG_PATH'] = '/opt/puppetlabs/puppet/lib/pkgconfig' unless Puppet::Util::Platform.windows?
-    super(command, command_options, custom_environment)
-  end
 end

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

@@ -14,7 +14,6 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
   has_feature :install_options
   has_feature :uninstall_options
   has_feature :virtual_packages
-  has_feature :install_only
 
   # Note: self:: is required here to keep these constants in the context of what will
   # eventually become this Puppet::Type::Package::ProviderRpm class.
@@ -22,7 +21,6 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
   self::NEVRA_FORMAT = %Q{%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}\\n}
   self::NEVRA_REGEX  = %r{^'?(\S+) (\S+) (\S+) (\S+) (\S+)$}
   self::NEVRA_FIELDS = [:name, :epoch, :version, :release, :arch]
-  self::MULTIVERSION_SEPARATOR = "; "
 
   ARCH_LIST = [
     'noarch',
@@ -82,9 +80,12 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
 
     # list out all of the packages
     begin
-      execpipe("#{command(:rpm)} -qa #{nosignature} #{nodigest} --qf '#{self::NEVRA_FORMAT}' | sort") { |process|
+      execpipe("#{command(:rpm)} -qa #{nosignature} #{nodigest} --qf '#{self::NEVRA_FORMAT}'") { |process|
         # now turn each returned line into a package object
-        nevra_to_multiversion_hash(process).each { |hash| packages << new(hash) }
+        process.each_line { |line|
+          hash = nevra_to_hash(line)
+          packages << new(hash) unless hash.empty?
+        }
       }
     rescue Puppet::ExecutionFailure
       raise Puppet::Error, _("Failed to list packages"), $!.backtrace
@@ -100,7 +101,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     #NOTE: Prior to a fix for issue 1243, this method potentially returned a cached value
     #IF YOU CALL THIS METHOD, IT WILL CALL RPM
     #Use get(:property) to check if cached values are available
-    cmd = ["-q",  @resource[:name], "#{self.class.nosignature}", "#{self.class.nodigest}", "--qf", "#{self.class::NEVRA_FORMAT}"]
+    cmd = ["-q",  @resource[:name], "#{self.class.nosignature}", "#{self.class.nodigest}", "--qf", "'#{self.class::NEVRA_FORMAT}'"]
 
     begin
       output = rpm(*cmd)
@@ -117,7 +118,9 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
         return nil
       end
     end
-    @property_hash.update(self.class.nevra_to_multiversion_hash(output))
+    # FIXME: We could actually be getting back multiple packages
+    # for multilib and this will only return the first such package
+    @property_hash.update(self.class.nevra_to_hash(output))
 
     @property_hash.dup
   end
@@ -128,8 +131,8 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
       @resource.fail _("RPMs must specify a package source")
     end
 
-    cmd = [command(:rpm), "-q", "--qf", "#{self.class::NEVRA_FORMAT}", "-p", source]
-    h = self.class.nevra_to_multiversion_hash(execute(cmd))
+    cmd = [command(:rpm), "-q", "--qf", "'#{self.class::NEVRA_FORMAT}'", "-p", source]
+    h = self.class.nevra_to_hash(execute(cmd))
     h[:ensure]
   rescue Puppet::ExecutionFailure => e
     raise Puppet::Error, e.message, e.backtrace
@@ -152,43 +155,28 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
   end
 
   def uninstall
-    query
-    # If version and release (or only version) is specified in the resource,
-    # uninstall using them, otherwise uninstall using only the name of the package.
-    name    = get(:name)
-    version = get(:version)
-    release = get(:release)
-    nav = "#{name}-#{version}"
-    nvr = "#{nav}-#{release}"
-    if @resource[:name].start_with? nvr
-      identifier = nvr
-    else
-      if @resource[:name].start_with? nav
-        identifier = nav
-      else
-        if @resource[:install_only]
-          identifier = get(:ensure).split(self.class::MULTIVERSION_SEPARATOR).map { |ver| "#{name}-#{ver}" }
-        else
-          identifier = name
-        end
-      end
-    end
-    # If an arch is specified in the resource, uninstall that arch,
-    # otherwise uninstall the arch returned by query.
-    # If multiple arches are installed and arch is not specified,
-    # this will uninstall all of them after successive runs.
-    #
-    # rpm prior to 4.2.1 cannot accept architecture as part of the package name.
+    query if get(:arch) == :absent
+    nvr = "#{get(:name)}-#{get(:version)}-#{get(:release)}"
+    arch = ".#{get(:arch)}"
+    # If they specified an arch in the manifest, erase that Otherwise,
+    # erase the arch we got back from the query. If multiple arches are
+    # installed and only the package name is specified (without the
+    # arch), this will uninstall all of them on successive runs of the
+    # client, one after the other
+
+    # version of RPM prior to 4.2.1 can't accept the architecture as
+    # part of the package name.
     unless Puppet::Util::Package.versioncmp(self.class.current_version, '4.2.1') < 0
-      arch = ".#{get(:arch)}"
-      if @resource[:name].end_with? arch
-        identifier += arch
+      if @resource[:name][-arch.size, arch.size] == arch
+        nvr += arch
+      else
+        nvr += ".#{get(:arch)}"
       end
     end
 
     flag = ['-e']
     flag += uninstall_options if resource[:uninstall_options]
-    rpm flag, identifier
+    rpm flag, nvr
   end
 
   def update
@@ -229,14 +217,14 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
       str2 = str2.gsub(front_strip_re, '')
 
       # "handle the tilde separator, it sorts before everything else"
-      if str1 =~ /^~/ && str2 =~ /^~/
+      if /^~/.match(str1) && /^~/.match(str2)
         # if they both have ~, strip it
         str1 = str1[1..-1]
         str2 = str2[1..-1]
         next
-      elsif str1 =~ /^~/
+      elsif /^~/.match(str1)
         return -1
-      elsif str2 =~ /^~/
+      elsif /^~/.match(str2)
         return 1
       end
 
@@ -245,7 +233,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
       # "grab first completely alpha or completely numeric segment"
       isnum = false
       # if the first char of str1 is a digit, grab the chunk of continuous digits from each string
-      if str1 =~ /^[0-9]+/
+      if /^[0-9]+/.match(str1)
         if str1 =~ /^[0-9]+/
           segment1 = $~.to_s
           str1 = $~.post_match
@@ -310,12 +298,8 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
 
   def insync?(is)
     return false if [:purged, :absent].include?(is)
-    return false if is.include?(self.class::MULTIVERSION_SEPARATOR) && !@resource[:install_only]
-
     should = resource[:ensure]
-    is.split(self.class::MULTIVERSION_SEPARATOR).any? do |version|
-      0 == self.rpm_compareEVR(rpm_parse_evr(should), rpm_parse_evr(version))
-    end
+    0 == rpm_compareEVR(rpm_parse_evr(should), rpm_parse_evr(is))
   end
 
   # parse a rpm "version" specification
@@ -340,7 +324,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
       v = s[0,ri]
       r = s[ri+1,s.length]
       if arch = r.scan(ARCH_REGEX)[0]
-        a = arch.delete('.')
+        a = arch.gsub(/\./, '')
         r.gsub!(ARCH_REGEX, '')
       end
     else
@@ -418,37 +402,4 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
 
     return hash
   end
-
-  # @param line [String] multiple lines of rpm package query information
-  # @return list of [Hash] of NEVRA_FIELDS strings parsed from package info
-  # or an empty list if we failed to parse
-  # @api private
-  def self.nevra_to_multiversion_hash(multiline)
-    list = []
-    multiversion_hash = {}
-    multiline.each_line do |line|
-      hash = self.nevra_to_hash(line)
-      if !hash.empty?
-        if multiversion_hash.empty?
-          multiversion_hash = hash.dup
-          next
-        end
-
-        if multiversion_hash[:name] != hash[:name]
-          list << multiversion_hash
-          multiversion_hash = hash.dup
-          next
-        end
-
-        if !multiversion_hash[:ensure].include?(hash[:ensure])
-          multiversion_hash[:ensure].concat("#{self::MULTIVERSION_SEPARATOR}#{hash[:ensure]}")
-        end
-      end
-    end
-    list << multiversion_hash if multiversion_hash
-    if list.size == 1
-      return list[0]
-    end
-    return list
-  end
 end

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

@@ -63,18 +63,14 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
     installer = Puppet::Provider::Package::Windows::Package.installer_class(resource)
 
     command = [installer.install_command(resource), install_options].flatten.compact.join(' ')
-    working_dir = File.dirname(resource[:source])
-    if !Puppet::FileSystem.exist?(working_dir) && resource[:source] =~ /\.msi"?\Z/i
-      working_dir = nil
-    end
-    output = execute(command, :failonfail => false, :combine => true, :cwd => working_dir, :suppress_window => true)
+    output = execute(command, :failonfail => false, :combine => true)
 
     check_result(output.exitstatus)
   end
 
   def uninstall
     command = [package.uninstall_command, uninstall_options].flatten.compact.join(' ')
-    output = execute(command, :failonfail => false, :combine => true, :suppress_window => true)
+    output = execute(command, :failonfail => false, :combine => true)
 
     check_result(output.exitstatus)
   end

data/lib/puppet/provider/package/windows/exe_package.rb

@@ -4,19 +4,6 @@ class Puppet::Provider::Package::Windows
   class ExePackage < Puppet::Provider::Package::Windows::Package
     attr_reader :uninstall_string
 
-    # registry values to load under each product entry in
-    # HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall
-    # for this provider
-    REG_VALUE_NAMES = [
-      'DisplayVersion',
-      'UninstallString',
-      'ParentKeyName',
-      'Security Update',
-      'Update Rollup',
-      'Hotfix',
-      'WindowsInstaller',
-    ]
-
     # Return an instance of the package from the registry, or nil
     def self.from_registry(name, values)
       if valid?(name, values)
@@ -55,10 +42,17 @@ class Puppet::Provider::Package::Windows
     end
 
     def self.install_command(resource)
-      munge(resource[:source])
+      ['cmd.exe', '/c', 'start', '"puppet-install"', '/w', munge(resource[:source])]
     end
 
     def uninstall_command
+      # 1. Launch using cmd /c start because if the executable is a console
+      #    application Windows will automatically display its console window
+      # 2. Specify a quoted title, otherwise if uninstall_string is quoted,
+      #    start will interpret that to be the title, and get confused
+      # 3. Specify /w (wait) to wait for uninstall to finish
+      command = ['cmd.exe', '/c', 'start', '"puppet-uninstall"', '/w']
+
       # Only quote bare uninstall strings, e.g.
       #   C:\Program Files (x86)\Notepad++\uninstall.exe
       # Don't quote uninstall strings that are already quoted, e.g.
@@ -66,9 +60,9 @@ class Puppet::Provider::Package::Windows
       # Don't quote uninstall strings that contain arguments:
       #   "C:\Program Files (x86)\Git\unins000.exe" /SILENT
       if uninstall_string =~ /\A[^"]*.exe\Z/i
-        command = "\"#{uninstall_string}\""
+        command << "\"#{uninstall_string}\""
       else
-        command = uninstall_string
+        command << uninstall_string
       end
 
       command

data/lib/puppet/provider/package/windows/msi_package.rb

@@ -8,14 +8,6 @@ class Puppet::Provider::Package::Windows
     INSTALLSTATE_DEFAULT = 5 # product is installed for the current user
     INSTALLUILEVEL_NONE  = 2 # completely silent installation
 
-    # registry values to load under each product entry in
-    # HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall
-    # for this provider
-    REG_VALUE_NAMES = [
-      'DisplayVersion',
-      'WindowsInstaller'
-    ]
-
     # Get the COM installer object, it's in a separate method for testing
     def self.installer
       # REMIND: when does the COM release happen?

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

@@ -11,14 +11,6 @@ class Puppet::Provider::Package::Windows
 
     attr_reader :name, :version
 
-    REG_DISPLAY_VALUE_NAMES = [ 'DisplayName', 'QuietDisplayName' ]
-
-    def self.reg_value_names_to_load
-      REG_DISPLAY_VALUE_NAMES |
-      MsiPackage::REG_VALUE_NAMES |
-      ExePackage::REG_VALUE_NAMES
-    end
-
     # Enumerate each package. The appropriate package subclass
     # will be yielded.
     def self.each(&block)
@@ -45,7 +37,7 @@ class Puppet::Provider::Package::Windows
             open(hive, 'Software\Microsoft\Windows\CurrentVersion\Uninstall', mode) do |uninstall|
               each_key(uninstall) do |name, wtime|
                 open(hive, "#{uninstall.keyname}\\#{name}", mode) do |key|
-                  yield key, values_by_name(key, reg_value_names_to_load)
+                  yield key, values(key)
                 end
               end
             end
@@ -79,7 +71,7 @@ class Puppet::Provider::Package::Windows
 
     def self.replace_forward_slashes(value)
       if value.include?('/')
-        value.tr!('/', "\\")
+        value = value.gsub('/', "\\")
         Puppet.debug('Package source parameter contained /s - replaced with \\s')
       end
       value