puppet 4.8.2-x86-mingw32 → 4.9.0-x86-mingw32

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_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/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '4.8.2'
+  PUPPETVERSION = '4.9.0'
 
   ##
   # version is a public API method intended to always provide a fast and

data/lib/semver.rb

@@ -2,6 +2,8 @@ require 'puppet/util/monkey_patches'
 
 # We need to subclass Numeric to force range comparisons not to try to iterate over SemVer
 # and instead use numeric comparisons (eg >, <, >=, <=)
+# @api private
+# @deprecated
 class SemVer < Numeric
   include Comparable
 
@@ -20,17 +22,17 @@ class SemVer < Numeric
     vstring =~ /-/ ? vstring : vstring + '-'
   end
 
-  def self.[](range)
+  def self.[](range, suppress_deprecation_warning = false)
     range.gsub(/([><=])\s+/, '\1').split(/\b\s+(?!-)/).map do |r|
       case r
       when SemVer::VERSION
-        SemVer.new(pre(r)) .. SemVer.new(r)
+        SemVer.new(pre(r), suppress_deprecation_warning) .. SemVer.new(r, suppress_deprecation_warning)
       when SemVer::SIMPLE_RANGE
         r += ".0" unless SemVer.valid?(r.gsub(/x/i, '0'))
-        SemVer.new(r.gsub(/x/i, '0'))...SemVer.new(r.gsub(/(\d+)\.x/i) { "#{$1.to_i + 1}.0" } + '-')
+        SemVer.new(r.gsub(/x/i, '0'))...SemVer.new(r.gsub(/(\d+)\.x/i) { "#{$1.to_i + 1}.0" } + '-', suppress_deprecation_warning)
       when /\s+-\s+/
         a, b = r.split(/\s+-\s+/)
-        SemVer.new(pre(a)) .. SemVer.new(b)
+        SemVer.new(pre(a)) .. SemVer.new(b, suppress_deprecation_warning)
       when /^~/
         ver = r.sub(/~/, '').split('.').map(&:to_i)
         start = (ver + [0] * (3 - ver.length)).join('.')
@@ -39,13 +41,13 @@ class SemVer < Numeric
         ver[-1] = ver.last + 1
 
         finish = (ver + [0] * (3 - ver.length)).join('.')
-        SemVer.new(pre(start)) ... SemVer.new(pre(finish))
+        SemVer.new(pre(start), suppress_deprecation_warning) ... SemVer.new(pre(finish), suppress_deprecation_warning)
       when /^>=/
         ver = r.sub(/^>=/, '')
-        SemVer.new(pre(ver)) .. SemVer::MAX
+        SemVer.new(pre(ver), suppress_deprecation_warning) .. SemVer::MAX
       when /^<=/
         ver = r.sub(/^<=/, '')
-        SemVer::MIN .. SemVer.new(ver)
+        SemVer::MIN .. SemVer.new(ver, suppress_deprecation_warning)
       when /^>/
         if r =~ /-/
           ver = [r[1..-1]]
@@ -53,10 +55,10 @@ class SemVer < Numeric
           ver = r.sub(/^>/, '').split('.').map(&:to_i)
           ver[2] = ver.last + 1
         end
-        SemVer.new(ver.join('.') + '-') .. SemVer::MAX
+        SemVer.new(ver.join('.') + '-', suppress_deprecation_warning) .. SemVer::MAX
       when /^</
         ver = r.sub(/^</, '')
-        SemVer::MIN ... SemVer.new(pre(ver))
+        SemVer::MIN ... SemVer.new(pre(ver), suppress_deprecation_warning)
       else
         (1..1)
       end
@@ -65,7 +67,12 @@ class SemVer < Numeric
 
   attr_reader :major, :minor, :tiny, :special
 
-  def initialize(ver)
+  def initialize(ver, suppress_deprecation_warning = false)
+    unless suppress_deprecation_warning || Puppet[:strict] == :off
+      Puppet.warn_once(:deprecation, 'Puppet::SemVer',
+        "Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead")
+    end
+
     unless SemVer.valid?(ver)
       raise ArgumentError.new("Invalid version string '#{ver}'!")
     end
@@ -130,10 +137,10 @@ class SemVer < Numeric
   end
   alias :to_s :inspect
 
-  MIN = SemVer.new('0.0.0-')
+  MIN = SemVer.new('0.0.0-', true)
   MIN.instance_variable_set(:@vstring, 'vMIN')
 
-  MAX = SemVer.new('8.0.0')
+  MAX = SemVer.new('8.0.0', true)
   MAX.instance_variable_set(:@major, Float::INFINITY) # => Infinity
   MAX.instance_variable_set(:@vstring, 'vMAX')
 end

data/locales/config.yaml

@@ -0,0 +1,29 @@
+---
+# 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: 'puppet'
+  # This is used in comments in the .pot and .po files to indicate what
+  # project the files belong to and should be a little more descriptive than
+  # <project_name>
+  package_name: Puppet automation framework
+  # The locale that the default messages in the .pot file are in
+  default_locale: en
+  # The address for sending bug reports.
+  bugs_address: https://tickets.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'
+  # Patterns for +Dir.glob+ used to find all files contained in
+  # `source_files` that should be ignored when searching for translatable
+  # content, relative to the project root directory
+  exclude_files:
+    - 'lib/puppet/pops/types/type_formatter.rb'
+    # The semantic_puppet gem is temporarily vendored (PUP-7114), and it
+    # handles its own translation.
+    - 'lib/semantic_puppet/**/*.rb'