puppet 0.13.1 → 0.13.2

data/lib/puppet/type/parsedtype/sshkey.rb

@@ -27,7 +27,11 @@ module Puppet
             # We actually want to return the whole array here, not just the first
             # value.
             def should
-                @should
+                if defined? @should
+                    return @should
+                else
+                    return nil
+                end
             end
 
             validate do |value|
@@ -119,11 +123,11 @@ module Puppet
         def to_record
             name = self[:name]
             if @states.include?(:alias)
-                name += "," + @states[:alias].should.join(",")
+                name += "," + @states[:alias].value.join(",")
             end
-            [name, @states[:type].should, @states[:key].should].join(" ")
+            [name, @states[:type].value, @states[:key].value].join(" ")
         end
     end
 end
 
-# $Id: sshkey.rb 831 2006-01-16 20:01:20Z luke $
+# $Id: sshkey.rb 910 2006-02-15 07:20:36Z luke $

data/lib/puppet/type/pfile.rb

@@ -98,7 +98,7 @@ module Puppet
             cur = []
             # Skip the nil in the beginning and don't add ourselves as a prereq
             # either.
-            self.name.split(File::SEPARATOR)[1..-2].collect { |dir|
+            self[:path].split(File::SEPARATOR)[1..-2].collect { |dir|
                 cur << dir
                 "/" + cur.join(File::SEPARATOR)
             }
@@ -248,7 +248,7 @@ module Puppet
                 # clean up the args a lot for links
                 old = args.dup
                 args = {
-                    :target => old[:source],
+                    :ensure => old[:source],
                     :path => path
                 }
             else
@@ -440,9 +440,11 @@ module Puppet
                 end
             end
 
+            #ignore = self[:ignore] || false
             ignore = self[:ignore]
 
-            #self.warning "Listing path %s" % path.inspect
+            #self.warning "Listing path %s with ignore %s" %
+            #    [path.inspect, ignore.inspect]
             desc = server.list(path, r, ignore)
            
             desc.split("\n").each { |line|
@@ -596,4 +598,4 @@ module Puppet
     require 'puppet/type/pfile/mode'
     require 'puppet/type/pfile/type'
 end
-# $Id: pfile.rb 896 2006-02-10 22:00:30Z luke $
+# $Id: pfile.rb 915 2006-02-15 21:56:54Z luke $

data/lib/puppet/type/pfile/ensure.rb

@@ -12,11 +12,6 @@ module Puppet
         # Most 'ensure' states have a default, but with files we, um, don't.
         nodefault
 
-        #newvalue(:false) do
-        #    # If they say "false" here, we just don't do anything at all; either
-        #    # the file is there or it's not.
-        #end
-
         newvalue(:absent) do
             File.unlink(@parent.name)
         end
@@ -209,4 +204,4 @@ module Puppet
     end
 end
 
-# $Id: ensure.rb 885 2006-02-08 17:44:44Z luke $
+# $Id: ensure.rb 912 2006-02-15 18:23:33Z luke $

data/lib/puppet/type/state.rb

@@ -39,42 +39,6 @@ class State < Puppet::Parameter
 
         define_method("set_" + name.to_s, &block)
     end
-#
-#    def self.aliasvalue(name, other)
-#        @statevalues ||= {}
-#        unless @statevalues.include?(other)
-#            raise Puppet::DevError, "Cannot alias nonexistent value %s" % other
-#        end
-#
-#        @aliasvalues ||= {}
-#        @aliasvalues[name] = other
-#    end
-#
-#    def self.alias(name)
-#        @aliasvalues[name]
-#    end
-#
-    def self.defaultvalues
-        newvalue(:present) do
-            @parent.create
-        end
-
-        newvalue(:absent) do
-            @parent.destroy
-        end
-
-        # This doc will probably get overridden
-        @doc ||= "The basic state that the object should be in."
-    end
-#
-#    # Return the list of valid values.
-#    def self.values
-#        @statevalues ||= {}
-#        @aliasvalues ||= {}
-#
-#        #[@aliasvalues.keys, @statevalues.keys].flatten
-#        @statevalues.keys
-#    end
 
     # Call the method associated with a given value.
     def set
@@ -278,46 +242,13 @@ class State < Puppet::Parameter
         self.set
     end
 
-#    munge do |value|
-#        if self.class.values.empty?
-#            # This state isn't using defined values to do its work.
-#            return value
-#        end
-#        intern = value.to_s.intern
-#        # If it's a valid value, always return it as a symbol.
-#        if self.class.values.include?(intern)
-#            retval = intern
-#        elsif other = self.class.alias(intern)
-#            self.info "returning alias %s for %s" % [other, intern]
-#            retval = other
-#        else
-#            retval = value
-#        end
-#        retval
-#    end
-#
-#    # Verify that the passed value is valid.
-#    validate do |value|
-#        if self.class.values.empty?
-#            # This state isn't using defined values to do its work.
-#            return 
-#        end
-#        unless value.is_a?(Symbol)
-#            value = value.to_s.intern
-#        end
-#        unless self.class.values.include?(value) or self.class.alias(value)
-#            self.fail "Invalid '%s' value '%s'.  Valid values are '%s'" %
-#                    [self.class.name, value, self.class.values.join(", ")]
-#        end
-#    end
-
     # How should a state change be printed as a string?
     def change_to_s
         begin
             if @is == :absent
                 return "defined '%s' as '%s'" %
                     [self.name, self.should_to_s]
-            elsif self.should == :absent
+            elsif self.should == :absent or self.should == [:absent]
                 return "undefined %s from '%s'" %
                     [self.name, self.is_to_s]
             else
@@ -341,7 +272,11 @@ class State < Puppet::Parameter
     end
 
     def should_to_s
-        @should.join(" ")
+        if defined? @should
+            @should.join(" ")
+        else
+            return nil
+        end
     end
 
     def to_s
@@ -349,10 +284,23 @@ class State < Puppet::Parameter
     end
 
     # This state will get automatically added to any type that responds
-    # to the methods 'exists?', 'create', and 'remove'.
+    # to the methods 'exists?', 'create', and 'destroy'.
     class Ensure < Puppet::State
         @name = :ensure
 
+        def self.defaultvalues
+            newvalue(:present) do
+                @parent.create
+            end
+
+            newvalue(:absent) do
+                @parent.destroy
+            end
+
+            # This doc will probably get overridden
+            @doc ||= "The basic state that the object should be in."
+        end
+
         def self.inherited(sub)
             # Add in the two states that everyone will have.
             sub.class_eval do
@@ -378,6 +326,11 @@ class State < Puppet::Parameter
         end
 
         def retrieve
+            # XXX This is a problem -- whether the object exists or not often
+            # depends on the results of other states, yet we're the first state
+            # to get checked, which means that those other states do not have
+            # @is values set.  This seems to be the source of quite a few bugs,
+            # although they're mostly logging bugs, not functional ones.
             if @parent.exists?
                 @is = :present
             else
@@ -387,9 +340,16 @@ class State < Puppet::Parameter
 
         # If they're talking about the thing at all, they generally want to
         # say it should exist.
-        defaultto :present
+        #defaultto :present
+        defaultto do
+            if @parent.managed?
+                :present
+            else
+                nil
+            end
+        end
     end
 end
 end
 
-# $Id: state.rb 883 2006-02-08 16:53:34Z luke $
+# $Id: state.rb 912 2006-02-15 18:23:33Z luke $

data/lib/puppet/type/symlink.rb

@@ -5,20 +5,26 @@ require 'puppet/type/pfile'
 module Puppet
     newtype(:symlink) do
         @doc = "Create symbolic links to existing files."
-        newstate(:target) do
+        #newstate(:ensure) do
+        ensurable do
             require 'etc'
             attr_accessor :file
 
-            @doc = "Create a link to another file.  Currently only symlinks
+            desc "Create a link to another file.  Currently only symlinks
                 are supported, and attempts to replace normal files with
                 links will currently fail, while existing but incorrect symlinks
                 will be removed."
-            @name = :target
+
+            validate do |value|
+                unless value == :absent or value =~ /^#{File::SEPARATOR}/
+                    raise Puppet::Error, "Invalid symlink %s" % value
+                end
+            end
+
+            nodefault
 
             def create
                 begin
-                    @parent.debug("Creating symlink '%s' to '%s'" %
-                        [self.parent[:path],self.should])
                     unless File.symlink(self.should,self.parent[:path])
                         self.fail "Could not create symlink '%s'" %
                             self.parent[:path]
@@ -31,7 +37,6 @@ module Puppet
 
             def remove
                 if FileTest.symlink?(self.parent[:path])
-                    debug("Removing symlink '%s'" % self.parent[:path])
                     begin
                         File.unlink(self.parent[:path])
                     rescue
@@ -52,10 +57,9 @@ module Puppet
 
                 if FileTest.symlink?(self.parent[:path])
                     self.is = File.readlink(self.parent[:path])
-                    debug("link value is '%s'" % self.is)
                     return
                 else
-                    self.is = nil
+                    self.is = :absent
                     return
                 end
             end
@@ -63,28 +67,36 @@ module Puppet
             # this is somewhat complicated, because it could exist and be
             # a file
             def sync
-                if self.should.nil?
+                case self.should
+                when :absent
                     self.remove()
-                else # it should exist and be a symlink
+                    return :symlink_removed
+                when /^#{File::SEPARATOR}/
                     if FileTest.symlink?(self.parent[:path])
                         path = File.readlink(self.parent[:path])
                         if path != self.should
                             self.remove()
                             self.create()
+                            return :symlink_changed
+                        else
+                            self.info "Already in sync"
+                            return nil
                         end
                     elsif FileTest.exists?(self.parent[:path])
                         self.fail "Cannot replace normal file '%s'" %
                             self.parent[:path]
                     else
                         self.create()
+                        return :symlink_created
                     end
+                else
+                    raise Puppet::DevError, "Got invalid symlink value %s" %
+                        self.should
                 end
-
-                #self.parent.newevent(:event => :inode_changed)
             end
         end
 
-        attr_reader :stat, :path, :params
+        attr_reader :stat, :params
 
         copyparam(Puppet.type(:file), :path)
 
@@ -96,7 +108,7 @@ module Puppet
                     # The Solaris Blastwave repository installs everything
                     # in /opt/csw; link it into /usr/local
                     symlink { \"/usr/local\":
-                        target => \"/opt/csw\",
+                        ensure => \"/opt/csw\",
                         recurse => 1
                     }
 
@@ -106,7 +118,7 @@ module Puppet
 
             munge do |value|
                 @stat = nil
-                @target = @parent.state(:target).should
+                @target = @parent.state(:ensure).should
 
                 # we want to remove our state, because we're creating children
                 # to do the links
@@ -124,7 +136,7 @@ module Puppet
                     return
                 end
 
-                @parent.delete(:target)
+                @parent.delete(:ensure)
 
                 recurse = value
                 # we might have a string, rather than a number
@@ -147,7 +159,7 @@ module Puppet
                 # working in pfile
 
                 args = {
-                    :name => @parent.name,
+                    :path => @parent.name,
                     :linkmaker => true,
                     :recurse => recurse,
                     :source => @target
@@ -155,7 +167,6 @@ module Puppet
 
                 dir = Puppet.type(:file).implicitcreate(args)
                 dir.parent = @parent
-                @parent.debug "Got dir %s" % dir.name
                 @parent.push dir
             end
         end
@@ -168,4 +179,4 @@ module Puppet
     end # Puppet.type(:symlink)
 end
 
-# $Id: symlink.rb 841 2006-01-18 17:24:15Z luke $
+# $Id: symlink.rb 903 2006-02-13 21:46:29Z luke $

data/lib/puppet/type/user.rb

@@ -82,19 +82,30 @@ module Puppet
                     return gid
                 end
 
-                # FIXME this should really check to see if we already have a
-                # group ready to be managed; if so, then we should just mark it
-                # as a prereq
-                begin
-                    ginfo = Etc.send(method, gid)
-                rescue ArgumentError => detail
-                    self.fail "Could not find group %s: %s" %
-                        [gid, detail]
+                if group = Puppet::Util.gid(gid)
+                    @found = true
+                    return group
+                else
+                    @found = false
+                    return gid
                 end
+            end
 
-                self.notice "setting gid to %s" % ginfo.gid.inspect
-                return ginfo.gid
+            # *shudder*  Make sure that we've looked up the group and gotten
+            # an ID for it.  Yuck-o.
+            def should
+                unless defined? @should
+                    return super
+                end
+                unless defined? @found and @found
+                    @should = @should.each { |val|
+                        next unless val
+                        Puppet::Util.gid(val)
+                    }
+                end
+                super
             end
+
         end
 
         newstate(:comment, @parentstate) do
@@ -167,6 +178,47 @@ module Puppet
 
         @netinfodir = "users"
 
+        # Autorequire the group, if it's around
+        autorequire(:group) do
+            #return nil unless @states.include?(:gid)
+            #return nil unless groups = @states[:gid].shouldorig
+            autos = []
+
+            if @states.include?(:gid) and groups = @states[:gid].shouldorig
+                groups = groups.collect { |group|
+                    if group =~ /^\d+$/
+                        Integer(group)
+                    else
+                        group
+                    end
+                }
+                groups.each { |group|
+                    case group
+                    when Integer:
+                        if obj = Puppet.type(:group).find { |gobj|
+                            gobj.should(:gid) == group
+                        }
+                            autos << obj
+                            
+                        end
+                    else
+                        autos << group
+                    end
+                }
+            end
+
+            autos
+        end
+
+        autorequire(:file) do
+            dir = self.should(:home) or self.is(:home)
+            if dir =~ /^#{File::SEPARATOR}/
+                dir
+            else
+                nil
+            end
+        end
+
         def exists?
             self.class.parentmodule.exists?(self)
         end
@@ -225,4 +277,4 @@ module Puppet
     end
 end
 
-# $Id: user.rb 841 2006-01-18 17:24:15Z luke $
+# $Id: user.rb 912 2006-02-15 18:23:33Z luke $