puppet 0.9.2 → 0.13.0

data/lib/puppet/util.rb

@@ -19,8 +19,8 @@ module Util
                 if group.is_a?(Integer)
                     gid = group
                 else
-                    unless obj = Puppet::Type::Group[group]
-                        obj = Puppet::Type::Group.create(
+                    unless obj = Puppet.type(:group)[group]
+                        obj = Puppet.type(:group).create(
                             :name => group,
                             :check => [:gid]
                         )
@@ -47,8 +47,8 @@ module Util
                 if user.is_a?(Integer)
                     uid = user
                 else
-                    unless obj = Puppet::Type::User[user]
-                        obj = Puppet::Type::User.create(
+                    unless obj = Puppet.type(:user)[user]
+                        obj = Puppet.type(:user).create(
                             :name => user,
                             :check => [:uid, :gid]
                         )
@@ -85,6 +85,91 @@ module Util
         return retval
     end
 
+    # 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
+            unless Process.gid == group
+                begin
+                    Process.egid = group 
+                    Process.gid = group 
+                rescue
+                    $stderr.puts "could not change to group %s" % group
+                    exit(74)
+                end
+            end
+        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
+            unless Process.uid == user
+                begin
+                    Process.euid = user 
+                    Process.uid = user 
+                rescue
+                    $stderr.puts "could not change to user %s" % user
+                    exit(74)
+                end
+            end
+        end
+    end
+
+    # Create a lock file while something is happening
+    def self.lock(*opts)
+        lock = opts[0] + ".lock"
+        while File.exists?(lock)
+            stamp = File.stat(lock).mtime.to_i 
+            if Time.now.to_i - stamp > 5
+                Puppet.notice "Lock file %s is %s seconds old; removing" %
+                    [lock, Time.now.to_i - stamp]
+                File.delete(lock)
+            end
+            #Puppet.debug "%s is locked" % opts[0]
+            sleep 0.1
+        end
+        File.open(lock, "w") { |f| f.print " "; f.flush }
+        writing = false
+        if opts[1] == "w"
+            writing = true
+            tmp = opts[0] + ".tmp"
+            orig = opts[0]
+            opts[0] = tmp
+        end
+        begin
+            File.open(*opts) { |file| yield file }
+            if writing
+                File.rename(tmp, orig)
+            end
+        rescue => detail
+            Puppet.err "Storage error: %s" % detail
+            raise
+        ensure
+            # I don't really understand how the lock file could disappear,
+            # but just in case...
+            if FileTest.exists?(lock)
+                File.delete(lock)
+            end
+        end
+    end
+
     # Create instance methods for each of the log levels.  This allows
     # the messages to be a little richer.  Most classes will be calling this
     # method.
@@ -97,12 +182,12 @@ module Util
                 if useself
                     Puppet::Log.create(
                         :level => level,
+                        :source => self,
                         :message => args
                     )
                 else
                     Puppet::Log.create(
                         :level => level,
-                        :source => self,
                         :message => args
                     )
                 end
@@ -132,7 +217,16 @@ module Util
             return true
         end
     end
+
+    def self.symbolize(value)
+        case value
+        when String: value = value.intern
+        when Symbol: # nothing
+        else
+            raise ArgumentError, "'%s' must be a string or symbol" % value
+        end
+    end
 end
 end
 
-# $Id: util.rb 743 2005-11-16 21:39:31Z luke $
+# $Id: util.rb 873 2006-02-07 23:12:33Z luke $

data/test/certmgr/certmgr.rb

@@ -26,7 +26,6 @@ class TestCertMgr < Test::Unit::TestCase
         super
         #@dir = File.join(Puppet[:certdir], "testing")
         @dir = File.join(@configpath, "certest")
-        Puppet.notice @dir
         system("mkdir -p %s" % @dir)
     end
 

data/test/client/client.rb

@@ -10,7 +10,7 @@ require 'puppet/server'
 require 'test/unit'
 require 'puppettest.rb'
 
-# $Id: client.rb 724 2005-10-22 22:27:20Z luke $
+# $Id: client.rb 847 2006-01-23 22:38:39Z luke $
 
 class TestClient < Test::Unit::TestCase
 	include ServerTest
@@ -114,11 +114,11 @@ class TestClient < Test::Unit::TestCase
 
         # now verify that our client cannot do non-cert operations
         # because its certs are signed by a different CA
-        assert_raise(Puppet::NetworkClientError,
+        assert_raise(Puppet::Error,
             "Client was allowed to call getconfig with no certs") {
             nonemaster.getconfig
         }
-        assert_raise(Puppet::NetworkClientError,
+        assert_raise(Puppet::Error,
             "Client was allowed to call getconfig with untrusted certs") {
             certmaster.getconfig
         }
@@ -138,7 +138,7 @@ class TestClient < Test::Unit::TestCase
     # i don't think this test makes much sense anyway
     def disabled_test_sslInitWithNonsigningLocalServer
         Puppet[:autosign] = false
-        Puppet[:ssldir] = "/tmp/puppetclientcertests"
+        Puppet[:ssldir] = tempfile()
         @@tmpfiles.push Puppet[:ssldir]
 
         file = File.join($puppetbase, "examples", "code", "head")

data/test/executables/puppetbin.rb

@@ -10,17 +10,8 @@ require 'puppet/sslcertificates'
 require 'test/unit'
 require 'puppettest.rb'
 
-# add the bin directory to our search path
-ENV["PATH"] += ":" + File.join($puppetbase, "bin")
-
-# and then the library directories
-libdirs = $:.find_all { |dir|
-    dir =~ /puppet/ or dir =~ /\.\./
-}
-ENV["RUBYLIB"] = libdirs.join(":")
-
 class TestPuppetBin < Test::Unit::TestCase
-	include ServerTest
+	include ExeTest
     def test_version
         output = nil
         assert_nothing_raised {
@@ -31,14 +22,16 @@ class TestPuppetBin < Test::Unit::TestCase
 
     def test_execution
         file = mktestmanifest()
-        @@tmpfiles << "/tmp/puppetbintesting"
+        @@tmpfiles << tempfile()
 
         output = nil
         cmd = "puppet"
-        cmd += " --verbose"
+        if Puppet[:debug]
+            cmd += " --debug"
+        end
         #cmd += " --fqdn %s" % fqdn
-        cmd += " --confdir %s" % Puppet[:puppetconf]
-        cmd += " --vardir %s" % Puppet[:puppetvar]
+        cmd += " --confdir %s" % Puppet[:confdir]
+        cmd += " --vardir %s" % Puppet[:vardir]
         cmd += " --logdest %s" % "/dev/null"
 
         assert_nothing_raised {

data/test/executables/puppetca.rb

@@ -10,19 +10,8 @@ require 'puppet/sslcertificates'
 require 'test/unit'
 require 'puppettest.rb'
 
-# $Id: puppetca.rb 724 2005-10-22 22:27:20Z luke $
-
-# ok, we have to add the bin directory to our search path
-ENV["PATH"] += ":" + File.join($puppetbase, "bin")
-
-# and then the library directories
-libdirs = $:.find_all { |dir|
-    dir =~ /puppet/ or dir =~ /\.\./
-}
-ENV["RUBYLIB"] = libdirs.join(":")
-
 class TestPuppetCA < Test::Unit::TestCase
-	include ServerTest
+	include ExeTest
     def mkcert(hostname)
         cert = nil
         assert_nothing_raised {
@@ -34,17 +23,20 @@ class TestPuppetCA < Test::Unit::TestCase
 
         return cert
     end
+    
+    def runca(args)
+        return %x{puppetca --confdir=#{Puppet[:confdir]} --user #{Process.uid} --group #{Process.gid} #{args} 2>&1}
+
+    end
 
     def test_signing
         ca = nil
-        Puppet[:ssldir] = "/tmp/puppetcatest"
-        @@tmpfiles << Puppet[:ssldir]
         Puppet[:autosign] = false
         assert_nothing_raised {
             ca = Puppet::Server::CA.new()
         }
-        #Puppet.warning "SSLDir is %s" % Puppet[:ssldir]
-        #system("find %s" % Puppet[:ssldir])
+        #Puppet.warning "SSLDir is %s" % Puppet[:confdir]
+        #system("find %s" % Puppet[:confdir])
 
         cert = mkcert("host.test.com")
         resp = nil
@@ -54,26 +46,28 @@ class TestPuppetCA < Test::Unit::TestCase
             resp = ca.getcert(cert.csr.to_pem, "fakename", "127.0.0.1")
         }
         assert_equal(["",""], resp)
-        #Puppet.warning "SSLDir is %s" % Puppet[:ssldir]
-        #system("find %s" % Puppet[:ssldir])
+        #Puppet.warning "SSLDir is %s" % Puppet[:confdir]
+        #system("find %s" % Puppet[:confdir])
 
         output = nil
         assert_nothing_raised {
-            output = %x{puppetca --list --ssldir=#{Puppet[:ssldir]} 2>&1}.chomp.split("\n").reject { |line| line =~ /warning:/ } # stupid ssl.rb
+            output = runca("--list").chomp.split("\n").reject { |line| line =~ /warning:/ } # stupid ssl.rb
         }
-        #Puppet.warning "SSLDir is %s" % Puppet[:ssldir]
-        #system("find %s" % Puppet[:ssldir])
+        #Puppet.warning "SSLDir is %s" % Puppet[:confdir]
+        #system("find %s" % Puppet[:confdir])
         assert_equal($?,0)
         assert_equal(%w{host.test.com}, output)
         assert_nothing_raised {
-            output = %x{puppetca --sign -a --ssldir=#{Puppet[:ssldir]}}.chomp.split("\n")
+            output = runca("--sign -a").chomp.split("\n")
         }
         assert_equal($?,0)
-        assert_equal([], output)
+        assert_equal(["Signed host.test.com"], output)
         assert_nothing_raised {
-            output = %x{puppetca --list --ssldir=#{Puppet[:ssldir]}}.chomp.split("\n")
+            output = runca("--list").chomp.split("\n")
         }
         assert_equal($?,0)
         assert_equal([], output)
     end
 end
+
+# $Id: puppetca.rb 873 2006-02-07 23:12:33Z luke $

data/test/executables/puppetd.rb

@@ -11,17 +11,6 @@ require 'puppettest.rb'
 require 'socket'
 require 'facter'
 
-# $Id: puppetd.rb 731 2005-10-26 04:44:25Z luke $
-
-# ok, we have to add the bin directory to our search path
-ENV["PATH"] += ":" + File.join($puppetbase, "bin")
-
-# and then the library directories
-libdirs = $:.find_all { |dir|
-    dir =~ /puppet/ or dir =~ /\.\./
-}
-ENV["RUBYLIB"] = libdirs.join(":")
-
 class TestPuppetDExe < Test::Unit::TestCase
 	include ExeTest
     def test_normalstart
@@ -36,16 +25,16 @@ class TestPuppetDExe < Test::Unit::TestCase
 
         cmd = "puppetd"
         cmd += " --verbose"
+        cmd += " --onetime"
         #cmd += " --fqdn %s" % fqdn
-        cmd += " --port %s" % @@port
-        cmd += " --confdir %s" % Puppet[:puppetconf]
-        cmd += " --vardir %s" % Puppet[:puppetvar]
+        cmd += " --masterport %s" % @@port
+        cmd += " --confdir %s" % Puppet[:confdir]
+        cmd += " --vardir %s" % Puppet[:vardir]
         cmd += " --server localhost"
 
         # and verify our daemon runs
         assert_nothing_raised {
-            output = %x{#{cmd}}.chomp
-            puts output
+            system cmd
         }
         sleep 1
         assert($? == 0, "Puppetd exited with code %s" % $?)
@@ -69,3 +58,5 @@ class TestPuppetDExe < Test::Unit::TestCase
         stopmasterd
     end
 end
+
+# $Id: puppetd.rb 873 2006-02-07 23:12:33Z luke $

data/test/executables/puppetmasterd.rb

@@ -12,8 +12,6 @@ require 'puppettest.rb'
 require 'socket'
 require 'facter'
 
-# $Id: puppetmasterd.rb 732 2005-10-28 05:39:59Z luke $
-
 class TestPuppetMasterD < Test::Unit::TestCase
 	include ExeTest
     def getcerts
@@ -29,7 +27,7 @@ class TestPuppetMasterD < Test::Unit::TestCase
     def test_normalstart
         startmasterd
 
-        pidfile = File.join(Puppet[:puppetvar], "puppetmasterd.pid")
+        pidfile = File.join(Puppet[:vardir], "run", "puppetmasterd.pid")
         assert(FileTest.exists?(pidfile), "PID file does not exist")
 
         sleep(1)
@@ -82,8 +80,6 @@ class TestPuppetMasterD < Test::Unit::TestCase
         }
 
         objects = nil
-        assert_instance_of(Puppet::TransBucket, retval,
-            "Retrieved non-transportable object")
         stopmasterd
         sleep(1)
     end
@@ -96,7 +92,7 @@ class TestPuppetMasterD < Test::Unit::TestCase
         pid = nil
         ps = Facter["ps"].value || "ps -ef"
         %x{#{ps}}.chomp.split(/\n/).each { |line|
-            if line =~ /puppetmasterd --manifest/
+            if line =~ /puppetmasterd.+--manifest/
                 ary = line.split(" ")
                 pid = ary[1].to_i
             end
@@ -137,17 +133,19 @@ class TestPuppetMasterD < Test::Unit::TestCase
         Facter.each { |p,v|
             facts[p] = v
         }
-        textfacts = CGI.escape(Marshal::dump(facts))
+        textfacts = CGI.escape(YAML.dump(facts))
         assert_nothing_raised() {
             #Puppet.notice "calling status"
             #retval = client.call("status.status", "")
-            retval = client.call("puppetmaster.getconfig", textfacts)
+            retval = client.call("puppetmaster.getconfig", textfacts, "yaml")
         }
 
         objects = nil
         assert_nothing_raised {
-            Marshal::load(CGI.unescape(retval))
+            YAML.load(CGI.unescape(retval))
         }
         #stopmasterd
     end
 end
+
+# $Id: puppetmasterd.rb 873 2006-02-07 23:12:33Z luke $

data/test/executables/puppetmodule.rb

@@ -10,19 +10,14 @@ require 'puppet/sslcertificates'
 require 'test/unit'
 require 'puppettest.rb'
 
-# add the bin directory to our search path
-ENV["PATH"] += ":" + File.join($puppetbase, "bin")
-
-# and then the library directories
-libdirs = $:.find_all { |dir|
-    dir =~ /puppet/ or dir =~ /\.\./
-}
-ENV["RUBYLIB"] = libdirs.join(":")
-
-$module = File.join($puppetbase, "ext", "module:puppet")
+$module = File.join($puppetbase, "ext", "module_puppet")
 
 class TestPuppetModule < Test::Unit::TestCase
-	include ServerTest
+	include ExeTest
+
+    def test_existence
+        assert(FileTest.exists?($module), "Module does not exist")
+    end
 
     def test_execution
         file = tempfile()
@@ -30,24 +25,24 @@ class TestPuppetModule < Test::Unit::TestCase
         createdfile = tempfile()
 
         File.open(file, "w") { |f|
-            f.puts "class yaytest { file { \"#{createdfile}\": create => true } }"
+            f.puts "class yaytest { file { \"#{createdfile}\": ensure => file } }"
         }
 
         output = nil
         cmd = $module
         cmd += " --verbose"
         #cmd += " --fqdn %s" % fqdn
-        cmd += " --confdir %s" % Puppet[:puppetconf]
-        cmd += " --vardir %s" % Puppet[:puppetvar]
+        cmd += " --confdir %s" % Puppet[:confdir]
+        cmd += " --vardir %s" % Puppet[:vardir]
         if Puppet[:debug]
             cmd += " --logdest %s" % "console"
+            cmd += " --debug"
         else
             cmd += " --logdest %s" % "/dev/null"
         end
 
         ENV["CFALLCLASSES"] = "yaytest:all"
 
-        Puppet.err :mark
         assert_nothing_raised {
             system(cmd + " " + file)
         }
@@ -57,4 +52,4 @@ class TestPuppetModule < Test::Unit::TestCase
     end
 end
 
-# $Id: puppetmodule.rb 746 2005-11-17 21:03:19Z luke $
+# $Id: puppetmodule.rb 873 2006-02-07 23:12:33Z luke $