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

data/lib/puppet/util/filetype.rb

@@ -37,37 +37,33 @@ class Puppet::Util::FileType
       # Rename the read method
       define_method(:real_read, instance_method(:read))
       define_method(:read) do
-        begin
-          val = real_read
-          @loaded = Time.now
-          if val
-            return val.gsub(/# HEADER.*\n/, '')
-          else
-            return ""
-          end
-        rescue Puppet::Error
-          raise
-        rescue => detail
-          message = _("%{klass} could not read %{path}: %{detail}") % { klass: self.class, path: @path, detail: detail }
-          Puppet.log_exception(detail, message)
-          raise Puppet::Error, message, detail.backtrace
+        val = real_read
+        @loaded = Time.now
+        if val
+          val.gsub(/# HEADER.*\n/, '')
+        else
+          ""
         end
+      rescue Puppet::Error
+        raise
+      rescue => detail
+        message = _("%{klass} could not read %{path}: %{detail}") % { klass: self.class, path: @path, detail: detail }
+        Puppet.log_exception(detail, message)
+        raise Puppet::Error, message, detail.backtrace
       end
 
       # And then the write method
       define_method(:real_write, instance_method(:write))
       define_method(:write) do |text|
-        begin
-          val = real_write(text)
-          @synced = Time.now
-          return val
-        rescue Puppet::Error
-          raise
-        rescue => detail
-          message = _("%{klass} could not write %{path}: %{detail}") % { klass: self.class, path: @path, detail: detail }
-          Puppet.log_exception(detail, message)
-          raise Puppet::Error, message, detail.backtrace
-        end
+        val = real_write(text)
+        @synced = Time.now
+        val
+      rescue Puppet::Error
+        raise
+      rescue => detail
+        message = _("%{klass} could not write %{path}: %{detail}") % { klass: self.class, path: @path, detail: detail }
+        Puppet.log_exception(detail, message)
+        raise Puppet::Error, message, detail.backtrace
       end
     end
   end
@@ -82,7 +78,7 @@ class Puppet::Util::FileType
   end
 
   def initialize(path, default_mode = nil)
-    raise ArgumentError.new(_("Path is nil")) if path.nil?
+    raise ArgumentError, _("Path is nil") if path.nil?
 
     @path = path
     @default_mode = default_mode
@@ -114,7 +110,7 @@ class Puppet::Util::FileType
         # being explicitly preserved
         Puppet::FileSystem.read(@path, :encoding => Encoding.default_external)
       else
-        return nil
+        nil
       end
     end
 
@@ -206,11 +202,11 @@ class Puppet::Util::FileType
     rescue => detail
       case detail.to_s
       when /no crontab for/
-        return ""
+        ""
       when /are not allowed to/
         Puppet.debug _("The %{path} user is not authorized to use cron. Their crontab file is treated as empty in case Puppet authorizes them in the middle of the run (by, for example, modifying the cron.deny or cron.allow files).") % { path: @path }
 
-        return ""
+        ""
       else
         raise FileReadError, _("Could not read crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
       end
@@ -219,7 +215,7 @@ class Puppet::Util::FileType
     # Remove a specific @path's cron tab.
     def remove
       cmd = "#{cmdbase} -r"
-      if %w{Darwin FreeBSD DragonFly}.include?(Puppet.runtime[:facter].value('os.name'))
+      if %w[Darwin FreeBSD DragonFly].include?(Puppet.runtime[:facter].value('os.name'))
         cmd = "/bin/echo yes | #{cmd}"
       end
 
@@ -249,9 +245,9 @@ class Puppet::Util::FileType
     # does not think I should be allowed to set the @path to my own user name
     def cmdbase
       if @uid == Puppet::Util::SUIDManager.uid || Puppet.runtime[:facter].value('os.name') == "HP-UX"
-        return "crontab"
+        "crontab"
       else
-        return "crontab -u #{@path}"
+        "crontab -u #{@path}"
       end
     end
   end
@@ -267,15 +263,15 @@ class Puppet::Util::FileType
         return ""
       end
 
-      Puppet::Util::Execution.execute(%w{crontab -l}, cronargs)
+      Puppet::Util::Execution.execute(%w[crontab -l], cronargs)
     rescue => detail
       case detail.to_s
       when /can't open your crontab/
-        return ""
+        ""
       when /you are not authorized to use cron/
         Puppet.debug _("The %{path} user is not authorized to use cron. Their crontab file is treated as empty in case Puppet authorizes them in the middle of the run (by, for example, modifying the cron.deny or cron.allow files).") % { path: @path }
 
-        return ""
+        ""
       else
         raise FileReadError, _("Could not read crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
       end
@@ -283,7 +279,7 @@ class Puppet::Util::FileType
 
     # Remove a specific @path's cron tab.
     def remove
-      Puppet::Util::Execution.execute(%w{crontab -r}, cronargs)
+      Puppet::Util::Execution.execute(%w[crontab -r], cronargs)
     rescue => detail
       raise FileReadError, _("Could not remove crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
     end
@@ -318,15 +314,15 @@ class Puppet::Util::FileType
         return ""
       end
 
-      Puppet::Util::Execution.execute(%w{crontab -l}, cronargs)
+      Puppet::Util::Execution.execute(%w[crontab -l], cronargs)
     rescue => detail
       case detail.to_s
       when /open.*in.*directory/
-        return ""
+        ""
       when /not.*authorized.*cron/
         Puppet.debug _("The %{path} user is not authorized to use cron. Their crontab file is treated as empty in case Puppet authorizes them in the middle of the run (by, for example, modifying the cron.deny or cron.allow files).") % { path: @path }
 
-        return ""
+        ""
       else
         raise FileReadError, _("Could not read crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
       end
@@ -334,7 +330,7 @@ class Puppet::Util::FileType
 
     # Remove a specific @path's cron tab.
     def remove
-      Puppet::Util::Execution.execute(%w{crontab -r}, cronargs)
+      Puppet::Util::Execution.execute(%w[crontab -r], cronargs)
     rescue => detail
       raise FileReadError, _("Could not remove crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
     end

data/lib/puppet/util/inifile.rb

@@ -73,7 +73,7 @@ module Puppet::Util::IniConfig
     # exists, return nil
     def [](key)
       entry = find_entry(key)
-      return(entry.nil? ? nil : entry[1])
+      (entry.nil? ? nil : entry[1])
     end
 
     # Format the section as text in the way it should be
@@ -150,7 +150,7 @@ module Puppet::Util::IniConfig
     )
     INI_CONTINUATION = /^[ \t\r\n\f]/
     INI_SECTION_NAME = /^\[([^\]]+)\]/
-    INI_PROPERTY     = /^\s*([^\s=]+)\s*\=\s*(.*)$/
+    INI_PROPERTY     = /^\s*([^\s=]+)\s*=\s*(.*)$/
 
     # @api private
     def parse(text)
@@ -184,7 +184,7 @@ module Puppet::Util::IniConfig
           val = match[2].rstrip
 
           if section.nil?
-            raise IniParseError.new(_("Property with key %{key} outside of a section") % { key: key.inspect })
+            raise IniParseError, _("Property with key %{key} outside of a section") % { key: key.inspect }
           end
 
           section[key] = val
@@ -251,7 +251,7 @@ module Puppet::Util::IniConfig
     private
 
     def section_exists?(name)
-      if self.get_section(name)
+      if get_section(name)
         true
       elsif @file_collection and @file_collection.get_section(name)
         true
@@ -275,9 +275,7 @@ module Puppet::Util::IniConfig
     end
 
     def store
-      @files.values.each do |file|
-        file.store
-      end
+      @files.values.each(&:store)
     end
 
     def each_section(&block)
@@ -318,11 +316,7 @@ module Puppet::Util::IniConfig
     # Return a file if it's already been defined, create a new file if it hasn't
     # been defined.
     def get_physical_file(file)
-      if @files[file]
-        @files[file]
-      else
-        new_physical_file(file)
-      end
+      @files[file] || new_physical_file(file)
     end
 
     # Create a new physical file and set required attributes on that file.

data/lib/puppet/util/ldap/connection.rb

@@ -48,7 +48,7 @@ class Puppet::Util::Ldap::Connection
 
   # Create a per-connection unique name.
   def name
-    [host, port, user, password, ssl].collect { |p| p.to_s }.join("/")
+    [host, port, user, password, ssl].collect(&:to_s).join("/")
   end
 
   # Should we reset the connection?

data/lib/puppet/util/ldap/manager.rb

@@ -31,7 +31,7 @@ class Puppet::Util::Ldap::Manager
     attributes = attributes.dup
 
     # Add the objectclasses
-    attributes["objectClass"] = objectclasses.collect { |o| o.to_s }
+    attributes["objectClass"] = objectclasses.collect(&:to_s)
     attributes["objectClass"] << "top" unless attributes["objectClass"].include?("top")
 
     attributes[rdn.to_s] = [name]
@@ -109,21 +109,19 @@ class Puppet::Util::Ldap::Manager
 
   # Create our normal search filter.
   def filter
-    return(objectclasses.length == 1 ? "objectclass=#{objectclasses[0]}" : "(&(objectclass=" + objectclasses.join(")(objectclass=") + "))")
+    (objectclasses.length == 1 ? "objectclass=#{objectclasses[0]}" : "(&(objectclass=" + objectclasses.join(")(objectclass=") + "))")
   end
 
   # Find the associated entry for a resource.  Returns a hash, minus
   # 'dn', or nil if the entry cannot be found.
   def find(name)
     connect do |conn|
-      begin
-        conn.search2(dn(name), 0, "objectclass=*") do |result|
-          # Convert to puppet-appropriate attributes
-          return entry2provider(result)
-        end
-      rescue
-        return nil
+      conn.search2(dn(name), 0, "objectclass=*") do |result|
+        # Convert to puppet-appropriate attributes
+        return entry2provider(result)
       end
+    rescue
+      return nil
     end
   end
 
@@ -153,7 +151,7 @@ class Puppet::Util::Ldap::Manager
       end
 
       result = [result] unless result.is_a?(Array)
-      result = result.collect { |r| r.to_s }
+      result = result.collect(&:to_s)
 
       values[generator.name] = result
     end
@@ -215,7 +213,7 @@ class Puppet::Util::Ldap::Manager
         result << entry2provider(entry)
       end
     end
-    return(result.empty? ? nil : result)
+    (result.empty? ? nil : result)
   end
 
   # Update the ldap entry with the desired state.
@@ -278,7 +276,7 @@ class Puppet::Util::Ldap::Manager
   # getting rid of :ensure and making sure everything's an array of strings.
   def ldap_convert(attributes)
     attributes.reject { |param, value| value == :absent or param == :ensure }.each_with_object({}) do |ary, result|
-      value = (ary[1].is_a?(Array) ? ary[1] : [ary[1]]).collect { |v| v.to_s }
+      value = (ary[1].is_a?(Array) ? ary[1] : [ary[1]]).collect(&:to_s)
       result[ldap_name(ary[0])] = value
     end
   end

data/lib/puppet/util/lockfile.rb

@@ -25,14 +25,12 @@ class Puppet::Util::Lockfile
 
   # @return [boolean] true if lock is successfully acquired, false otherwise.
   def lock(lock_data = nil)
-    begin
-      Puppet::FileSystem.exclusive_create(@file_path, nil) do |fd|
-        fd.print(lock_data)
-      end
-      true
-    rescue Errno::EEXIST
-      false
+    Puppet::FileSystem.exclusive_create(@file_path, nil) do |fd|
+      fd.print(lock_data)
     end
+    true
+  rescue Errno::EEXIST
+    false
   end
 
   def unlock
@@ -53,7 +51,7 @@ class Puppet::Util::Lockfile
   #  was locked.
   # @return [String] the data object.
   def lock_data
-    return File.read(@file_path) if file_locked?
+    File.read(@file_path) if file_locked?
   end
 
   # Private, internal utility method for encapsulating the logic about

data/lib/puppet/util/log/destination.rb

@@ -32,9 +32,9 @@ class Puppet::Util::Log::Destination
 
   def name
     if defined?(@name)
-      return @name
+      @name
     else
-      return self.class.name
+      self.class.name
     end
   end
 

data/lib/puppet/util/log/destinations.rb

@@ -19,8 +19,8 @@ Puppet::Util::Log.newdesttype :syslog do
     str = Puppet[:syslogfacility]
     begin
       facility = Syslog.const_get("LOG_#{str.upcase}")
-    rescue NameError
-      raise Puppet::Error, _("Invalid syslog facility %{str}") % { str: str }, $!.backtrace
+    rescue NameError => e
+      raise Puppet::Error, _("Invalid syslog facility %{str}") % { str: str }, e.backtrace
     end
 
     @syslog = Syslog.open(name, options, facility)
@@ -72,7 +72,7 @@ Puppet::Util::Log.newdesttype :file do
     # We can't just use 'Config.use' here, because they've
     # specified a "special" destination.
     unless Puppet::FileSystem.exist?(Puppet::FileSystem.dir(path))
-      FileUtils.mkdir_p(File.dirname(path), :mode => 0755)
+      FileUtils.mkdir_p(File.dirname(path), :mode => 0o755)
       Puppet.info _("Creating log directory %{dir}") % { dir: File.dirname(path) }
     end
 
@@ -211,7 +211,7 @@ Puppet::Util::Log.newdesttype :eventlog do
   Puppet::Util::Log::DestEventlog::EVENTLOG_ERROR_TYPE       = 0x0001
   Puppet::Util::Log::DestEventlog::EVENTLOG_WARNING_TYPE     = 0x0002
   Puppet::Util::Log::DestEventlog::EVENTLOG_INFORMATION_TYPE = 0x0004
-  Puppet::Util::Log::DestEventlog::EVENTLOG_CHARACTER_LIMIT  = 31838
+  Puppet::Util::Log::DestEventlog::EVENTLOG_CHARACTER_LIMIT  = 31_838
 
   def self.suitable?(obj)
     Puppet::Util::Platform.windows?

data/lib/puppet/util/log.rb

@@ -64,7 +64,7 @@ class Puppet::Util::Log
       close(dest)
     }
     # TRANSLATORS "Log.close_all" is a method name and should not be translated
-    raise Puppet::DevError.new(_("Log.close_all failed to close %{destinations}") % { destinations: @destinations.keys.inspect }) if !@destinations.empty?
+    raise Puppet::DevError, _("Log.close_all failed to close %{destinations}") % { destinations: @destinations.keys.inspect } unless @destinations.empty?
   end
 
   # Flush any log destinations that support such operations.
@@ -135,7 +135,7 @@ class Puppet::Util::Log
       klass.match?(dest)
     end
 
-    if type.respond_to?(:suitable?) and not type.suitable?(dest)
+    if type.respond_to?(:suitable?) and !type.suitable?(dest)
       return
     end
 
@@ -224,7 +224,7 @@ class Puppet::Util::Log
   #  error scenario.
   # @return nil
   def Log.force_flushqueue
-    if (@destinations.empty? and !(@queued.empty?))
+    if @destinations.empty? and !@queued.empty?
       newdestination(:console)
     end
     flushqueue
@@ -257,8 +257,11 @@ class Puppet::Util::Log
 
   def self.setup_default
     Log.newdestination(
-      (Puppet.features.syslog?   ? :syslog   :
-      (Puppet.features.eventlog? ? :eventlog : Puppet[:puppetdlog]))
+      if Puppet.features.syslog?
+        :syslog
+      else
+        Puppet.features.eventlog? ? :eventlog : Puppet[:puppetdlog]
+      end
     )
   end
 
@@ -309,7 +312,7 @@ class Puppet::Util::Log
 
     tags = args[:tags]
     if tags
-      tags.each { |t| self.tag(t) }
+      tags.each { |t| tag(t) }
     end
 
     # Don't add these unless defined (preserve 3.x API as much as possible)
@@ -333,7 +336,7 @@ class Puppet::Util::Log
       @time = Time.parse(@time)
     end
     # Don't add these unless defined (preserve 3.x API as much as possible)
-    %w(file line pos issue_code environment node backtrace).each do |name|
+    %w[file line pos issue_code environment node backtrace].each do |name|
       value = data[name]
       next unless value
 
@@ -342,7 +345,7 @@ class Puppet::Util::Log
   end
 
   def to_hash
-    self.to_data_hash
+    to_data_hash
   end
 
   def to_data_hash
@@ -365,7 +368,7 @@ class Puppet::Util::Log
       'tags' => @tags.to_a,
       'time' => @time.iso8601(9),
     }
-    %w(file line pos issue_code environment node backtrace).each do |name|
+    %w[file line pos issue_code environment node backtrace].each do |name|
       attr_name = "@#{name}"
       hash[name] = instance_variable_get(attr_name) if instance_variable_defined?(attr_name)
     end

data/lib/puppet/util/logging.rb

@@ -160,7 +160,7 @@ module Logging
     file = options[:file]
     line = options[:line]
     # TRANSLATORS the literals ":file", ":line", and ":key" should not be translated
-    raise Puppet::DevError, _("Need either :file and :line, or :key") if (key.nil?) && (file.nil? || line.nil?)
+    raise Puppet::DevError, _("Need either :file and :line, or :key") if key.nil? && (file.nil? || line.nil?)
 
     key ||= "#{file}:#{line}"
     issue_deprecation_warning(message, key, file, line, false)
@@ -183,7 +183,7 @@ module Logging
 
     $unique_warnings ||= {}
     if $unique_warnings.length < 100 then
-      if (!$unique_warnings.has_key?(key)) then
+      unless $unique_warnings.has_key?(key) then
         $unique_warnings[key] = message
         call_trace = if file == :default and line == :default
                        # Suppress the file and line number output
@@ -238,16 +238,16 @@ module Logging
 
     # Deprecation messages are UTF-8 as they are produced by Ruby
     Puppet::FileSystem.open(deprecations_file, nil, "a:UTF-8") do |f|
-      if ($deprecation_warnings) then
+      if $deprecation_warnings then
         $deprecation_warnings.each do |offender, message|
-          if (!$logged_deprecation_warnings.has_key?(offender)) then
-            $logged_deprecation_warnings[offender] = true
-            if ((pattern.nil?) || (message =~ pattern)) then
-              f.puts(message)
-              f.puts(offender)
-              f.puts()
-            end
-          end
+          next if $logged_deprecation_warnings.has_key?(offender)
+
+          $logged_deprecation_warnings[offender] = true
+          next unless pattern.nil? || (message =~ pattern)
+
+          f.puts(message)
+          f.puts(offender)
+          f.puts()
         end
       end
     end

data/lib/puppet/util/metric.rb

@@ -36,9 +36,9 @@ class Puppet::Util::Metric
   def [](name)
     value = @values.find { |v| v[0] == name }
     if value
-      return value[2]
+      value[2]
     else
-      return 0
+      0
     end
   end
 
@@ -51,7 +51,7 @@ class Puppet::Util::Metric
   end
 
   def newvalue(name, value, label = nil)
-    raise ArgumentError.new("metric name #{name.inspect} is not a string") unless name.is_a? String
+    raise ArgumentError, "metric name #{name.inspect} is not a string" unless name.is_a? String
 
     label ||= self.class.labelize(name)
     @values.push [name, label, value]

data/lib/puppet/util/monkey_patches.rb

@@ -17,7 +17,7 @@ module RDoc
   def self.caller(skip = nil)
     in_gem_wrapper = false
     Kernel.caller.reject { |call|
-      in_gem_wrapper ||= call =~ /#{Regexp.escape $0}:\d+:in `load'/
+      in_gem_wrapper ||= call =~ /#{Regexp.escape $PROGRAM_NAME}:\d+:in `load'/
     }
   end
 end
@@ -82,12 +82,10 @@ if Puppet::Util::Platform.windows?
       unless @puppet_certs_loaded
         @puppet_certs_loaded = true
 
-        Puppet::Util::Windows::RootCerts.instance.to_a.uniq { |cert| cert.to_der }.each do |x509|
-          begin
-            add_cert(x509)
-          rescue OpenSSL::X509::StoreError
-            warn "Failed to add #{x509.subject.to_utf8}"
-          end
+        Puppet::Util::Windows::RootCerts.instance.to_a.uniq(&:to_der).each do |x509|
+          add_cert(x509)
+        rescue OpenSSL::X509::StoreError
+          warn "Failed to add #{x509.subject.to_utf8}"
         end
       end
 

data/lib/puppet/util/network_device/config.rb

@@ -6,7 +6,7 @@ require_relative '../../../puppet/util/network_device'
 
 class Puppet::Util::NetworkDevice::Config
   def self.main
-    @main ||= self.new
+    @main ||= new
   end
 
   def self.devices
@@ -51,7 +51,7 @@ class Puppet::Util::NetworkDevice::Config
             file_line_count += 1
             next
           when /^\[([\w.-]+)\]\s*$/ # [device.fqdn]
-            name = $1
+            name = ::Regexp.last_match(1)
             name.chomp!
             if devices.include?(name)
               file_error_location = Puppet::Util::Errors.error_location(nil, file_line_count)
@@ -66,7 +66,7 @@ class Puppet::Util::NetworkDevice::Config
             Puppet.debug "found device: #{device.name} at #{device.line}"
             devices[name] = device
           when /^\s*(type|url|debug)(\s+(.+)\s*)*$/
-            parse_directive(device, $1, $3, file_line_count)
+            parse_directive(device, ::Regexp.last_match(1), ::Regexp.last_match(3), file_line_count)
           else
             error_location_str = Puppet::Util::Errors.error_location(nil, file_line_count)
             raise Puppet::Error, _("Invalid entry at %{error_location}: %{file_text}") %

data/lib/puppet/util/package/version/debian.rb

@@ -110,42 +110,41 @@ module Puppet::Util::Package::Version
         mine_index += mytilde.length
         yours_index += yourstilde.length
 
-        if cmp == 0 # handle letters
+        next unless cmp == 0 # handle letters
 
-          _mymatch, myletters = *match_letters(mine.slice(mine_index..-1))
-          myletters ||= ''
+        _mymatch, myletters = *match_letters(mine.slice(mine_index..-1))
+        myletters ||= ''
 
-          _yoursmatch, yoursletters = *match_letters(yours.slice(yours_index..-1))
-          yoursletters ||= ''
+        _yoursmatch, yoursletters = *match_letters(yours.slice(yours_index..-1))
+        yoursletters ||= ''
 
-          cmp = myletters <=> yoursletters
-          mine_index += myletters.length
-          yours_index += yoursletters.length
+        cmp = myletters <=> yoursletters
+        mine_index += myletters.length
+        yours_index += yoursletters.length
 
-          if cmp == 0 # handle nonletters except tilde
-            _mymatch, mynon_letters = *match_non_letters(mine.slice(mine_index..-1))
-            mynon_letters ||= ''
+        next unless cmp == 0 # handle nonletters except tilde
 
-            _yoursmatch, yoursnon_letters = *match_non_letters(yours.slice(yours_index..-1))
-            yoursnon_letters ||= ''
+        _mymatch, mynon_letters = *match_non_letters(mine.slice(mine_index..-1))
+        mynon_letters ||= ''
 
-            cmp = mynon_letters <=> yoursnon_letters
-            mine_index += mynon_letters.length
-            yours_index += yoursnon_letters.length
+        _yoursmatch, yoursnon_letters = *match_non_letters(yours.slice(yours_index..-1))
+        yoursnon_letters ||= ''
 
-            if cmp == 0 # handle digits
-              _mymatch, mydigits = *match_digits(mine.slice(mine_index..-1))
-              mydigits ||= ''
+        cmp = mynon_letters <=> yoursnon_letters
+        mine_index += mynon_letters.length
+        yours_index += yoursnon_letters.length
 
-              _yoursmatch, yoursdigits = *match_digits(yours.slice(yours_index..-1))
-              yoursdigits ||= ''
+        next unless cmp == 0 # handle digits
 
-              cmp = mydigits.to_i <=> yoursdigits.to_i
-              mine_index += mydigits.length
-              yours_index += yoursdigits.length
-            end
-          end
-        end
+        _mymatch, mydigits = *match_digits(mine.slice(mine_index..-1))
+        mydigits ||= ''
+
+        _yoursmatch, yoursdigits = *match_digits(yours.slice(yours_index..-1))
+        yoursdigits ||= ''
+
+        cmp = mydigits.to_i <=> yoursdigits.to_i
+        mine_index += mydigits.length
+        yours_index += yoursdigits.length
       end
       if cmp == 0
         if mine_index < mine.length && match_tildes(mine[mine_index])
@@ -164,7 +163,7 @@ module Puppet::Util::Package::Version
     end
 
     def match_non_letters(a)
-      a.match(/^([\.\+-]+)/)
+      a.match(/^([.+-]+)/)
     end
 
     def match_tildes(a)