puppet 4.8.2-universal-darwin → 4.9.0-universal-darwin

data/lib/puppet/type/user.rb

@@ -171,10 +171,23 @@ module Puppet
 
     newproperty(:comment) do
       desc "A description of the user.  Generally the user's full name."
-      if RUBY_VERSION < "2.1.0"
-        munge do |v|
-          v.respond_to?(:force_encoding) ? v.force_encoding(Encoding::ASCII_8BIT) : v
+      def insync?(is)
+        # nameservice provider requires special attention to encoding
+        # Overrides Puppet::Property#insync?
+        if !@should.empty? && provider.respond_to?(:comments_insync?)
+          return provider.comments_insync?(is, @should)
+        end
+        super(is)
+      end
+
+      # In the case that our comments have incompatible encodings, set external
+      # encoding to support concatenation for display.
+      # overrides Puppet::Property#change_to_s
+      def change_to_s(currentvalue, newvalue)
+        if newvalue.respond_to?(:force_encoding) && !Encoding.compatible?(currentvalue, newvalue)
+          return super(currentvalue, newvalue.dup.force_encoding(currentvalue.encoding))
         end
+        super(currentvalue, newvalue)
       end
     end
 

data/lib/puppet/util/execution.rb

@@ -184,9 +184,9 @@ module Puppet::Util::Execution
     null_file = Puppet.features.microsoft_windows? ? 'NUL' : '/dev/null'
 
     begin
-      stdin = File.open(options[:stdinfile] || null_file, 'r')
-      stdout = options[:squelch] ? File.open(null_file, 'w') : Puppet::FileSystem::Uniquefile.new('puppet')
-      stderr = options[:combine] ? stdout : File.open(null_file, 'w')
+      stdin = Puppet::FileSystem.open(options[:stdinfile] || null_file, nil, 'r')
+      stdout = options[:squelch] ? Puppet::FileSystem.open(null_file, nil, 'w') : Puppet::FileSystem::Uniquefile.new('puppet')
+      stderr = options[:combine] ? stdout : Puppet::FileSystem.open(null_file, nil, 'w')
 
       exec_args = [command, options, stdin, stdout, stderr]
 

data/lib/puppet/util/filetype.rb

@@ -105,7 +105,9 @@ class Puppet::Util::FileType
     # Read the file.
     def read
       if Puppet::FileSystem.exist?(@path)
-        File.read(@path)
+        # this code path is used by many callers so the original default is
+        # being explicitly preserved
+        Puppet::FileSystem.read(@path, :encoding => Encoding.default_external)
       else
         return nil
       end
@@ -118,7 +120,8 @@ class Puppet::Util::FileType
 
     # Overwrite the file.
     def write(text)
-      tf = Tempfile.new("puppet")
+      # this file is managed by the OS and should be using system encoding
+      tf = Tempfile.new("puppet", :encoding => Encoding.default_external)
       tf.print text; tf.flush
       File.chmod(@default_mode, tf.path) if @default_mode
       FileUtils.cp(tf.path, @path)
@@ -197,7 +200,8 @@ class Puppet::Util::FileType
     # Overwrite a specific @path's cron tab; must be passed the @path name
     # and the text with which to create the cron tab.
     def write(text)
-      IO.popen("#{cmdbase()} -", "w") { |p|
+      # this file is managed by the OS and should be using system encoding
+      IO.popen("#{cmdbase()} -", "w", :encoding => Encoding.default_external) { |p|
         p.print text
       }
     end
@@ -242,7 +246,8 @@ class Puppet::Util::FileType
     # Overwrite a specific @path's cron tab; must be passed the @path name
     # and the text with which to create the cron tab.
     def write(text)
-      output_file = Tempfile.new("puppet_suntab")
+      # this file is managed by the OS and should be using system encoding
+      output_file = Tempfile.new("puppet_suntab", :encoding => Encoding.default_external)
       begin
         output_file.print text
         output_file.close
@@ -284,7 +289,8 @@ class Puppet::Util::FileType
     # Overwrite a specific @path's cron tab; must be passed the @path name
     # and the text with which to create the cron tab.
     def write(text)
-      output_file = Tempfile.new("puppet_aixtab")
+      # this file is managed by the OS and should be using system encoding
+      output_file = Tempfile.new("puppet_aixtab", :encoding => Encoding.default_external)
 
       begin
         output_file.print text

data/lib/puppet/util/logging.rb

@@ -224,7 +224,8 @@ module Logging
     # find the same offender, and we'd end up logging it again.
     $logged_deprecation_warnings ||= {}
 
-    File.open(deprecations_file, "a") do |f|
+    # 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
         $deprecation_warnings.each do |offender, message|
           if (! $logged_deprecation_warnings.has_key?(offender)) then

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

@@ -59,7 +59,7 @@ class Puppet::Util::NetworkDevice::Config
             device.options = { :debug => false }
             Puppet.debug "found device: #{device.name} at #{device.line}"
             devices[name] = device
-          when /^\s*(type|url|debug)(\s+(.+))*$/
+          when /^\s*(type|url|debug)(\s+(.+)\s*)*$/
             parse_directive(device, $1, $3, count)
           else
             raise Puppet::Error, "Invalid line #{count}: #{line}"

data/lib/puppet/util/plist.rb

@@ -78,6 +78,12 @@ module Puppet::Util::Plist
     # stubbing purposes
     #
     # @api private
+    #
+    # @param args [String] Extra file operation mode information to use
+    #   (defaults to read-only mode 'r')
+    #   This is the standard mechanism Ruby uses in the IO class, and therefore
+    #   encoding may be explicitly like fmode : encoding or fmode : "BOM|UTF-*"
+    #   for example, a:ASCII or w+:UTF-8
     def open_file_with_args(file, args)
       File.open(file, args).read
     end

data/lib/puppet/util/profiler/aggregate.rb

@@ -42,7 +42,7 @@ class Puppet::Util::Profiler::Aggregate < Puppet::Util::Profiler::WallClock
   end
 
   def print_metrics(metrics_hash, prefix)
-    metrics_hash.sort_by {|k,v| v.time }.reverse.each do |k,v|
+    metrics_hash.sort_by {|k,v| v.time }.reverse_each do |k,v|
       @logger.call("#{prefix}#{k}: #{v.time} s (#{v.count} calls)")
       print_metrics(metrics_hash[k], "#{prefix}#{k} -> ")
     end

data/lib/puppet/util/rdoc/generators/puppet_generator.rb

@@ -225,7 +225,7 @@ module Generators
         'style_url'  => style_url('', @options.css),
       }
 
-      File.open(filename, "w") do |f|
+      Puppet::FileSystem.open(filename, nil, "w:UTF-8") do |f|
         template.write_html_on(f, values)
       end
     end
@@ -301,7 +301,7 @@ module Generators
       values["plugins"] = res4 if res4.size>0
       values["nodes"] = res5 if res5.size>0
 
-      File.open(filename, "w") do |f|
+      Puppet::FileSystem.open(filename, nil, "w:UTF-8") do |f|
         template.write_html_on(f, values)
       end
     end

data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb

@@ -104,7 +104,8 @@ module RDoc::PuppetParserCore
     comment = ""
     %w{README README.rdoc}.each do |rfile|
       readme = File.join(File.dirname(File.dirname(@input_file_name)), rfile)
-      comment = File.open(readme,"r") { |f| f.read } if FileTest.readable?(readme)
+      # module README should be UTF-8, not default system encoding
+      comment = File.open(readme,"r:UTF-8") { |f| f.read } if FileTest.readable?(readme)
     end
     look_for_directives_in(container, comment) unless comment.empty?
 

data/lib/puppet/util/windows/adsi.rb

@@ -195,10 +195,9 @@ module Puppet::Util::Windows::ADSI
     end
 
     def [](attribute)
-      value = native_user.Get(attribute)
-      # Rubys WIN32OLE errantly converts UTF-16 values to Encoding.default_external
-      return value.encode(Encoding::UTF_8) if value.is_a?(String)
-      value
+      # Setting WIN32OLE.codepage in the microsoft_windows feature ensures
+      # values are returned as UTF-8
+      native_user.Get(attribute)
     end
 
     def []=(attribute, value)
@@ -248,8 +247,9 @@ module Puppet::Util::Windows::ADSI
       # https://msdn.microsoft.com/en-us/library/aa746342.aspx
       # WIN32OLE objects aren't enumerable, so no map
       groups = []
-      # Rubys WIN32OLE errantly converts UTF-16 values to Encoding.default_external
-      native_user.Groups.each {|g| groups << g.Name.encode(Encoding::UTF_8)} rescue nil
+      # Setting WIN32OLE.codepage in the microsoft_windows feature ensures
+      # values are returned as UTF-8
+      native_user.Groups.each {|g| groups << g.Name} rescue nil
       groups
     end
 
@@ -372,8 +372,9 @@ module Puppet::Util::Windows::ADSI
 
       users = []
       wql.each do |u|
-        # Rubys WIN32OLE errantly converts UTF-16 values to Encoding.default_external
-        users << new(u.name.encode(Encoding::UTF_8))
+        # Setting WIN32OLE.codepage in the microsoft_windows feature ensures
+        # values are returned as UTF-8
+        users << new(u.name)
       end
 
       users.each(&block)
@@ -465,8 +466,9 @@ module Puppet::Util::Windows::ADSI
     def members
       # WIN32OLE objects aren't enumerable, so no map
       members = []
-      # Rubys WIN32OLE errantly converts UTF-16 values to Encoding.default_external
-      native_group.Members.each {|m| members << m.Name.encode(Encoding::UTF_8)}
+      # Setting WIN32OLE.codepage in the microsoft_windows feature ensures
+      # values are returned as UTF-8
+      native_group.Members.each {|m| members << m.Name}
       members
     end
 
@@ -535,8 +537,9 @@ module Puppet::Util::Windows::ADSI
 
       groups = []
       wql.each do |g|
-        # Rubys WIN32OLE errantly converts UTF-16 values to Encoding.default_external
-        groups << new(g.name.encode(Encoding::UTF_8))
+        # Setting WIN32OLE.codepage in the microsoft_windows feature ensures
+        # values are returned as UTF-8
+        groups << new(g.name)
       end
 
       groups.each(&block)

data/lib/puppet/util.rb

@@ -450,6 +450,7 @@ module Util
 
     begin
       file     = Puppet::FileSystem.pathname(file)
+      # encoding for Uniquefile is not important here because the caller writes to it as it sees fit
       tempfile = Puppet::FileSystem::Uniquefile.new(Puppet::FileSystem.basename_string(file), Puppet::FileSystem.dir_string(file))
 
       # Set properties of the temporary file before we write the content, because

data/lib/puppet/vendor/load_semantic_puppet.rb

@@ -0,0 +1 @@
+$: << File.join([File.dirname(__FILE__), "semantic_puppet/lib"])

data/lib/puppet/vendor/pathspec/lib/pathspec.rb

@@ -75,7 +75,8 @@ class PathSpec
 
   # Generate specs from a filename, such as a .gitignore
   def self.from_filename(filename, type=:git)
-    self.from_lines(File.open(filename, 'r'))
+    # .gitignore is a UTF-8 file
+    self.from_lines(File.open(filename, 'r', :encoding => Encoding::UTF_8), type)
   end
 
   def self.from_lines(lines, type=:git)

data/lib/puppet/vendor/require_vendored.rb

@@ -1,7 +1,6 @@
 # This adds upfront requirements on vendored code found under lib/vendor/x
 # Add one requirement per vendored package (or a comment if it is loaded on demand).
 
-# The vendored library 'semantic' is loaded on demand.
 # The vendored library 'rgen' is loaded on demand.
 # The vendored library 'pathspec' is loaded on demand.
 # The vendored library 'deep_merge' is loaded on demand.

data/lib/puppet/vendor/{semantic/lib/semantic → semantic_puppet/lib/semantic_puppet}/dependency/graph.rb

@@ -1,6 +1,6 @@
-require 'semantic/dependency'
+require 'semantic_puppet/dependency'
 
-module Semantic
+module SemanticPuppet
   module Dependency
     class Graph
       include GraphNode

data/lib/puppet/vendor/{semantic/lib/semantic → semantic_puppet/lib/semantic_puppet}/dependency/graph_node.rb

@@ -1,7 +1,7 @@
-require 'semantic/dependency'
+require 'semantic_puppet/dependency'
 require 'set'
 
-module Semantic
+module SemanticPuppet
   module Dependency
     module GraphNode
       include Comparable

data/lib/puppet/vendor/semantic_puppet/lib/semantic_puppet/dependency/module_release.rb

@@ -0,0 +1,58 @@
+require 'semantic_puppet/dependency'
+
+module SemanticPuppet
+  module Dependency
+    class ModuleRelease
+      include GraphNode
+
+      attr_reader :name, :version
+
+      # Create a new instance of a module release.
+      #
+      # @param source [SemanticPuppet::Dependency::Source]
+      # @param name [String]
+      # @param version [SemanticPuppet::Version]
+      # @param dependencies [{String => SemanticPuppet::VersionRange}]
+      def initialize(source, name, version, dependencies = {})
+        @source      = source
+        @name        = name.freeze
+        @version     = version.freeze
+
+        dependencies.each do |name, range|
+          add_constraint('initialize', name, range.to_s) do |node|
+            range === node.version
+          end
+
+          add_dependency(name)
+        end
+      end
+
+      def priority
+        @source.priority
+      end
+
+      def <=>(oth)
+        our_key   = [ priority, name, version ]
+        their_key = [ oth.priority, oth.name, oth.version ]
+
+        return our_key <=> their_key
+      end
+
+      def eql?(other)
+        other.is_a?(ModuleRelease) &&
+          @name.eql?(other.name) &&
+          @version.eql?(other.version) &&
+          dependencies.eql?(other.dependencies)
+      end
+      alias == eql?
+
+      def hash
+        @name.hash ^ @version.hash
+      end
+
+      def to_s
+        "#<#{self.class} #{name}@#{version}>"
+      end
+    end
+  end
+end

data/lib/puppet/vendor/{semantic/lib/semantic → semantic_puppet/lib/semantic_puppet}/dependency/source.rb

@@ -1,6 +1,6 @@
-require 'semantic/dependency'
+require 'semantic_puppet/dependency'
 
-module Semantic
+module SemanticPuppet
   module Dependency
     class Source
       def self.priority

data/lib/puppet/vendor/{semantic/lib/semantic → semantic_puppet/lib/semantic_puppet}/dependency/unsatisfiable_graph.rb

@@ -1,6 +1,6 @@
-require 'semantic/dependency'
+require 'semantic_puppet/dependency'
 
-module Semantic
+module SemanticPuppet
   module Dependency
     class UnsatisfiableGraph < StandardError
       attr_reader :graph

data/lib/puppet/vendor/{semantic/lib/semantic → semantic_puppet/lib/semantic_puppet}/dependency.rb

@@ -1,15 +1,15 @@
-require 'semantic'
+require 'semantic_puppet'
 
-module Semantic
+module SemanticPuppet
   module Dependency
     extend self
 
-    autoload :Graph,         'semantic/dependency/graph'
-    autoload :GraphNode,     'semantic/dependency/graph_node'
-    autoload :ModuleRelease, 'semantic/dependency/module_release'
-    autoload :Source,        'semantic/dependency/source'
+    autoload :Graph,         'semantic_puppet/dependency/graph'
+    autoload :GraphNode,     'semantic_puppet/dependency/graph_node'
+    autoload :ModuleRelease, 'semantic_puppet/dependency/module_release'
+    autoload :Source,        'semantic_puppet/dependency/source'
 
-    autoload :UnsatisfiableGraph, 'semantic/dependency/unsatisfiable_graph'
+    autoload :UnsatisfiableGraph, 'semantic_puppet/dependency/unsatisfiable_graph'
 
     # @!group Sources
 

data/lib/puppet/vendor/semantic_puppet/lib/semantic_puppet/gem_version.rb

@@ -0,0 +1,3 @@
+module SemanticPuppet
+  VERSION = '0.1.4'
+end

data/lib/puppet/vendor/semantic_puppet/lib/semantic_puppet/locales/config.yaml

@@ -0,0 +1,21 @@
+---
+# This is the project-specific configuration file for setting up
+# fast_gettext for your project.
+gettext:
+  # This is used for the name of the .pot and .po files; they will be
+  # called <project_name>.pot?
+  project_name: 'semantic_puppet'
+  # This is used in comments in the .pot and .po files to indicate what
+  # project the files belong to and should bea little more desctiptive than
+  # <project_name>
+  package_name: Semantic Puppet Gem
+  # The locale that the default messages in the .pot file are in
+  default_locale: en
+  # The email used for sending bug reports.
+  bugs_address: docs@puppetlabs.com
+  # The holder of the copyright.
+  copyright_holder: Puppet, Inc.
+  # Patterns for +Dir.glob+ used to find all files that might contain
+  # translatable content, relative to the project root directory
+  source_files:
+    - 'lib/**/*.rb'

data/lib/puppet/vendor/{semantic/lib/semantic → semantic_puppet/lib/semantic_puppet}/version.rb

@@ -1,8 +1,8 @@
-require 'semantic'
+require 'semantic_puppet'
 
-module Semantic
+module SemanticPuppet
 
-  # @note Semantic::Version subclasses Numeric so that it has sane Range
+  # @note SemanticPuppet::Version subclasses Numeric so that it has sane Range
   #       semantics in Ruby 1.9+.
   class Version < Numeric
     include Comparable
@@ -10,44 +10,47 @@ module Semantic
     class ValidationFailure < ArgumentError; end
 
     class << self
-      LOOSE_REGEX = /
-        \A
-        (\d+)[.](\d+)[.](\d+) # Major . Minor . Patch
-        (?: [-](.*?))?        # Prerelease
-        (?: [+](.*?))?        # Build
-        \Z
-      /x
-
       # Parse a Semantic Version string.
       #
       # @param ver [String] the version string to parse
       # @return [Version] a comparable {Version} object
       def parse(ver)
-        match, major, minor, patch, prerelease, build = *ver.match(LOOSE_REGEX)
+        match, major, minor, patch, prerelease, build = *ver.match(/\A#{REGEX_FULL}\Z/)
 
         if match.nil?
-          raise 'Version numbers MUST begin with three dot-separated numbers'
-        elsif [major, minor, patch].any? { |x| x =~ /^0\d+/ }
-          raise 'Version numbers MUST NOT contain leading zeroes'
+          raise _("Unable to parse '%{version}' as a semantic version identifier") % {version: ver}
         end
 
         prerelease = parse_prerelease(prerelease) if prerelease
-        build = parse_build_metadata(build) if build
+        # Build metadata is not yet supported in semantic_puppet, but we hope to.
+        # The following code prevents build metadata for now.
+        #build = parse_build_metadata(build) if build
+        if !build.nil?
+          raise _("'%{version}' MUST NOT include build identifiers") % {version: ver}
+        end
 
         self.new(major.to_i, minor.to_i, patch.to_i, prerelease, build)
       end
 
+      # Validate a Semantic Version string.
+      #
+      # @param ver [String] the version string to validate
+      # @return [bool] whether or not the string represents a valid Semantic Version
+      def valid?(ver)
+        !!(ver =~ /\A#{REGEX_FULL}\Z/)
+      end
+
       private
       def parse_prerelease(prerelease)
         subject = 'Prerelease identifiers'
         prerelease = prerelease.split('.', -1)
 
         if prerelease.empty? or prerelease.any? { |x| x.empty? }
-          raise "#{subject} MUST NOT be empty"
+          raise _("%{subject} MUST NOT be empty") % {subject: subject}
         elsif prerelease.any? { |x| x =~ /[^0-9a-zA-Z-]/ }
-          raise "#{subject} MUST use only ASCII alphanumerics and hyphens"
+          raise _("%{subject} MUST use only ASCII alphanumerics and hyphens") % {subject: subject}
         elsif prerelease.any? { |x| x =~ /^0\d+$/ }
-          raise "#{subject} MUST NOT contain leading zeroes"
+          raise _("%{subject} MUST NOT contain leading zeroes") % {subject: subject}
         end
 
         return prerelease.map { |x| x =~ /^\d+$/ ? x.to_i : x }
@@ -58,9 +61,9 @@ module Semantic
         build = build.split('.', -1)
 
         if build.empty? or build.any? { |x| x.empty? }
-          raise "#{subject} MUST NOT be empty"
+          raise _("%{subject} MUST NOT be empty") % {subject: subject}
         elsif build.any? { |x| x =~ /[^0-9a-zA-Z-]/ }
-          raise "#{subject} MUST use only ASCII alphanumerics and hyphens"
+          raise _("%{subject} MUST use only ASCII alphanumerics and hyphens") % {subject: subject}
         end
 
         return build
@@ -112,6 +115,16 @@ module Semantic
       return compare_prerelease(other)
     end
 
+    def eql?(other)
+      other.is_a?(Version) &&
+        @major.eql?(other.major) &&
+        @minor.eql?(other.minor) &&
+        @patch.eql?(other.patch) &&
+        @prerelease.eql?(other.instance_variable_get(:@prerelease)) &&
+        @build.eql?(other.instance_variable_get(:@build))
+    end
+    alias == eql?
+
     def to_s
       "#{major}.#{minor}.#{patch}" +
       (@prerelease.nil? || prerelease.empty? ? '' : "-" + prerelease) +
@@ -164,5 +177,19 @@ module Semantic
     def first_prerelease
       self.class.new(@major, @minor, @patch, [])
     end
+
+    public
+
+    # Version string matching regexes
+    REGEX_NUMERIC = "(0|[1-9]\\d*)[.](0|[1-9]\\d*)[.](0|[1-9]\\d*)" # Major . Minor . Patch
+    REGEX_PRE     = "(?:[-](.*?))?"            # Prerelease
+    REGEX_BUILD   = "(?:[+](.*?))?"            # Build
+    REGEX_FULL    = REGEX_NUMERIC + REGEX_PRE + REGEX_BUILD
+
+    # The lowest precedence Version possible
+    MIN = self.new(0, 0, 0, []).freeze
+
+    # The highest precedence Version possible
+    MAX = self.new((1.0/0.0), 0, 0).freeze
   end
 end

data/lib/puppet/vendor/{semantic/lib/semantic → semantic_puppet/lib/semantic_puppet}/version_range.rb

@@ -1,6 +1,6 @@
-require 'semantic'
+require 'semantic_puppet'
 
-module Semantic
+module SemanticPuppet
   class VersionRange < Range
     class << self
       # Parses a version range string into a comparable {VersionRange} instance.
@@ -46,7 +46,7 @@ module Semantic
         end
 
       rescue ArgumentError
-        raise ArgumentError, "Unparsable version range: #{range_str.inspect}"
+        raise ArgumentError, _("Unparsable version range: %{range}") % {range: range_str.inspect}
       end
 
       private
@@ -123,7 +123,7 @@ module Semantic
           start = process_loose_expr(expr).last.send(:first_prerelease)
         end
 
-        self.new(start, MAX_VERSION)
+        self.new(start, SemanticPuppet::Version::MAX)
       end
 
       # Returns a range covering all versions greater than or equal to the given
@@ -139,7 +139,7 @@ module Semantic
           start = process_loose_expr(expr).first.send(:first_prerelease)
         end
 
-        self.new(start, MAX_VERSION)
+        self.new(start, SemanticPuppet::Version::MAX)
       end
 
       # Returns a range covering all versions less than the given `expr`.
@@ -154,7 +154,7 @@ module Semantic
           finish = process_loose_expr(expr).first.send(:first_prerelease)
         end
 
-        self.new(MIN_VERSION, finish, true)
+        self.new(SemanticPuppet::Version::MIN, finish, true)
       end
 
       # Returns a range covering all versions less than or equal to the given
@@ -166,10 +166,10 @@ module Semantic
       def parse_lte_expression(expr)
         if expr =~ /^[^+]*-/
           finish = Version.parse(expr)
-          self.new(MIN_VERSION, finish)
+          self.new(SemanticPuppet::Version::MIN, finish)
         else
           finish = process_loose_expr(expr).last.send(:first_prerelease)
-          self.new(MIN_VERSION, finish, true)
+          self.new(SemanticPuppet::Version::MIN, finish, true)
         end
       end
 
@@ -190,7 +190,7 @@ module Semantic
       # @example "Reasonably close" minor version
       #   "~1.2" # => (>=1.2.0 <1.3.0)
       # @example "Reasonably close" patch version
-      #   "~1.2.3" # => (1.2.3)
+      #   "~1.2.3" # => (>=1.2.3 <1.3.0)
       # @example "Reasonably close" prerelease version
       #   "~1.2.3-alpha" # => (>=1.2.3-alpha <1.2.4)
       #
@@ -201,6 +201,10 @@ module Semantic
 
         if parsed.stable?
           parsed = parsed.send(:first_prerelease)
+
+          # Handle the special case of "~1.2.3" expressions.
+          succ = succ.next(:minor) if ((parsed.major == succ.major) && (parsed.minor == succ.minor))
+
           succ = succ.send(:first_prerelease)
           self.new(parsed, succ, true)
         else
@@ -323,12 +327,6 @@ module Semantic
 
     private
 
-    # The lowest precedence Version possible
-    MIN_VERSION = Version.new(0, 0, 0, []).freeze
-
-    # The highest precedence Version possible
-    MAX_VERSION = Version.new((1.0/0.0), 0, 0).freeze
-
     # Determines whether this {VersionRange} has an earlier endpoint than the
     # give `other` range.
     #
@@ -342,13 +340,13 @@ module Semantic
     # Describes whether this range has an upper limit.
     # @return [Boolean] true if this range has no upper limit
     def open_end?
-      self.end == MAX_VERSION
+      self.end == SemanticPuppet::Version::MAX
     end
 
     # Describes whether this range has a lower limit.
     # @return [Boolean] true if this range has no lower limit
     def open_begin?
-      self.begin == MIN_VERSION
+      self.begin == SemanticPuppet::Version::MIN
     end
 
     # Describes whether this range follows the patterns for matching all

data/lib/puppet/vendor/semantic_puppet/lib/semantic_puppet.rb

@@ -0,0 +1,17 @@
+begin
+  require 'gettext-setup'
+rescue LoadError
+  def _(msg)
+    msg
+  end
+end
+
+module SemanticPuppet
+  if defined?(GettextSetup)
+    GettextSetup.initialize(File.absolute_path('semantic_puppet/locales', File.dirname(__FILE__)))
+  end
+
+  autoload :Version, 'semantic_puppet/version'
+  autoload :VersionRange, 'semantic_puppet/version_range'
+  autoload :Dependency, 'semantic_puppet/dependency'
+end