puppet 0.24.6 → 0.24.7

data/lib/puppet/network/client/master.rb

@@ -488,7 +488,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
         return unless Puppet[:splay]
         return if splayed?
 
-        time = rand(Integer(Puppet[:splaylimit]))
+        time = rand(Integer(Puppet[:splaylimit]) + 1)
         Puppet.info "Sleeping for %s seconds (splay is enabled)" % time
         sleep(time)
         @splayed = true

data/lib/puppet/network/xmlrpc/client.rb

@@ -73,7 +73,9 @@ module Puppet::Network
                     rescue Timeout::Error => detail
                         Puppet.err "Connection timeout calling %s.%s: %s" %
                             [namespace, method, detail.to_s]
-                        raise XMLRPCClientError.new("Connection Timeout").set_backtrace(detail.backtrace)
+                        error = XMLRPCClientError.new("Connection Timeout")
+                        error.set_backtrace(detail.backtrace)
+                        raise error
                     rescue => detail
                         if detail.message =~ /^Wrong size\. Was \d+, should be \d+$/
                             Puppet.warning "XMLRPC returned wrong size.  Retrying."

data/lib/puppet/parameter.rb

@@ -63,7 +63,7 @@ class Puppet::Parameter
                     end
                     unless regs.empty?
                         @doc += "  Values can also match ``" +
-                            regs.join("``, ``") + "``."
+                            regs.collect { |r| r.inspect }.join("``, ``") + "``."
                     end
                 end
 

data/lib/puppet/parser/ast.rb

@@ -12,8 +12,23 @@ class Puppet::Parser::AST
 
     include Puppet::Util::Errors
     include Puppet::Util::MethodHelper
+    include Puppet::Util::Docs
+
     attr_accessor :line, :file, :parent, :scope
 
+    # 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
+
     # Does this ast object set something?  If so, it gets evaluated first.
     def self.settor?
         if defined? @settor

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

@@ -30,10 +30,9 @@ class Puppet::Parser::AST
                     items << child
                 end
             }
-
             rets = items.flatten.collect { |child|
                 child.safeevaluate(scope)
-            }
+            }.flatten
             return rets.reject { |o| o.nil? }
         end
 

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

@@ -6,6 +6,8 @@ class Puppet::Parser::AST
     class CaseStatement < AST::Branch
         attr_accessor :test, :options, :default
 
+        associates_doc
+
         # Short-curcuit evaluation.  Return the value of the statements for
         # the first option that matches.
         def evaluate(scope)

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

@@ -8,6 +8,8 @@ class Puppet::Parser::AST
 class Collection < AST::Branch
     attr_accessor :type, :query, :form
 
+    associates_doc
+
     # We return an object that does a late-binding evaluation.
     def evaluate(scope)
         if self.query

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

@@ -18,6 +18,10 @@ class Puppet::Parser::AST
             lval = @lval.safeevaluate(scope)
             rval = @rval.safeevaluate(scope)
 
+            # convert to number if operands are number
+            lval = Puppet::Parser::Scope.number?(lval) || lval
+            rval = Puppet::Parser::Scope.number?(rval) || rval
+            
             # return result
             unless @operator == '!='
                 lval.send(@operator,rval)

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

@@ -10,6 +10,8 @@ class Puppet::Parser::AST::Definition < Puppet::Parser::AST::Branch
         attr_accessor :name
     end
 
+    associates_doc
+
     # The class name
     @name = :definition
 

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

@@ -4,6 +4,9 @@ class Puppet::Parser::AST
     # A separate ElseIf statement; can function as an 'else' if there's no
     # test.
     class Else < AST::Branch
+
+        associates_doc
+
         attr_accessor :statements
 
         def each

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

@@ -3,25 +3,17 @@ require 'puppet/parser/ast/branch'
 class Puppet::Parser::AST
     # An AST object to call a function.
     class Function < AST::Branch
+
+        associates_doc
+
         attr_accessor :name, :arguments
 
         @settor = true
 
         def evaluate(scope)
-            # We don't need to evaluate the name, because it's plaintext
-            args = @arguments.safeevaluate(scope)
-
-            return scope.send("function_" + @name, args)
-        end
-
-        def initialize(hash)
-            @ftype = hash[:ftype] || :rvalue
-            hash.delete(:ftype) if hash.include? :ftype
-
-            super(hash)
 
             # Make sure it's a defined function
-            unless @fname = Puppet::Parser::Functions.function(@name)
+            unless @fname
                 raise Puppet::ParseError, "Unknown function %s" % @name
             end
 
@@ -42,6 +34,21 @@ class Puppet::Parser::AST
                 raise Puppet::DevError, "Invalid function type %s" % @ftype.inspect
             end
 
+
+
+            # We don't need to evaluate the name, because it's plaintext
+            args = @arguments.safeevaluate(scope)
+
+            return scope.send("function_" + @name, args)
+        end
+
+        def initialize(hash)
+            @ftype = hash[:ftype] || :rvalue
+            hash.delete(:ftype) if hash.include? :ftype
+
+            super(hash)
+
+             @fname = Puppet::Parser::Functions.function(@name)
             # Lastly, check the parity
         end
     end

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

@@ -4,6 +4,9 @@ require 'puppet/parser/ast/definition'
 # in that each class is a singleton -- only one will exist for a given
 # node.
 class Puppet::Parser::AST::HostClass < Puppet::Parser::AST::Definition
+
+    associates_doc
+
     @name = :class
 
     # Are we a child of the passed class?  Do a recursive search up our
@@ -56,7 +59,12 @@ class Puppet::Parser::AST::HostClass < Puppet::Parser::AST::Definition
 
         # Don't create a subscope for the top-level class, since it already
         # has its own scope.
-        scope = subscope(scope, resource) unless resource.title == :main
+        unless resource.title == :main
+            scope = subscope(scope, resource)
+
+            scope.setvar("title", resource.title)
+            scope.setvar("name", resource.name)
+        end
 
         # Add the parent scope namespaces to our own.
         if pnames

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

@@ -3,6 +3,9 @@ require 'puppet/parser/ast/branch'
 class Puppet::Parser::AST
     # A basic 'if/elsif/else' statement.
     class IfStatement < AST::Branch
+
+        associates_doc
+
         attr_accessor :test, :else, :statements
 
         def each

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

@@ -3,6 +3,9 @@ require 'puppet/parser/ast/hostclass'
 # The specific code associated with a host.  Nodes are annoyingly unlike
 # other objects.  That's just the way it is, at least for now.
 class Puppet::Parser::AST::Node < Puppet::Parser::AST::HostClass
+
+    associates_doc
+
     @name = :node
 
     def initialize(options)

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

@@ -4,6 +4,9 @@ require 'puppet/parser/ast/resource_reference'
 # builtin type.
 class Puppet::Parser::AST
 class Resource < AST::ResourceReference
+
+    associates_doc
+
     attr_accessor :title, :type, :exported, :virtual
     attr_reader :params
 

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

@@ -6,6 +6,8 @@ class Puppet::Parser::AST
     class ResourceDefaults < AST::Branch
         attr_accessor :type, :params
 
+        associates_doc
+
         # As opposed to ResourceDef, this stores each default for the given
         # object type.
         def evaluate(scope)

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

@@ -4,6 +4,9 @@ class Puppet::Parser::AST
     # Set a parameter on a resource specification created somewhere else in the
     # configuration.  The object is responsible for verifying that this is allowed.
     class ResourceOverride < Resource
+
+        associates_doc
+
         attr_accessor :object
         attr_reader :params
 

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

@@ -3,6 +3,9 @@ require 'puppet/parser/ast/branch'
 class Puppet::Parser::AST
     # Define a variable.  Stores the value in the current scope.
     class VarDef < AST::Branch
+
+        associates_doc
+
         attr_accessor :name, :value, :append
 
         @settor = true

data/lib/puppet/parser/functions.rb

@@ -54,6 +54,20 @@ module Functions
         end
     end
 
+    # Remove a function added by newfunction
+    def self.rmfunction(name)
+        name = symbolize(name)
+
+        unless @functions.include? name
+            raise Puppet::DevError, "Function %s is not defined" % name
+        end
+
+        @functions.delete(name)
+
+        fname = "function_" + name.to_s
+        Puppet::Parser::Scope.send(:remove_method, fname)
+    end
+
     # Determine if a given name is a function
     def self.function(name)
         name = symbolize(name)

data/lib/puppet/parser/functions/inline_template.rb

@@ -0,0 +1,21 @@
+Puppet::Parser::Functions::newfunction(:inline_template, :type => :rvalue, :doc => 
+    "Evaluate a template string and return its value.  See `the templating docs 
+    </trac/puppet/wiki/PuppetTemplating>`_ for more information.  Note that 
+    if multiple template strings are specified, their output is all concatenated 
+    and returned as the output of the function.") do |vals|
+        require 'erb'
+
+        vals.collect do |string|
+            # Use a wrapper, so the template can't get access to the full
+            # Scope object.
+
+            wrapper = Puppet::Parser::TemplateWrapper.new(self)
+            begin
+                wrapper.result(string)
+            rescue => detail
+                raise Puppet::ParseError,
+                    "Failed to parse inline template: %s" %
+                        [detail]
+            end
+        end.join("")
+end

data/lib/puppet/parser/functions/template.rb

@@ -9,10 +9,11 @@ Puppet::Parser::Functions::newfunction(:template, :type => :rvalue, :doc =>
             # Use a wrapper, so the template can't get access to the full
             # Scope object.
             debug "Retrieving template %s" % file
-            wrapper = Puppet::Parser::TemplateWrapper.new(self, file)
 
+            wrapper = Puppet::Parser::TemplateWrapper.new(self)
+            wrapper.file = file
             begin
-                wrapper.result()
+                wrapper.result
             rescue => detail
                 raise Puppet::ParseError,
                     "Failed to parse template %s: %s" %

data/lib/puppet/parser/lexer.rb

@@ -17,7 +17,7 @@ class Puppet::Parser::Lexer
 
     # Our base token class.
     class Token
-        attr_accessor :regex, :name, :string, :skip, :incr_line, :skip_text
+        attr_accessor :regex, :name, :string, :skip, :incr_line, :skip_text, :accumulate
 
         def initialize(regex, name)
             if regex.is_a?(String)
@@ -28,8 +28,10 @@ class Puppet::Parser::Lexer
             end
         end
 
-        def skip?
-            self.skip
+        %w{skip accumulate}.each do |method|
+            define_method(method+"?") do
+                self.send(method)
+            end
         end
 
         def to_s
@@ -132,7 +134,7 @@ class Puppet::Parser::Lexer
         '*' => :TIMES,
         '<<' => :LSHIFT,
         '>>' => :RSHIFT,
-        %r{([a-z][-\w]*::)+[a-z][-\w]*} => :CLASSNAME,
+        %r{([a-z][-\w]*)?(::[a-z][-\w]*)+} => :CLASSNAME, # Require '::' in the class name, else we'd compete with NAME
         %r{((::){0,1}[A-Z][-\w]*)+} => :CLASSREF
     )
 
@@ -155,7 +157,17 @@ class Puppet::Parser::Lexer
         [string_token, value]
     end
 
-    TOKENS.add_token :COMMENT, %r{#.*}, :skip => true
+    TOKENS.add_token :COMMENT, %r{#.*}, :accumulate => true, :skip => true do |lexer,value|
+        value.sub!(/# ?/,'')
+        [self, value]
+    end
+
+    TOKENS.add_token :MLCOMMENT, %r{/\*(.*?)\*/}m, :accumulate => true, :skip => true do |lexer, value|
+        lexer.line += value.count("\n")
+        value.sub!(/^\/\* ?/,'')
+        value.sub!(/ ?\*\/$/,'')
+        [self,value]
+    end
 
     TOKENS.add_token :RETURN, "\n", :skip => true, :incr_line => true, :skip_text => true
 
@@ -320,6 +332,7 @@ class Puppet::Parser::Lexer
         @namestack = []
         @indefine = false
         @expected = []
+        @commentstack = ['']
     end
 
     # Make any necessary changes to the token and/or value.
@@ -328,12 +341,18 @@ class Puppet::Parser::Lexer
 
         skip() if token.skip_text
 
-        return if token.skip
+        return if token.skip and not token.accumulate?
 
         token, value = token.convert(self, value) if token.respond_to?(:convert)
 
         return unless token
 
+        if token.accumulate?
+            @commentstack.last << value + "\n"
+        end
+
+        return if token.skip
+
         return token, value
     end
 
@@ -384,6 +403,18 @@ class Puppet::Parser::Lexer
                 raise "Could not match '%s'" % nword
             end
 
+            if matched_token.name == :RETURN
+                # this matches a blank line
+                if @last_return
+                    # eat the previously accumulated comments
+                    getcomment
+                end
+                # since :RETURN skips, we won't survive to munge_token
+                @last_return = true
+            else
+                @last_return = false
+            end
+
             final_token, value = munge_token(matched_token, value)
 
             next unless final_token
@@ -394,6 +425,10 @@ class Puppet::Parser::Lexer
                 @expected.pop
             end
 
+            if final_token.name == :LBRACE
+                commentpush
+            end
+
             yield [final_token.name, value]
 
             if @previous_token
@@ -409,7 +444,6 @@ class Puppet::Parser::Lexer
                     @indefine = value
                 end
             end
-
             @previous_token = final_token
             skip()
         end
@@ -448,4 +482,19 @@ class Puppet::Parser::Lexer
     def string=(string)
         @scanner = StringScanner.new(string)
     end
+
+    # returns the content of the currently accumulated content cache
+    def commentpop
+        return @commentstack.pop
+    end
+
+    def getcomment
+        comment = @commentstack.pop
+        @commentstack.push('')
+        return comment
+    end
+
+    def commentpush
+        @commentstack.push('')
+    end
 end