puppet 0.23.0 → 0.23.1

data/test/util/filetype.rb

@@ -2,9 +2,9 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/util/filetype'
 require 'puppettest'
+require 'puppet/util/filetype'
+require 'mocha'
 
 class TestFileType < Test::Unit::TestCase
 	include PuppetTest
@@ -53,6 +53,52 @@ class TestFileType < Test::Unit::TestCase
         assert_equal(text, newtext, "Text was changed somehow")
     end
 
+    # Make sure that modified files are backed up before they're changed.
+    def test_backup_is_called
+        path = tempfile
+        File.open(path, "w") { |f| f.print 'yay' }
+
+        obj = Puppet::Util::FileType.filetype(:flat).new(path)
+
+        obj.expects(:backup)
+
+        obj.write("something")
+
+        assert_equal("something", File.read(path), "File did not get changed")
+    end
+
+    def test_backup
+        path = tempfile
+        type = Puppet::Type.type(:filebucket)
+
+        obj = Puppet::Util::FileType.filetype(:flat).new(path)
+
+        # First try it when the file does not yet exist.
+        assert_nothing_raised("Could not call backup when file does not exist") do
+            obj.backup
+        end
+
+        # Then create the file
+        File.open(path, "w") { |f| f.print 'one' }
+
+        # Then try it with no filebucket objects
+        assert_nothing_raised("Could not call backup with no buckets") do
+            obj.backup
+        end
+        puppet = type["puppet"]
+        assert(puppet, "Did not create default filebucket")
+
+        assert_equal("one", puppet.bucket.getfile(Digest::MD5.hexdigest(File.read(path))), "Could not get file from backup")
+
+        # Try it again when the default already exists
+        File.open(path, "w") { |f| f.print 'two' }
+        assert_nothing_raised("Could not call backup with no buckets") do
+            obj.backup
+        end
+
+        assert_equal("two", puppet.bucket.getfile(Digest::MD5.hexdigest(File.read(path))), "Could not get file from backup")
+    end
+
     if Facter["operatingsystem"].value == "Darwin"
     def test_ninfotoarray
         obj = nil
@@ -89,4 +135,4 @@ class TestFileType < Test::Unit::TestCase
     end
 end
 
-# $Id: filetype.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: filetype.rb 2679 2007-07-11 20:23:49Z luke $

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: puppet
 version: !ruby/object:Gem::Version 
-  version: 0.23.0
-date: 2007-06-20 00:00:00 +02:00
+  version: 0.23.1
+date: 2007-07-20 00:00:00 +02:00
 summary: System Automation and Configuration Management Software
 require_paths: 
 - lib
@@ -62,10 +62,11 @@ files:
 - lib/puppet/type/pfile/content.rb
 - lib/puppet/type/sshkey.rb
 - lib/puppet/type/pfile.rb
-- lib/puppet/type/property.rb
 - lib/puppet/type/cron.rb
 - lib/puppet/type/exec.rb
 - lib/puppet/type/mount.rb
+- lib/puppet/type/mailalias.rb
+- lib/puppet/type/maillist.rb
 - lib/puppet/type/port.rb
 - lib/puppet/reference/function.rb
 - lib/puppet/reference/network.rb
@@ -104,7 +105,7 @@ files:
 - lib/puppet/reports/rrdgraph.rb
 - lib/puppet/reports/log.rb
 - lib/puppet/reports/tagmail.rb
-- lib/puppet/element.rb
+- lib/puppet/module.rb
 - lib/puppet/feature/base.rb
 - lib/puppet/feature/rails.rb
 - lib/puppet/transportable.rb
@@ -143,6 +144,7 @@ files:
 - lib/puppet/provider/service/debian.rb
 - lib/puppet/provider/service/gentoo.rb
 - lib/puppet/provider/service/init.rb
+- lib/puppet/provider/mailalias/aliases.rb
 - lib/puppet/provider/user/useradd.rb
 - lib/puppet/provider/user/pw.rb
 - lib/puppet/provider/user/netinfo.rb
@@ -155,6 +157,7 @@ files:
 - lib/puppet/provider/parsedfile.rb
 - lib/puppet/provider/cron/crontab.rb
 - lib/puppet/provider/mount.rb
+- lib/puppet/provider/maillist/mailman.rb
 - lib/puppet/provider/nameservice/pw.rb
 - lib/puppet/provider/nameservice/netinfo.rb
 - lib/puppet/provider/nameservice/objectadd.rb
@@ -196,7 +199,6 @@ files:
 - lib/puppet/sslcertificates/ca.rb
 - lib/puppet/sslcertificates/inventory.rb
 - lib/puppet/sslcertificates/certificate.rb
-- lib/puppet/modules.rb
 - lib/puppet/metatype/attributes.rb
 - lib/puppet/metatype/relationships.rb
 - lib/puppet/metatype/metaparams.rb
@@ -209,6 +211,7 @@ files:
 - lib/puppet/metatype/schedules.rb
 - lib/puppet/metatype/instances.rb
 - lib/puppet/config_stores/rest.rb
+- lib/puppet/property.rb
 - lib/puppet/type.rb
 - lib/puppet/util/reference.rb
 - lib/puppet/util/posix.rb
@@ -233,6 +236,7 @@ files:
 - lib/puppet/util/subclass_loader.rb
 - lib/puppet/util/logging.rb
 - lib/puppet/util/storage.rb
+- lib/puppet/util/log_paths.rb
 - lib/puppet/util/plist.rb
 - lib/puppet/util/metric.rb
 - lib/puppet/util/fileparsing.rb
@@ -315,6 +319,7 @@ files:
 - test/ral/providers/nameservice.rb
 - test/ral/providers/package.rb
 - test/ral/providers/service/base.rb
+- test/ral/providers/mailalias/aliases.rb
 - test/ral/providers/user/useradd.rb
 - test/ral/providers/mount/parsed.rb
 - test/ral/providers/mount/netinfo.rb
@@ -344,6 +349,7 @@ files:
 - test/ral/types/fileignoresource.rb
 - test/ral/types/exec.rb
 - test/ral/types/mount.rb
+- test/ral/types/mailalias.rb
 - test/ral/types/port.rb
 - test/ral/manager/attributes.rb
 - test/ral/manager/manager.rb
@@ -545,6 +551,7 @@ files:
 - test/language/ast/selector.rb
 - test/language/ast/component.rb
 - test/language/ast/casestatement.rb
+- test/language/ast/resourceref.rb
 - test/language/ast/hostclass.rb
 - test/language/ast/variable.rb
 - test/language/collector.rb
@@ -638,7 +645,7 @@ files:
 - conf/redhat/client.sysconfig
 - conf/redhat/server.init
 - conf/redhat/client.init
-- conf/redhat/puppetd.conf
+- conf/redhat/puppet.conf
 - conf/redhat/puppet.spec
 - conf/redhat/no-lockdir.patch
 - conf/redhat/no-chuser-0.15.1.patch

data/lib/puppet/element.rb

@@ -1,52 +0,0 @@
-# included so we can test object types
-require 'puppet'
-
-# the base class for both types and parameters.
-# very little functionality; basically just defines the interface
-# and provides a few simple across-the-board functions like 'noop'
-class Puppet::Element
-    include Puppet
-    include Puppet::Util
-    include Puppet::Util::Errors
-    attr_writer :noop
-
-    class << self
-        attr_accessor :doc, :nodoc
-        include Puppet::Util
-    end
-
-    # all of our subclasses must respond to each of these methods...
-    @@interface_methods = [
-        :retrieve, :insync?, :sync, :evaluate
-    ]
-
-    # so raise an error if a method that isn't overridden gets called
-    @@interface_methods.each { |method|
-        self.send(:define_method,method) {
-            raise Puppet::DevError, "%s(%s) has not overridden %s" %
-                [self.class, self.class.name,method]
-        }
-    }
-
-    Puppet::Util.logmethods(self, true)
-
-    # for testing whether we should actually do anything
-    def noop
-        unless defined? @noop
-            @noop = false
-        end
-        return @noop || Puppet[:noop] || false
-    end
-
-    # return the full path to us, for logging and rollback
-    # some classes (e.g., FileTypeRecords) will have to override this
-    def path
-        unless defined? @path
-            @path = pathbuilder
-        end
-
-        return "/" + @path.join("/")
-    end
-end
-
-# $Id: element.rb 2169 2007-02-07 06:47:10Z luke $