puppet 0.16.0 → 0.18.4

data/lib/puppet/util.rb

@@ -4,11 +4,21 @@ require 'sync'
 require 'puppet/lock'
 
 module Puppet
+    # A command failed to execute.
+    class ExecutionFailure < RuntimeError
+    end
 module Util
     require 'benchmark'
 
-    # Create a sync point for any threads
-    @@sync = Sync.new
+    # Create a hash to store the different sync objects.
+    @@syncresources = {}
+
+    # Return the sync object associated with a given resource.
+    def self.sync(resource)
+        @@syncresources[resource] ||= Sync.new
+        return @@syncresources[resource]
+    end
+
     # Execute a block as a given user or group
     def self.asuser(user = nil, group = nil)
         require 'etc'
@@ -124,24 +134,22 @@ module Util
 
     # Create a shared lock for reading
     def self.readlock(file)
-        @@sync.synchronize(Sync::SH) do
+        self.sync(file).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
+    # Create an exclusive lock for writing, and do the writing in a
     # tmp file.
     def self.writelock(file, mode = 0600)
         tmpfile = file + ".tmp"
-        @@sync.synchronize(Sync::EX) do
+        self.sync(file).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)
@@ -296,7 +304,7 @@ module Util
     def self.symbolize(value)
         case value
         when String: value = value.intern
-        when Symbol: # nothing
+        when Symbol: value
         else
             raise ArgumentError, "'%s' must be a string or symbol" % value
         end
@@ -337,21 +345,49 @@ module Util
         if Puppet::Log.sendlevel?(level)
             result = nil
             seconds = Benchmark.realtime {
-                result = yield
+                yield
             }
             object.send(level, msg + (" in %0.2f seconds" % seconds))
-            result
+            return seconds
         else
             yield
         end
     end
 
+    # Execute the desired command, and return the status and output.
+    def execute(command, failonfail = true)
+        if respond_to? :debug
+            debug "Executing '%s'" % command
+        else
+            Puppet.debug "Executing '%s'" % command
+        end
+        output = %x{#{command} 2>&1}
+
+        if failonfail
+            unless $? == 0
+                raise ExecutionFailure, output
+            end
+        end
+
+        return output
+    end
+
+    # Create an exclusive lock.
+    def threadlock(resource, type = Sync::EX)
+        Puppet::Util.sync(resource).synchronize(type) do
+            yield
+        end
+    end
+
+    # Because some modules provide their own version of this method.
+    alias util_execute execute
+
     module_function :benchmark
 
     def memory
         unless defined? @pmap
             pmap = %x{which pmap 2>/dev/null}.chomp
-            if pmap == ""
+            if $? != 0 or pmap =~ /^no/
                 @pmap = nil
             else
                 @pmap = pmap
@@ -363,8 +399,18 @@ module Util
             0
         end
     end
+
+    # Just benchmark, with no logging.
+    def thinmark
+        seconds = Benchmark.realtime {
+            yield
+        }
+
+        return seconds
+    end
+
     module_function :memory
 end
 end
 
-# $Id: util.rb 1113 2006-04-17 16:15:33Z luke $
+# $Id: util.rb 1346 2006-06-30 20:41:41Z luke $

data/test/client/client.rb

@@ -10,7 +10,7 @@ require 'puppet/server'
 require 'test/unit'
 require 'puppettest.rb'
 
-# $Id: client.rb 1068 2006-04-04 23:13:55Z luke $
+# $Id: client.rb 1160 2006-05-02 04:30:40Z luke $
 
 class TestClient < Test::Unit::TestCase
 	include ServerTest
@@ -86,7 +86,7 @@ class TestClient < Test::Unit::TestCase
         # make a new ssldir for it
         ca = nil
         assert_nothing_raised {
-            ca = Puppet::Client::CAClient.new(
+            ca = Puppet::Client::CA.new(
                 :CA => true, :Local => true
             )
             ca.requestcert

data/test/client/master.rb

@@ -10,7 +10,7 @@ require 'puppet/server'
 require 'test/unit'
 require 'puppettest.rb'
 
-# $Id: master.rb 1107 2006-04-11 23:00:29Z luke $
+# $Id: master.rb 1368 2006-07-05 17:17:39Z luke $
 
 class TestMasterClient < Test::Unit::TestCase
 	include ServerTest
@@ -98,8 +98,8 @@ class TestMasterClient < Test::Unit::TestCase
         assert_nothing_raised do
             client.lock do
                 pid = nil
-                assert(pid = client.locked?, "Client is not locked")
-                assert(pid =~ /^\d+$/, "PID is, um, not a pid")
+                assert(client.locked?, "Client is not locked")
+                assert(client.lockpid.is_a?(Integer), "PID #{client.lockpid} is, um, not a pid")
             end
         end
         assert(! client.locked?)
@@ -115,4 +115,93 @@ class TestMasterClient < Test::Unit::TestCase
         end
         assert(! client.locked?)
     end
+
+    # Make sure non-string facts don't make things go kablooie
+    def test_nonstring_facts
+        # Add a nonstring fact
+        Facter.add("nonstring") do
+            setcode { 1 }
+        end
+
+        assert_equal(1, Facter.nonstring, "Fact was a string from facter")
+
+        client = mkclient()
+
+        assert(! FileTest.exists?(@createdfile))
+
+        assert_nothing_raised {
+            client.run
+        }
+    end
+
+    def test_getplugins
+        Puppet[:pluginsource] = tempfile()
+        Dir.mkdir(Puppet[:pluginsource])
+
+        myplugin = File.join(Puppet[:pluginsource], "myplugin.rb")
+        File.open(myplugin, "w") do |f|
+            f.puts %{Puppet::Type.newtype(:myplugin) do
+    newparam(:argument) do
+        isnamevar
+    end
+end
+}
+        end
+
+        client = mkclient()
+
+        assert_nothing_raised {
+            client.send(:getplugins)
+        }
+
+        destfile = File.join(Puppet[:plugindest], "myplugin.rb")
+
+        assert(File.exists?(destfile), "Did not get plugin")
+
+        obj = Puppet::Type.type(:myplugin)
+
+        assert(obj, "Did not define type")
+
+        assert(obj.validattr?(:argument),
+            "Did not get namevar")
+
+        # Now modify the file and make sure the type is replaced
+        File.open(myplugin, "w") do |f|
+            f.puts %{Puppet::Type.newtype(:myplugin) do
+    newparam(:yayness) do
+        isnamevar
+    end
+
+    newparam(:rahness) do
+    end
+end
+}
+        end
+
+        assert_nothing_raised {
+            client.send(:getplugins)
+        }
+
+        destfile = File.join(Puppet[:pluginpath], "myplugin.rb")
+
+        obj = Puppet::Type.type(:myplugin)
+
+        assert(obj, "Did not define type")
+
+        assert(obj.validattr?(:yayness),
+            "Did not get namevar")
+
+        assert(obj.validattr?(:rahness),
+            "Did not get other var")
+
+        assert(! obj.validattr?(:argument),
+            "Old namevar is still valid")
+
+        # Now make sure it works with multiple paths specified.
+        newdir = tempfile()
+        Dir.mkdir(newdir)
+        Puppet[:pluginpath] = [Puppet[:pluginpath], newdir].join(":")
+
+        client.send(:getplugins)
+    end
 end

data/test/client/pelement.rb

@@ -0,0 +1,99 @@
+if __FILE__ == $0
+    $:.unshift '..'
+    $:.unshift '../../lib'
+    $puppetbase = "../.."
+end
+
+require 'puppet'
+require 'puppet/client/pelement'
+require 'puppet/server'
+require 'test/unit'
+require 'puppettest.rb'
+
+# $Id: pelement.rb 1144 2006-04-28 04:08:32Z luke $
+
+class TestPElementClient < Test::Unit::TestCase
+	include ServerTest
+
+    def mkpelementserver
+        handlers = {
+            :CA => {}, # so that certs autogenerate
+            :PElement => {},
+        }
+
+        return mkserver(handlers)
+    end
+
+    def mkclient
+        client = nil
+        assert_nothing_raised {
+            client = Puppet::Client::PElement.new(:Server => "localhost",
+                :Port => @@port)
+        }
+
+        return client
+    end
+
+    def test_pelements
+        file = tempfile()
+        text = "yayness\n"
+        File.open(file, "w") { |f| f.print text }
+
+        mkpelementserver()
+
+        client = mkclient()
+
+        # Test describing
+        tobj = nil
+        assert_nothing_raised {
+            tobj = client.describe("file", file)
+        }
+
+        assert(tobj, "Did not get response")
+
+        assert_instance_of(Puppet::TransObject, tobj)
+
+        obj = nil
+        assert_nothing_raised {
+            obj = tobj.to_type
+        }
+        assert_events([], obj)
+        File.unlink(file)
+        assert_events([:file_created], obj)
+        File.unlink(file)
+
+        # Now test applying
+        result = nil
+        assert_nothing_raised {
+            result = client.apply(tobj)
+        }
+        assert(FileTest.exists?(file), "File was not created on apply")
+
+        # Lastly, test "list"
+        list = nil
+        assert_nothing_raised {
+            list = client.list("user")
+        }
+
+        assert_instance_of(Puppet::TransBucket, list)
+
+        count = 0
+        list.each do |tobj|
+            break if count > 3
+            assert_instance_of(Puppet::TransObject, tobj)
+
+            tobj2 = nil
+            assert_nothing_raised {
+                tobj2 = client.describe(tobj.type, tobj.name)
+            }
+
+            obj = nil
+            assert_nothing_raised {
+                obj = tobj2.to_type
+            }
+            assert_events([], obj)
+
+            count += 1
+        end
+    end
+end

data/test/executables/puppetbin.rb

@@ -28,7 +28,6 @@ class TestPuppetBin < Test::Unit::TestCase
         if Puppet[:debug]
             cmd += " --debug"
         end
-        #cmd += " --fqdn %s" % fqdn
         cmd += " --confdir %s" % Puppet[:confdir]
         cmd += " --vardir %s" % Puppet[:vardir]
         unless Puppet[:debug]
@@ -36,7 +35,7 @@ class TestPuppetBin < Test::Unit::TestCase
         end
 
         assert_nothing_raised {
-            system(cmd + " " + file)
+            output = %x{#{cmd + " " + file} 2>&1}
         }
         assert($? == 0, "Puppet exited with code %s" % $?.to_i)
 
@@ -62,7 +61,7 @@ class TestPuppetBin < Test::Unit::TestCase
         cmd += " -e \"#{code}\""
 
         assert_nothing_raised {
-            system(cmd)
+            out = %x{#{cmd} 2>&1}
         }
         assert($? == 0, "Puppet exited with code %s" % $?.to_i)
 
@@ -70,4 +69,4 @@ class TestPuppetBin < Test::Unit::TestCase
     end
 end
 
-# $Id: puppetbin.rb 1065 2006-04-04 22:23:08Z luke $
+# $Id: puppetbin.rb 1256 2006-06-13 15:57:06Z luke $

data/test/executables/puppetca.rb

@@ -29,7 +29,7 @@ class TestPuppetCA < Test::Unit::TestCase
         if Puppet[:debug]
             debug = "-d "
         end
-        return %x{puppetca --user=#{Puppet[:user]} #{debug} --group=#{Puppet[:group]} --confdir=#{Puppet[:confdir]} #{args} 2>&1}
+        return %x{puppetca --user=#{Puppet[:user]} #{debug} --group=#{Puppet[:group]} --confdir=#{Puppet[:confdir]} --vardir=#{Puppet[:vardir]} #{args} 2>&1}
 
     end
 
@@ -82,8 +82,8 @@ class TestPuppetCA < Test::Unit::TestCase
             output = runca("--list").chomp.split("\n")
         }
         assert_equal($?,0)
-        assert_equal([], output)
+        assert_equal(["No certificates to sign"], output)
     end
 end
 
-# $Id: puppetca.rb 1113 2006-04-17 16:15:33Z luke $
+# $Id: puppetca.rb 1256 2006-06-13 15:57:06Z luke $

data/test/executables/puppetd.rb

@@ -18,7 +18,7 @@ class TestPuppetDExe < Test::Unit::TestCase
         file = startmasterd
 
         # create the client
-        client = Puppet::Client.new(:Server => "localhost", :Port => @@port)
+        client = Puppet::Client::MasterClient.new(:Server => "localhost", :Port => @@port)
 
         # make a new fqdn
         fqdn = client.fqdn.sub(/^\w+\./, "testing.")
@@ -34,7 +34,7 @@ class TestPuppetDExe < Test::Unit::TestCase
 
         # and verify our daemon runs
         assert_nothing_raised {
-            system(cmd)
+            %x{#{cmd} 2>&1}
         }
         sleep 1
         assert($? == 0, "Puppetd exited with code %s" % $?)
@@ -59,4 +59,4 @@ class TestPuppetDExe < Test::Unit::TestCase
     end
 end
 
-# $Id: puppetd.rb 967 2006-03-02 20:28:45Z luke $
+# $Id: puppetd.rb 1256 2006-06-13 15:57:06Z luke $

data/test/executables/puppetmasterd.rb

@@ -74,14 +74,10 @@ class TestPuppetMasterD < Test::Unit::TestCase
             )
         }
         assert_nothing_raised() {
-            #Puppet.notice "calling status"
-            #retval = client.call("status.status", "")
             retval = client.getconfig
         }
 
         objects = nil
-        stopmasterd
-        sleep(1)
     end
 
     # verify that we can run puppetmasterd in parse-only mode
@@ -149,4 +145,4 @@ class TestPuppetMasterD < Test::Unit::TestCase
     end
 end
 
-# $Id: puppetmasterd.rb 952 2006-02-27 22:21:44Z luke $
+# $Id: puppetmasterd.rb 1304 2006-06-20 18:10:06Z luke $