puppet 0.9.2 → 0.13.0

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

@@ -1,31 +1,28 @@
 module Puppet
-    class State
-        class PFileType < Puppet::State
-            require 'etc'
-            @doc = "A read-only state to check the file type."
-            @name = :type
+    Puppet.type(:file).newstate(:type) do
+        require 'etc'
+        desc "A read-only state to check the file type."
 
-            def shouldprocess(value)
-                raise Puppet::Error, ":type is read-only"
+        #munge do |value|
+        #    raise Puppet::Error, ":type is read-only"
+        #end
+        
+        def retrieve
+            if stat = @parent.stat(false)
+                @is = stat.ftype
+            else
+                @is = :absent
             end
-            
-            def retrieve
-                if stat = @parent.stat(true)
-                    @is = stat.ftype
-                else
-                    @is = :notfound
-                end
 
-                # so this state is never marked out of sync
-                @should = [@is]
-            end
+            # so this state is never marked out of sync
+            @should = [@is]
+        end
 
 
-            def sync
-                raise Puppet::Error, ":type is read-only"
-            end
+        def sync
+            raise Puppet::Error, ":type is read-only"
         end
     end
 end
 
-# $Id: type.rb 713 2005-10-02 01:56:38Z luke $
+# $Id: type.rb 862 2006-01-31 02:07:56Z luke $

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

@@ -1,166 +1,163 @@
 module Puppet
-    class State
-        class PFileUID < Puppet::State
-            require 'etc'
-            @doc = "To whom the file should belong.  Argument can be user name or
-                user ID."
-            @name = :owner
-            @event = :inode_changed
-
-            def id2name(id)
-                if id.is_a?(Symbol)
-                    return id.to_s
-                end
-                begin
-                    user = Etc.getpwuid(id)
-                rescue TypeError
-                    return nil
-                rescue ArgumentError
-                    return nil
-                end
+    Puppet.type(:file).newstate(:owner) do
+        require 'etc'
+        desc "To whom the file should belong.  Argument can be user name or
+            user ID."
+        @event = :file_changed
+
+        def id2name(id)
+            if id.is_a?(Symbol)
+                return id.to_s
+            end
+            begin
+                user = Etc.getpwuid(id)
+            rescue TypeError
+                return nil
+            rescue ArgumentError
+                return nil
+            end
+            if user.uid == ""
+                return nil
+            else
+                return user.name
+            end
+        end
+
+        def name2id(value)
+            if value.is_a?(Symbol)
+                return value.to_s
+            end
+            begin
+                user = Etc.getpwnam(value)
                 if user.uid == ""
                     return nil
-                else
-                    return user.name
                 end
+                return user.uid
+            rescue ArgumentError => detail
+                return nil
             end
+        end
 
-            def name2id(value)
-                if value.is_a?(Symbol)
-                    return value.to_s
-                end
-                begin
-                    user = Etc.getpwnam(value)
-                    if user.uid == ""
-                        return nil
-                    end
-                    return user.uid
-                rescue ArgumentError => detail
-                    return nil
-                end
+        # Determine if the user is valid, and if so, return the UID
+        def validuser?(value)
+            if value =~ /^\d+$/
+                value = value.to_i
             end
 
-            # Determine if the user is valid, and if so, return the UID
-            def validuser?(value)
-                if value =~ /^\d+$/
-                    value = value.to_i
+            if value.is_a?(Integer)
+                # verify the user is a valid user
+                if tmp = id2name(value)
+                    return value
+                else
+                    return false
                 end
-
-                if value.is_a?(Integer)
-                    # verify the user is a valid user
-                    if tmp = id2name(value)
-                        return value
-                    else
-                        return false
-                    end
+            else
+                if tmp = name2id(value)
+                    return tmp
                 else
-                    if tmp = name2id(value)
-                        return tmp
-                    else
-                        return false
-                    end
+                    return false
                 end
             end
+        end
 
-            # We want to print names, not numbers
-            def is_to_s
-                id2name(@is) || @is
+        # We want to print names, not numbers
+        def is_to_s
+            id2name(@is) || @is
+        end
+
+        def should_to_s
+            case self.should
+            when Symbol
+                self.should.to_s
+            when Integer
+                id2name(self.should) || self.should
+            when String
+                self.should
+            else
+                raise Puppet::DevError, "Invalid uid type %s(%s)" %
+                    [self.should.class, self.should]
             end
+        end
 
-            def should_to_s
-                case self.should
-                when Symbol
-                    self.should.to_s
-                when Integer
-                    id2name(self.should) || self.should
-                when String
-                    self.should
-                else
-                    raise Puppet::DevError, "Invalid uid type %s(%s)" %
-                        [self.should.class, self.should]
-                end
+        def retrieve
+            unless stat = @parent.stat(false)
+                @is = :absent
+                return
             end
 
-            def retrieve
-                unless stat = @parent.stat(true)
-                    @is = :notfound
-                    return
-                end
+            self.is = stat.uid
 
-                self.is = stat.uid
+            # On OS X, files that are owned by -2 get returned as really
+            # large UIDs instead of negative ones.  This isn't a Ruby bug,
+            # it's an OS X bug, since it shows up in perl, too.
+            if @is > 120000
+                self.warning "current state is silly: %s" % @is
+                @is = :absent
+            end
+        end
 
-                # On OS X, files that are owned by -2 get returned as really
-                # large UIDs instead of negative ones.  This isn't a Ruby bug,
-                # it's an OS X bug, since it shows up in perl, too.
-                if @is > 120000
-                    self.warning "current state is silly: %s" % @is
-                    @is = :notfound
-                end
+        # If we're not root, we can check the values but we cannot change
+        # them.  We can't really do any processing here, because users
+        # might not exist yet.  FIXME There's still a bit of a problem here
+        # if the user's UID changes at run time, but we're just going to
+        # have to be okay with that for now, unfortunately.
+        munge do |value|
+            if tmp = self.validuser?(value)
+                return tmp
+            else
+                return value
             end
+        end
 
-            # If we're not root, we can check the values but we cannot change
-            # them.  We can't really do any processing here, because users
-            # might not exist yet.  FIXME There's still a bit of a problem here
-            # if the user's UID changes at run time, but we're just going to
-            # have to be okay with that for now, unfortunately.
-            def shouldprocess(value)
-                if tmp = self.validuser?(value)
-                    return tmp
-                else
-                    return value
+        def sync
+            unless Process.uid == 0
+                unless defined? @@notifieduid
+                    self.notice "Cannot manage ownership unless running as root"
+                    #@parent.delete(self.name)
+                    @@notifieduid = true
                 end
+                return nil
             end
 
-            def sync
-                unless Process.uid == 0
-                    unless defined? @@notifieduid
-                        self.notice "Cannot manage ownership unless running as root"
-                        #@parent.delete(self.name)
-                        @@notifieduid = true
-                    end
-                    return nil
+            user = nil
+            unless user = self.validuser?(self.should)
+                tmp = self.should
+                unless defined? @@usermissing
+                    @@usermissing = {}
                 end
 
-                user = nil
-                unless user = self.validuser?(self.should)
-                    tmp = self.should
-                    unless defined? @@usermissing
-                        @@usermissing = {}
-                    end
-
-                    if @@usermissing.include?(tmp)
-                        @@usermissing[tmp] += 1
-                    else
-                        self.notice "user %s does not exist" % tmp
-                        @@usermissing[tmp] = 1
-                        return nil
-                    end
+                if @@usermissing.include?(tmp)
+                    @@usermissing[tmp] += 1
+                else
+                    self.notice "user %s does not exist" % tmp
+                    @@usermissing[tmp] = 1
                 end
+                return nil
+            end
 
-                if @is == :notfound
-                    @parent.stat(true)
-                    self.retrieve
-                    if @is == :notfound
-                        self.info "File does not exist; cannot set owner"
-                        return nil
-                    end
-                    if self.insync?
-                        return nil
-                    end
-                    #self.debug "%s: after refresh, is '%s'" % [self.class.name,@is]
+            if @is == :absent
+                @parent.stat(true)
+                self.retrieve
+                if @is == :absent
+                    self.info "File does not exist; cannot set owner"
+                    return nil
                 end
-
-                begin
-                    File.chown(user, nil, @parent[:path])
-                rescue => detail
-                    raise Puppet::Error, "Failed to set owner to '%s': %s" %
-                        [user, detail]
+                if self.insync?
+                    return nil
                 end
+                #self.debug "%s: after refresh, is '%s'" % [self.class.name,@is]
+            end
 
-                return :inode_changed
+            begin
+                File.chown(user, nil, @parent[:path])
+            rescue => detail
+                raise Puppet::Error, "Failed to set owner to '%s': %s" %
+                    [user, detail]
             end
+
+            return :file_changed
         end
     end
 end
 
-# $Id: uid.rb 749 2005-11-22 05:33:42Z luke $
+# $Id: uid.rb 862 2006-01-31 02:07:56Z luke $

data/lib/puppet/type/pfilebucket.rb

@@ -1,80 +1,85 @@
-# An interface for managing filebuckets from puppet 
-
-# $Id: pfilebucket.rb 632 2005-09-07 05:28:28Z luke $
-
 require 'puppet/server/filebucket'
 
 module Puppet
-	class Type
-		class PFileBucket < Type
-            attr_reader :bucket
+    newtype(:filebucket) do
+        attr_reader :bucket
+
+        @doc = "A repository for backing up files.  If no filebucket is
+            defined, then files will be backed up in their current directory,
+            but the filebucket can be either a host- or site-global repository
+            for backing up.  It stores files and returns the MD5 sum, which
+            can later be used to retrieve the file if restoration becomes
+            necessary.  A filebucket does not do any work itself; instead,
+            it can be specified as the value of *backup* in a **file** object.
+            
+            Currently, filebuckets are only useful for manual retrieval of
+            accidentally removed files (e.g., you look in the log for the md5
+            sum and retrieve the file with that sum from the filebucket), but
+            when transactions are fully supported filebuckets will be used to
+            undo transactions."
 
-			@states = []
+        @states = []
 
-			@parameters = [
-                :name,
-                :server,
-                :path,
-                :port
-            ]
+        newparam(:name) do
+            desc "The name of the filebucket."
+            isnamevar
+        end
 
-            @doc = "A repository for backing up files.  If no filebucket is
-                defined, then files will be backed up in their current directory,
-                but the filebucket can be either a host- or site-global repository
-                for backing up.  It stores files and returns the MD5 sum, which
-                can later be used to retrieve the file if restoration becomes
-                necessary.  A filebucket does not do any work itself; instead,
-                it can be specified as the value of *backup* in a **file** object."
+        newparam(:server) do
+            desc "The server providing the filebucket.  If this is
+                not specified, then the bucket is local and *path* must be
+                specified."
+        end
 
-            @paramdoc[:name] = "The name of the filebucket."
-            @paramdoc[:server] = "The server providing the filebucket.  If this is
-                not specified, then the bucket is local and *path* must be specified."
-            @paramdoc[:port] = "The port on which the remote server is listening.
+        newparam(:port) do
+            desc "The port on which the remote server is listening.
                 Defaults to the normal Puppet port, %s." % Puppet[:masterport]
-            @paramdoc[:path] = "The path to the local filebucket.  If this is
+
+            defaultto Puppet[:masterport]
+        end
+
+        newparam(:path) do
+            desc "The path to the local filebucket.  If this is
                 not specified, then the bucket is remote and *server* must be
                 specified."
+        end
 
-            @name = :filebucket
-			@namevar = :name
+        # get the actual filebucket object
+        def self.bucket(name)
+            oname, object = @objects.find { |oname, o| oname == name }
+            return object.bucket
+        end
 
-            # get the actual filebucket object
-            def self.bucket(name)
-                oname, object = @objects.find { |oname, o| oname == name }
-                return object.bucket
-            end
-
-            def initialize(hash)
-                super
+        def initialize(hash)
+            super
 
-                if @parameters.include?(:server)
-                    @parameters[:port] ||= FileBucket::DEFAULTPORT
-                    begin
-                        @bucket = Puppet::Client::Dipper.new( 
-                            :Server => @parameters[:server],
-                            :Port => @parameters[:port]
-                        )
-                    rescue => detail
-                        raise Puppet::Error.new(
-                            "Could not create remote filebucket: %s" % detail
-                        )
-                    end
-                else
-                    @parameters[:path] ||= Puppet[:bucketdir]
-                    begin
-                        @bucket = Puppet::Client::Dipper.new(
-                            :Path => @parameters[:path]
-                        )
-                    rescue => detail
-                        raise Puppet::Error.new(
-                            "Could not create local filebucket: %s" % detail
-                        )
-                    end
+            if self[:server]
+                begin
+                    @bucket = Puppet::Client::Dipper.new( 
+                        :Server => self[:server],
+                        :Port => self[:port]
+                    )
+                rescue => detail
+                    self.fail(
+                        "Could not create remote filebucket: %s" % detail
+                    )
+                end
+            else
+                unless self[:path]
+                    self[:path] = Puppet[:bucketdir] 
+                end
+                begin
+                    @bucket = Puppet::Client::Dipper.new(
+                        :Path => self[:path]
+                    )
+                rescue => detail
+                    self.fail(
+                        "Could not create local filebucket: %s" % detail
+                    )
                 end
             end
-
-		end
-	end
+        end
+    end
 end
 
-# $Id: pfilebucket.rb 632 2005-09-07 05:28:28Z luke $
+# $Id: pfilebucket.rb 841 2006-01-18 17:24:15Z luke $