puppet 0.24.9 → 0.25.0

data/lib/puppet/external/nagios/makefile

@@ -0,0 +1,9 @@
+all: parser.rb
+
+debug: parser.rb setdebug
+
+parser.rb: grammar.ry
+	racc -E -oparser.rb grammar.ry
+
+setdebug:
+	perl -pi -e 's{\@yydebug =.*$$}{\@yydebug = true}' parser.rb

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

@@ -402,7 +402,7 @@ module Racc
         toks.each {|t| out.print ' ', racc_token2str(t) }
       end
       out.puts " --> #{racc_token2str(sim)}"
-          
+
       racc_print_stacks tstack, vstack
       @racc_debug_out.puts
     end

data/lib/puppet/feature/json.rb

@@ -0,0 +1,2 @@
+# This is here so it autoloads correctly.
+Puppet.features.rails?

data/lib/puppet/feature/rack.rb

@@ -0,0 +1,24 @@
+require 'puppet/util/feature'
+
+# See if we have rack available, an HTTP Application Stack
+# Explicitly depend on rack library version >= 1.0.0
+Puppet.features.add(:rack) do
+    begin
+        require 'rack'
+    rescue LoadError => detail
+        require 'rubygems'
+        require 'rack'
+    end
+
+    if ! (defined?(::Rack) and defined?(::Rack.release))
+        false
+    else
+        major_version = ::Rack.release().split('.')[0].to_i
+        if major_version >= 1
+            true
+        else
+            false
+        end
+    end
+end
+

data/lib/puppet/feature/rails.rb

@@ -3,49 +3,39 @@
 
 require 'puppet/util/feature'
 
+Puppet.features.rubygems?
+
 Puppet.features.add(:rails) do
     begin
         require 'active_record'
     rescue LoadError => detail
-        if Facter["operatingsystem"].value == "Debian" and
-            FileTest.exists?("/usr/share/rails")
-                count = 0
-                Dir.entries("/usr/share/rails").each do |dir|
-                    libdir = File.join("/usr/share/rails", dir, "lib")
-                    if FileTest.exists?(libdir) and ! $:.include?(libdir)
-                        count += 1
-                        $: << libdir
-                    end
-                end
-
-                if count > 0
-                    retry
+        if FileTest.exists?("/usr/share/rails")
+            count = 0
+            Dir.entries("/usr/share/rails").each do |dir|
+                libdir = File.join("/usr/share/rails", dir, "lib")
+                if FileTest.exists?(libdir) and ! $:.include?(libdir)
+                    count += 1
+                    $: << libdir
                 end
-        else
-            #If ActiveRecord was installed only via rubygems this is required
-            require 'rubygems'
-            require 'active_record'
-        end
-    end
+            end
 
-    # If we couldn't find it the normal way, try using a Gem.
-    unless defined? ActiveRecord
-        begin
-            require 'rubygems'
-            require 'rails'
-        rescue LoadError
-            # Nothing
+            if count > 0
+                retry
+            end
         end
     end
 
-    # We check a fairly specific class, so that we can be sure that we've
-    # loaded a new enough version of AR that will support the features we
-    # actually use.
-    if defined? ActiveRecord::Associations::BelongsToPolymorphicAssociation
-        require 'puppet/rails'
-        true
-    else
+    if ! (defined?(::ActiveRecord) and defined?(::ActiveRecord::VERSION) and defined?(::ActiveRecord::VERSION::MAJOR) and defined?(::ActiveRecord::VERSION::MINOR))
+        false
+    elsif ! (::ActiveRecord::VERSION::MAJOR == 2 and ::ActiveRecord::VERSION::MINOR >= 1)
+        Puppet.info "ActiveRecord 2.1 or later required for StoreConfigs"
         false
+    else
+        true
     end
 end
 
+# We have JSON available
+# This is stupid - Rails breaks json compatibility if we load json before
+# rails, therefore we load rails and then json.  Dumb, mother-dumb.
+Puppet.features.add(:json, :libs => ["json"])

data/lib/puppet/feature/rubygems.rb

@@ -0,0 +1,6 @@
+#  Created by Luke Kanies on 2006-11-07.
+#  Copyright (c) 2006. All rights reserved.
+
+require 'puppet/util/feature'
+
+Puppet.features.add(:rubygems, :libs => "rubygems")

data/lib/puppet/feature/stomp.rb

@@ -0,0 +1,6 @@
+require 'puppet/util/feature'
+
+# We want this to load if possible, but it's not automatically
+# required.
+Puppet.features.rubygems?
+Puppet.features.add(:stomp, :libs => %{stomp})

data/lib/puppet/file_serving/{file_base.rb → base.rb}

@@ -6,8 +6,10 @@ require 'puppet/file_serving'
 
 # The base class for Content and Metadata; provides common
 # functionality like the behaviour around links.
-class Puppet::FileServing::FileBase
-    attr_accessor :key
+class Puppet::FileServing::Base
+    # This is for external consumers to store the source that was used
+    # to retrieve the metadata.
+    attr_accessor :source
 
     # Does our file exist?
     def exist?
@@ -21,17 +23,15 @@ class Puppet::FileServing::FileBase
 
     # Return the full path to our file.  Fails if there's no path set.
     def full_path
-        raise(ArgumentError, "You must set a path to get a file's path") unless self.path
-
-        if relative_path.nil? or relative_path == ""
+        (if relative_path.nil? or relative_path == "" or relative_path == "."
             path
         else
             File.join(path, relative_path)
-        end
+        end).gsub(%r{/+}, "/")
     end
 
-    def initialize(key, options = {})
-        @key = key
+    def initialize(path, options = {})
+        self.path = path
         @links = :manage
 
         options.each do |param, value|
@@ -46,8 +46,9 @@ class Puppet::FileServing::FileBase
     # Determine how we deal with links.
     attr_reader :links
     def links=(value)
+        value = value.to_sym
         value = :manage if value == :ignore
-        raise(ArgumentError, ":links can only be set to :manage or :follow") unless [:manage, :follow].include?(value) 
+        raise(ArgumentError, ":links can only be set to :manage or :follow") unless [:manage, :follow].include?(value)
         @links = value
     end
 

data/lib/puppet/file_serving/configuration.rb

@@ -5,46 +5,48 @@
 require 'puppet'
 require 'puppet/file_serving'
 require 'puppet/file_serving/mount'
+require 'puppet/file_serving/mount/file'
+require 'puppet/file_serving/mount/modules'
+require 'puppet/file_serving/mount/plugins'
+require 'puppet/util/cacher'
 
 class Puppet::FileServing::Configuration
     require 'puppet/file_serving/configuration/parser'
 
-    @config_fileuration = nil
+    class << self
+        include Puppet::Util::Cacher
+        cached_attr(:configuration) { new() }
+    end
 
     Mount = Puppet::FileServing::Mount
 
-    # Remove our singleton instance.
-    def self.clear_cache
-        @config_fileuration = nil
-    end
-
     # Create our singleton configuration.
     def self.create
-        unless @config_fileuration
-            @config_fileuration = new()
-        end
-        @config_fileuration
+        configuration
     end
 
     private_class_method  :new
 
-    # Verify that the client is allowed access to this file.
-    def authorized?(file, options = {})
-        mount, file_path = split_path(file, options[:node])
-        # If we're not serving this mount, then access is denied.
-        return false unless mount
-        return mount.allowed?(options[:node], options[:ipaddress])
-    end
+    attr_reader :mounts
+    #private :mounts
+
+    # Find the right mount.  Does some shenanigans to support old-style module
+    # mounts.
+    def find_mount(mount_name, environment)
+        # Reparse the configuration if necessary.
+        readconfig
 
-    # Search for a file.
-    def file_path(key, options = {})
-        mount, file_path = split_path(key, options[:node])
+        if mount = mounts[mount_name]
+            return mount
+        end
 
-        return nil unless mount
+        if environment.module(mount_name)
+            Puppet::Util::Warnings.notice_once "DEPRECATION NOTICE: Files found in modules without specifying 'modules' in file path will be deprecated in the next major release.  Please fix module '%s' when no 0.24.x clients are present" % mount_name
+            return mounts["modules"]
+        end
 
-        # The mount checks to see if the file exists, and returns nil
-        # if not.
-        return mount.file(file_path, options)
+        # This can be nil.
+        mounts[mount_name]
     end
 
     def initialize
@@ -61,21 +63,43 @@ class Puppet::FileServing::Configuration
         @mounts.include?(name)
     end
 
+    # Split the path into the separate mount point and path.
+    def split_path(request)
+        # Reparse the configuration if necessary.
+        readconfig
+
+        mount_name, path = request.key.split(File::Separator, 2)
+
+        raise(ArgumentError, "Cannot find file: Invalid path '%s'" % mount_name) unless mount_name =~ %r{^[-\w]+$}
+
+        return nil unless mount = find_mount(mount_name, request.environment)
+        if mount.name == "modules" and mount_name != "modules"
+            # yay backward-compatibility
+            path = "%s/%s" % [mount_name, path]
+        end
+
+        if path == ""
+            path = nil
+        elsif path
+            # Remove any double slashes that might have occurred
+            path = path.gsub(/\/+/, "/")
+        end
+
+        return mount, path
+    end
+
     def umount(name)
         @mounts.delete(name) if @mounts.include? name
     end
 
     private
 
-    # Deal with ignore parameters.
-    def handleignore(children, path, ignore)            
-        ignore.each { |ignore|                
-            Dir.glob(File.join(path,ignore), File::FNM_DOTMATCH) { |match|
-                children.delete(File.basename(match))
-            }                
-        }
-        return children
-    end  
+    def mk_default_mounts
+        @mounts["modules"] ||= Mount::Modules.new("modules")
+        @mounts["modules"].allow('*')
+        @mounts["plugins"] ||= Mount::Plugins.new("plugins")
+        @mounts["plugins"].allow('*')
+    end
 
     # Read the configuration file.
     def readconfig(check = true)
@@ -94,36 +118,12 @@ class Puppet::FileServing::Configuration
             newmounts = @parser.parse
             @mounts = newmounts
         rescue => detail
+            puts detail.backtrace if Puppet[:trace]
             Puppet.err "Error parsing fileserver configuration: %s; using old configuration" % detail
         end
-    end
-
-    # Split the path into the separate mount point and path.
-    def split_path(uri, node)
-        # Reparse the configuration if necessary.
-        readconfig
-
-        raise(ArgumentError, "Cannot find file: Invalid path '%s'" % uri) unless uri =~ %r{/([-\w]+)/?}
-
-        # the dir is based on one of the mounts
-        # so first retrieve the mount path
-        mount = path = nil
-        # Strip off the mount name.
-        mount_name, path = uri.sub(%r{^/}, '').split(File::Separator, 2)
-
-        return nil unless mount = @mounts[mount_name]
-
-        if path == ""
-            path = nil
-        elsif path
-            # Remove any double slashes that might have occurred
-            path = URI.unescape(path.gsub(/\/\//, "/"))
-        end
-
-        return mount, path
-    end
 
-    def to_s
-        "fileserver"
+    ensure
+        # Make sure we've got our plugins and modules.
+        mk_default_mounts
     end
 end

data/lib/puppet/file_serving/configuration/parser.rb

@@ -20,20 +20,20 @@ class Puppet::FileServing::Configuration::Parser < Puppet::Util::LoadedFile
                 @count += 1
 
                 case line
-                when /^\s*#/: next # skip comments
-                when /^\s*$/: next # skip blank lines
-                when /\[([-\w]+)\]/:
+                when /^\s*#/; next # skip comments
+                when /^\s*$/; next # skip blank lines
+                when /\[([-\w]+)\]/
                     mount = newmount($1)
-                when /^\s*(\w+)\s+(.+)$/:
+                when /^\s*(\w+)\s+(.+)$/
                     var = $1
                     value = $2
                     raise(ArgumentError, "Fileserver configuration file does not use '=' as a separator") if value =~ /^=/
                     case var
-                    when "path":
+                    when "path"
                         path(mount, value)
-                    when "allow":
+                    when "allow"
                         allow(mount, value)
-                    when "deny":
+                    when "deny"
                         deny(mount, value)
                     else
                         raise ArgumentError.new("Invalid argument '%s'" % var,
@@ -46,23 +46,16 @@ class Puppet::FileServing::Configuration::Parser < Puppet::Util::LoadedFile
             }
         }
 
+        validate()
+
         return @mounts
     end
 
     private
 
-    # Add the mount for getting files from modules.
-    def add_module_mount
-        unless @mounts[MODULES]
-            mount = Mount.new(MODULES)
-            mount.allow("*")
-            @mounts[MODULES] = mount
-        end
-    end
-
     # Allow a given pattern access to a mount.
     def allow(mount, value)
-        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com] 
+        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
         x = value.split(/\s*,\s*/).each { |val|
             begin
                 mount.info "allowing %s access" % val
@@ -76,7 +69,7 @@ class Puppet::FileServing::Configuration::Parser < Puppet::Util::LoadedFile
 
     # Deny a given pattern access to a mount.
     def deny(mount, value)
-        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com] 
+        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com]
         x = value.split(/\s*,\s*/).each { |val|
             begin
                 mount.info "denying %s access" % val
@@ -94,33 +87,35 @@ class Puppet::FileServing::Configuration::Parser < Puppet::Util::LoadedFile
             raise ArgumentError, "%s is already mounted at %s" %
                 [@mounts[name], name], @count, file
         end
-        mount = Mount.new(name)
+        case name
+        when "modules"
+            mount = Mount::Modules.new(name)
+        when "plugins"
+            mount = Mount::Plugins.new(name)
+        else
+            mount = Mount::File.new(name)
+        end
         @mounts[name] = mount
         return mount
     end
 
     # Set the path for a mount.
     def path(mount, value)
-        if mount.name == MODULES
-            Puppet.warning "The '#{MODULES}' module can not have a path. Ignoring attempt to set it"
-        else
+        if mount.respond_to?(:path=)
             begin
                 mount.path = value
             rescue ArgumentError => detail
-                Puppet.err "Removing mount %s: %s" %
-                    [mount.name, detail]
+                Puppet.err "Removing mount %s: %s" % [mount.name, detail]
                 @mounts.delete(mount.name)
             end
+        else
+            Puppet.warning "The '#{mount.name}' module can not have a path. Ignoring attempt to set it"
         end
     end
 
     # Make sure all of our mounts are valid.  We have to do this after the fact
     # because details are added over time as the file is parsed.
     def validate
-        @mounts.each { |name, mount|
-            unless mount.valid?
-                raise ArgumentError, "No path specified for mount %s" % name
-            end
-        }
+        @mounts.each { |name, mount| mount.validate }
     end
 end