puppet 0.13.0 → 0.13.1

data/lib/puppet/type/cron.rb

@@ -21,6 +21,16 @@ module Puppet
                 attr_accessor :boundaries
             end
 
+            # We have to override the parent method, because we consume the entire
+            # "should" array
+            def insync?
+                if self.class.name == :command
+                    return super
+                else
+                    return @is == @should
+                end
+            end
+
             # A method used to do parameter input handling.  Converts integers
             # in string form to actual integers, and returns the value if it's
             # an integer or false if it's just a normal string.
@@ -67,6 +77,18 @@ module Puppet
                 return false
             end
 
+            def is_to_s
+                if @is.empty?
+                    return "*"
+                else
+                    if @is.is_a? Array
+                        return @is.join(",")
+                    else
+                        return @is.to_s
+                    end
+                end
+            end
+
             def should_to_s
                 if @should.empty?
                     return "*"
@@ -169,16 +191,18 @@ module Puppet
         newparam(:user) do
             desc "The user to run the command as.  This user must
                 be allowed to run cron jobs, which is not currently checked by
-                Puppet."
+                Puppet.
+                
+                The user defaults to whomever Puppet is running as."
+
+            defaultto Process.uid
 
-            # This validation isn't really a good idea, since the user might
-            # be created by Puppet, in which case the validation will fail.
             validate do |user|
                 require 'etc'
 
                 begin
-                    obj = Etc.getpwnam(user)
-                    parent.uid = obj.uid
+                    parent.uid = Puppet::Util.uid(user)
+                    #obj = Etc.getpwnam(user)
                 rescue ArgumentError
                     self.fail "User %s not found" % user
                 end
@@ -212,13 +236,6 @@ module Puppet
         @instances = {}
         @tabs = {}
 
-        case Facter["operatingsystem"].value
-        when "Solaris":
-            @filetype = Puppet::FileType.filetype(:suntab)
-        else
-            @filetype = Puppet::FileType.filetype(:crontab)
-        end
-
         class << self
             attr_accessor :filetype
         end
@@ -240,6 +257,17 @@ module Puppet
             super
         end
 
+        def self.defaulttype
+            case Facter["operatingsystem"].value
+            when "Solaris":
+                return Puppet::FileType.filetype(:suntab)
+            else
+                return Puppet::FileType.filetype(:crontab)
+            end
+        end
+
+        self.filetype = self.defaulttype()
+
         # Override the default Puppet::Type method, because instances
         # also need to be deleted from the @instances hash
         def self.delete(child)
@@ -303,9 +331,9 @@ module Puppet
                         fields().zip(match.captures).each { |param, value|
                             unless value == "*"
                                 unless param == :command
-                                    if value =~ /,/
-                                        value = value.split(",")
-                                    end
+                                    # We always want the 'is' value to be an
+                                    # array
+                                    value = value.split(",")
                                 end
                                 hash[param] = value
                             end
@@ -403,7 +431,7 @@ module Puppet
         # Collect all Cron instances for a given user and convert them
         # into literal text.
         def self.tab(user)
-            Puppet.info "writing cron tab for %s" % user
+            Puppet.info "Writing cron tab for %s" % user
             if @instances.include?(user)
                 return self.header() + @instances[user].reject { |obj|
                     if obj.is_a?(self) and obj.should(:ensure) == :absent
@@ -501,4 +529,4 @@ module Puppet
     end
 end
 
-# $Id: cron.rb 841 2006-01-18 17:24:15Z luke $
+# $Id: cron.rb 898 2006-02-13 17:13:09Z luke $

data/lib/puppet/type/parsedtype.rb

@@ -55,7 +55,8 @@ module Puppet
                     tail = "deleted"
                 #elsif @is == @should
                 elsif self.insync?
-                    self.info "already in sync"
+                    self.info "Already in sync: %s vs %s" %
+                        [@is.inspect, @should.inspect]
                     return nil
                 else
                     #@is = self.should
@@ -292,4 +293,4 @@ end
 require 'puppet/type/parsedtype/host'
 require 'puppet/type/parsedtype/port'
 
-# $Id: parsedtype.rb 847 2006-01-23 22:38:39Z luke $
+# $Id: parsedtype.rb 898 2006-02-13 17:13:09Z luke $

data/lib/puppet/type/pfile.rb

@@ -22,6 +22,12 @@ module Puppet
         newparam(:path) do
             desc "The path to the file to manage.  Must be fully qualified."
             isnamevar
+
+            validate do |value|
+                unless value =~ /^#{File::SEPARATOR}/
+                    raise Puppet::Error, "File paths must be fully qualified"
+                end
+            end
         end
 
         newparam(:backup) do
@@ -590,4 +596,4 @@ module Puppet
     require 'puppet/type/pfile/mode'
     require 'puppet/type/pfile/type'
 end
-# $Id: pfile.rb 883 2006-02-08 16:53:34Z luke $
+# $Id: pfile.rb 896 2006-02-10 22:00:30Z luke $

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

@@ -181,7 +181,6 @@ module Puppet
             # out of sync.  We don't want to generate an event the first
             # time we get a sum.
             if @should == [:nosum]
-                self.warning "updatingness from %s" % @should.inspect
                 @should = [@is]
                 # FIXME we should support an updatechecksums-like mechanism
                 self.updatesum
@@ -272,4 +271,4 @@ module Puppet
     end
 end
 
-# $Id: checksum.rb 885 2006-02-08 17:44:44Z luke $
+# $Id: checksum.rb 896 2006-02-10 22:00:30Z luke $

data/lib/puppet/util.rb

@@ -1,7 +1,12 @@
 # A module to collect utility functions.
 
+require 'sync'
+require 'puppet/lock'
+
 module Puppet
 module Util
+    # Create a sync point for any threads
+    @@sync = Sync.new
     # Execute a block as a given user or group
     def self.asuser(user = nil, group = nil)
         require 'etc'
@@ -16,21 +21,7 @@ module Util
             # The gid has to be changed first, because, well, otherwise we won't
             # be able to
             if group
-                if group.is_a?(Integer)
-                    gid = group
-                else
-                    unless obj = Puppet.type(:group)[group]
-                        obj = Puppet.type(:group).create(
-                            :name => group,
-                            :check => [:gid]
-                        )
-                    end
-                    obj.retrieve
-                    gid = obj.is(:gid)
-                    unless gid.is_a?(Integer)
-                        raise Puppet::Error, "Could not find group %s" % group
-                    end
-                end
+                gid = self.gid(group)
 
                 if Process.gid != gid
                     oldgid = Process.gid
@@ -43,23 +34,7 @@ module Util
             end
 
             if user
-                # Retrieve the user id
-                if user.is_a?(Integer)
-                    uid = user
-                else
-                    unless obj = Puppet.type(:user)[user]
-                        obj = Puppet.type(:user).create(
-                            :name => user,
-                            :check => [:uid, :gid]
-                        )
-                    end
-                    obj.retrieve
-                    uid = obj.is(:uid)
-                    unless uid.is_a?(Integer)
-                        raise Puppet::Error, "Could not find user %s" % user
-                    end
-                end
-
+                uid = self.uid(user)
                 # Now change the uid
                 if Process.uid != uid
                     olduid = Process.uid
@@ -88,16 +63,7 @@ module Util
     # Change the process to a different user
     def self.chuser
         if group = Puppet[:group]
-            if group =~ /^\d+$/
-                group = Integer(group)
-            else
-                begin
-                    g = Etc.getgrnam(group)
-                rescue ArgumentError
-                    $stderr.puts "Could not find group %s" % group
-                end
-                group = g.gid
-            end
+            group = self.gid(group)
             unless Process.gid == group
                 begin
                     Process.egid = group 
@@ -110,16 +76,7 @@ module Util
         end
 
         if user = Puppet[:user]
-            if user =~ /^\d+$/
-                user = Integer(user)
-            else
-                begin
-                    u = Etc.getpwnam(user)
-                rescue ArgumentError
-                    $stderr.puts "Could not find user %s" % user
-                end
-                user = u.uid
-            end
+            user = self.uid(user)
             unless Process.uid == user
                 begin
                     Process.euid = user 
@@ -132,8 +89,90 @@ module Util
         end
     end
 
+    # Create a shared lock for reading
+    def self.readlock(file)
+        @@sync.synchronize(Sync::SH) do
+            File.open(file) { |f|
+                f.lock_shared { |lf| yield lf }
+            }
+        end
+    end
+
+    # Create an exclusive lock fro writing, and do the writing in a
+    # tmp file.
+    def self.writelock(file, mode = 0600)
+        tmpfile = file + ".tmp"
+        @@sync.synchronize(Sync::EX) do
+            File.open(file, "w", mode) do |rf|
+                rf.lock_exclusive do |lrf|
+                    yield lrf
+                    File.open(tmpfile, "w", mode) do |tf|
+                        yield tf
+                        tf.flush
+                    end
+                    begin
+                        File.rename(tmpfile, file)
+                    rescue => detail
+                        Puppet.err "Could not rename %s to %s: %s" %
+                            [file, tmpfile, detail]
+                    end
+                end
+            end
+        end
+    end
+
+    # Get the GID of a given group, provided either a GID or a name
+    def self.gid(group)
+        if group =~ /^\d+$/
+            group = Integer(group)
+        end
+        gid = nil
+        if group.is_a?(Integer)
+            gid = group
+        else
+            unless obj = Puppet.type(:group)[group]
+                obj = Puppet.type(:group).create(
+                    :name => group,
+                    :check => [:gid]
+                )
+            end
+            obj.retrieve
+            gid = obj.is(:gid)
+            unless gid.is_a?(Integer)
+                raise Puppet::Error, "Could not find group %s" % group
+            end
+        end
+
+        return gid
+    end
+
+    # Get the UID of a given user, whether a UID or name is provided
+    def self.uid(user)
+        uid = nil
+        if user =~ /^\d+$/
+            user = Integer(user)
+        end
+        if user.is_a?(Integer)
+            uid = user
+        else
+            unless obj = Puppet.type(:user)[user]
+                obj = Puppet.type(:user).create(
+                    :name => user,
+                    :check => [:uid, :gid]
+                )
+            end
+            obj.retrieve
+            uid = obj.is(:uid)
+            unless uid.is_a?(Integer)
+                raise Puppet::Error, "Could not find user %s" % user
+            end
+        end
+
+        return uid
+    end
+
     # Create a lock file while something is happening
-    def self.lock(*opts)
+    def self.disabledlock(*opts)
         lock = opts[0] + ".lock"
         while File.exists?(lock)
             stamp = File.stat(lock).mtime.to_i 
@@ -141,9 +180,11 @@ module Util
                 Puppet.notice "Lock file %s is %s seconds old; removing" %
                     [lock, Time.now.to_i - stamp]
                 File.delete(lock)
+                break
+            else
+                sleep 0.1
             end
             #Puppet.debug "%s is locked" % opts[0]
-            sleep 0.1
         end
         File.open(lock, "w") { |f| f.print " "; f.flush }
         writing = false
@@ -155,8 +196,16 @@ module Util
         end
         begin
             File.open(*opts) { |file| yield file }
-            if writing
-                File.rename(tmp, orig)
+            begin
+                if writing
+                    Puppet.warning "opts were %s" % opts.inspect
+                    system("ls -l %s 2>/dev/null" % tmp)
+                    system("ls -l %s 2>/dev/null" % orig)
+                    File.rename(tmp, orig)
+                end
+            rescue => detail
+                Puppet.err "Could not replace %s: %s" % [orig, detail]
+                File.unlink(tmp)
             end
         rescue => detail
             Puppet.err "Storage error: %s" % detail
@@ -229,4 +278,4 @@ module Util
 end
 end
 
-# $Id: util.rb 873 2006-02-07 23:12:33Z luke $
+# $Id: util.rb 898 2006-02-13 17:13:09Z luke $

data/test/language/ast.rb

@@ -293,11 +293,11 @@ class TestAST < Test::Unit::TestCase
 
         # And now verify that we got both the top and node objects
         assert_nothing_raised("Could not find top-declared object") {
-            assert_equal("/testing", objects[0]["name"])
+            assert_equal("/testing", objects[0].name)
         }
 
         assert_nothing_raised("Could not find node-declared object") {
-            assert_equal("/%s" % name, objects[1][0]["name"])
+            assert_equal("/%s" % name, objects[1][0].name)
         }
     end
 
@@ -338,7 +338,7 @@ class TestAST < Test::Unit::TestCase
         assert(objects, "Could not retrieve objects")
 
         assert_nothing_raised("Could not find top-declared object") {
-            assert_equal("/%s" % klassname, objects[0][0]["name"])
+            assert_equal("/%s" % klassname, objects[0][0].name)
         }
     end
 
@@ -395,19 +395,19 @@ class TestAST < Test::Unit::TestCase
             # And now verify that we got the subnode file
             assert_nothing_raised("Could not find basenode file") {
                 base = inner[0]
-                assert_equal("/basenode", base["name"])
+                assert_equal("/basenode", base.name)
             }
 
             # and the parent node file
             assert_nothing_raised("Could not find subnode file") {
                 sub = inner[1]
-                assert_equal("/subnode", sub["name"])
+                assert_equal("/subnode", sub.name)
             }
 
             inner.each { |obj|
                 %w{basenode subnode}.each { |tag|
                     assert(obj.tags.include?(tag),
-                        "%s did not include %s tag" % [obj["name"], tag]
+                        "%s did not include %s tag" % [obj.name, tag]
                     )
                 }
             }

data/test/language/snippets.rb

@@ -394,6 +394,12 @@ class TestSnippets < Test::Unit::TestCase
         }
     end
 
+    def snippet_aliastest(trans)
+        %w{/tmp/aliastest /tmp/aliastest2 /tmp/aliastest3}.each { |file|
+            assert(FileTest.file?(file), "File %s does not exist" % file)
+        }
+    end
+
     def snippet_emptyclass(trans)
         # There's nothing to check other than that it works
     end