puppet 0.13.6 → 0.16.0

data/lib/puppet/log.rb

@@ -108,6 +108,10 @@ module Puppet
             @loglevel = @levels.index(level)
         end
 
+        def Log.levels
+            @levels.dup
+        end
+
         # Create a new log destination.
         def Log.newdestination(dest)
             # Each destination can only occur once.
@@ -120,7 +124,9 @@ module Puppet
                 if Syslog.opened?
                     Syslog.close
                 end
-                @destinations[:syslog] = Syslog.open("puppet")
+                name = Puppet.name
+                name = "puppet-#{name}" unless name =~ /puppet/
+                @destinations[:syslog] = Syslog.open(name)
             when /^\// # files
                 Puppet.info "opening %s as a log" % dest
                 # first make sure the directory exists
@@ -195,14 +201,20 @@ module Puppet
                     dest.puts("%s %s (%s): %s" %
                         [msg.time, msg.source, msg.level, msg.to_s])
                 when :console
+                    color = ""
+                    reset = ""
+                    if Puppet[:color]
+                        color = @colors[msg.level]
+                        reset = RESET
+                    end
                     if msg.source == "Puppet"
-                        puts @colors[msg.level] + "%s: %s" % [
+                        puts color + "%s: %s" % [
                             msg.level, msg.to_s
-                        ] + RESET
+                        ] + reset
                     else
-                        puts @colors[msg.level] + "%s: %s: %s" % [
+                        puts color + "%s: %s: %s" % [
                             msg.level, msg.source, msg.to_s
-                        ] + RESET
+                        ] + reset
                     end
                 when Puppet::Client::LogClient
                     unless msg.is_a?(String) or msg.remote
@@ -344,4 +356,4 @@ module Puppet
 	end
 end
 
-# $Id: log.rb 966 2006-03-02 17:12:26Z luke $
+# $Id: log.rb 1124 2006-04-20 07:00:10Z luke $

data/lib/puppet/parameter.rb

@@ -30,6 +30,12 @@ module Puppet
                 @doc = str
             end
 
+            def initvars
+                @parametervalues = []
+                @aliasvalues = {}
+                @parameterregexes = []
+            end
+
             # This is how we munge the value.  Basically, this is our
             # opportunity to convert the value from one form into another.
             def munge(&block)
@@ -56,10 +62,6 @@ module Puppet
                 #@munger = block
             end
 
-            #def inspect
-            #    "Parameter(#{self.name})"
-            #end
-
             # Mark whether we're the namevar.
             def isnamevar
                 @isnamevar = true
@@ -118,27 +120,46 @@ module Puppet
                 end
             end
 
+            # Does the value match any of our regexes?
+            def match?(value)
+                value = value.to_s unless value.is_a? String
+                @parameterregexes.find { |r|
+                    r = r[0] if r.is_a? Array # States use a hash here
+                    r =~ value
+                }
+            end
+
             # Define a new value for our parameter.
             def newvalues(*names)
-                @parametervalues ||= []
-
                 names.each { |name|
-                    if @parametervalues.include?(name)
-                        Puppet.warning "%s already has a value for %s" %
-                            [name, name]
+                    name = name.intern if name.is_a? String
+
+                    case name
+                    when Symbol
+                        if @parametervalues.include?(name)
+                            Puppet.warning "%s already has a value for %s" %
+                                [name, name]
+                        end
+                        @parametervalues << name
+                    when Regexp
+                        if @parameterregexes.include?(name)
+                            Puppet.warning "%s already has a value for %s" %
+                                [name, name]
+                        end
+                        @parameterregexes << name
+                    else
+                        raise ArgumentError, "Invalid value %s of type %s" %
+                            [name, name.class]
                     end
-                    @parametervalues << name
                 }
             end
 
             def aliasvalue(name, other)
-                @parametervalues ||= []
                 unless @parametervalues.include?(other)
                     raise Puppet::DevError,
                         "Cannot alias nonexistent value %s" % other
                 end
 
-                @aliasvalues ||= {}
                 @aliasvalues[name] = other
             end
 
@@ -146,11 +167,12 @@ module Puppet
                 @aliasvalues[name]
             end
 
+            def regexes
+                return @parameterregexes.dup
+            end
+
             # Return the list of valid values.
             def values
-                @parametervalues ||= []
-                @aliasvalues ||= {}
-
                 #[@aliasvalues.keys, @parametervalues.keys].flatten
                 if @parametervalues.is_a? Array
                     return @parametervalues.dup
@@ -240,36 +262,65 @@ module Puppet
 
         # If the specified value is allowed, then munge appropriately.
         munge do |value|
-            if self.class.values.empty?
+            if self.class.values.empty? and self.class.regexes.empty?
                 # This parameter isn't using defined values to do its work.
                 return value
             end
+
+            # We convert to a string and then a symbol so that things like
+            # booleans work as we expect.
             intern = value.to_s.intern
+
             # If it's a valid value, always return it as a symbol.
             if self.class.values.include?(intern)
                 retval = intern
             elsif other = self.class.alias(intern)
-                self.info "returning alias %s for %s" % [other, intern]
                 retval = other
+            elsif ary = self.class.match?(value)
+                retval = value
             else
+                # If it passed the validation but is not a registered value,
+                # we just return it as is.
                 retval = value
             end
+
             retval
         end
 
         # Verify that the passed value is valid.
         validate do |value|
-            values = self.class.values
-            if values.empty?
+            vals = self.class.values
+            regs = self.class.regexes
+
+            if regs.is_a? Hash # this is true on states
+                regs = regs.keys
+            end
+            if vals.empty? and regs.empty?
                 # This parameter isn't using defined values to do its work.
                 return 
             end
+            newval = value
             unless value.is_a?(Symbol)
-                value = value.to_s.intern
+                newval = value.to_s.intern
             end
-            unless values.include?(value) or self.class.alias(value)
-                self.fail "Invalid '%s' value '%s'.  Valid values are '%s'" %
-                        [self.class.name, value, values.join(", ")]
+
+            unless vals.include?(newval) or
+                self.class.alias(newval) or
+                self.class.match?(value) # We match the string, not the symbol
+                    str = "Invalid '%s' value %s. " %
+                        [self.class.name, value.inspect]
+
+                    unless vals.empty?
+                        str += "Valid values are %s. " % vals.join(", ")
+                    end
+
+                    unless regs.empty?
+                        str += "Valid values match %s." % regs.collect { |r|
+                            r.to_s
+                        }.join(", ")
+                    end
+
+                    raise ArgumentError, str
             end
         end
 
@@ -277,12 +328,12 @@ module Puppet
         # it possible to call for states, too.
         def value
             if self.is_a?(Puppet::State)
-                # We should return the 'is' value if there's not 'should' value.
-                # This might be bad, though, because the 'should' method
-                # knows whether to return an array or not and that info is
-                # not exposed, and the 'is' value could be a symbol.  I can't
-                # seem to create a test in which this is a problem, but that doesn't
-                # mean it's not one.
+                # We should return the 'is' value if there's not 'should'
+                # value.  This might be bad, though, because the 'should'
+                # method knows whether to return an array or not and that info
+                # is not exposed, and the 'is' value could be a symbol.  I
+                # can't seem to create a test in which this is a problem, but
+                # that doesn't mean it's not one.
                 if self.should
                     return self.should
                 else

data/lib/puppet/parser/ast.rb

@@ -69,15 +69,16 @@ module Puppet
                     except.file ||= @file
                     raise
                 rescue => detail
-                    if Puppet[:debug]
-                        puts detail.backtrace
-                    end
+                    #if Puppet[:debug]
+                    #    puts detail.backtrace
+                    #end
                     error = Puppet::DevError.new(
                         "Child of type %s failed with error %s: %s" %
                             [self.class, detail.class, detail.to_s]
                     )
                     error.line ||= @line
                     error.file ||= @file
+                    error.backtrace = detail.backtrace
                     raise error
                 end
             end
@@ -145,5 +146,6 @@ require 'puppet/parser/ast/objectref'
 require 'puppet/parser/ast/selector'
 require 'puppet/parser/ast/typedefaults'
 require 'puppet/parser/ast/vardef'
+require 'puppet/parser/ast/tag'
 
-# $Id: ast.rb 962 2006-03-01 22:28:27Z luke $
+# $Id: ast.rb 1106 2006-04-11 22:32:51Z luke $

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

@@ -13,6 +13,7 @@ class Puppet::Parser::AST
 
         # Are we the default option?
         def default?
+            # Cache the @default value.
             if defined? @default
                 return @default
             end
@@ -38,13 +39,21 @@ class Puppet::Parser::AST
         end
 
         # You can specify a list of values; return each in turn.
-        def eachvalue
+        def eachvalue(scope)
             if @value.is_a?(AST::ASTArray)
                 @value.each { |subval|
-                    yield subval.value
+                    if scope
+                        yield subval.evaluate(:scope => scope)
+                    elsif subval.is_a? AST::Leaf
+                        yield subval.value
+                    end
                 }
             else
-                yield @value.value
+                if scope
+                    yield @value.evaluate(:scope => scope)
+                elsif @value.is_a? AST::Leaf
+                    yield @value.value
+                end
             end
         end
 
@@ -52,7 +61,7 @@ class Puppet::Parser::AST
         # our option matched.
         def evaluate(hash)
             scope = hash[:scope]
-            return @statements.safeevaluate(:scope => scope.newscope)
+            return @statements.safeevaluate(:scope => scope)
         end
 
         def tree(indent = 0)

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

@@ -15,7 +15,7 @@ class Puppet::Parser::AST
             
             # Iterate across the options looking for a match.
             @options.each { |option|
-                if option.eachvalue { |opval| break true if opval == value }
+                if option.eachvalue(scope) { |opval| break true if opval == value }
                     # we found a matching option
                     retvalue = option.safeevaluate(:scope => scope)
                     found = true
@@ -49,7 +49,7 @@ class Puppet::Parser::AST
                 if option.default?
                     @default = option
                 end
-                option.eachvalue { |val|
+                option.eachvalue(nil) { |val|
                     if values.include?(val)
                         raise Puppet::ParseError,
                             "Value %s appears twice in case statement" %

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

@@ -24,24 +24,14 @@ class Puppet::Parser::AST
                 :name => objname,
                 :keyword => self.keyword
             )
-            if hash[:newcontext]
+            newcontext = hash[:newcontext]
+
+            unless self.is_a? AST::HostClass and ! newcontext
                 #scope.warning "Setting context to %s" % self.object_id
                 scope.context = self.object_id
             end
             @scope = scope
 
-            # The type is the component or class name
-            #scope.type = objtype
-
-            # The name is the name the user has chosen or that has
-            # been dynamically generated.  This is almost never used
-            #scope.name = objname
-
-            #scope.keyword = self.keyword
-
-            #if self.is_a?(Node)
-            #    scope.isnodescope
-            #end
 
             # Additionally, add a tag for whatever kind of class
             # we are
@@ -146,4 +136,4 @@ class Puppet::Parser::AST
     end
 end
 
-# $Id: component.rb 953 2006-02-27 22:25:59Z luke $
+# $Id: component.rb 972 2006-03-03 18:23:53Z luke $

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

@@ -48,7 +48,7 @@ class Puppet::Parser::AST
 
             # Set the mark after we evaluate, so we don't record it but
             # then encounter an error
-            scope.setclass(self.object_id)
+            scope.setclass(self.object_id, @type)
             return retval
         end
 

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

@@ -69,6 +69,18 @@ class Puppet::Parser::AST
     # Lower-case words.
     class Name < AST::Leaf; end
 
+    # Host names, either fully qualified or just the short name
+    class HostName < AST::Leaf
+        def initialize(hash)
+            super
+
+            unless @value =~ %r{^[0-9a-zA-Z\-]+(\.[0-9a-zA-Z\-]+)*$}
+                raise Puppet::DevError,
+                    "'%s' is not a valid hostname" % @value
+            end
+        end
+    end
+
     # A simple variable.  This object is only used during interpolation;
     # the VarDef class is used for assignment.
     class Variable < Name

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

@@ -19,10 +19,6 @@ class Puppet::Parser::AST
             )
             scope.context = self.object_id
 
-            # Mark this scope as a nodescope, so that classes will be
-            # singletons within it
-            scope.isnodescope
-
             # Now set all of the facts inside this scope
             facts.each { |var, value|
                 scope.setvar(var, value)
@@ -43,6 +39,10 @@ class Puppet::Parser::AST
             # And then evaluate our code.
             @code.safeevaluate(:scope => scope)
 
+            # Mark our node name as a class, too, but strip it of the domain
+            # name.
+            scope.setclass(self.object_id, @type.sub(/\..+/, ''))
+
             return scope
         end
 

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

@@ -65,8 +65,7 @@ class Puppet::Parser::AST
                 end
             end
 
-            # Retrieve the defaults for our type
-            hash = getdefaults(objtype, scope)
+            hash = {}
 
             # then set all of the specified params
             @params.each { |param|
@@ -105,52 +104,9 @@ class Puppet::Parser::AST
                     error.backtrace = detail.backtrace
                     raise error
                 end
-#                else
-#                    # but things like components create a new type; if we find
-#                    # one of those, evaluate that with our arguments
-#                    #Puppet.debug("Calling object '%s' with arguments %s" %
-#                    #    [object.name, hash.inspect])
-#                    #obj = object.safeevaluate(scope,hash,objtype,objname)
-#                    obj = object.safeevaluate(
-#                        :scope => scope,
-#                        :arguments => hash,
-#                        :type => objtype,
-#                        :name => objname
-#                    )
-#
-#                    # and pass the result on
-#                    obj
-#                end
             }.reject { |obj| obj.nil? }
         end
 
-        # Retrieve the defaults for our type
-        def getdefaults(objtype, scope)
-            # first, retrieve the defaults
-            begin
-                defaults = scope.lookupdefaults(objtype)
-                if defaults.length > 0
-                    #Puppet.debug "Got defaults for %s: %s" %
-                    #    [objtype,defaults.inspect]
-                end
-            rescue => detail
-                raise Puppet::DevError, 
-                    "Could not lookup defaults for %s: %s" %
-                        [objtype, detail.to_s]
-            end
-
-            hash = {}
-            # Add any found defaults to our argument list
-            defaults.each { |var,value|
-                Puppet.debug "Found default %s for %s" %
-                    [var,objtype]
-
-                hash[var] = value
-            }
-
-            return hash
-        end
-
         # Create our ObjectDef.  Handles type checking for us.
         def initialize(hash)
             @checked = false
@@ -192,7 +148,7 @@ class Puppet::Parser::AST
             unless type.validattr?(pname)
                 error = Puppet::ParseError.new(
                     "Invalid parameter '%s' for type '%s'" %
-                        [pname,type.name]
+                        [pname, type.name]
                 )
                 error.line = self.line
                 error.file = self.file
@@ -213,12 +169,10 @@ class Puppet::Parser::AST
                 raise Puppet::DevError, detail.to_s
             end
 
-            # FIXME This should look through the scope tree, not in a global
-            # hash
             unless objtype.validarg?(pname)
                 error = Puppet::ParseError.new(
                     "Invalid parameter '%s' for type '%s'" %
-                        [pname,objtype]
+                        [pname,objtype.type]
                 )
                 error.line = self.line
                 error.file = self.file
@@ -285,7 +239,7 @@ class Puppet::Parser::AST
                 return true unless defined? @scope and @scope
 
                 # Unless we can look up the type, throw an error
-                unless objtype = @scope.lookuptype(objtype)
+                unless typeobj = @scope.lookuptype(objtype)
                     error = Puppet::ParseError.new(
                         "Unknown type '%s'" % objtype
                     )
@@ -297,7 +251,7 @@ class Puppet::Parser::AST
                 # Now that we have the type, verify all of the parameters.
                 # Note that we're now passing an AST Class object or whatever
                 # as the type, not a simple string.
-                self.paramcheck(builtin, objtype)
+                self.paramcheck(builtin, typeobj)
             end
         end