puppet 4.5.3-x86-mingw32 → 4.6.1-x86-mingw32

data/lib/puppet/pops/validation.rb

@@ -17,7 +17,7 @@ module Validation
   # validation configuration depending on the context/type of validation that should be performed (static, vs. runtime, etc.).
   #
   # This class is abstract and must be subclassed. The subclass must implement the methods
-  # {#label_provider} and {#checker}. It is also expected that the sublcass will override
+  # {#label_provider} and {#checker}. It is also expected that the subclass will override
   # the severity_producer and configure the issues that should be reported as errors (i.e. if they should be ignored, produce
   # a warning, or a deprecation warning).
   #
@@ -384,12 +384,12 @@ module Validation
       errors? || warnings?
     end
 
-    # Returns the diagnosed errors in the order thwy were reported.
+    # Returns the diagnosed errors in the order they were reported.
     def errors
       @diagnostics.select {|d| d.severity == :error }
     end
 
-    # Returns the diagnosed warnings in the order thwy were reported.
+    # Returns the diagnosed warnings in the order they were reported.
     # (This includes :warning and :deprecation severity)
     def warnings
       @diagnostics.select {|d| d.severity == :warning || d.severity == :deprecation }
@@ -399,7 +399,7 @@ module Validation
       @diagnostics.select {|d| d.severity != :ignore }
     end
 
-    # Returns the ignored diagnostics in the order thwy were reported (if reported at all)
+    # Returns the ignored diagnostics in the order they were reported (if reported at all)
     def ignored
       @diagnostics.select {|d| d.severity == :ignore }
     end

data/lib/puppet/pops/validation/checker4_0.rb

@@ -310,7 +310,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   end
 
   # Only used for function names, grammar should not be able to produce something faulty, but
-  # check anyway if model is created programatically (it will fail in transformation to AST for sure).
+  # check anyway if model is created programmatically (it will fail in transformation to AST for sure).
   def check_NamedAccessExpression(o)
     name = o.right_expr
     unless name.is_a? Model::QualifiedName
@@ -349,7 +349,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   # for 'class', 'define', and function
   def check_NamedDefinition(o)
     top(o.eContainer, o)
-    if o.name !~ Patterns::CLASSREF
+    if o.name !~ Patterns::CLASSREF_DECL
       acceptor.accept(Issues::ILLEGAL_DEFINITION_NAME, o, {:name=>o.name})
     end
     internal_check_reserved_type_name(o, o.name)
@@ -358,6 +358,9 @@ class Checker4_0 < Evaluator::LiteralEvaluator
 
   def check_TypeAlias(o)
     top(o.eContainer, o)
+    if o.name !~ Patterns::CLASSREF_EXT_DECL
+      acceptor.accept(Issues::ILLEGAL_DEFINITION_NAME, o, {:name=>o.name})
+    end
     internal_check_reserved_type_name(o, o.name)
     internal_check_type_ref(o, o.type_expr)
   end

data/lib/puppet/pops/visitor.rb

@@ -1,7 +1,7 @@
 # A Visitor performs delegation to a given receiver based on the configuration of the Visitor.
 # A new visitor is created with a given receiver, a method prefix, min, and max argument counts.
 # e.g.
-#   vistor = Visitor.new(self, "visit_from", 1, 1)
+#   visitor = Visitor.new(self, "visit_from", 1, 1)
 # will make the visitor call "self.visit_from_CLASS(x)" where CLASS is resolved to the given
 # objects class, or one of is ancestors, the first class for which there is an implementation of
 # a method will be selected.
@@ -72,7 +72,7 @@ class Puppet::Pops::Visitor
   end
 
   # Visit an explicit receiver with 2 args
-  # (This is ~30% faster than calling th general method)
+  # (This is ~30% faster than calling the general method)
   #
   def visit_this_2(receiver, thing, arg1, arg2)
     if method_name = @cache[thing.class]

data/lib/puppet/property.rb

@@ -98,6 +98,22 @@ class Puppet::Property < Puppet::Parameter
       raise ArgumentError, "Supported values for Property#array_matching are 'first' and 'all'" unless [:first, :all].include?(value)
       @array_matching = value
     end
+
+    # Used to mark a type property as having or lacking idempotency (on purpose
+    # generally). This is used to avoid marking the property as a
+    # corrective_change when there is known idempotency issues with the property
+    # rendering a corrective_change flag as useless.
+    # @return [Boolean] true if the property is marked as idempotent
+    def idempotent
+      @idempotent.nil? ? @idempotent = true : @idempotent
+    end
+
+    # Attribute setter for the idempotent attribute.
+    # @param [bool] value boolean indicating if the property is idempotent.
+    # @see idempotent
+    def idempotent=(value)
+      @idempotent = value
+    end
   end
 
   # Looks up a value's name among valid values, to enable option lookup with result as a key.
@@ -228,18 +244,20 @@ class Puppet::Property < Puppet::Parameter
   # * `:name` - the event_name
   # * `:desired_value` - a.k.a _should_ or _wanted value_
   # * `:property` - reference to this property
-  # * `:source_description` - the _path_ (?? See todo)
+  # * `:source_description` - The containment path of this property, indicating what resource this
+  #                           property is associated with and in what stage and class that resource
+  #                           was declared, e.g. "/Stage[main]/Myclass/File[/tmp/example]/ensure"
   # * `:invalidate_refreshes` - if scheduled refreshes should be invalidated
+  # * `:redacted` - if the event will be redacted (due to this property being sensitive)
   #
-  # @todo What is the intent of this method? What is the meaning of the :source_description passed in the
-  #   options to the created event?
   # @return [Puppet::Transaction::Event] the created event
   # @see Puppet::Type#event
-  def event
-    attrs = { :name => event_name, :desired_value => should, :property => self, :source_description => path }
+  def event(options = {})
+    attrs = { :name => event_name, :desired_value => should, :property => self, :source_description => path }.merge(options)
     if should and value = self.class.value_collection.match?(should)
       attrs[:invalidate_refreshes] = true if value.invalidate_refreshes
     end
+    attrs[:redacted] = @sensitive
     resource.event attrs
   end
 
@@ -324,6 +342,41 @@ class Puppet::Property < Puppet::Parameter
     end
   end
 
+  # This method tests if two values are insync? outside of the properties current
+  # should value. This works around the requirement for corrective_change analysis
+  # that requires two older values to be compared with the properties potentially
+  # custom insync? code.
+  #
+  # @param [Object] should the value it should be
+  # @param [Object] is the value it is
+  # @return [Boolean] whether or not the values are in sync or not
+  # @api private
+  def insync_values?(should, is)
+    # Here be dragons. We're setting the should value of a property purely just to
+    # call its insync? method, as it lacks a way to pass in a should.
+    # Unfortunately there isn't an API compatible way of avoiding this, as both should
+    # an insync? behaviours are part of the public API. Future API work should factor
+    # this kind of arbitrary comparisons into the API to remove this complexity. -ken
+
+    # Backup old should, set it to the new value, then call insync? on the property.
+    old_should = @should
+
+    begin
+      @should = should
+      insync?(is)
+    rescue => detail
+      # Certain operations may fail, but we don't want to fail the transaction if we can
+      # avoid it
+      Puppet.log_exception(detail, "Unknown failure comparing values #{should} and #{is} using insync? on type: #{self.resource.ref} property: #{self.name}", { :level => :info })
+
+      # Return nil, ie. unknown
+      nil
+    ensure
+      # Always restore old should
+      @should = old_should
+    end
+  end
+
   # Checks if the given current and desired values are equal.
   # This default implementation performs this check in a backwards compatible way where
   # the equality of the two values is checked, and then the equality of current with desired
@@ -368,6 +421,12 @@ class Puppet::Property < Puppet::Parameter
     self.class.array_matching == :all
   end
 
+  # @return [Boolean] whether the property is marked as idempotent for the purposes
+  #   of calculating corrective change.
+  def idempotent?
+    self.class.idempotent
+  end
+
   # @return [Symbol] the name of the property as stated when the property was created.
   # @note A property class (just like a parameter class) describes one specific property and
   #   can only be used once within one type's inheritance chain.

data/lib/puppet/provider.rb

@@ -505,7 +505,7 @@ class Puppet::Provider
   # structure of the provider - this hash holds the current state property values of system entities
   # as they are being discovered by querying or other operations (typically getters).
   #
-  # @todo The use of a hash as a parameter needs a better exaplanation; why is this done? What is the intent?
+  # @todo The use of a hash as a parameter needs a better explanation; why is this done? What is the intent?
   # @param resource [Puppet::Resource, Hash] optional resource or hash
   #
   def initialize(resource = nil)

data/lib/puppet/provider/aixobject.rb

@@ -26,7 +26,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
   # Valid attributes to be managed by this provider.
   # It is a list of hashes
   #  :aix_attr      AIX command attribute name
-  #  :puppet_prop   Puppet propertie name
+  #  :puppet_prop   Puppet property name
   #  :to            Optional. Method name that adapts puppet property to aix command value.
   #  :from          Optional. Method to adapt aix command line value to puppet property. Optional
   class << self
@@ -226,7 +226,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
       begin
         output = execute(self.lscmd)
         @objectinfo = self.parse_command_output(output)
-        # All attributtes without translation
+        # All attributes without translation
         @objectosinfo = self.parse_command_output(output, nil)
       rescue Puppet::ExecutionFailure => detail
         # Print error if needed. FIXME: Do not check the user here.
@@ -237,7 +237,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
   end
 
   # Like getinfo, but it will not use the mapping to translate the keys and values.
-  # It might be usefult to retrieve some raw information.
+  # It might be useful to retrieve some raw information.
   def getosinfo(refresh = false)
     if @objectosinfo.nil? or refresh == true
       getinfo(refresh)

data/lib/puppet/provider/group/aix.rb

@@ -33,7 +33,7 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
   # Valid attributes to be managed by this provider.
   # It is a list with of hash
   #  :aix_attr      AIX command attribute name
-  #  :puppet_prop   Puppet propertie name
+  #  :puppet_prop   Puppet property name
   #  :to            Method to adapt puppet property to aix command value. Optional.
   #  :from          Method to adapt aix command value to puppet property. Optional
   self.attribute_mapping = [
@@ -94,9 +94,9 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
 
 
   #--------------
-  # Overwrite get_arguments to add the attributes arguments
+  # Overwrite get_arguments to add the attributes' arguments
   def get_arguments(key, value, mapping, objectinfo)
-    # In the case of attributes, return a list of key=vlaue
+    # In the case of attributes, return a list of key=value
     if key == :attributes
       raise Puppet::Error, "Attributes must be a list of pairs key=value on #{@resource.class.name}[#{@resource.name}]" \
         unless value and value.is_a? Hash
@@ -106,7 +106,7 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
   end
 
   def filter_attributes(hash)
-    # Return only not managed attributtes.
+    # Return only not managed attributes.
     hash.select {
         |k,v| !self.class.attribute_mapping_from.include?(k) and
                 !self.class.attribute_ignore.include?(k)

data/lib/puppet/provider/macauthorization/macauthorization.rb

@@ -141,7 +141,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
     # first we re-read the right just to make sure we're in sync for
     # values that weren't specified in the manifest. As we're supplying
     # the whole plist when specifying the right it seems safest to be
-    # paranoid given the low cost of quering the db once more.
+    # paranoid given the low cost of querying the db once more.
     cmds = []
     cmds << :security << "authorizationdb" << "read" << resource[:name]
     output = execute(cmds, :failonfail => false, :combine => false)

data/lib/puppet/provider/mailalias/aliases.rb

@@ -34,7 +34,7 @@ Puppet::Type.type(:mailalias).provide(
       if record[:recipient]
 	dest = record[:recipient].collect do |d|
 	  # Quote aliases that have non-alpha chars
-	  if d =~ /[^-\w@.]/
+	  if d =~ /[^-+\w@.]/
 	    '"%s"' % d
 	  else
 	    d

data/lib/puppet/provider/mcx/mcxcontent.rb

@@ -133,13 +133,13 @@ Puppet::Type.type(:mcx).provide :mcxcontent, :parent => Puppet::Provider do
     ds_type = name.split('/')[1]
     unless ds_type
       raise MCXContentProviderException,
-      "Coult not parse ds_type from resource name '#{name}'.  Specify with ds_type parameter."
+      "Could not parse ds_type from resource name '#{name}'.  Specify with ds_type parameter."
     end
     # De-pluralize and downcase.
     ds_type = ds_type.chop.downcase.to_sym
     unless TypeMap.key? ds_type
       raise MCXContentProviderException,
-      "Coult not parse ds_type from resource name '#{name}'.  Specify with ds_type parameter."
+      "Could not parse ds_type from resource name '#{name}'.  Specify with ds_type parameter."
     end
     ds_type
   end

data/lib/puppet/provider/mount/parsed.rb

@@ -61,7 +61,7 @@ Puppet::Type.type(:mount).provide(
           ret[filesystem_index] = filesystem_stanza.join("\n") if filesystem_stanza
           filesystem_stanza = Array(line)
           filesystem_index = i
-          # Eat the preceeding blank line
+          # Eat the preceding blank line
           ret[i-1] = nil if i > 0 and ret[i-1] and ret[i-1].match(%r{^\s*$})
           nil
         elsif line.match(%r{^(\s*\*.*|\s*)$})

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

@@ -63,7 +63,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
   def self.instances
     # JJM Class method that provides an array of instance objects of this
     #     type.
-    # JJM: Properties are dependent on the Puppet::Type we're managine.
+    # JJM: Properties are dependent on the Puppet::Type we're managing.
     type_property_array = [:name] + @resource_type.validproperties
 
     # Create a new instance of this Puppet::Type for each object present
@@ -126,7 +126,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
 
     # NBK: need to read the existing password here as it's not actually
     # stored in the user record. It is stored at a path that involves the
-    # UUID of the user record for non-Mobile local acccounts.
+    # UUID of the user record for non-Mobile local accounts.
     # Mobile Accounts are out of scope for this provider for now
     attribute_hash[:password] = self.get_password(attribute_hash[:guid], attribute_hash[:name]) if @resource_type.validproperties.include?(:password) and Puppet.features.root?
     attribute_hash
@@ -167,8 +167,8 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
 
     command_vector = [ command(:dscl), "-plist", "." ]
 
-    # JJM: The actual action to perform.  See "man dscl"
-    #      Common actiosn: -create, -delete, -merge, -append, -passwd
+    # JJM: The actual action to perform. See "man dscl".
+    #      Common actions: -create, -delete, -merge, -append, -passwd
     command_vector << ds_action
     # JJM: get_ds_path will spit back "Users" or "Groups",
     # etc...  Depending on the Puppet::Type of our self.
@@ -186,7 +186,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     # 10.7 uses salted SHA512 password hashes which are 128 characters plus
     # an 8 character salt. Previous versions used a SHA1 hash padded with
     # zeroes. If someone attempts to use a password hash that worked with
-    # a previous version of OX X, we will fail early and warn them.
+    # a previous version of OS X, we will fail early and warn them.
     if password_hash.length != 136
       fail("OS X 10.7 requires a Salted SHA512 hash password of 136 characters. \
            Please check your password and try again.")

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

@@ -7,7 +7,7 @@
 # and are easier to manage.
 #
 # Note: the 'apple' Provider checks for the package name
-# in /L/Receipts.  Since we possibly install multiple apps's from
+# in /L/Receipts.  Since we possibly install multiple apps from
 # a single source, we treat the source .app.dmg file as the package name.
 # As a result, we store installed .app.dmg file names
 # in /var/db/.puppet_appdmg_installed_<name>
@@ -100,10 +100,10 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
   def install
     source = nil
     unless source = @resource[:source]
-      self.fail "Mac OS X PKG DMG's must specify a package source."
+      self.fail "Mac OS X PKG DMGs must specify a package source."
     end
     unless name = @resource[:name]
-      self.fail "Mac OS X PKG DMG's must specify a package name."
+      self.fail "Mac OS X PKG DMGs must specify a package name."
     end
     self.class.installpkgdmg(source,name)
   end

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

@@ -2,7 +2,7 @@ require 'puppet/provider/package'
 
 # OS X Packaging sucks.  We can install packages, but that's about it.
 Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package do
-  desc "Package management based on OS X's builtin packaging system.  This is
+  desc "Package management based on OS X's built-in packaging system.  This is
     essentially the simplest and least functional package system in existence --
     it only supports installation; no deletion or upgrades.  The provider will
     automatically add the `.pkg` extension, so leave that off when specifying

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

@@ -30,6 +30,11 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do
 
   defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => ['22', '23', '24']
 
+  def self.update_command
+    # In DNF, update is deprecated for upgrade
+    'upgrade'
+  end
+
   # The value to pass to DNF as its error output level.
   # DNF differs from Yum slightly with regards to error outputting.
   #

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

@@ -114,7 +114,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
       # Now we know if the package type is RPM or not, and we can adjust our
       # `pkg` string for passing to the install command accordingly.
       if (package_type == :rpm)
-        # RPM's expect a hyphen between the package name and the version number
+        # RPMs expect a hyphen between the package name and the version number
         version_separator = "-"
       else
         # installp/BFF packages expect a space between the package name and the

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

@@ -36,7 +36,7 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
   end
 
   # Install a package using 'pacman', or 'yaourt' if available.
-  # Installs quietly, without confirmation or progressbar, updates package
+  # Installs quietly, without confirmation or progress bar, updates package
   # list from servers defined in pacman.conf.
   def install
     if @resource[:source]
@@ -163,7 +163,7 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
     end
   end
 
-  # Querys information for a package or package group
+  # Queries information for a package or package group
   def query
     installed_packages = self.class.get_installed_packages
     resource_name = @resource[:name]

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

@@ -1,5 +1,5 @@
 # Puppet package provider for Python's `pip` package management frontend.
-# <http://pip.openplans.org/>
+# <http://pip.pypa.io/>
 
 require 'puppet/provider/package'
 require 'xmlrpc/client'
@@ -153,8 +153,10 @@ Puppet::Type.type(:package).provide :pip,
       process.collect do |line|
         # 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 = $'
-          versionList = textAfterLastMatch.chomp(")\n").split(', ')
+          textAfterLastMatch = $'.chomp(")\n")
+          versionList = textAfterLastMatch.split(', ').sort do |x,y|
+            Puppet::Util::Package.versioncmp(x, y)
+          end
           return versionList.last
         end
       end

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

@@ -1,5 +1,5 @@
 # Puppet package provider for Python's `pip3` package management frontend.
-# <http://pip.openplans.org/>
+# <http://pip.pypa.io/>
 
 require 'puppet/provider/package/pip'
 

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

@@ -1,16 +1,16 @@
 require 'puppet/provider/package'
 
 Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package do
-  desc "OpenSolaris image packaging system. See pkg(5) for more information"
+  desc "OpenSolaris image packaging system. See pkg(5) for more information."
   # https://docs.oracle.com/cd/E19963-01/html/820-6572/managepkgs.html
-  # A few notes before we start :
+  # A few notes before we start:
   # Opensolaris pkg has two slightly different formats (as of now.)
   # The first one is what is distributed with the Solaris 11 Express 11/10 dvd
   # The latest one is what you get when you update package.
   # To make things more interesting, pkg version just returns a sha sum.
   # dvd:     pkg version => 052adf36c3f4
   # updated: pkg version => 630e1ffc7a19
-  # Thankfully, solaris has not changed the commands to be used.
+  # Thankfully, Solaris has not changed the commands to be used.
   # TODO: We still have to allow packages to specify a preferred publisher.
 
   has_feature :versionable
@@ -29,11 +29,11 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
     pkg(:list, '-Hv').split("\n").map{|l| new(parse_line(l))}
   end
 
-  # The IFO flag field is just what it names, the first field can have ether
+  # The IFO flag field is just what it names, the first field can have either
   # i_nstalled or -, and second field f_rozen or -, and last
   # o_bsolate or r_rename or -
   # so this checks if the installed field is present, and also verifies that
-  # if not the field is -, else we dont know what we are doing and exit with
+  # if not the field is -, else we don't know what we are doing and exit with
   # out doing more damage.
   def self.ifo_flag(flags)
     (