puppet 0.24.9 → 0.25.0

data/ext/vim/syntax/puppet.vim

@@ -1,10 +1,10 @@
 " puppet syntax file
 " Filename:     puppet.vim
-" Language:     puppet configuration file 
+" Language:     puppet configuration file
 " Maintainer:   Luke Kanies <luke@madstop.com>
-" URL:          
-" Last Change: 
-" Version:      
+" URL:
+" Last Change:
+" Version:
 "
 
 " Copied from the cfengine, ruby, and perl syntax files
@@ -16,41 +16,61 @@ elseif exists("b:current_syntax")
   finish
 endif
 
-syn region  puppetDefine        start="^\s*\(class\|define\|node\)" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments
-syn keyword puppetDefType       class define site node inherits contained
-syn keyword puppetInherits      inherits contained
+" match class/definition/node declarations
+syn region  puppetDefine        start="^\s*\(class\|define\|node\)\s" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments
+syn keyword puppetDefType       class define node inherits contained
 syn region  puppetDefArguments  start="(" end=")" contains=puppetArgument
 syn match   puppetArgument      "\w\+" contained
 syn match   puppetArgument      "\$\w\+" contained
 syn match   puppetArgument      "'[^']+'" contained
 syn match   puppetArgument      '"[^"]+"' contained
-syn match   puppetDefName     "\w\+" contained
+syn match   puppetDefName       "\w\+" contained
 
-syn match   puppetInstance           "\w\+\s*{" contains=puppetTypeBrace,puppetTypeName,puppetTypeDefault
-syn match   puppetTypeBrace       "{" contained
-syn match   puppetTypeName       "[a-z]\w*" contained
-syn match   puppetTypeDefault    "[A-Z]\w*" contained
+" match 'foo' in 'class foo { ...'
+" match 'foo::bar' in 'class foo::bar { ...'
+" match 'Foo::Bar' in 'Foo::Bar["..."]
+"FIXME: "Foo-bar" doesn't get highlighted as expected, although "foo-bar" does.
+syn match   puppetInstance      "[A-Za-z0-9_-]\+\(::[A-Za-z0-9_-]\+\)*\s*{" contains=puppetTypeName,puppetTypeDefault
+syn match   puppetInstance      "[A-Z][a-z_-]\+\(::[A-Z][a-z_-]\+\)*\s*[[{]" contains=puppetTypeName,puppetTypeDefault
+syn match   puppetTypeName      "[a-z]\w*" contained
+syn match   puppetTypeDefault   "[A-Z]\w*" contained
 
-syn match   puppetParam           "\w\+\s*=>" contains=puppetTypeRArrow,puppetParamName
-syn match   puppetParamRArrow       "=>" contained
-syn match   puppetParamName       "\w\+" contained
-syn match   puppetVariable           "$\w\+"
-syn match   puppetVariable           "${\w\+}"
-syn match   puppetParen           "("
-syn match   puppetParen           ")"
-syn match   puppetBrace           "{"
-syn match   puppetBrace           "}"
+" match 'foo' in 'foo => "bar"'
+syn match   puppetParam         "\w\+\s*[=+]>" contains=puppetParamName
+syn match   puppetParamName     "\w\+" contained
 
-syn region  puppetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=puppetVariable
+" match 'present' in 'ensure => present'
+" match '2755' in 'mode => 2755'
+" don't match 'bar' in 'foo => bar'
+syn match   puppetParam         "\w\+\s*[=+]>\s*[a-z0-9]\+" contains=puppetParamString,puppetParamName
+syn match   puppetParamString   "[=+]>\s*\w\+" contains=puppetParamKeyword,puppetParamSpecial,puppetParamDigits contained
+syn keyword puppetParamKeyword  present absent purged latest installed running stopped mounted unmounted role configured file directory link contained
+syn keyword puppetParamSpecial  true false undef contained
+syn match   puppetParamDigits   "[0-9]\+"
 
-syn keyword puppetBoolean    true false 
-syn keyword puppetKeyword    import inherits include
-syn keyword puppetControl    case default 
+" match 'template' in 'content => template("...")'
+syn match   puppetParam         "\w\+\s*[=+]>\s*\w\+\s*(" contains=puppetFunction,puppetParamName
+syn keyword puppetFunction      debug info notice warning err alert emerg crit
+syn keyword puppetFunction      sprintf template fail tagged include generate search file tag versioncmp fqdn_rand realize split defined regsubst sha1 inline_template contained
+
+syn match   puppetVariable      "$\w\+"
+syn match   puppetVariable      "${\w\+}"
+
+" match anything between simple/double quotes.
+" don't match variables if preceded by a backslash.
+syn region  puppetString        start=+'+ skip=+\\\\\|\\'+ end=+'+
+syn region  puppetString        start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=puppetVariable,puppetNotVariable
+syn match   puppetNotVariable   "\\$\w\+" contained
+syn match   puppetNotVariable   "\\${\w\+}" contained
+
+syn keyword puppetKeyword       import inherits include
+syn keyword puppetControl       case default if else
+syn keyword puppetSpecial       true false undef
 
 " comments last overriding everything else
-syn match   puppetComment            "\s*#.*$" contains=puppetTodo
-syn region  puppetComment            start="/\*" end="\*/" contains=puppetTodo extend
-syn keyword puppetTodo               TODO NOTE FIXME XXX contained
+syn match   puppetComment       "\s*#.*$" contains=puppetTodo
+syn region  puppetComment       start="/\*" end="\*/" contains=puppetTodo extend
+syn keyword puppetTodo          TODO NOTE FIXME XXX BUG HACK contained
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -64,18 +84,16 @@ if version >= 508 || !exists("did_puppet_syn_inits")
   endif
 
   HiLink puppetVariable             Identifier
-  HiLink puppetBoolean              Boolean
   HiLink puppetType                 Identifier
-  HiLink puppetDefault              Identifier
   HiLink puppetKeyword              Define
-  HiLink puppetTypeDefs             Define
   HiLink puppetComment              Comment
   HiLink puppetString               String
+  HiLink puppetParamKeyword         String
+  HiLink puppetParamDigits          String
+  HiLink puppetNotVariable          String
+  HiLink puppetParamSpecial         Special
+  HiLink puppetSpecial              Special
   HiLink puppetTodo                 Todo
-"  HiLink puppetBrace                Delimiter
-"  HiLink puppetTypeBrace            Delimiter
-"  HiLink puppetParen                Delimiter
-  HiLink puppetDelimiter            Delimiter
   HiLink puppetControl              Statement
   HiLink puppetDefType              Define
   HiLink puppetDefName              Type
@@ -83,6 +101,7 @@ if version >= 508 || !exists("did_puppet_syn_inits")
   HiLink puppetTypeDefault          Type
   HiLink puppetParamName            Identifier
   HiLink puppetArgument             Identifier
+  HiLink puppetFunction             Function
 
   delcommand HiLink
 endif

data/install.rb

@@ -161,6 +161,15 @@ def prepare_installation
 
   InstallOptions.tests = true
 
+  if $haveman
+      InstallOptions.man = true
+      if RUBY_PLATFORM == "i386-mswin32"
+        InstallOptions.man  = false
+      end
+  else
+      InstallOptions.man = false
+  end
+
   ARGV.options do |opts|
     opts.banner = "Usage: #{File.basename($0)} [options]"
     opts.separator ""
@@ -198,6 +207,7 @@ def prepare_installation
     end
     opts.on('--full', 'Performs a full installation. All', 'optional installation steps are run.') do |full|
       InstallOptions.rdoc   = true
+      InstallOptions.man    = true
       InstallOptions.ri     = true
       InstallOptions.tests  = true
     end
@@ -215,27 +225,28 @@ def prepare_installation
   version = [Config::CONFIG["MAJOR"], Config::CONFIG["MINOR"]].join(".")
   libdir = File.join(Config::CONFIG["libdir"], "ruby", version)
 
-  # Mac OS X 10.5 declares bindir and sbindir as
+  # Mac OS X 10.5 and higher declare bindir and sbindir as
   # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin
   # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/sbin
   # which is not generally where people expect executables to be installed
-  if RUBY_PLATFORM == "universal-darwin9.0"
+  # These settings are appropriate defaults for all OS X versions.
+  if RUBY_PLATFORM =~ /^universal-darwin[\d\.]+$/
     Config::CONFIG['bindir'] = "/usr/bin"
     Config::CONFIG['sbindir'] = "/usr/sbin"
   end
-  
+
   if not InstallOptions.bindir.nil?
     bindir = InstallOptions.bindir
   else
     bindir = Config::CONFIG['bindir']
   end
-  
+
   if not InstallOptions.sbindir.nil?
     sbindir = InstallOptions.sbindir
   else
     sbindir = Config::CONFIG['sbindir']
   end
-  
+
   if not InstallOptions.sitelibdir.nil?
     sitelibdir = InstallOptions.sitelibdir
   else
@@ -249,11 +260,11 @@ def prepare_installation
       end
     end
   end
-  
+
   if not InstallOptions.mandir.nil?
     mandir = InstallOptions.mandir
   else
-    mandir = Config::CONFIG['mandir'] 
+    mandir = Config::CONFIG['mandir']
   end
 
   # To be deprecated once people move over to using --destdir option
@@ -345,24 +356,24 @@ def build_man(bins)
 end
 
 def run_tests(test_list)
-	begin
-		require 'test/unit/ui/console/testrunner'
-		$:.unshift "lib"
-		test_list.each do |test|
-		next if File.directory?(test)
-		require test
-		end
-
-		tests = []
-		ObjectSpace.each_object { |o| tests << o if o.kind_of?(Class) } 
-		tests.delete_if { |o| !o.ancestors.include?(Test::Unit::TestCase) }
-		tests.delete_if { |o| o == Test::Unit::TestCase }
-
-		tests.each { |test| Test::Unit::UI::Console::TestRunner.run(test) }
-		$:.shift
-	rescue LoadError
-		puts "Missing testrunner library; skipping tests"
-	end
+    begin
+        require 'test/unit/ui/console/testrunner'
+        $:.unshift "lib"
+        test_list.each do |test|
+            next if File.directory?(test)
+            require test
+        end
+
+        tests = []
+        ObjectSpace.each_object { |o| tests << o if o.kind_of?(Class) }
+        tests.delete_if { |o| !o.ancestors.include?(Test::Unit::TestCase) }
+        tests.delete_if { |o| o == Test::Unit::TestCase }
+
+        tests.each { |test| Test::Unit::UI::Console::TestRunner.run(test) }
+        $:.shift
+    rescue LoadError
+        puts "Missing testrunner library; skipping tests"
+    end
 end
 
 ##
@@ -378,7 +389,7 @@ def install_binfile(from, op_file, target)
       break
     end
   end
-  
+
   fail "Cannot find a temporary directory" unless tmp_dir
   tmp_file = File.join(tmp_dir, '_tmp')
   ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])

data/lib/puppet.rb

@@ -8,7 +8,6 @@ end
 require 'singleton'
 require 'facter'
 require 'puppet/error'
-require 'puppet/external/event-loop'
 require 'puppet/util'
 require 'puppet/util/log'
 require 'puppet/util/autoload'
@@ -25,21 +24,14 @@ require 'puppet/util/suidmanager'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-    PUPPETVERSION = '0.24.9'
+    PUPPETVERSION = '0.25.0'
 
     def Puppet.version
         return PUPPETVERSION
     end
 
     class << self
-        # So we can monitor signals and such.
-        include SignalObserver
-
         include Puppet::Util
-
-        # To keep a copy of arguments.  Set within Config#addargs, because I'm
-        # lazy.
-        attr_accessor :args
         attr_reader :features
         attr_writer :name
     end
@@ -67,7 +59,7 @@ module Puppet
     # I keep wanting to use Puppet.error
     # XXX this isn't actually working right now
     alias :error :err
-    
+
     # The feature collection
     @features = Puppet::Util::Feature.new('puppet/feature')
 
@@ -79,10 +71,10 @@ module Puppet
         @@settings.setdefaults(section, hash)
     end
 
-	# configuration parameter access and stuff
-	def self.[](param)
+    # configuration parameter access and stuff
+    def self.[](param)
         case param
-        when :debug:
+        when :debug
             if Puppet::Util::Log.level == :debug
                 return true
             else
@@ -91,12 +83,12 @@ module Puppet
         else
             return @@settings[param]
         end
-	end
+    end
 
-	# configuration parameter access and stuff
-	def self.[]=(param,value)
+    # configuration parameter access and stuff
+    def self.[]=(param,value)
         @@settings[param] = value
-	end
+    end
 
     def self.clear
         @@settings.clear
@@ -117,7 +109,6 @@ module Puppet
     # Load all of the configuration parameters.
     require 'puppet/defaults'
 
-
     def self.genmanifest
         if Puppet[:genmanifest]
             puts Puppet.settings.to_manifest
@@ -125,216 +116,9 @@ module Puppet
         end
     end
 
-    # Run all threads to their ends
-    def self.join
-        defined? @threads and @threads.each do |t| t.join end
-    end
-
-    # Create a new service that we're supposed to run
-    def self.newservice(service)
-        @services ||= []
-
-        @services << service
-    end
-
-    def self.newthread(&block)
-        @threads ||= []
-
-        @threads << Thread.new do
-            yield
-        end
-    end
-
-    def self.newtimer(hash, &block)
-        timer = nil
-        threadlock(:timers) do
-            @timers ||= []
-            timer = EventLoop::Timer.new(hash)
-            @timers << timer
-
-            if block_given?
-                observe_signal(timer, :alarm, &block)
-            end
-        end
-
-        # In case they need it for something else.
-        timer
-    end
-
     # Parse the config file for this process.
-    def self.parse_config(oldconfig = nil)
-        # First look for the old configuration file.
-        oldconfig ||= File.join(Puppet[:confdir], Puppet[:name].to_s + ".conf")
-        if FileTest.exists?(oldconfig) and Puppet[:name] != "puppet"
-            Puppet.warning "Individual config files are deprecated; remove %s and use puppet.conf" % oldconfig
-            Puppet.settings.old_parse(oldconfig)
-            return
-        end
-
-        # Now check for the normal config.
-        if Puppet[:config] and File.exists? Puppet[:config]
-            Puppet.debug "Parsing %s" % Puppet[:config]
-            Puppet.settings.parse(Puppet[:config])
-        end
-    end
-
-    # Relaunch the executable.
-    def self.restart
-        command = $0 + " " + self.args.join(" ")
-        Puppet.notice "Restarting with '%s'" % command
-        Puppet.shutdown(false)
-        Puppet::Util::Log.reopen
-        exec(command)
-    end
-
-    # Trap a couple of the main signals.  This should probably be handled
-    # in a way that anyone else can register callbacks for traps, but, eh.
-    def self.settraps
-        [:INT, :TERM].each do |signal|
-            trap(signal) do
-                Puppet.notice "Caught #{signal}; shutting down"
-                Puppet.debug "Signal caught here:"
-                caller.each { |l| Puppet.debug l }
-                Puppet.shutdown
-            end
-        end
-
-        # Handle restarting.
-        trap(:HUP) do
-            if client = @services.find { |s| s.is_a? Puppet::Network::Client.master } and client.running?
-                client.restart
-            else
-                Puppet.restart
-            end
-        end
-
-        # Provide a hook for running clients where appropriate
-        trap(:USR1) do
-            done = 0
-            Puppet.notice "Caught USR1; triggering client run"
-            @services.find_all { |s| s.is_a? Puppet::Network::Client }.each do |client|
-                if client.respond_to? :running?
-                    if client.running?
-                        Puppet.info "Ignoring running %s" % client.class
-                    else
-                        done += 1
-                        begin
-                            client.runnow
-                        rescue => detail
-                            Puppet.err "Could not run client: %s" % detail
-                        end
-                    end
-                else
-                    Puppet.info "Ignoring %s; cannot test whether it is running" %
-                        client.class
-                end
-            end
-
-            unless done > 0
-                Puppet.notice "No clients were run"
-            end
-        end
-
-        trap(:USR2) do
-            Puppet::Util::Log.reopen
-        end
-    end
-
-    # Shutdown our server process, meaning stop all services and all threads.
-    # Optionally, exit.
-    def self.shutdown(leave = true)
-        Puppet.notice "Shutting down"
-        # Unmonitor our timers
-        defined? @timers and @timers.each do |timer|
-            EventLoop.current.ignore_timer timer
-        end
-
-        # This seems to exit the process, although I can't find where it does
-        # so.  Leaving it out doesn't seem to hurt anything.
-        #if EventLoop.current.running?
-        #    EventLoop.current.quit
-        #end
-
-        # Stop our services
-        defined? @services and @services.each do |svc|
-            next unless svc.respond_to?(:shutdown)
-            begin
-                timeout(20) do
-                    svc.shutdown
-                end
-            rescue TimeoutError
-                Puppet.err "%s could not shut down within 20 seconds" % svc.class
-            end
-        end
-
-        # And wait for them all to die, giving a decent amount of time
-        defined? @threads and @threads.each do |thr|
-            begin
-                timeout(20) do
-                    thr.join
-                end
-            rescue TimeoutError
-                # Just ignore this, since we can't intelligently provide a warning
-            end
-        end
-
-        if leave
-            exit(0)
-        end
-    end
-
-    # Start all of our services and optionally our event loop, which blocks,
-    # waiting for someone, somewhere, to generate events of some kind.
-    def self.start(block = true)
-        # Starting everything in its own thread, fwiw
-        defined? @services and @services.dup.each do |svc|
-            newthread do
-                begin
-                    svc.start
-                rescue => detail
-                    if Puppet[:trace]
-                        puts detail.backtrace
-                    end
-                    @services.delete svc
-                    Puppet.err "Could not start %s: %s" % [svc.class, detail]
-                end
-            end
-        end
-
-        # We need to give the services a chance to register their timers before
-        # we try to start monitoring them.
-        sleep 0.5
-
-        unless @services.length > 0
-            Puppet.notice "No remaining services; exiting"
-            exit(1)
-        end
-
-        if defined? @timers and ! @timers.empty?
-            @timers.each do |timer|
-                EventLoop.current.monitor_timer timer
-            end
-        end
-
-        if block
-            EventLoop.current.run
-        end
-    end
-
-    # Create the timer that our different objects (uh, mostly the client)
-    # check.
-    def self.timer
-        unless defined? @timer
-            #Puppet.info "Interval is %s" % Puppet[:runinterval]
-            #@timer = EventLoop::Timer.new(:interval => Puppet[:runinterval])
-            @timer = EventLoop::Timer.new(
-                :interval => Puppet[:runinterval],
-                :tolerance => 1,
-                :start? => true
-            )
-            EventLoop.current.monitor_timer @timer
-        end
-        @timer
+    def self.parse_config
+        Puppet.settings.parse
     end
 
     # XXX this should all be done using puppet objects, not using
@@ -375,15 +159,19 @@ module Puppet
 
     # Retrieve a type by name.  Just proxy to the Type class.
     def self.type(name)
+        # LAK:DEP Deprecation notice added 12/17/2008
+        Puppet.warning "Puppet.type is deprecated; use Puppet::Type.type"
         Puppet::Type.type(name)
     end
 end
 
 require 'puppet/type'
 require 'puppet/network'
+require 'puppet/ssl'
 require 'puppet/module'
 require 'puppet/util/storage'
 require 'puppet/parser/interpreter'
+
 if Puppet[:storeconfigs]
     require 'puppet/rails'
 end