puppet 3.8.7-x86-mingw32 → 4.0.0.rc1-x86-mingw32

data/lib/puppet/node/facts.rb

@@ -2,16 +2,17 @@ require 'time'
 
 require 'puppet/node'
 require 'puppet/indirector'
+require 'puppet/util/psych_support'
 
-require 'puppet/util/pson'
 
 # Manage a given node's facts.  This either accepts facts and stores them, or
 # returns facts for a given node.
 class Puppet::Node::Facts
+  include Puppet::Util::PsychSupport
+
   # Set up indirection, so that nodes can be looked for in
   # the node sources.
   extend Puppet::Indirector
-  extend Puppet::Util::Pson
 
   # We want to expire any cached nodes if the facts are saved.
   module NodeExpirer
@@ -23,7 +24,7 @@ class Puppet::Node::Facts
 
   indirects :facts, :terminus_setting => :facts_terminus, :extend => NodeExpirer
 
-  attr_accessor :name, :values
+  attr_accessor :name, :values, :timestamp
 
   def add_local_facts
     values["clientcert"] = Puppet.settings[:certname]
@@ -41,16 +42,16 @@ class Puppet::Node::Facts
   def initialize_from_hash(data)
     @name = data['name']
     @values = data['values']
-    # Timestamp will be here in YAML
-    timestamp = data['values']['_timestamp']
-    @values.delete_if do |key, val|
-      key =~ /^_/
-    end
-
-    #Timestamp will be here in pson
+    # Timestamp will be here in YAML, e.g. when reading old reports
+    timestamp = @values.delete('_timestamp')
+    # Timestamp will be here in JSON
     timestamp ||= data['timestamp']
-    timestamp = Time.parse(timestamp) if timestamp.is_a? String
-    self.timestamp = timestamp
+
+    if timestamp.is_a? String
+      @timestamp = Time.parse(timestamp)
+    else
+      @timestamp = timestamp
+    end
 
     self.expiration = data['expiration']
     if expiration.is_a? String
@@ -58,13 +59,6 @@ class Puppet::Node::Facts
     end
   end
 
-  # Convert all fact values into strings.
-  def stringify
-    values.each do |fact, value|
-      values[fact] = value.to_s
-    end
-  end
-
   # Sanitize fact values by converting everything not a string, boolean
   # numeric, array or hash into strings.
   def sanitize
@@ -75,7 +69,7 @@ class Puppet::Node::Facts
 
   def ==(other)
     return false unless self.name == other.name
-    strip_internal == other.send(:strip_internal)
+    values == other.values
   end
 
   def self.from_data_hash(data)
@@ -84,22 +78,17 @@ class Puppet::Node::Facts
     new_facts
   end
 
-  def self.from_pson(data)
-    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
-    self.from_data_hash(data)
-  end
-
   def to_data_hash
     result = {
       'name' => name,
-      'values' => strip_internal,
+      'values' => values
     }
 
-    if timestamp
-      if timestamp.is_a? Time
-        result['timestamp'] = timestamp.iso8601(9)
+    if @timestamp
+      if @timestamp.is_a? Time
+        result['timestamp'] = @timestamp.iso8601(9)
       else
-        result['timestamp'] = timestamp
+        result['timestamp'] = @timestamp
       end
     end
 
@@ -114,24 +103,13 @@ class Puppet::Node::Facts
     result
   end
 
-  # Add internal data to the facts for storage.
   def add_timestamp
-    self.timestamp = Time.now
-  end
-
-  def timestamp=(time)
-    self.values['_timestamp'] = time
-  end
-
-  def timestamp
-    self.values['_timestamp']
+    @timestamp = Time.now
   end
 
-  # Strip out that internal data.
+  # @deprecated Use {#values} instead of this method.
   def strip_internal
-    newvals = values.dup
-    newvals.find_all { |name, value| name.to_s =~ /^_/ }.each { |name, value| newvals.delete(name) }
-    newvals
+    values
   end
 
   private

data/lib/puppet/parameter.rb

@@ -29,19 +29,6 @@ class Puppet::Parameter
   class << self
     include Puppet::Util
     include Puppet::Util::Docs
-    # Unused?
-    # @todo The term "validater" only appears in this location in the Puppet code base. There is `validate`
-    #   which seems to works fine without this attribute declaration.
-    # @api private
-    #
-    attr_reader :validater
-
-    # Unused?
-    # @todo The term "munger" only appears in this location in the Puppet code base. There is munge and unmunge
-    #  and they seem to work perfectly fine without this attribute declaration.
-    # @api private
-    #
-    attr_reader :munger
 
     # @return [Symbol] The parameter name as given when it was created.
     attr_reader :name
@@ -121,8 +108,8 @@ class Puppet::Parameter
           @doc << "\n\n#{vals}"
         end
 
-        if f = self.required_features
-          @doc << "\n\nRequires features #{f.flatten.collect { |f| f.to_s }.join(" ")}."
+        if features = self.required_features
+          @doc << "\n\nRequires features #{features.flatten.collect { |f| f.to_s }.join(" ")}."
         end
         @addeddocvals = true
       end
@@ -555,7 +542,7 @@ class Puppet::Parameter
   #
   def self.format_value_for_display(value)
     if value.is_a? Array
-      formatted_values = value.collect {|value| format_value_for_display(value)}.join(', ')
+      formatted_values = value.collect {|v| format_value_for_display(v)}.join(', ')
       "[#{formatted_values}]"
     elsif value.is_a? Hash
       # Sorting the hash keys for display is largely for having stable

data/lib/puppet/parameter/value.rb

@@ -7,7 +7,7 @@ require 'puppet/parameter/value_collection'
 #
 class Puppet::Parameter::Value
   attr_reader :name, :options, :event
-  attr_accessor :block, :call, :method, :required_features, :invalidate_refreshes
+  attr_accessor :block, :method, :required_features, :invalidate_refreshes
 
   # Adds an alias for this value.
   # Makes the given _name_ be an alias for this acceptable value.
@@ -47,8 +47,6 @@ class Puppet::Parameter::Value
     end
 
     @aliases = []
-
-    @call = :instead
   end
 
   # Checks if the given value matches the acceptance rules (literal value, regular expression, or one

data/lib/puppet/parameter/value_collection.rb

@@ -120,12 +120,7 @@ class Puppet::Parameter::ValueCollection
   # @option options [Symbol] :event The event that should be emitted when this value is set.
   # @todo Option :event original comment says "event should be returned...", is "returned" the correct word
   #   to use?
-  # @option options [Symbol] :call When to call any associated block. The default value is `:instead` which
-  #   means that the block should be called instead of the provider. In earlier versions (before 20081031) it
-  #   was possible to specify a value of `:before` or `:after` for the purpose of calling
-  #   both the block and the provider. Use of these deprecated options will now raise an exception later
-  #   in the process when the _is_ value is set (see Puppet::Property#set).
-  # @option options [Symbol] :invalidate_refreshes True if a change on this property should invalidate and
+ # @option options [Symbol] :invalidate_refreshes True if a change on this property should invalidate and
   #   remove any scheduled refreshes (from notify or subscribe) targeted at the same resource. For example, if
   #   a change in this property takes into account any changes that a scheduled refresh would have performed,
   #   then the scheduled refresh would be deleted.
@@ -135,6 +130,13 @@ class Puppet::Parameter::ValueCollection
   # @api private
   #
   def newvalue(name, options = {}, &block)
+    call_opt = options[:call]
+    unless call_opt.nil?
+      devfail "Cannot use obsolete :call value '#{call_opt}' for property '#{self.class.name}'" unless call_opt == :none || call_opt == :instead
+      Puppet.deprecation_warning("Property option :call is deprecated and no longer used. Please remove it.")
+      options = options.reject { |k,v| k == :call }
+    end
+
     value = Puppet::Parameter::Value.new(name)
     @values[value.name] = value
     if value.regex?
@@ -145,13 +147,12 @@ class Puppet::Parameter::ValueCollection
 
     options.each { |opt, arg| value.send(opt.to_s + "=", arg) }
     if block_given?
+      devfail "Cannot use :call value ':none' in combination with a block for property '#{self.class.name}'" if call_opt == :none
       value.block = block
+      value.method ||= "set_#{value.name}" if !value.regex?
     else
-      value.call = options[:call] || :none
+      devfail "Cannot use :call value ':instead' without a block for property '#{self.class.name}'" if call_opt == :instead
     end
-
-    value.method ||= "set_#{value.name}" if block_given? and ! value.regex?
-
     value
   end
 
@@ -194,7 +195,7 @@ class Puppet::Parameter::ValueCollection
   # @todo This looks odd, asking for an instance that matches a symbol, or an instance that has
   #   a regexp. What is the intention here? Marking as api private...
   #
-  # @return [Puppet::Parameter::Value] a valid valud matcher
+  # @return [Puppet::Parameter::Value] a valid value matcher
   # @api private
   #
   def value(name)

data/lib/puppet/parser.rb

@@ -1,7 +1,17 @@
-# @api public
+# is only needed to create the name space
 module Puppet::Parser; end
 
-require 'puppet/parser/parser'
+require 'puppet/parser/ast'
 require 'puppet/parser/compiler'
 require 'puppet/resource/type_collection'
 
+require 'puppet/parser/functions'
+require 'puppet/parser/files'
+require 'puppet/parser/relationship'
+
+require 'puppet/resource/type_collection_helper'
+require 'puppet/resource/type'
+require 'monitor'
+
+# PUP-3274 This should probably go someplace else
+class Puppet::LexError < RuntimeError; end

data/lib/puppet/parser/ast.rb

@@ -1,18 +1,13 @@
-# the parent class for all of our syntactical objects
-
-require 'puppet'
-require 'puppet/util/autoload'
-
-# The base class for all of the objects that make up the parse trees.
+# The base class for the 3x "parse tree", now only used by the top level
+# constructs and the compiler.
 # Handles things like file name, line #, and also does the initialization
 # for all of the parameters of all of the child objects.
+#
 class Puppet::Parser::AST
-  # Do this so I don't have to type the full path in all of the subclasses
   AST = Puppet::Parser::AST
 
   include Puppet::Util::Errors
   include Puppet::Util::MethodHelper
-  include Puppet::Util::Docs
 
   attr_accessor :parent, :scope, :file, :line, :pos
 
@@ -20,45 +15,20 @@ class Puppet::Parser::AST
     "( #{self.class} #{self.to_s} #{@children.inspect} )"
   end
 
-  # don't fetch lexer comment by default
-  def use_docs
-    self.class.use_docs
-  end
-
-  # allow our subclass to specify they want documentation
-  class << self
-    attr_accessor :use_docs
-    def associates_doc
-      self.use_docs = true
-    end
-  end
-
   # Evaluate the current object.  Just a stub method, since the subclass
   # should override this method.
-  def evaluate(*options)
-  end
-
-  # Throw a parse error.
-  def parsefail(message)
-    self.fail(Puppet::ParseError, message)
-  end
-
-  # Wrap a statemp in a reusable way so we always throw a parse error.
-  def parsewrap
-    exceptwrap :type => Puppet::ParseError do
-      yield
-    end
+  def evaluate(scope)
   end
 
   # The version of the evaluate method that should be called, because it
   # correctly handles errors.  It is critical to use this method because
   # it can enable you to catch the error where it happens, rather than
   # much higher up the stack.
-  def safeevaluate(*options)
+  def safeevaluate(scope)
     # We duplicate code here, rather than using exceptwrap, because this
     # is called so many times during parsing.
     begin
-      return self.evaluate(*options)
+      return self.evaluate(scope)
     rescue Puppet::Error => detail
       raise adderrorcontext(detail)
     rescue => detail
@@ -70,60 +40,21 @@ class Puppet::Parser::AST
   end
 
   # Initialize the object.  Requires a hash as the argument, and
-  # takes each of the parameters of the hash and calls the settor
+  # takes each of the parameters of the hash and calls the setter
   # method for them.  This is probably pretty inefficient and should
   # likely be changed at some point.
   def initialize(args)
     set_options(args)
   end
 
-  # evaluate ourselves, and match
-  def evaluate_match(value, scope)
-    obj = self.safeevaluate(scope)
-
-    obj   = obj.downcase   if obj.respond_to?(:downcase)
-    value = value.downcase if value.respond_to?(:downcase)
-
-    obj   = Puppet::Parser::Scope.number?(obj)   || obj
-    value = Puppet::Parser::Scope.number?(value) || value
-
-    # "" == undef for case/selector/if
-    obj == value or (obj == "" and value == :undef) or (obj == :undef and value == "")
-  end
 end
 
 # And include all of the AST subclasses.
-require 'puppet/parser/ast/arithmetic_operator'
-require 'puppet/parser/ast/astarray'
-require 'puppet/parser/ast/asthash'
-require 'puppet/parser/ast/boolean_operator'
 require 'puppet/parser/ast/branch'
-require 'puppet/parser/ast/caseopt'
-require 'puppet/parser/ast/casestatement'
-require 'puppet/parser/ast/collection'
-require 'puppet/parser/ast/collexpr'
-require 'puppet/parser/ast/comparison_operator'
-require 'puppet/parser/ast/definition'
-require 'puppet/parser/ast/else'
-require 'puppet/parser/ast/function'
-require 'puppet/parser/ast/hostclass'
-require 'puppet/parser/ast/ifstatement'
-require 'puppet/parser/ast/in_operator'
-require 'puppet/parser/ast/lambda'
 require 'puppet/parser/ast/leaf'
-require 'puppet/parser/ast/match_operator'
-require 'puppet/parser/ast/method_call'
-require 'puppet/parser/ast/minus'
+require 'puppet/parser/ast/block_expression'
+require 'puppet/parser/ast/hostclass'
 require 'puppet/parser/ast/node'
-require 'puppet/parser/ast/nop'
-require 'puppet/parser/ast/not'
-require 'puppet/parser/ast/relationship'
 require 'puppet/parser/ast/resource'
-require 'puppet/parser/ast/resource_defaults'
 require 'puppet/parser/ast/resource_instance'
-require 'puppet/parser/ast/resource_override'
-require 'puppet/parser/ast/resource_reference'
 require 'puppet/parser/ast/resourceparam'
-require 'puppet/parser/ast/selector'
-require 'puppet/parser/ast/vardef'
-require 'puppet/parser/code_merger'

data/lib/puppet/parser/ast/block_expression.rb

@@ -1,40 +1,15 @@
-require 'puppet/parser/ast/branch'
-
-class Puppet::Parser::AST
-  class BlockExpression < Branch
-    include Enumerable
-
-    # Evaluate contained expressions, produce result of the last
-    def evaluate(scope)
-      result = nil
-      @children.each do |child|
-        result = child.safeevaluate(scope)
-      end
-      result
-    end
-
-    # Return a child by index.
-    def [](index)
-      @children[index]
-    end
-
-    def push(*ary)
-      ary.each { |child|
-        #Puppet.debug "adding %s(%s) of type %s to %s" %
-        #    [child, child.object_id, child.class.to_s.sub(/.+::/,''),
-        #    self.object_id]
-        @children.push(child)
-      }
-
-      self
-    end
+# Evaluates contained expressions, produce result of the last
+#
+class Puppet::Parser::AST::BlockExpression < Puppet::Parser::AST::Branch
+  def evaluate(scope)
+    @children.reduce(nil) { |_, child| child.safeevaluate(scope) }
+  end
 
-    def sequence_with(other)
-      Puppet::Parser::AST::BlockExpression.new(:children => self.children + other.children)
-    end
+  def sequence_with(other)
+    Puppet::Parser::AST::BlockExpression.new(:children => self.children + other.children)
+  end
 
-    def to_s
-      "[" + @children.collect { |c| c.to_s }.join(', ') + "]"
-    end
+  def to_s
+    "[" + @children.collect { |c| c.to_s }.join(', ') + "]"
   end
 end

data/lib/puppet/parser/ast/branch.rb

@@ -1,22 +1,19 @@
-class Puppet::Parser::AST
-  # The parent class of all AST objects that contain other AST objects.
-  # Everything but the really simple objects descend from this.  It is
-  # important to note that Branch objects contain other AST objects only --
-  # if you want to contain values, use a descendent of the AST::Leaf class.
-  class Branch < AST
-    include Enumerable
-    attr_accessor :pin, :children
+# The parent class of all AST objects that contain other AST objects.
+# Everything but the really simple objects descend from this.  It is
+# important to note that Branch objects contain other AST objects only --
+# if you want to contain values, use a descendent of the AST::Leaf class.
+#
+# @api private
+class Puppet::Parser::AST::Branch < Puppet::Parser::AST
+  include Enumerable
+  attr_accessor :pin, :children
 
-    def each
-      @children.each { |child|
-        yield child
-      }
-    end
-
-    def initialize(arghash)
-      super(arghash)
+  def each
+    @children.each { |child| yield child }
+  end
 
-      @children ||= []
-    end
+  def initialize(arghash)
+    super(arghash)
+    @children ||= []
   end
 end