puppet 0.13.6 → 0.16.0

data/lib/puppet/type/cron.rb

@@ -27,7 +27,11 @@ module Puppet
                 if self.class.name == :command
                     return super
                 else
-                    return @is == @should
+                    if @is.is_a? Array
+                        return @is == @should
+                    else
+                        return @is == @should[0]
+                    end
                 end
             end
 
@@ -90,7 +94,7 @@ module Puppet
             end
 
             def should_to_s
-                if @should.empty?
+                if ! defined? @should or @should.empty?
                     return "*"
                 else
                     return @should.join(",")
@@ -204,19 +208,15 @@ module Puppet
                 
                 The user defaults to whomever Puppet is running as."
 
-            defaultto Process.uid
+            defaultto { ENV["USER"] }
 
-            validate do |user|
-                require 'etc'
+            def value=(value)
+                super
 
-                begin
-                    parent.uid = Puppet::Util.uid(user)
-                    #obj = Etc.getpwnam(user)
-                rescue ArgumentError
-                    self.fail "User %s not found" % user
+                # Make sure the user is not an array
+                if @value.is_a? Array
+                    @value = @value[0]
                 end
-
-                user
             end
         end
 
@@ -314,6 +314,15 @@ module Puppet
             end
         end
 
+        def self.list
+            # Look for cron jobs for each user
+            Puppet::Type.type(:user).list.each { |user|
+                self.retrieve(user.name)
+            }
+
+            self.collect { |c| c }
+        end
+
         # Parse a user's cron job into individual cron objects.
         #
         # Autogenerates names for any jobs that don't already have one; these
@@ -400,6 +409,13 @@ module Puppet
         # method.  Returns nil if there was no cron job; else, returns the
         # number of cron instances found.
         def self.retrieve(user)
+            # First make sure the user exists
+            begin
+                Puppet::Util.uid(user)
+            rescue ArgumentError
+                raise Puppet::Error,  "User %s not found" % user
+            end
+
             @tabs[user] ||= @filetype.new(user)
             text = @tabs[user].read
             if $? != 0
@@ -480,7 +496,6 @@ module Puppet
 
         def create
             # nothing
-            self.info "creating"
             self.store
         end
 
@@ -544,4 +559,4 @@ module Puppet
     end
 end
 
-# $Id: cron.rb 910 2006-02-15 07:20:36Z luke $
+# $Id: cron.rb 1127 2006-04-21 02:36:30Z luke $

data/lib/puppet/type/exec.rb

@@ -138,12 +138,8 @@ module Puppet
 
                 loglevel = @parent[:loglevel]
                 if status.exitstatus.to_s != self.should.to_s
-                    err("%s returned %s instead of %s" %
+                    self.fail("%s returned %s instead of %s" %
                         [self.parent[:command], status.exitstatus, self.should.to_s])
-
-                    # if we've had a failure, up the log level
-                    loglevel = :err
-                    event = :failed_command
                 end
 
                 if log = @parent[:logoutput]
@@ -244,14 +240,14 @@ module Puppet
             desc "The directory from which to run the command.  If
                 this directory does not exist, the command will fail."
 
+            validate do |dir|
+                self.fail("CWD must be a fully qualified path") unless dir
+            end
+
             munge do |dir|
                 if dir.is_a?(Array)
                     dir = dir[0]
                 end
-
-                unless File.directory?(dir)
-                    self.fail "Directory '%s' does not exist" % dir
-                end
                 
                 dir
             end
@@ -288,9 +284,11 @@ module Puppet
                 
                 "
 
+            newvalues(:true, :false)
+
             # We always fail this test, because we're only supposed to run
             # on refresh.
-            def check
+            def check(value)
                 false
             end
         end
@@ -312,16 +310,22 @@ module Puppet
 
             # FIXME if they try to set this and fail, then we should probably 
             # fail the entire exec, right?
-            validate do |file|
-                unless file =~ %r{^#{File::SEPARATOR}}
-                    self.fail "'creates' files must be fully qualified."
+            validate do |files|
+                files = [files] unless files.is_a? Array
+
+                files.each do |file|
+                    self.fail("'creates' must be set to a fully qualified path") unless file
+
+                    unless file =~ %r{^#{File::SEPARATOR}}
+                        self.fail "'creates' files must be fully qualified."
+                    end
                 end
             end
 
             # If the file exists, return false (i.e., don't run the command),
             # else return true
-            def check
-                return ! FileTest.exists?(self.value)
+            def check(value)
+                return ! FileTest.exists?(value)
             end
         end
 
@@ -341,9 +345,17 @@ module Puppet
                 which is to say that it must be fully qualified if the path is not set.
                 "
 
+            validate do |cmds|
+                cmds = [cmds] unless cmds.is_a? Array
+
+                cmds.each do |cmd|
+                    @parent.validatecmd(cmd)
+                end
+            end
+
             # Return true if the command does not return 0.
-            def check
-                output, status = @parent.run(self.value)
+            def check(value)
+                output, status = @parent.run(value, true)
 
                 return status.exitstatus != 0
             end
@@ -364,9 +376,17 @@ module Puppet
                 which is to say that it must be fully qualified if the path is not set.
                 "
 
+            validate do |cmds|
+                cmds = [cmds] unless cmds.is_a? Array
+
+                cmds.each do |cmd|
+                    @parent.validatecmd(cmd)
+                end
+            end
+
             # Return true if the command returns 0.
-            def check
-                output, status = @parent.run(self.value)
+            def check(value)
+                output, status = @parent.run(value, true)
 
                 return status.exitstatus == 0
             end
@@ -376,14 +396,10 @@ module Puppet
         @isomorphic = false
 
         validate do
-            # if we're not fully qualified, require a path
-            if self[:command] !~ /^\//
-                if self[:path].nil?
-                    self.fail "both unqualifed and specified no search path"
-                end
-            end
+            validatecmd(self[:command])
         end
 
+        # FIXME exec should autorequire any exec that 'creates' our cwd
         autorequire(:file) do
             reqs = []
 
@@ -399,11 +415,16 @@ module Puppet
             [:onlyif, :unless].each { |param|
                 next unless tmp = self[param]
 
-                # And search the command line for files, adding any we find.  This
-                # will also catch the command itself if it's fully qualified.  It might
-                # not be a bad idea to add unqualified files, but, well, that's a
-                # bit more annoying to do.
-                reqs += tmp.scan(%r{(#{File::SEPARATOR}\S+)})
+                tmp = [tmp] unless tmp.is_a? Array
+
+                tmp.each do |line|
+                    # And search the command line for files, adding any we
+                    # find.  This will also catch the command itself if it's
+                    # fully qualified.  It might not be a bad idea to add
+                    # unqualified files, but, well, that's a bit more annoying
+                    # to do.
+                    reqs += line.scan(%r{(#{File::SEPARATOR}\S+)})
+                end
             }
 
             # For some reason, the += isn't causing a flattening
@@ -412,12 +433,20 @@ module Puppet
             reqs
         end
 
+        def self.list
+            self.collect { |i| i }
+        end
+
         # Verify that we pass all of the checks.
         def check
             self.class.checks.each { |check|
                 if @parameters.include?(check)
-                    unless @parameters[check].check
-                        return false
+                    val = @parameters[check].value
+                    val = [val] unless val.is_a? Array
+                    val.each do |value|
+                        unless @parameters[check].check(value)
+                            return false
+                        end
                     end
                 end
             }
@@ -439,11 +468,30 @@ module Puppet
         end
 
         # Run a command.
-        def run(command)
+        def run(command, check = false)
             output = nil
             status = nil
             tmppath = ENV["PATH"]
-            dir = self[:cwd] || Dir.pwd
+
+            dir = nil
+
+            if dir = self[:cwd]
+                unless File.directory?(dir)
+                    if check
+                        dir = nil
+                    else
+                        self.fail "Working directory '%s' does not exist" % dir
+                    end
+                end
+            end
+
+            dir ||= Dir.pwd
+
+            if check
+                debug "Executing check '#{command}'"
+            else
+                debug "Executing '#{command}'"
+            end
             begin
                 # Do our chdir
                 Dir.chdir(dir) {
@@ -482,7 +530,16 @@ module Puppet
         def to_s
             "exec(%s)" % self.name
         end
+
+        def validatecmd(cmd)
+            # if we're not fully qualified, require a path
+            if cmd !~ /^\//
+                if self[:path].nil?
+                    self.fail "both unqualifed and specified no search path"
+                end
+            end
+        end
     end
 end
 
-# $Id: exec.rb 922 2006-02-16 19:10:34Z luke $
+# $Id: exec.rb 1125 2006-04-20 19:38:48Z luke $

data/lib/puppet/type/group.rb

@@ -112,15 +112,23 @@ module Puppet
 
             def autogen
                 highest = 0
-                Etc.group { |group|
-                    if group.gid > highest
-                        unless group.gid > 65000
-                            highest = group.gid
+
+                # Make sure we don't use the same value multiple times
+                if defined? @@prevauto
+                    @@prevauto += 1
+                else
+                    Etc.group { |group|
+                        if group.gid > highest
+                            unless group.gid > 65000
+                                highest = group.gid
+                            end
                         end
-                    end
-                }
+                    }
+
+                    @@prevauto = highest + 1
+                end
 
-                return highest + 1
+                return @@prevauto
             end
 
             munge do |gid|
@@ -136,15 +144,14 @@ module Puppet
                         self.devfail "Invalid GID %s" % gid
                     end
                     if gid == :auto
+                        # FIXME this should be done at sync time, not
+                        # here.
                         unless self.class.autogen?
                             gid = autogen()
-                            @parent.log "autogenerated value as %s" % gid
                         end
                     end
                 end
 
-                self.info "Setting gid to %s" % gid
-
                 return gid
             end
         end
@@ -164,6 +171,17 @@ module Puppet
             isnamevar
         end
 
+        # List all groups
+        def self.listbyname
+            groups = []
+            while ent = Etc.getgrent
+                groups << ent.name
+            end
+            Etc.endgrent
+
+            return groups
+        end
+
         def exists?
             self.class.parentmodule.exists?(self)
         end
@@ -204,4 +222,4 @@ module Puppet
     end
 end
 
-# $Id: group.rb 966 2006-03-02 17:12:26Z luke $
+# $Id: group.rb 1125 2006-04-20 19:38:48Z luke $

data/lib/puppet/type/nameservice.rb

@@ -11,6 +11,27 @@ class Type
             # netinfo types if that were the case.
             attr_accessor :netinfodir
 
+            # Create an instance for every object that exists on the machine
+            def list
+                listbyname.collect do |name|
+                    obj = nil
+                    check = @states.collect { |st| st.name }
+                    if obj = self[name]
+                        obj[:check] = check
+                    else
+                        # unless it exists, create it as an unmanaged object
+                        obj = self.create(:name => name, :check => check)
+                    end
+
+                    next unless obj # In case there was an error somewhere
+                    
+                    obj.retrieve
+
+
+                    obj
+                end
+            end
+
             def newstate(*args, &block)
                 s = super(*args, &block)
 
@@ -110,6 +131,33 @@ class State
             end
         end
 
+        # The list of all groups the user is a member of.  Different
+        # user mgmt systems will need to override this method.
+        def grouplist
+            groups = []
+
+            # Reset our group list
+            Etc.setgrent
+
+            user = @parent[:name]
+
+            # Now iterate across all of the groups, adding each one our
+            # user is a member of
+            while group = Etc.getgrent
+                members = group.mem
+
+                if members.include? user
+                    groups << group.name
+                end
+            end
+
+            # We have to close the file, so each listing is a separate
+            # reading of the file.
+            Etc.endgrent
+
+            groups
+        end
+
         # Sync the information.
         def sync
             event = nil
@@ -194,6 +242,7 @@ class State
                 Puppet.debug "%s is not allatonce" % @parent.class.name
                 if type == "create"
                     @parent.eachstate { |state|
+                        next if state.name == :ensure
                         state.sync
                         state.retrieve
                     }
@@ -215,4 +264,4 @@ else
 end
 
 
-# $Id: nameservice.rb 966 2006-03-02 17:12:26Z luke $
+# $Id: nameservice.rb 1125 2006-04-20 19:38:48Z luke $