puppet 0.24.7 → 0.24.8

data/lib/puppet/executables/client/certhandler.rb

@@ -49,7 +49,12 @@ module Puppet
                           exit(23) if @one_time
                        end
 
-                       sleep @wait_for_cert 
+                        if @wait_for_cert > 0
+                            sleep @wait_for_cert
+                        else
+                            Puppet.notice "waitforcert disabled; exiting with no certificate"
+                            exit(1)
+                        end
                     end
                 end
 

data/lib/puppet/external/nagios/parser.rb

@@ -1,22 +1,20 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by racc 1.4.4
+# This file is automatically generated by racc 1.4.5
 # from racc grammer file "grammar.ry".
 #
 #
 # parser.rb: generated by racc (runtime embedded)
 #
-
-###### racc/parser.rb
-
+###### racc/parser.rb begin
 unless $".index 'racc/parser.rb'
 $".push 'racc/parser.rb'
 
-self.class.module_eval <<'..end /usr/lib/ruby/1.8/racc/parser.rb modeval..id1306b79176', '/usr/lib/ruby/1.8/racc/parser.rb', 1
+self.class.module_eval <<'..end racc/parser.rb modeval..id5256434e8a', 'racc/parser.rb', 1
 #
-# parser.rb
+# $Id: parser.rb,v 1.7 2005/11/20 17:31:32 aamine Exp $
 #
-# Copyright (c) 1999-2003 Minero Aoki <aamine@loveruby.net>
+# Copyright (c) 1999-2005 Minero Aoki
 #
 # This program is free software.
 # You can distribute/modify this program under the same terms of ruby.
@@ -25,8 +23,6 @@ self.class.module_eval <<'..end /usr/lib/ruby/1.8/racc/parser.rb modeval..id1306
 # into a Racc output file, you may use that output file
 # without restriction.
 #
-# $raccId: parser.rb,v 1.4 2003/11/03 13:41:47 aamine Exp $
-#
 
 unless defined?(NotImplementedError)
   NotImplementedError = NotImplementError
@@ -39,7 +35,6 @@ unless defined?(::ParseError)
   ParseError = Racc::ParseError
 end
 
-
 module Racc
 
   unless defined?(Racc_No_Extentions)
@@ -48,14 +43,14 @@ module Racc
 
   class Parser
 
-    Racc_Runtime_Version = '1.4.4'
-    Racc_Runtime_Revision = '$raccRevision: 1.4 $'.split[1]
+    Racc_Runtime_Version = '1.4.5'
+    Racc_Runtime_Revision = '$Revision: 1.7 $'.split[1]
 
-    Racc_Runtime_Core_Version_R = '1.4.4'
-    Racc_Runtime_Core_Revision_R = '$raccRevision: 1.4 $'.split[1]
+    Racc_Runtime_Core_Version_R = '1.4.5'
+    Racc_Runtime_Core_Revision_R = '$Revision: 1.7 $'.split[1]
     begin
       require 'racc/cparse'
-    # Racc_Runtime_Core_Version_C  = (defined in extension)
+    # Racc_Runtime_Core_Version_C  = (defined in extention)
       Racc_Runtime_Core_Revision_C = Racc_Runtime_Core_Id_C.split[2]
       unless new.respond_to?(:_racc_do_parse_c, true)
         raise LoadError, 'old cparse.so'
@@ -121,7 +116,7 @@ module Racc
       raise NotImplementedError, "#{self.class}\#next_token is not defined"
     end
 
-    def _racc_do_parse_rb( arg, in_debug )
+    def _racc_do_parse_rb(arg, in_debug)
       action_table, action_check, action_default, action_pointer,
       goto_table,   goto_check,   goto_default,   goto_pointer,
       nt_base,      reduce_table, token_table,    shift_n,
@@ -166,11 +161,11 @@ module Racc
     ### yyparse
     ###
 
-    def yyparse( recv, mid )
+    def yyparse(recv, mid)
       __send__(Racc_YY_Parse_Method, recv, mid, _racc_setup(), true)
     end
 
-    def _racc_yyparse_rb( recv, mid, arg, c_debug )
+    def _racc_yyparse_rb(recv, mid, arg, c_debug)
       action_table, action_check, action_default, action_pointer,
       goto_table,   goto_check,   goto_default,   goto_pointer,
       nt_base,      reduce_table, token_table,    shift_n,
@@ -189,7 +184,6 @@ module Racc
           end
         end
         recv.__send__(mid) do |tok, val|
-# $stderr.puts "rd: tok=#{tok}, val=#{val}"
           unless tok
             @racc_t = 0
           else
@@ -203,12 +197,7 @@ module Racc
                  act = action_table[i] and
                  action_check[i] == @racc_state[-1]
             act = action_default[@racc_state[-1]]
-# $stderr.puts "02: act=#{act}"
-# $stderr.puts "curstate=#{@racc_state[-1]}"
-          else
-# $stderr.puts "01: act=#{act}"
           end
-
           while act = _racc_evalact(act, arg)
             ;
           end
@@ -221,9 +210,6 @@ module Racc
                    act = action_table[i] and
                    action_check[i] == @racc_state[-1]
               act = action_default[@racc_state[-1]]
-# $stderr.puts "04: act=#{act}"
-            else
-# $stderr.puts "03: act=#{act}"
             end
             while act = _racc_evalact(act, arg)
               ;
@@ -237,13 +223,12 @@ module Racc
     ### common
     ###
 
-    def _racc_evalact( act, arg )
-# $stderr.puts "ea: act=#{act}"
+    def _racc_evalact(act, arg)
       action_table, action_check, action_default, action_pointer,
       goto_table,   goto_check,   goto_default,   goto_pointer,
       nt_base,      reduce_table, token_table,    shift_n,
       reduce_n,     use_result,   * = arg
-nerr = 0   # tmp
+      nerr = 0   # tmp
 
       if act > 0 and act < shift_n
         #
@@ -276,7 +261,7 @@ nerr = 0   # tmp
           when 2 # yyaccept
             return shift_n
           else
-            raise RuntimeError, '[Racc Bug] unknown jump code'
+            raise '[Racc Bug] unknown jump code'
           end
         end
 
@@ -314,7 +299,6 @@ nerr = 0   # tmp
               break
             end
           end
-
           throw :racc_end_parse, nil if @racc_state.size <= 1
           @racc_state.pop
           @racc_vstack.pop
@@ -326,7 +310,7 @@ nerr = 0   # tmp
         return act
 
       else
-        raise RuntimeError, "[Racc Bug] unknown action #{act.inspect}"
+        raise "[Racc Bug] unknown action #{act.inspect}"
       end
 
       racc_next_state(@racc_state[-1], @racc_state) if @yydebug
@@ -334,7 +318,7 @@ nerr = 0   # tmp
       nil
     end
 
-    def _racc_do_reduce( arg, act )
+    def _racc_do_reduce(arg, act)
       action_table, action_check, action_default, action_pointer,
       goto_table,   goto_check,   goto_default,   goto_pointer,
       nt_base,      reduce_table, token_table,    shift_n,
@@ -375,7 +359,7 @@ nerr = 0   # tmp
       goto_default[k1]
     end
 
-    def on_error( t, val, vstack )
+    def on_error(t, val, vstack)
       raise ParseError, sprintf("\nparse error on value %s (%s)",
                                 val.inspect, token_to_str(t) || '?')
     end
@@ -396,20 +380,20 @@ nerr = 0   # tmp
     # for debugging output
     #
 
-    def racc_read_token( t, tok, val )
+    def racc_read_token(t, tok, val)
       @racc_debug_out.print 'read    '
       @racc_debug_out.print tok.inspect, '(', racc_token2str(t), ') '
       @racc_debug_out.puts val.inspect
       @racc_debug_out.puts
     end
 
-    def racc_shift( tok, tstack, vstack )
+    def racc_shift(tok, tstack, vstack)
       @racc_debug_out.puts "shift   #{racc_token2str tok}"
       racc_print_stacks tstack, vstack
       @racc_debug_out.puts
     end
 
-    def racc_reduce( toks, sim, tstack, vstack )
+    def racc_reduce(toks, sim, tstack, vstack)
       out = @racc_debug_out
       out.print 'reduce '
       if toks.empty?
@@ -428,20 +412,20 @@ nerr = 0   # tmp
       @racc_debug_out.puts
     end
 
-    def racc_e_pop( state, tstack, vstack )
+    def racc_e_pop(state, tstack, vstack)
       @racc_debug_out.puts 'error recovering mode: pop token'
       racc_print_states state
       racc_print_stacks tstack, vstack
       @racc_debug_out.puts
     end
 
-    def racc_next_state( curstate, state )
+    def racc_next_state(curstate, state)
       @racc_debug_out.puts  "goto    #{curstate}"
       racc_print_states state
       @racc_debug_out.puts
     end
 
-    def racc_print_stacks( t, v )
+    def racc_print_stacks(t, v)
       out = @racc_debug_out
       out.print '        ['
       t.each_index do |i|
@@ -450,34 +434,37 @@ nerr = 0   # tmp
       out.puts ' ]'
     end
 
-    def racc_print_states( s )
+    def racc_print_states(s)
       out = @racc_debug_out
       out.print '        ['
       s.each {|st| out.print ' ', st }
       out.puts ' ]'
     end
 
-    def racc_token2str( tok )
+    def racc_token2str(tok)
       self.class::Racc_token_to_s_table[tok] or
-          raise RuntimeError, "[Racc Bug] can't convert token #{tok} to string"
+          raise "[Racc Bug] can't convert token #{tok} to string"
     end
 
-    def token_to_str( t )
+    def token_to_str(t)
       self.class::Racc_token_to_s_table[t]
     end
 
   end
 
 end
-..end /usr/lib/ruby/1.8/racc/parser.rb modeval..id1306b79176
-end   # end of racc/parser.rb
+..end racc/parser.rb modeval..id5256434e8a
+end
+###### racc/parser.rb end
 
 
 module Nagios
 
   class Parser < Racc::Parser
 
-module_eval <<'..end grammar.ry modeval..id458299781d', 'grammar.ry', 57
+module_eval <<'..end grammar.ry modeval..idcb2ea30b34', 'grammar.ry', 57
+
+class ::Nagios::Parser::SyntaxError < RuntimeError; end
 
 def parse(src)
 	@src = src
@@ -490,12 +477,7 @@ def parse(src)
 	@line = 0
 	@yydebug = true
 
-    begin
-        do_parse
-    rescue SyntaxError
-        $stderr.print "#{$!}\n"
-        exit
-    end
+    do_parse
 end
 
 # The lexer.  Very simple.
@@ -607,12 +589,12 @@ def on_error(token, value, vstack )
 	if token == '$end'.intern
 		puts "okay, this is silly"
 	else
-		raise SyntaxError, msg
+		raise ::Nagios::Parser::SyntaxError, msg
 	end
 end
-..end grammar.ry modeval..id458299781d
+..end grammar.ry modeval..idcb2ea30b34
 
-##### racc 1.4.4 generates ###
+##### racc 1.4.5 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,

data/lib/puppet/file_collection.rb

@@ -0,0 +1,30 @@
+# A simple way to turn file names into singletons,
+# so we don't have tons of copies of each file path around.
+class Puppet::FileCollection
+    require 'puppet/file_collection/lookup'
+
+    def self.collection
+        @collection
+    end
+
+    def initialize
+        @paths = []
+        @inverse = {}
+    end
+
+    def index(path)
+        if i = @inverse[path]
+            return i
+        else
+            @paths << path
+            i = @inverse[path] = @paths.length - 1
+            return i
+        end
+    end
+
+    def path(index)
+        @paths[index]
+    end
+
+    @collection = self.new
+end

data/lib/puppet/file_collection/lookup.rb

@@ -0,0 +1,20 @@
+require 'puppet/file_collection'
+
+# A simple module for looking up file paths and indexes
+# in a file collection.
+module Puppet::FileCollection::Lookup
+    attr_accessor :line, :file_index
+
+    def file_collection
+        Puppet::FileCollection.collection
+    end
+
+    def file=(path)
+        @file_index = file_collection.index(path)
+    end
+
+    def file
+        return nil unless file_index
+        file_collection.path(file_index)
+    end
+end

data/lib/puppet/indirector/facts/facter.rb

@@ -24,8 +24,12 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
     end
 
     def self.loadfacts
-        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com] 
-        x = Puppet[:factpath].split(":").each do |dir|
+        # Add any per-module fact directories to the factpath
+        module_fact_dirs = Puppet[:modulepath].split(":").collect do |d|
+            Dir.glob("%s/*/plugins/facter" % d)
+        end.flatten
+        dirs = module_fact_dirs + Puppet[:factpath].split(":")
+        x = dirs.each do |dir|
             loaddir(dir, "fact")
         end
     end

data/lib/puppet/indirector/node/ldap.rb

@@ -81,45 +81,10 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
     def entry2hash(entry)
         result = {}
         result[:name] = entry.dn.split(',')[0].split("=")[1]
-        if pattr = parent_attribute
-            if values = entry.vals(pattr)
-                if values.length > 1
-                    raise Puppet::Error,
-                        "Node entry %s specifies more than one parent: %s" % [entry.dn, values.inspect]
-                end
-                unless values.empty?
-                    result[:parent] = values.shift
-                end
-            end
-        end
-
-        result[:classes] = []
-        class_attributes.each { |attr|
-            if values = entry.vals(attr)
-                values.each do |v| result[:classes] << v end
-            end
-        }
-        result[:classes].uniq!
-
-        result[:stacked] = []
-        stacked_params = stacked_attributes
-        stacked_params.each { |attr|
-            if values = entry.vals(attr)
-                result[:stacked] = result[:stacked] + values
-            end
-        }
-        
-
-        result[:parameters] = entry.to_hash.inject({}) do |hash, ary|
-            unless stacked_params.include?(ary[0]) # don't add our stacked parameters to the main param list
-                if ary[1].length == 1
-                    hash[ary[0]] = ary[1].shift
-                else
-                    hash[ary[0]] = ary[1]
-                end
-            end
-            hash
-        end
+        result[:parent] = get_parent_from_entry(entry) if parent_attribute
+        result[:classes] = get_classes_from_entry(entry)
+        result[:stacked] = get_stacked_values_from_entry(entry)
+        result[:parameters] = get_parameters_from_entry(entry)
 
         result[:environment] = result[:parameters]["environment"] if result[:parameters]["environment"]
 
@@ -138,6 +103,8 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
             end
         end
 
+        result[:parameters] = convert_parameters(result[:parameters])
+
         result
     end
 
@@ -178,6 +145,29 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
         node.environment = information[:environment] if information[:environment]
     end
 
+    def convert_parameters(parameters)
+        result = {}
+        parameters.each do |param, value|
+            if value.is_a?(Array)
+                result[param] = value.collect { |v| convert(v) }
+            else
+                result[param] = convert(value)
+            end
+        end
+        result
+    end
+
+    # Convert any values if necessary.
+    def convert(value)
+        case value
+        when Integer, Fixnum, Bignum; value
+        when "true"; true
+        when "false"; false
+        else
+            value
+        end
+    end
+
     # Find information for our parent and merge it into the current info.
     def find_and_merge_parent(parent, information)
         unless parent_info = name2hash(parent)
@@ -224,4 +214,50 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
 
         return info
     end
+
+    def get_classes_from_entry(entry)
+        result = class_attributes.inject([]) do |array, attr|
+            if values = entry.vals(attr)
+                values.each do |v| array << v end
+            end
+            array
+        end
+        result.uniq
+    end
+
+    def get_parameters_from_entry(entry)
+        stacked_params = stacked_attributes
+        entry.to_hash.inject({}) do |hash, ary|
+            unless stacked_params.include?(ary[0]) # don't add our stacked parameters to the main param list
+                if ary[1].length == 1
+                    hash[ary[0]] = ary[1].shift
+                else
+                    hash[ary[0]] = ary[1]
+                end
+            end
+            hash
+        end
+    end
+
+    def get_parent_from_entry(entry)
+        pattr = parent_attribute
+
+        return nil unless values = entry.vals(pattr)
+
+        if values.length > 1
+            raise Puppet::Error,
+                "Node entry %s specifies more than one parent: %s" % [entry.dn, values.inspect]
+        end
+        return nil if values.empty?
+        return values.shift
+    end
+
+    def get_stacked_values_from_entry(entry)
+        stacked_attributes.inject([]) do |result, attr|
+            if values = entry.vals(attr)
+                result += values
+            end
+            result
+        end
+    end
 end