puppet 0.22.4 → 0.23.0

data/lib/puppet/external/event-loop/event-loop.rb

@@ -74,6 +74,10 @@ class EventLoop
 
     @notify_src, @notify_snk = IO.pipe
 
+    # prevent file descriptor leaks
+    @notify_src.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+    @notify_snk.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+
     @notify_src.will_block = false
     @notify_snk.will_block = false
 

data/lib/puppet/external/gratr/rdot.rb

@@ -1,6 +1,6 @@
 # rdot.rb
 # 
-# $Id: rdot.rb 2119 2007-01-30 05:27:56Z luke $
+# $Id: rdot.rb 1892 2006-11-17 20:15:23Z luke $
 #
 # This is a modified version of dot.rb from Dave Thomas's rdoc project.  I [Horst Duchene]
 # renamed it to rdot.rb to avoid collision with an installed rdoc/dot.

data/lib/puppet/fact_stores/yaml.rb

@@ -0,0 +1,42 @@
+Puppet::Util::FactStore.newstore(:yaml) do
+    desc "Store client facts as flat files, serialized using YAML."
+
+    # Get a client's facts.
+    def get(node)
+        file = path(node)
+
+        return nil unless FileTest.exists?(file)
+
+        begin
+            facts = YAML::load(File.read(file))
+        rescue => detail
+            Puppet.err "Could not load facts for %s: %s" % [node, detail]
+        end
+        facts
+    end
+
+    def initialize
+        Puppet.config.use(:yamlfacts)
+    end
+
+    # Store the facts to disk.
+    def set(node, facts)
+        File.open(path(node), "w", 0600) do |f|
+            begin
+                f.print YAML::dump(facts)
+            rescue => detail
+                Puppet.err "Could not write facts for %s: %s" % [node, detail]
+            end
+        end
+        nil
+    end
+
+    private
+
+    # Return the path to a given node's file.
+    def path(node)
+        File.join(Puppet[:yamlfactdir], node + ".yaml")
+    end
+end
+
+# $Id: yaml.rb 2457 2007-05-03 05:24:13Z luke $

data/lib/puppet/feature/base.rb

@@ -17,4 +17,7 @@ Puppet.features.add(:libshadow, :libs => ["shadow"])
 # We're running as root.
 Puppet.features.add(:root) { require 'puppet/util/suidmanager'; Puppet::Util::SUIDManager.uid == 0 }
 
-# $Id: base.rb 2441 2007-04-30 19:41:18Z luke $
+# We've got mongrel available
+Puppet.features.add(:mongrel, :libs => %w{rubygems mongrel puppet/network/server/mongrel})
+
+# $Id: base.rb 2577 2007-06-14 03:39:23Z luke $

data/lib/puppet/metatype/attributes.rb

@@ -307,9 +307,7 @@ class Puppet::Type
             # method on the class.
             if options[:retrieve]
                 define_method(:retrieve) do
-                    instance_variable_set(
-                        "@is", provider.send(options[:retrieve])
-                    )
+                    provider.send(options[:retrieve])
                 end
             end
 
@@ -415,8 +413,8 @@ class Puppet::Type
         # This duplication is here because it might be a transobject.
         hash = oldhash.dup.to_hash
 
-        if hash.include?(:parent)
-            hash.delete(:parent)
+        if hash.include?(:resource)
+            hash.delete(:resource)
         end
         namevar = self.class.namevar
 
@@ -458,22 +456,16 @@ class Puppet::Type
         obj = @parameters[:ensure] and obj.should == :absent
     end
 
-    # Allow an outside party to specify the 'is' value for a property.  The
-    # arguments are an array because you can't use parens with 'is=' calls.
-    # Most classes won't use this.
-    def is=(ary)
-        param, value = ary
-        param = attr_alias(param)
-        if self.class.validproperty?(param)
-            unless prop = @parameters[param]
-                prop = self.newattr(param)
-            end
-            prop.is = value
-        else
-            self[param] = value
+    # Create a new property if it is valid but doesn't exist
+    # Returns: true if a new parameter was added, false otherwise
+    def add_property_parameter(prop_name)
+        if self.class.validproperty?(prop_name) && !@parameters[prop_name]
+            self.newattr(prop_name)
+            return true
         end
+        return false
     end
-
+    
     # abstract accessing parameters and properties, and normalize
     # access to always be symbols, not strings
     # This returns a value, not an object.  It returns the 'is'
@@ -491,8 +483,10 @@ class Puppet::Type
         end
 
         if obj = @parameters[name]
+            # We throw a failure here, because this method is too
+            # ambiguous when used with properties.
             if obj.is_a?(Puppet::Type::Property)
-                return obj.is
+                fail "[] called on a property"
             else
                 return obj.value
             end
@@ -532,17 +526,10 @@ class Puppet::Type
     # when an error has been encountered
     def delete(attr)
         attr = symbolize(attr)
-        case attr
-        when Puppet::Type
-            if @children.include?(attr)
-                @children.delete(attr)
-            end
+        if @parameters.has_key?(attr)
+            @parameters.delete(attr)
         else
-            if @parameters.has_key?(attr)
-                @parameters.delete(attr)
-            else
-                raise Puppet::DevError.new("Undefined attribute '#{attr}' in #{self}")
-            end
+            raise Puppet::DevError.new("Undefined attribute '#{attr}' in #{self}")
         end
     end
 
@@ -554,16 +541,6 @@ class Puppet::Type
         }
     end
 
-    # retrieve the 'is' value for a specified property
-    def is(name)
-        name = attr_alias(name)
-        if prop = @parameters[name] and prop.is_a?(Puppet::Type::Property)
-            return prop.is
-        else
-            return nil
-        end
-    end
-
     # retrieve the 'should' value for a specified property
     def should(name)
         name = attr_alias(name)
@@ -598,9 +575,9 @@ class Puppet::Type
             return nil
         end
 
-        # Add parent information at creation time, so it's available
+        # Add resource information at creation time, so it's available
         # during validation.
-        options[:parent] = self
+        options[:resource] = self
         begin
             # make sure the parameter doesn't have any errors
             return @parameters[name] = klass.new(options)
@@ -716,4 +693,4 @@ class Puppet::Type
     end
 end
 
-# $Id: attributes.rb 2444 2007-05-01 03:14:09Z luke $
+# $Id: attributes.rb 2513 2007-05-14 17:27:56Z luke $

data/lib/puppet/metatype/container.rb

@@ -1,5 +1,4 @@
 class Puppet::Type
-    attr_accessor :children
 
     # this is a retarded hack method to get around the difference between
     # component children and file children
@@ -31,48 +30,14 @@ class Puppet::Type
         elsif defined? @parent and @parent.parentof?(child)
             debug "My parent is parent of child"
             return true
-        elsif @children.include?(child)
-            debug "child is already in children array"
-            return true
         else
             return false
         end
     end
 
-    def push(*childs)
-        unless defined? @children
-            @children = []
-        end
-        childs.each { |child|
-            # Make sure we don't have any loops here.
-            if parentof?(child)
-                devfail "Already the parent of %s[%s]" % [child.class.name, child.title]
-            end
-            unless child.is_a?(Puppet::Element)
-                self.debug "Got object of type %s" % child.class
-                self.devfail(
-                    "Containers can only contain Puppet::Elements, not %s" %
-                    child.class
-                )
-            end
-            @children.push(child)
-            child.parent = self
-        }
-    end
-
     # Remove an object.  The argument determines whether the object's
     # subscriptions get eliminated, too.
     def remove(rmdeps = true)
-        # Our children remove themselves from our @children array (else the object
-        # we called this on at the top would not be removed), so we duplicate the
-        # array and iterate over that.  If we don't do this, only half of the
-        # objects get removed.
-        @children.dup.each { |child|
-            child.remove(rmdeps)
-        }
-
-        @children.clear
-
         # This is hackish (mmm, cut and paste), but it works for now, and it's
         # better than warnings.
         @parameters.each do |name, obj|
@@ -91,4 +56,4 @@ class Puppet::Type
     end
 end
 
-# $Id: container.rb 2169 2007-02-07 06:47:10Z luke $
+# $Id: container.rb 2499 2007-05-09 21:30:44Z luke $

data/lib/puppet/metatype/evaluation.rb

@@ -20,9 +20,9 @@ class Puppet::Type
         # it's important that we call retrieve() on the type instance,
         # not directly on the property, because it allows the type to override
         # the method, like pfile does
-        self.retrieve
+        currentvalues = self.retrieve
 
-        changes = propertychanges().flatten
+        changes = propertychanges(currentvalues).flatten
 
         # now record how many changes we've resulted in
         if changes.length > 0
@@ -44,19 +44,32 @@ class Puppet::Type
     # if all contained objects are in sync, then we're in sync
     # FIXME I don't think this is used on the type instances any more,
     # it's really only used for testing
-    def insync?
+    def insync?(is)
         insync = true
-
+        
         if property = @parameters[:ensure]
-            if property.insync? and property.should == :absent
+            unless is.include? property
+               raise Puppet::DevError,
+                        "The is value is not in the is array for '%s'" %
+                        [property.name]
+            end
+            ensureis = is[property]           
+            if property.insync?(ensureis) and property.should == :absent
                 return true
             end
         end
 
         properties.each { |property|
-            unless property.insync?
+            unless is.include? property
+               raise Puppet::DevError,
+                        "The is value is not in the is array for '%s'" %
+                        [property.name]
+            end
+
+            propis = is[property]
+            unless property.insync?(propis)
                 property.debug("Not in sync: %s vs %s" %
-                    [property.is.inspect, property.should.inspect])
+                    [propis.inspect, property.should.inspect])
                 insync = false
             #else
             #    property.debug("In sync")
@@ -66,28 +79,40 @@ class Puppet::Type
         #self.debug("%s sync status is %s" % [self,insync])
         return insync
     end
-
+        
     # retrieve the current value of all contained properties
     def retrieve
+         return currentpropvalues
+    end
+    
+    # get a hash of the current properties.  
+    def currentpropvalues(override_value = nil)
         # it's important to use the method here, as it follows the order
         # in which they're defined in the object
-        properties().each { |property|
-            property.retrieve
-        }
+        return properties().inject({}) { | prophash, property|
+                   prophash[property] = override_value.nil? ? 
+                                          property.retrieve : 
+                                             override_value
+                   prophash
+               }
     end
-
+     
     # Retrieve the changes associated with all of the properties.
-    def propertychanges
+    def propertychanges(currentvalues)
         # If we are changing the existence of the object, then none of
         # the other properties matter.
         changes = []
-        if @parameters.include?(:ensure) and ! @parameters[:ensure].insync?
+        ensureparam = @parameters[:ensure]
+        if @parameters.include?(:ensure) && !currentvalues.include?(ensureparam)
+            raise Puppet::DevError, "Parameter ensure defined but missing from current values"
+        end
+        if @parameters.include?(:ensure) and ! ensureparam.insync?(currentvalues[ensureparam])
 #            self.info "ensuring %s from %s" %
 #                [@parameters[:ensure].should, @parameters[:ensure].is]
-            changes = [Puppet::PropertyChange.new(@parameters[:ensure])]
+            changes << Puppet::PropertyChange.new(ensureparam, currentvalues[ensureparam])
         # Else, if the 'ensure' property is correctly absent, then do
         # nothing
-        elsif @parameters.include?(:ensure) and @parameters[:ensure].is == :absent
+        elsif @parameters.include?(:ensure) and currentvalues[ensureparam] == :absent
             #            self.info "Object is correctly absent"
             return []
         else
@@ -98,9 +123,13 @@ class Puppet::Type
 #                self.info "no ensure property"
 #            end
             changes = properties().find_all { |property|
-                ! property.insync?
+                unless currentvalues.include?(property)
+                    raise Puppet::DevError, "Property %s does not have a current value", 
+                               [property.name]
+                end
+                ! property.insync?(currentvalues[property])
             }.collect { |property|
-                Puppet::PropertyChange.new(property)
+                Puppet::PropertyChange.new(property, currentvalues[property])
             }
         end
 
@@ -115,4 +144,4 @@ class Puppet::Type
     end
 end
 
-# $Id: evaluation.rb 2275 2007-03-08 21:18:43Z luke $
+# $Id: evaluation.rb 2488 2007-05-09 12:30:03Z ballman $

data/lib/puppet/metatype/instances.rb

@@ -248,6 +248,40 @@ class Puppet::Type
         return trans
     end
 
+    # Retrieve all known instances.  Either requires providers or must be overridden.
+    def self.instances
+        unless defined?(@providers) and ! @providers.empty?
+            raise Puppet::DevError, "%s has no providers and has not overridden 'instances'" % self.name
+        end
+
+        # Put the default provider first, then the rest of the suitable providers.
+        packages = {}
+        providers_by_source.collect do |provider|
+            provider.instances.collect do |instance|
+                if other = packages[instance.name]
+                    Puppet.warning "Package %s found in both %s and %s; skipping the %s version" %
+                        [instance.name, other.class.name, instance.class.name, instance.class.name]
+                    next
+                end
+                packages[instance.name] = instance
+
+                create(:name => instance.name, :provider => instance, :check => :all)
+            end
+        end.flatten.compact
+    end
+
+    # Return a list of one suitable provider per source, with the default provider first.
+    def self.providers_by_source
+        # Put the default provider first, then the rest of the suitable providers.
+        sources = []
+        [defaultprovider, suitableprovider].flatten.uniq.collect do |provider|
+            next if sources.include?(provider.source)
+
+            sources << provider.source
+            provider
+        end.compact
+    end
+
     # Create the path for logging and such.
     def pathbuilder
         if defined? @parent and @parent
@@ -258,4 +292,4 @@ class Puppet::Type
     end
 end
 
-# $Id: instances.rb 1977 2006-12-28 06:49:03Z luke $
+# $Id: instances.rb 2555 2007-06-08 17:20:00Z luke $

data/lib/puppet/metatype/metaparams.rb

@@ -16,8 +16,8 @@ class Puppet::Type
         newvalues(:true, :false)
         munge do |value|
             case value
-            when true, :true, "true": @parent.noop = true
-            when false, :false, "false": @parent.noop = false
+            when true, :true, "true": @resource.noop = true
+            when false, :false, "false": @resource.noop = false
             end
         end
     end
@@ -59,7 +59,7 @@ class Puppet::Type
         munge do |args|
             # If they've specified all, collect all known properties
             if args == :all
-                args = @parent.class.properties.collect do |property|
+                args = @resource.class.properties.collect do |property|
                     property.name
                 end
             end
@@ -68,7 +68,7 @@ class Puppet::Type
                 args = [args]
             end
 
-            unless defined? @parent
+            unless defined? @resource
                 self.devfail "No parent for %s, %s?" %
                     [self.class, self.name]
             end
@@ -77,14 +77,18 @@ class Puppet::Type
                 unless property.is_a?(Symbol)
                     property = property.intern
                 end
-                next if @parent.propertydefined?(property)
+                next if @resource.propertydefined?(property)
 
-                unless propertyklass = @parent.class.validproperty?(property)
-                    raise Puppet::Error, "%s is not a valid attribute for %s" %
-                        [property, self.class.name]
+                unless propertyklass = @resource.class.validproperty?(property)
+                    if @resource.class.validattr?(property)
+                        next
+                    else
+                        raise Puppet::Error, "%s is not a valid attribute for %s" %
+                            [property, self.class.name]
+                    end
                 end
                 next unless propertyklass.checkable?
-                @parent.newattr(property)
+                @resource.newattr(property)
             }
         end
     end
@@ -191,20 +195,20 @@ class Puppet::Type
             unless aliases.is_a?(Array)
                 aliases = [aliases]
             end
-            @parent.info "Adding aliases %s" % aliases.collect { |a|
+            @resource.info "Adding aliases %s" % aliases.collect { |a|
                     a.inspect
             }.join(", ")
             aliases.each do |other|
-                if obj = @parent.class[other]
-                    unless obj == @parent
+                if obj = @resource.class[other]
+                    unless obj == @resource
                         self.fail(
                             "%s can not create alias %s: object already exists" %
-                            [@parent.title, other]
+                            [@resource.title, other]
                         )
                     end
                     next
                 end
-                @parent.class.alias(other, @parent)
+                @resource.class.alias(other, @resource)
             end
         end
     end
@@ -227,7 +231,7 @@ class Puppet::Type
             tags = [tags] unless tags.is_a? Array
 
             tags.each do |tag|
-                @parent.tag(tag)
+                @resource.tag(tag)
             end
         end
     end
@@ -244,7 +248,7 @@ class Puppet::Type
         end
         
         def munge(rels)
-            @parent.store_relationship(self.class.name, rels)
+            @resource.store_relationship(self.class.name, rels)
         end
         
         # Create edges from each of our relationships.    :in
@@ -278,9 +282,9 @@ class Puppet::Type
                 # for futher info on this.
                 if self.class.direction == :in
                     source = object
-                    target = @parent
+                    target = @resource
                 else
-                    source = @parent
+                    source = @resource
                     target = object
                 end
 
@@ -406,4 +410,4 @@ class Puppet::Type
     end
 end # Puppet::Type
 
-# $Id: metaparams.rb 2410 2007-04-24 06:39:22Z luke $
+# $Id: metaparams.rb 2591 2007-06-15 19:49:26Z luke $