puppet 0.25.1 → 0.25.2

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

@@ -27,25 +27,12 @@ class Puppet::Network::Client::Resource < Puppet::Network::Client
     def describe(type, name, retrieve = false, ignore = false)
         Puppet.info "Describing %s[%s]" % [type.to_s.capitalize, name]
         text = @driver.describe(type, name, retrieve, ignore, "yaml")
-
-        object = nil
-        if @local
-            object = text
-        else
-            object = YAML::load(Base64.decode64(text))
-        end
-
-        return object
+        @local ? text : YAML::load(Base64.decode64(text))
     end
 
     def list(type, ignore = false, base = false)
         bucket = @driver.list(type, ignore, base, "yaml")
-
-        unless @local
-            bucket = YAML::load(Base64.decode64(bucket))
-        end
-
-        return bucket
+        @local ? bucket : YAML::load(Base64.decode64(bucket))
     end
 end
 

data/lib/puppet/network/format.rb

@@ -107,17 +107,7 @@ class Puppet::Network::Format
 
         method = send(name)
 
-        if type == :class
-            has_method = klass.respond_to?(method)
-            message = "has not implemented method '%s'" % method
-        else
-            has_method = klass.instance_methods.include?(method)
-            message = "has not implemented instance method  '%s'" % method
-        end
-
-        return true if has_method
-
-        Puppet.debug "Format %s not supported for %s; %s" % [self.name, klass, message]
-        return false
+        return klass.respond_to?(method) if type == :class
+        return klass.instance_methods.include?(method)
     end
 end

data/lib/puppet/network/format_handler.rb

@@ -119,16 +119,30 @@ module Puppet::Network::FormatHandler
                 format_handler.format(b).weight <=> format_handler.format(a).weight
             end
 
-            put_preferred_format_first(result)
+            result = put_preferred_format_first(result)
+
+            Puppet.debug "#{friendly_name} supports formats: #{result.map{ |f| f.to_s }.sort.join(' ')}; using #{result.first}"
+
+            result
         end
 
         private
 
+        def friendly_name
+            if self.respond_to? :indirection
+                indirection.name
+            else
+                self
+            end
+        end
+
         def put_preferred_format_first(list)
             preferred_format = Puppet.settings[:preferred_serialization_format].to_sym
             if list.include?(preferred_format)
                 list.delete(preferred_format)
                 list.unshift(preferred_format)
+            else
+                Puppet.warning "Value of 'preferred_serialization_format' (#{preferred_format}) is invalid for #{friendly_name}, using default (#{list.first})"
             end
             list
         end

data/lib/puppet/network/formats.rb

@@ -44,7 +44,18 @@ end
 # This format combines a yaml serialization, then zlib compression and base64 encoding.
 Puppet::Network::FormatHandler.create(:b64_zlib_yaml, :mime => "text/b64_zlib_yaml") do
     require 'base64'
-    require 'zlib'
+
+    def use_zlib?
+        Puppet.features.zlib? && Puppet[:zlib]
+    end
+
+    def requiring_zlib
+        if use_zlib?
+            yield
+        else
+            raise Puppet::Error, "the zlib library is not installed or is disabled."
+        end
+    end
 
     def intern(klass, text)
         decode(text)
@@ -70,7 +81,7 @@ Puppet::Network::FormatHandler.create(:b64_zlib_yaml, :mime => "text/b64_zlib_ya
 
     # Because of yaml issue in ruby 1.8.1...
     def supported?(klass)
-        RUBY_VERSION != '1.8.1'
+        RUBY_VERSION != '1.8.1' and use_zlib?
     end
 
     # fixup invalid yaml as per:
@@ -81,11 +92,15 @@ Puppet::Network::FormatHandler.create(:b64_zlib_yaml, :mime => "text/b64_zlib_ya
     end
 
     def encode(text)
-        Base64.encode64(Zlib::Deflate.deflate(text, Zlib::BEST_COMPRESSION))
+        requiring_zlib do 
+            Base64.encode64(Zlib::Deflate.deflate(text, Zlib::BEST_COMPRESSION))
+        end
     end
 
     def decode(yaml)
-        YAML.load(Zlib::Inflate.inflate(Base64.decode64(yaml)))
+        requiring_zlib do 
+            YAML.load(Zlib::Inflate.inflate(Base64.decode64(yaml)))
+        end
     end
 end
 

data/lib/puppet/network/handler/fileserver.rb

@@ -310,6 +310,7 @@ class Puppet::Network::Handler
                                         mount.info "allowing %s access" % val
                                         mount.allow(val)
                                     rescue AuthStoreError => detail
+                                        puts detail.backtrace if Puppet[:trace]
                                         raise FileServerError.new(detail.to_s,
                                             count, @configuration.file)
                                     end

data/lib/puppet/network/http/handler.rb

@@ -97,6 +97,7 @@ module Puppet::Network::HTTP::Handler
     # Execute our find.
     def do_find(indirection_request, request, response)
         unless result = indirection_request.model.find(indirection_request.key, indirection_request.to_hash)
+            Puppet.info("Could not find %s for '%s'" % [indirection_request.indirection_name, indirection_request.key])
             return do_exception(response, "Could not find %s %s" % [indirection_request.indirection_name, indirection_request.key], 404)
         end
 

data/lib/puppet/network/http/rack/httphandler.rb

@@ -12,23 +12,5 @@ class Puppet::Network::HTTP::RackHttpHandler
         raise NotImplementedError, "Your RackHttpHandler subclass is supposed to override service(request)"
     end
 
-    def ssl_client_header(request)
-        env_or_request_env(Puppet[:ssl_client_header], request)
-    end
-
-    def ssl_client_verify_header(request)
-        env_or_request_env(Puppet[:ssl_client_verify_header], request)
-    end
-
-    # Older Passenger versions passed all Environment vars in app(env),
-    # but since 2.2.3 they (some?) are really in ENV.
-    # Mongrel, etc. may also still use request.env.
-    def env_or_request_env(var, request)
-        if ENV.include?(var)
-            ENV[var]
-        else
-            request.env[var]
-        end
-    end
 end
 

data/lib/puppet/network/http/rack/rest.rb

@@ -63,11 +63,11 @@ class Puppet::Network::HTTP::RackREST < Puppet::Network::HTTP::RackHttpHandler
         result[:ip] = request.ip
 
         # if we find SSL info in the headers, use them to get a hostname.
-        # try this with :ssl_client_header.
-        # For Apache you need special configuration, see ext/rack/README.
-        if dn = ssl_client_header(request) and dn_matchdata = dn.match(/^.*?CN\s*=\s*(.*)/)
+        # try this with :ssl_client_header, which defaults should work for
+        # Apache with StdEnvVars.
+        if dn = request.env[Puppet[:ssl_client_header]] and dn_matchdata = dn.match(/^.*?CN\s*=\s*(.*)/)
             result[:node] = dn_matchdata[1].to_str
-            result[:authenticated] = (ssl_client_verify_header(request) == 'SUCCESS')
+            result[:authenticated] = (request.env[Puppet[:ssl_client_verify_header]] == 'SUCCESS')
         else
             result[:node] = resolve_node(result)
             result[:authenticated] = false

data/lib/puppet/network/http/rack/xmlrpc.rb

@@ -43,11 +43,11 @@ class Puppet::Network::HTTP::RackXMLRPC < Puppet::Network::HTTP::RackHttpHandler
         ip = request.ip
 
         # if we find SSL info in the headers, use them to get a hostname.
-        # try this with :ssl_client_header.
-        # For Apache you need special configuration, see ext/rack/README.
-        if dn = ssl_client_header(request) and dn_matchdata = dn.match(/^.*?CN\s*=\s*(.*)/)
+        # try this with :ssl_client_header, which defaults should work for
+        # Apache with StdEnvVars.
+        if dn = request.env[Puppet[:ssl_client_header]] and dn_matchdata = dn.match(/^.*?CN\s*=\s*(.*)/)
             node = dn_matchdata[1].to_str
-            authenticated = (ssl_client_verify_header(request) == 'SUCCESS')
+            authenticated = (request.env[Puppet[:ssl_client_verify_header]] == 'SUCCESS')
         else
             begin
                 node = Resolv.getname(ip)

data/lib/puppet/network/http/webrick.rb

@@ -44,7 +44,8 @@ class Puppet::Network::HTTP::WEBrick
                     sock.accept
                     @server.run(sock)
                 }
-           }
+            }
+            sleep 0.1 until @server.status == :Running
         end
     end
 

data/lib/puppet/network/server.rb

@@ -22,7 +22,7 @@ class Puppet::Network::Server
             $stderr.reopen $stdout
             Puppet::Util::Log.reopen
         rescue => detail
-            File.open("/tmp/daemonout", "w") { |f|
+            Puppet::Util.secure_open("/tmp/daemonout", "w") { |f|
                 f.puts "Could not start %s: %s" % [Puppet[:name], detail]
             }
             raise "Could not start %s: %s" % [Puppet[:name], detail]

data/lib/puppet/node/environment.rb

@@ -55,15 +55,7 @@ class Puppet::Node::Environment
         if ENV["PUPPETLIB"]
             dirs = ENV["PUPPETLIB"].split(File::PATH_SEPARATOR) + dirs
         end
-        dirs.collect do |dir|
-            if dir !~ /^#{File::SEPARATOR}/
-                File.join(Dir.getwd, dir)
-            else
-                dir
-            end
-        end.find_all do |p|
-            p =~ /^#{File::SEPARATOR}/ && FileTest.directory?(p)
-        end
+        validate_dirs(dirs)
     end
 
     # Return all modules from this environment.
@@ -73,7 +65,26 @@ class Puppet::Node::Environment
         module_names.collect { |path| Puppet::Module.new(path, self) rescue nil }.compact
     end
 
+    # Cache the manifestdir, so that we aren't searching through
+    # all known directories all the time.
+    cached_attr(:manifestdir, :ttl => Puppet[:filetimeout]) do
+        validate_dirs(self[:manifestdir].split(File::PATH_SEPARATOR))
+    end
+
     def to_s
         name.to_s
     end
+
+    def validate_dirs(dirs)
+        dirs.collect do |dir|
+            if dir !~ /^#{File::SEPARATOR}/
+                File.join(Dir.getwd, dir)
+            else
+                dir
+            end
+        end.find_all do |p|
+            p =~ /^#{File::SEPARATOR}/ && FileTest.directory?(p)
+        end
+    end
+
 end

data/lib/puppet/parameter.rb

@@ -293,6 +293,13 @@ class Puppet::Parameter
             define_method(:unmunge, &block)
         end
 
+        # Optionaly convert the value to a canonical form so that it will
+        # be found in hashes, etc.  Mostly useful for namevars.
+        def to_canonicalize(&block)
+            metaclass = (class << self; self; end)
+            metaclass.send(:define_method,:canonicalize,&block)
+        end
+
         # Mark whether we're the namevar.
         def isnamevar
             @isnamevar = true
@@ -464,10 +471,19 @@ class Puppet::Parameter
         value
     end
 
+    # Assume the value is already in canonical form by default
+    def self.canonicalize(value)
+        value
+    end
+
+    def canonicalize(value)
+        self.class.canonicalize(value)
+    end
+
     # A wrapper around our munging that makes sure we raise useful exceptions.
     def munge(value)
         begin
-            ret = unsafe_munge(value)
+            ret = unsafe_munge(canonicalize(value))
         rescue Puppet::Error => detail
             Puppet.debug "Reraising %s" % detail
             raise

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

@@ -20,14 +20,14 @@ class Puppet::Parser::AST
             # return result
             # lazy evaluate right operand
             case @operator
-            when "and";
+            when "and"
                 if Puppet::Parser::Scope.true?(lval)
                     rval = @rval.safeevaluate(scope)
                     Puppet::Parser::Scope.true?(rval)
                 else # false and false == false
                     false
                 end
-            when "or";
+            when "or"
                 if Puppet::Parser::Scope.true?(lval)
                     true
                 else

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

@@ -101,7 +101,7 @@ class Puppet::Parser::AST
             end
         end
 
-        def to_classname
+        def to_classname(dummy_argument=:work_arround_for_ruby_GC_bug)
             to_s.downcase.gsub(/[^-\w:.]/,'').sub(/^\.+/,'')
         end
 
@@ -150,6 +150,10 @@ class Puppet::Parser::AST
                 return scope.lookupvar(@value)
             end
         end
+
+        def to_s
+            "\$#{value}"
+        end
     end
 
     class Regex < AST::Leaf

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

@@ -18,5 +18,9 @@ class Puppet::Parser::AST
                 :add => self.add
             )
         end
+
+        def to_s
+            "#{@param} => #{@value.to_s}"
+        end
     end
 end

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

@@ -41,5 +41,9 @@ class Puppet::Parser::AST
         ensure
             scope.unset_ephemeral_var
         end
+
+        def to_s
+            param.to_s + " ? { " + values.collect { |v| v.to_s }.join(', ') + " }"
+        end
     end
 end

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

@@ -1,7 +1,7 @@
 # Runs an external command and returns the results
 Puppet::Parser::Functions::newfunction(:generate, :type => :rvalue,
-        :doc => "Calls an external command and returns the results of the
-        command.  Any arguments are passed to the external command as
+        :doc => "Calls an external command on the Puppet master and returns 
+        the results of the command.  Any arguments are passed to the external command as
         arguments.  If the generator does not exit with return code of 0,
         the generator is considered to have failed and a parse error is
         thrown.  Generators can only have file separators, alphanumerics, dashes,

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

@@ -10,7 +10,7 @@ module Puppet::Parser::Functions
         with spaces.  If an argument is an array, the elements of that
         array is interpolated within the rest of the arguments; this makes
         it possible to have an array of arguments and pass that array to
-        shellquote() instead of having to specify specify each argument
+        shellquote() instead of having to specify each argument
         individually in the call.
         ") \
     do |args|

data/lib/puppet/property.rb

@@ -355,20 +355,12 @@ class Puppet::Property < Puppet::Parameter
     end
 
     def should_to_s(newvalue)
-        newvalue = [newvalue] unless newvalue.is_a? Array
-        if defined? newvalue
-            newvalue.join(" ")
-        else
-            return nil
-        end
+        [newvalue].flatten.join(" ")
     end
 
     def sync
-        if value = self.should
-            set(value)
-        else
-            self.devfail "Got a nil value for should"
-        end
+        devfail "Got a nil value for should" unless should
+        set(should)
     end
 
     def to_s

data/lib/puppet/provider/cron/crontab.rb

@@ -3,6 +3,8 @@ require 'puppet/provider/parsedfile'
 tab = case Facter.value(:operatingsystem)
     when "Solaris"
         :suntab
+    when "AIX"
+        :aixtab
     else
         :crontab
     end

data/lib/puppet/provider/host/parsed.rb

@@ -17,8 +17,8 @@ Puppet::Type.type(:host).provide(:parsed,
     text_line :comment, :match => /^#/
     text_line :blank, :match => /^\s*$/
 
-    record_line :parsed, :fields => %w{ip name alias},
-        :optional => %w{alias},
+    record_line :parsed, :fields => %w{ip name host_aliases},
+        :optional => %w{host_aliases},
         :rts => true do |line|
         hash = {}
         if line.sub!(/^(\S+)\s+(\S+)\s*/, '')
@@ -30,7 +30,7 @@ Puppet::Type.type(:host).provide(:parsed,
                 line.sub!(/^([^#]+)\s*/) do |value|
                     aliases = $1
                     unless aliases =~ /^\s*$/
-                        hash[:alias] = aliases.split(/\s+/)
+                        hash[:host_aliases] = aliases.split(/\s+/)
                     end
 
                     ""
@@ -40,8 +40,8 @@ Puppet::Type.type(:host).provide(:parsed,
             raise Puppet::Error, "Could not match '%s'" % line
         end
 
-        if hash[:alias] == ""
-            hash.delete(:alias)
+        if hash[:host_aliases] == ""
+            hash.delete(:host_aliases)
         end
 
         return hash
@@ -58,11 +58,11 @@ Puppet::Type.type(:host).provide(:parsed,
 
         str = "%s\t%s" % [hash[:ip], hash[:name]]
 
-        if hash.include? :alias
-            if hash[:alias].is_a? Array
-                str += "\t%s" % hash[:alias].join("\t")
+        if hash.include? :host_aliases
+            if hash[:host_aliases].is_a? Array
+                str += "\t%s" % hash[:host_aliases].join("\t")
             else
-                raise ArgumentError, "Aliases must be specified as an array"
+                raise ArgumentError, "Host aliases must be specified as an array"
             end
         end