puppet 0.24.1 → 0.24.2

data/test/ral/{types → type}/host.rb

@@ -138,8 +138,24 @@ class TestHost < Test::Unit::TestCase
         host[:ensure] = :absent
         assert_events([:host_removed], host)
     end
+ 
+    def test_invalid_ipaddress
+        host = mkhost()
+
+        assert_raise(Puppet::Error) {
+            host[:ip] = "abc.def.ghi.jkl"
+        }
+    end
+
+    def test_invalid_hostname
+        host = mkhost()
+
+        assert_raise(Puppet::Error) {
+            host[:name] = "!invalid.hostname.$$$"
+        }
     end
 
+    end  
     def test_aliasisproperty
         assert_equal(:property, @hosttype.attrtype(:alias))
     end

data/test/ral/{types → type}/tidy.rb

@@ -4,6 +4,7 @@ require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppettest/support/utils'
+require 'puppet/type/tidy'
 
 class TestTidy < Test::Unit::TestCase
     include PuppetTest::Support::Utils

data/test/util/autoload.rb

@@ -103,10 +103,10 @@ TestAutoload.newthing(:#{name.to_s})
         assert(loader.send(:searchpath).include?(dir), "searchpath does not include the libdir")
     end
 
-    # This causes very strange behaviour in the tests.  We need to make sure we
-    # require the same path that a user would use, otherwise we'll result in
-    # a reload of the 
-    def test_require_does_not_cause_reload
+    # This tests #1027, which was caused by using the unqualified
+    # path for requires, which was initially done so that the kernel
+    # would keep track of which files got loaded.
+    def test_require_uses_full_path
         loadname = "testing"
         loader = Puppet::Util::Autoload.new(self.class, loadname)
 
@@ -120,7 +120,26 @@ TestAutoload.newthing(:#{name.to_s})
 
         Dir.expects(:glob).with("#{dir}/*.rb").returns(file)
 
-        Kernel.expects(:require).with(File.join(loadname, subname))
+        Kernel.expects(:require).with(file)
         loader.loadall
     end
+
+    def test_searchpath_includes_plugin_dirs
+        moddir = "/what/ever"
+        libdir = "/other/dir"
+        Puppet.settings.stubs(:value).with(:modulepath).returns(moddir)
+        Puppet.settings.stubs(:value).with(:libdir).returns(libdir)
+
+        loadname = "testing"
+        loader = Puppet::Util::Autoload.new(self.class, loadname)
+
+        # Currently, include both plugins and libs.
+        paths = %w{plugins lib}.inject({}) { |hash, d| hash[d] = File.join(moddir, "testing", d); FileTest.stubs(:directory?).with(hash[d]).returns(true); hash  }
+        Dir.expects(:glob).with("#{moddir}/*/{plugins,lib}").returns(paths.values)
+
+        searchpath = loader.searchpath
+        paths.each do |dir, path|
+            assert(searchpath.include?(path), "search path did not include path for %s" % dir)
+        end
+    end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: puppet
 version: !ruby/object:Gem::Version 
-  version: 0.24.1
-date: 2007-12-22 00:00:00 +01:00
+  version: 0.24.2
+date: 2008-03-03 00:00:00 +01:00
 summary: System Automation and Configuration Management Software
 require_paths: 
 - lib
@@ -37,77 +37,72 @@ files:
 - CHANGELOG
 - lib/puppet.rb
 - lib/puppet/parameter.rb
+- lib/puppet/network.rb
 - lib/puppet/node/catalog.rb
 - lib/puppet/node/environment.rb
 - lib/puppet/node/facts.rb
 - lib/puppet/reports.rb
 - lib/puppet/type/tidy.rb
 - lib/puppet/type/zone.rb
+- lib/puppet/type/nagios_serviceescalation.rb
 - lib/puppet/type/group.rb
+- lib/puppet/type/nagios_service.rb
+- lib/puppet/type/file.rb
 - lib/puppet/type/service.rb
 - lib/puppet/type/k5login.rb
 - lib/puppet/type/yumrepo.rb
+- lib/puppet/type/nagios_command.rb
+- lib/puppet/type/nagios_hostgroup.rb
 - lib/puppet/type/resources.rb
 - lib/puppet/type/host.rb
 - lib/puppet/type/interface.rb
+- lib/puppet/type/nagios_timeperiod.rb
+- lib/puppet/type/nagios_contactgroup.rb
 - lib/puppet/type/notify.rb
 - lib/puppet/type/component.rb
 - lib/puppet/type/user.rb
-- lib/puppet/type/pfilebucket.rb
 - lib/puppet/type/package.rb
 - lib/puppet/type/schedule.rb
-- lib/puppet/type/pfile/mode.rb
-- lib/puppet/type/pfile/target.rb
-- lib/puppet/type/pfile/group.rb
-- lib/puppet/type/pfile/ensure.rb
-- lib/puppet/type/pfile/checksum.rb
-- lib/puppet/type/pfile/type.rb
-- lib/puppet/type/pfile/source.rb
-- lib/puppet/type/pfile/owner.rb
-- lib/puppet/type/pfile/content.rb
 - lib/puppet/type/sshkey.rb
-- lib/puppet/type/pfile.rb
+- lib/puppet/type/nagios_hostextinfo.rb
+- lib/puppet/type/nagios_servicedependency.rb
+- lib/puppet/type/filebucket.rb
+- lib/puppet/type/file/mode.rb
+- lib/puppet/type/file/target.rb
+- lib/puppet/type/file/group.rb
+- lib/puppet/type/file/ensure.rb
+- lib/puppet/type/file/checksum.rb
+- lib/puppet/type/file/type.rb
+- lib/puppet/type/file/source.rb
+- lib/puppet/type/file/owner.rb
+- lib/puppet/type/file/content.rb
 - lib/puppet/type/cron.rb
 - lib/puppet/type/exec.rb
+- lib/puppet/type/nagios_hostgroupescalation.rb
 - lib/puppet/type/mount.rb
+- lib/puppet/type/nagios_host.rb
 - lib/puppet/type/mailalias.rb
+- lib/puppet/type/nagios_serviceextinfo.rb
+- lib/puppet/type/nagios_contact.rb
 - lib/puppet/type/maillist.rb
 - lib/puppet/type/port.rb
 - lib/puppet/node.rb
 - lib/puppet/reference/function.rb
 - lib/puppet/reference/network.rb
 - lib/puppet/reference/providers.rb
-- lib/puppet/reference/report.rb
 - lib/puppet/reference/type.rb
 - lib/puppet/reference/indirection.rb
-- lib/puppet/reference/node_source.rb
 - lib/puppet/reference/configuration.rb
 - lib/puppet/simple_graph.rb
-- lib/puppet/external/gratr.rb
+- lib/puppet/external/nagios/base.rb
+- lib/puppet/external/nagios/parser.rb
 - lib/puppet/external/lock.rb
 - lib/puppet/external/event-loop/better-definers.rb
 - lib/puppet/external/event-loop/event-loop.rb
 - lib/puppet/external/event-loop/signal-system.rb
-- lib/puppet/external/gratr/graph_api.rb
-- lib/puppet/external/gratr/adjacency_graph.rb
-- lib/puppet/external/gratr/digraph.rb
-- lib/puppet/external/gratr/base.rb
-- lib/puppet/external/gratr/graph.rb
-- lib/puppet/external/gratr/undirected_graph.rb
-- lib/puppet/external/gratr/digraph_distance.rb
-- lib/puppet/external/gratr/dot.rb
-- lib/puppet/external/gratr/chinese_postman.rb
-- lib/puppet/external/gratr/comparability.rb
-- lib/puppet/external/gratr/strong_components.rb
-- lib/puppet/external/gratr/search.rb
-- lib/puppet/external/gratr/common.rb
-- lib/puppet/external/gratr/import.rb
-- lib/puppet/external/gratr/biconnected.rb
-- lib/puppet/external/gratr/edge.rb
-- lib/puppet/external/gratr/maximum_flow.rb
-- lib/puppet/external/gratr/labels.rb
-- lib/puppet/external/gratr/rdot.rb
+- lib/puppet/external/dot.rb
 - lib/puppet/external/base64.rb
+- lib/puppet/external/nagios.rb
 - lib/puppet/external/event-loop.rb
 - lib/puppet/pgraph.rb
 - lib/puppet/reports/store.rb
@@ -119,6 +114,7 @@ files:
 - lib/puppet/feature/rails.rb
 - lib/puppet/transportable.rb
 - lib/puppet/event.rb
+- lib/puppet/provider/naginator.rb
 - lib/puppet/provider/interface/redhat.rb
 - lib/puppet/provider/interface/sunos.rb
 - lib/puppet/provider/port/parsed.rb
@@ -269,6 +265,7 @@ files:
 - lib/puppet/util/logging.rb
 - lib/puppet/util/storage.rb
 - lib/puppet/util/log_paths.rb
+- lib/puppet/util/nagios_maker.rb
 - lib/puppet/util/plist.rb
 - lib/puppet/util/metric.rb
 - lib/puppet/util/fileparsing.rb
@@ -280,6 +277,8 @@ files:
 - lib/puppet/util/rails/collection_merger.rb
 - lib/puppet/util/plist/parser.rb
 - lib/puppet/util/plist/generator.rb
+- lib/puppet/util/constant_inflector.rb
+- lib/puppet/util/tagging.rb
 - lib/puppet/util/execution.rb
 - lib/puppet/dsl.rb
 - lib/puppet/sslcertificates.rb
@@ -327,16 +326,12 @@ files:
 - lib/puppet/rails/param_name.rb
 - lib/puppet/rails/fact_value.rb
 - lib/puppet/rails/host.rb
-- lib/puppet/rails/external/tagging/tag.rb
-- lib/puppet/rails/external/tagging/acts_as_taggable.rb
-- lib/puppet/rails/external/tagging/init.rb
-- lib/puppet/rails/external/tagging/tagging.rb
-- lib/puppet/rails/puppet_class.rb
 - lib/puppet/rails/param_value.rb
 - lib/puppet/rails/puppet_tag.rb
 - lib/puppet/rails/resource_tag.rb
 - lib/puppet/rails/resource.rb
 - lib/puppet/rails/database/schema.rb
+- lib/puppet/rails/database/001_add_created_at_to_all_tables.rb
 - lib/puppet/rails/fact_name.rb
 - lib/puppet/rails/source_file.rb
 - lib/puppet/file_serving/terminus_helper.rb
@@ -362,7 +357,6 @@ files:
 - lib/puppet/parser/parser.rb
 - lib/puppet/parser/resource/reference.rb
 - lib/puppet/parser/resource/param.rb
-- lib/puppet/parser/compile.rb
 - lib/puppet/parser/functions.rb
 - lib/puppet/parser/templatewrapper.rb
 - lib/puppet/parser/resource.rb
@@ -388,6 +382,7 @@ files:
 - lib/puppet/parser/ast/resource_reference.rb
 - lib/puppet/parser/ast/resource_override.rb
 - lib/puppet/parser/collector.rb
+- lib/puppet/parser/compiler.rb
 - lib/puppet/provider/package/yumhelper.py
 - test/ral/providers/group.rb
 - test/ral/providers/port/parsed.rb
@@ -409,27 +404,27 @@ files:
 - test/ral/providers/parsedfile.rb
 - test/ral/providers/cron/crontab.rb
 - test/ral/providers/provider.rb
-- test/ral/types/parameter.rb
-- test/ral/types/tidy.rb
-- test/ral/types/filesources.rb
-- test/ral/types/zone.rb
-- test/ral/types/group.rb
-- test/ral/types/file.rb
-- test/ral/types/service.rb
-- test/ral/types/yumrepo.rb
-- test/ral/types/resources.rb
-- test/ral/types/host.rb
-- test/ral/types/user.rb
-- test/ral/types/basic.rb
-- test/ral/types/sshkey.rb
-- test/ral/types/property.rb
-- test/ral/types/filebucket.rb
-- test/ral/types/file/target.rb
-- test/ral/types/cron.rb
-- test/ral/types/fileignoresource.rb
-- test/ral/types/exec.rb
-- test/ral/types/mailalias.rb
-- test/ral/types/port.rb
+- test/ral/type/parameter.rb
+- test/ral/type/tidy.rb
+- test/ral/type/filesources.rb
+- test/ral/type/zone.rb
+- test/ral/type/group.rb
+- test/ral/type/file.rb
+- test/ral/type/service.rb
+- test/ral/type/yumrepo.rb
+- test/ral/type/resources.rb
+- test/ral/type/host.rb
+- test/ral/type/user.rb
+- test/ral/type/basic.rb
+- test/ral/type/sshkey.rb
+- test/ral/type/property.rb
+- test/ral/type/filebucket.rb
+- test/ral/type/file/target.rb
+- test/ral/type/cron.rb
+- test/ral/type/fileignoresource.rb
+- test/ral/type/exec.rb
+- test/ral/type/mailalias.rb
+- test/ral/type/port.rb
 - test/ral/manager/attributes.rb
 - test/ral/manager/manager.rb
 - test/ral/manager/type.rb
@@ -477,44 +472,8 @@ files:
 - test/executables/puppetd.rb
 - test/executables/puppetmodule.rb
 - test/lib/puppettest.rb
-- test/lib/mocha.rb
 - test/lib/mocha_standalone.rb
 - test/lib/stubba.rb
-- test/lib/mocha/expectation.rb
-- test/lib/mocha/pretty_parameters.rb
-- test/lib/mocha/central.rb
-- test/lib/mocha/yield_parameters.rb
-- test/lib/mocha/mock.rb
-- test/lib/mocha/setup_and_teardown.rb
-- test/lib/mocha/any_instance_method.rb
-- test/lib/mocha/metaclass.rb
-- test/lib/mocha/infinite_range.rb
-- test/lib/mocha/is_a.rb
-- test/lib/mocha/no_yields.rb
-- test/lib/mocha/exception_raiser.rb
-- test/lib/mocha/standalone.rb
-- test/lib/mocha/single_yield.rb
-- test/lib/mocha/expectation_error.rb
-- test/lib/mocha/class_method.rb
-- test/lib/mocha/missing_expectation.rb
-- test/lib/mocha/instance_method.rb
-- test/lib/mocha/test_case_adapter.rb
-- test/lib/mocha/parameter_matchers.rb
-- test/lib/mocha/inspect.rb
-- test/lib/mocha/auto_verify.rb
-- test/lib/mocha/multiple_yields.rb
-- test/lib/mocha/single_return_value.rb
-- test/lib/mocha/stub.rb
-- test/lib/mocha/deprecation.rb
-- test/lib/mocha/return_values.rb
-- test/lib/mocha/parameter_matchers/has_value.rb
-- test/lib/mocha/parameter_matchers/anything.rb
-- test/lib/mocha/parameter_matchers/includes.rb
-- test/lib/mocha/parameter_matchers/all_of.rb
-- test/lib/mocha/parameter_matchers/has_entry.rb
-- test/lib/mocha/parameter_matchers/has_key.rb
-- test/lib/mocha/parameter_matchers/any_of.rb
-- test/lib/mocha/object.rb
 - test/lib/puppettest/testcase.rb
 - test/lib/puppettest/resourcetesting.rb
 - test/lib/puppettest/reporttesting.rb
@@ -558,19 +517,15 @@ files:
 - test/certmgr/inventory.rb
 - test/certmgr/certmgr.rb
 - test/language/ast.rb
-- test/language/lexer.rb
 - test/language/scope.rb
 - test/language/parser.rb
 - test/language/transportable.rb
-- test/language/compile.rb
 - test/language/functions.rb
 - test/language/resource.rb
 - test/language/snippets.rb
-- test/language/ast/definition.rb
 - test/language/ast/selector.rb
 - test/language/ast/casestatement.rb
 - test/language/ast/resource.rb
-- test/language/ast/hostclass.rb
 - test/language/ast/variable.rb
 - test/language/ast/resource_reference.rb
 - test/puppet/conffiles.rb
@@ -655,9 +610,8 @@ files:
 - examples/root/etc/configfile
 - examples/root/etc/puppet
 - examples/root/etc/puppet/tagmail.conf
-- examples/root/etc/puppet/puppetmasterd.conf
 - examples/root/etc/puppet/namespaceauth.conf
-- examples/root/etc/puppet/puppetd.conf
+- examples/root/etc/puppet/puppet.conf
 - examples/root/etc/puppet/fileserver.conf
 - conf/suse
 - conf/suse/server.init
@@ -671,9 +625,7 @@ files:
 - conf/gentoo/init.d/puppetmaster
 - conf/gentoo/init.d/puppet
 - conf/gentoo/puppet
-- conf/gentoo/puppet/puppetmasterd.conf
-- conf/gentoo/puppet/puppetca.conf
-- conf/gentoo/puppet/puppetd.conf
+- conf/gentoo/puppet/puppet.conf
 - conf/gentoo/puppet/fileserver.conf
 - conf/redhat
 - conf/redhat/client.sysconfig
@@ -694,6 +646,7 @@ files:
 - conf/solaris/smf/puppetmasterd.xml
 - conf/solaris/smf/svc-puppetd
 - conf/solaris/pkginfo
+- conf/namespaceauth.conf
 - conf/freebsd
 - conf/freebsd/puppetmasterd
 - conf/freebsd/puppetd

data/conf/gentoo/puppet/puppetca.conf

@@ -1,29 +0,0 @@
-[puppet]
-    # Where Puppet stores dynamic and growing data.
-    # The default value is '/var/puppet'.
-    vardir = /var/lib/puppet
-
-    # The Puppet log directory.
-    # The default value is '$vardir/log'.
-    logdir = /var/log/puppet
-
-    # Where Puppet PID files are kept.
-    # The default value is '$vardir/run'.
-    rundir = /var/run/puppet
-
-    # Where SSL certificates are kept.
-    # The default value is '$confdir/ssl'.
-    ssldir = $vardir/ssl
-
-[puppetd]
-    # The file in which puppetd stores a list of the classes
-    # associated with the retrieved configuratiion.  Can be loaded in
-    # the separate ``puppet`` executable using the ``--loadclasses``
-    # option.
-    # The default value is '$confdir/classes.txt'.
-    classfile = $vardir/classes.txt
-
-    # Where puppetd caches the local configuration.  An
-    # extension indicating the cache format is added automatically.
-    # The default value is '$confdir/localconfig'.
-    localconfig = $vardir/localconfig

data/conf/gentoo/puppet/puppetd.conf

@@ -1,29 +0,0 @@
-[puppet]
-    # Where Puppet stores dynamic and growing data.
-    # The default value is '/var/puppet'.
-    vardir = /var/lib/puppet
-
-    # The Puppet log directory.
-    # The default value is '$vardir/log'.
-    logdir = /var/log/puppet
-
-    # Where Puppet PID files are kept.
-    # The default value is '$vardir/run'.
-    rundir = /var/run/puppet
-
-    # Where SSL certificates are kept.
-    # The default value is '$confdir/ssl'.
-    ssldir = $vardir/ssl
-
-[puppetd]
-    # The file in which puppetd stores a list of the classes
-    # associated with the retrieved configuratiion.  Can be loaded in
-    # the separate ``puppet`` executable using the ``--loadclasses``
-    # option.
-    # The default value is '$confdir/classes.txt'.
-    classfile = $vardir/classes.txt
-
-    # Where puppetd caches the local configuration.  An
-    # extension indicating the cache format is added automatically.
-    # The default value is '$confdir/localconfig'.
-    localconfig = $vardir/localconfig