puppet 0.25.5 → 2.6.0

data/man/man8/puppetdoc.8

@@ -6,15 +6,15 @@
 .SH SYNOPSIS
 .sp
 Generate a reference for all Puppet types. Largely meant for internal
-Puppet Labs use.
+Reductive Labs use.
 .SH USAGE
 .INDENT 0.0
 .INDENT 3.5
 .INDENT 0.0
 .TP
-.B puppetdoc [\-a|\-\-all] [\-h|\-\-help] [\-o|\-\-outputdir <rdoc outputdir>] [\-m|\-\-mode <text|pdf|markdown|trac|rdoc>]
+.B puppet doc [\-a|\-\-all] [\-h|\-\-help] [\-o|\-\-outputdir <rdoc outputdir>] [\-m|\-\-mode <text|pdf|markdown|trac|rdoc>]
 .
-[\-r|\-\-reference <[type]|configuration|..>] [manifest\-file]
+[\-r|\-\-reference <[type]|configuration|..>] [\-\-charset CHARSET] [manifest\-file]
 .UNINDENT
 .UNINDENT
 .UNINDENT
@@ -24,7 +24,7 @@ If mode is not \(aqrdoc\(aq, then this command generates a restructured\-text
 document describing all installed Puppet types or all allowable
 arguments to puppet executables. It is largely meant for internal use
 and is used to generate the reference document available on the
-Puppet Labs web site.
+Reductive Labs web site.
 .sp
 In \(aqrdoc\(aq mode, this command generates an html RDoc hierarchy describing
 the manifests that are in \(aqmanifestdir\(aq and \(aqmodulepath\(aq configuration
@@ -32,7 +32,7 @@ directives. The generated documentation directory is doc by default but
 can be changed with the \(aqoutputdir\(aq option.
 .sp
 If the command is started with \(aqmanifest\-file\(aq command\-line arguments,
-puppetdoc generate a single manifest documentation that is output on
+puppet doc generate a single manifest documentation that is output on
 stdout.
 .SH OPTIONS
 .INDENT 0.0
@@ -53,19 +53,23 @@ documentation in \(aqrdoc\(aq mode.
 .
 \(aqpdf\(aq, \(aqmarkdown\(aq and \(aqrdoc\(aq. The \(aqpdf\(aq and \(aqmarkdown\(aq modes
 create PDF or Markdown formatted files in the /tmp directory.
-Note that \(aqtrac\(aq mode only works on Puppet Labs servers.
+Note that \(aqtrac\(aq mode only works on Reductive Labs servers.
 The default mode is \(aqtext\(aq. In \(aqrdoc\(aq mode you must provide
 \(aqmanifests\-path\(aq
 .TP
 .B reference: Build a particular reference. Get a list of references by
 .
-running +puppetdoc \-\-list+.
+running +puppet doc \-\-list+.
+.TP
+.B charset:   Used only in \(aqrdoc\(aq mode. It sets the charset used in the
+.
+html files produced.
 .UNINDENT
 .SH EXAMPLE
 .INDENT 0.0
 .INDENT 3.5
 .sp
-$ puppetdoc \-r type > /tmp/type_reference.rst
+$ puppet doc \-r type > /tmp/type_reference.rst
 .UNINDENT
 .UNINDENT
 .sp
@@ -73,7 +77,7 @@ or
 .INDENT 0.0
 .INDENT 3.5
 .sp
-$ puppetdoc \-\-outputdir /tmp/rdoc \-\-mode rdoc /path/to/manifests
+$ puppet doc \-\-outputdir /tmp/rdoc \-\-mode rdoc /path/to/manifests
 .UNINDENT
 .UNINDENT
 .sp
@@ -81,7 +85,7 @@ or
 .INDENT 0.0
 .INDENT 3.5
 .sp
-$ puppetdoc /etc/puppet/manifests/site.pp
+$ puppet doc /etc/puppet/manifests/site.pp
 .UNINDENT
 .UNINDENT
 .sp
@@ -89,7 +93,7 @@ or
 .INDENT 0.0
 .INDENT 3.5
 .sp
-$ puppetdoc \-m markdown \-r configuration
+$ puppet doc \-m markdown \-r configuration
 .UNINDENT
 .UNINDENT
 .SH AUTHOR
@@ -97,7 +101,7 @@ $ puppetdoc \-m markdown \-r configuration
 Luke Kanies
 .SH COPYRIGHT
 .sp
-Copyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU
+Copyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU
 Public License
 .\" Generated by docutils manpage writer.
 .\" 

data/man/man8/puppetmasterd.8

@@ -12,7 +12,7 @@ default.
 .INDENT 3.5
 .INDENT 0.0
 .TP
-.B puppetmasterd [\-D|\-\-daemonize|\-\-no\-daemonize] [\-d|\-\-debug] [\-h|\-\-help]
+.B puppet master [\-D|\-\-daemonize|\-\-no\-daemonize] [\-d|\-\-debug] [\-h|\-\-help]
 .
 [\-l|\-\-logdest <file>|console|syslog] [\-v|\-\-verbose] [\-V|\-\-version]
 .UNINDENT
@@ -29,7 +29,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
 argument.
 .sp
 See the configuration file documentation at
-\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://docs.puppetlabs.com/references/stable/configuration.html\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppetmasterdd
 with \(aq\-\-genconfig\(aq.
@@ -57,7 +57,7 @@ version:      Print the puppet version number and exit.
 .INDENT 0.0
 .INDENT 3.5
 .sp
-puppetmasterd
+puppet master
 .UNINDENT
 .UNINDENT
 .SH AUTHOR
@@ -65,7 +65,7 @@ puppetmasterd
 Luke Kanies
 .SH COPYRIGHT
 .sp
-Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public
+Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
 License
 .\" Generated by docutils manpage writer.
 .\" 

data/man/man8/puppetqd.8

@@ -9,7 +9,7 @@ Retrieve serialized records from a queue and process them in order.
 .INDENT 0.0
 .INDENT 3.5
 .sp
-puppetqd  [\-d|\-\-debug] [\-v|\-\-verbose]
+puppet queue [\-d|\-\-debug] [\-v|\-\-verbose]
 .UNINDENT
 .UNINDENT
 .SH DESCRIPTION
@@ -24,7 +24,7 @@ configuration parameter, so you can specify \(aq\-\-server <servername>\(aq as
 an argument.
 .sp
 See the configuration file documentation at
-\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://docs.puppetlabs.com/references/stable/configuration.html\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppetd with
 \(aq\-\-genconfig\(aq.
@@ -40,7 +40,7 @@ version: Print the puppet version number and exit.
 .INDENT 0.0
 .INDENT 3.5
 .sp
-puppetqd
+puppet queue
 .UNINDENT
 .UNINDENT
 .SH AUTHOR
@@ -48,7 +48,7 @@ puppetqd
 Luke Kanies
 .SH COPYRIGHT
 .sp
-Copyright (c) 2009 Puppet Labs, LLC Licensed under the GNU Public
+Copyright (c) 2009 Reductive Labs, LLC Licensed under the GNU Public
 License
 .\" Generated by docutils manpage writer.
 .\" 

data/man/man8/puppetrun.8

@@ -5,47 +5,48 @@
 .
 .SH SYNOPSIS
 .sp
-Trigger a puppetd run on a set of hosts.
+Trigger a puppet agent run on a set of hosts.
 .SH USAGE
 .INDENT 0.0
 .INDENT 3.5
 .INDENT 0.0
 .TP
-.B puppetrun [\-a|\-\-all] [\-c|\-\-class <class>] [\-d|\-\-debug] [\-f|\-\-foreground]
+.B puppet kick [\-a|\-\-all] [\-c|\-\-class <class>] [\-d|\-\-debug] [\-f|\-\-foreground]
 .
 [\-h|\-\-help] [\-\-host <host>] [\-\-no\-fqdn] [\-\-ignoreschedules]
-[\-t|\-\-tag <tag>] [\-\-test] [\-p|\-\-ping]
+[\-t|\-\-tag <tag>] [\-\-test] [\-p|\-\-ping] <host> [<host> [...]]
 .UNINDENT
 .UNINDENT
 .UNINDENT
 .SH DESCRIPTION
 .sp
-This script can be used to connect to a set of machines running
-+puppetd+ and trigger them to run their configurations. The most common
+This script can be used to connect to a set of machines running +puppet
+agent+ and trigger them to run their configurations. The most common
 usage would be to specify a class of hosts and a set of tags, and
-+puppetrun+ would look up in LDAP all of the hosts matching that class,
-then connect to each host and trigger a run of all of the objects with
-the specified tags.
++puppet kick+ would look up in LDAP all of the hosts matching that
+class, then connect to each host and trigger a run of all of the objects
+with the specified tags.
 .sp
 If you are not storing your host configurations in LDAP, you can specify
 hosts manually.
 .sp
-You will most likely have to run +puppetrun+ as root to get access to
+You will most likely have to run +puppet kick+ as root to get access to
 the SSL certificates.
 .sp
-+puppetrun+ reads +puppetmaster+\(aqs configuration file, so that it can
++puppet kick+ reads +puppet master+\(aqs configuration file, so that it can
 copy things like LDAP settings.
 .SH USAGE NOTES
 .sp
-+puppetrun+ is useless unless +puppetd+ is listening. See its
++puppet kick+ is useless unless +puppet agent+ is listening. See its
 documentation for more information, but the gist is that you must enable
-+listen+ on the +puppetd+ daemon, either using +\-\-listen+ on the command
-line or adding \(aqlisten: true\(aq in its config file. In addition, you need
-to set the daemons up to specifically allow connections by creating the
-+namespaceauth+ file, normally at \(aq/etc/puppet/namespaceauth.conf\(aq. This
-file specifies who has access to each namespace; if you create the file
-you must add every namespace you want any Puppet daemon to allow \-\- it
-is currently global to all Puppet daemons.
++listen+ on the +puppet agent+ daemon, either using +\-\-listen+ on the
+command line or adding \(aqlisten: true\(aq in its config file. In addition,
+you need to set the daemons up to specifically allow connections by
+creating the +namespaceauth+ file, normally at
+\(aq/etc/puppet/namespaceauth.conf\(aq. This file specifies who has access to
+each namespace; if you create the file you must add every namespace you
+want any Puppet daemon to allow \-\- it is currently global to all Puppet
+daemons.
 .sp
 An example file looks like this:
 .sp
@@ -74,9 +75,9 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
 argument.
 .sp
 See the configuration file documentation at
-\fI\%http://puppetlabs.com/projects/puppet/reference/configref.html\fP for
+\fI\%http://reductivelabs.com/projects/puppet/reference/configref.html\fP for
 the full list of acceptable parameters. A commented list of all
-configuration options can also be generated by running puppetmasterdd
+configuration options can also be generated by running puppet master
 with \(aq\-\-genconfig\(aq.
 .INDENT 0.0
 .TP
@@ -137,7 +138,7 @@ Do a ICMP echo against the target host. Skip hosts that don\(aqt respond to ping
 .INDENT 0.0
 .INDENT 3.5
 .sp
-sudo puppetrun \-p 10 \-\-host host1 \-\-host host2 \-t remotefile \-t webserver
+sudo puppet kick \-p 10 \-t remotefile \-t webserver host1 host2
 .UNINDENT
 .UNINDENT
 .SH AUTHOR
@@ -145,7 +146,7 @@ sudo puppetrun \-p 10 \-\-host host1 \-\-host host2 \-t remotefile \-t webserver
 Luke Kanies
 .SH COPYRIGHT
 .sp
-Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public
+Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
 License
 .\" Generated by docutils manpage writer.
 .\" 

data/man/man8/ralsh.8

@@ -3,8 +3,6 @@
  \- 
 .\" Man page generated from reStructeredText.
 .
-.sp
-vim: softtabstop=4 shiftwidth=4 expandtab
 .SH SYNOPSIS
 .sp
 Use the Puppet RAL to directly interact with the system.
@@ -13,9 +11,10 @@ Use the Puppet RAL to directly interact with the system.
 .INDENT 3.5
 .INDENT 0.0
 .TP
-.B ralsh [\-h|\-\-help] [\-d|\-\-debug] [\-v|\-\-verbose] [\-e|\-\-edit] [\-H|\-\-host <host>]
+.B puppet resource [\-h|\-\-help] [\-d|\-\-debug] [\-v|\-\-verbose] [\-e|\-\-edit]
 .
-[\-p|\-\-param <param>] [\-t|\-\-types] type <name>
+[\-H|\-\-host <host>] [\-p|\-\-param <param>] [\-t|\-\-types]
+type <name>
 .UNINDENT
 .UNINDENT
 .UNINDENT
@@ -25,15 +24,15 @@ This command provides simple facilities for converting current system
 state into Puppet code, along with some ability to use Puppet to affect
 the current state.
 .sp
-By default, you must at least provide a type to list, which case ralsh
-will tell you everything it knows about all instances of that type. You
-can optionally specify an instance name, and ralsh will only describe
-that single instance.
+By default, you must at least provide a type to list, which case puppet
+resource will tell you everything it knows about all instances of that
+type. You can optionally specify an instance name, and puppet resource
+will only describe that single instance.
 .sp
-You can also add +\-\-edit+ as an argument, and ralsh will write its
-output to a file, open that file in an editor, and then apply the file
-as a Puppet transaction. You can easily use this to use Puppet to make
-simple changes to a system.
+You can also add +\-\-edit+ as an argument, and puppet resource will write
+its output to a file, open that file in an editor, and then apply the
+file as a Puppet transaction. You can easily use this to use Puppet to
+make simple changes to a system.
 .SH OPTIONS
 .sp
 Note that any configuration parameter that\(aqs valid in the configuration
@@ -42,7 +41,7 @@ configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
 argument.
 .sp
 See the configuration file documentation at
-\fI\%http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+\fI\%http://docs.puppetlabs.com/references/stable/configuration.html\fP for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 \(aq\-\-genconfig\(aq.
@@ -94,12 +93,12 @@ List all available types.
 verbose: Print extra information.
 .SH EXAMPLE
 .sp
-This example uses \fBralsh\fP to return Puppet configuration for the user
-\fBluke\fP:
+This example uses \fBpuppet resource\fP to return Puppet configuration for
+the user \fBluke\fP:
 .sp
 .nf
 .ft C
-$ ralsh user luke
+$ puppet resource user luke
 user { \(aqluke\(aq:
   home => \(aq/home/luke\(aq,
   uid => \(aq100\(aq,
@@ -116,7 +115,7 @@ user { \(aqluke\(aq:
 Luke Kanies
 .SH COPYRIGHT
 .sp
-Copyright (c) 2005\-2007 Puppet Labs, LLC Licensed under the GNU
+Copyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU
 Public License
 .\" Generated by docutils manpage writer.
 .\" 

data/spec/fixtures/yaml/test.local.yaml

@@ -0,0 +1,16 @@
+--- !ruby/object:Puppet::Node::Facts
+  expiration: 2010-06-07 19:15:36.519351 -07:00
+  name: test.local
+  values: 
+    sp_number_processors: "2"
+    kernelmajversion: "10.3"
+    kernelversion: 10.3.1
+    sp_secure_vm: secure_vm_enabled
+    ps: ps auxwww
+    macosx_productversion_major: "10.6"
+    hostname: test
+    !ruby/sym _timestamp: Mon Jun 07 18:45:36 -0700 2010
+    facterversion: 1.5.7
+    sp_packages: "1"
+    timezone: PDT
+    environment: production

data/spec/integration/application/apply_spec.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'puppet_spec/files'
+
+require 'puppet/application/apply'
+
+describe "apply" do
+  include PuppetSpec::Files
+
+  describe "when applying provided catalogs" do
+    confine "PSON library is missing; cannot test applying catalogs" => Puppet.features.pson?
+    it "should be able to apply catalogs provided in a file in pson" do
+      file_to_create = tmpfile("pson_catalog")
+      catalog = Puppet::Resource::Catalog.new
+      resource = Puppet::Resource.new(:file, file_to_create, :parameters => {:content => "my stuff"})
+      catalog.add_resource resource
+
+      manifest = tmpfile("manifest")
+
+      File.open(manifest, "w") { |f| f.print catalog.to_pson }
+
+      puppet = Puppet::Application[:apply]
+      puppet.options[:catalog] = manifest
+
+      puppet.apply
+
+      File.should be_exist(file_to_create)
+      File.read(file_to_create).should == "my stuff"
+    end
+  end
+end

data/spec/integration/configurer_spec.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+require 'puppet/configurer'
+
+describe Puppet::Configurer do
+  describe "when downloading plugins" do
+    it "should use the :pluginsignore setting, split on whitespace, for ignoring remote files" do
+      resource = Puppet::Type.type(:notify).new :name => "yay"
+      Puppet::Type.type(:file).expects(:new).with { |args| args[:ignore] == Puppet[:pluginsignore].split(/\s+/) }.returns resource
+
+      configurer = Puppet::Configurer.new
+      configurer.stubs(:download_plugins?).returns true
+      configurer.download_plugins
+    end
+  end
+
+  describe "when running" do
+    it "should send a transaction report with valid data" do
+      catalog = Puppet::Resource::Catalog.new
+      catalog.add_resource(Puppet::Type.type(:notify).new(:title => "testing"))
+
+      configurer = Puppet::Configurer.new
+
+      Puppet::Transaction::Report.indirection.expects(:save).with do |x, report|
+        report.time.class == Time and report.logs.length > 0
+      end
+
+      Puppet[:report] = true
+
+      configurer.run :catalog => catalog
+    end
+  end
+end

data/spec/integration/defaults_spec.rb

@@ -0,0 +1,258 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+require 'puppet/defaults'
+
+describe "Puppet defaults" do
+    include Puppet::Util::Execution
+  after { Puppet.settings.clear }
+
+  describe "when setting the :factpath" do
+    it "should add the :factpath to Facter's search paths" do
+      Facter.expects(:search).with("/my/fact/path")
+
+      Puppet.settings[:factpath] = "/my/fact/path"
+    end
+  end
+
+  describe "when setting the :certname" do
+    it "should fail if the certname is not downcased" do
+      lambda { Puppet.settings[:certname] = "Host.Domain.Com" }.should raise_error(ArgumentError)
+    end
+  end
+
+  describe "when configuring the :crl" do
+    it "should warn if :cacrl is set to false" do
+      Puppet.expects(:warning)
+      Puppet.settings[:cacrl] = 'false'
+    end
+  end
+
+  describe "when setting the :catalog_format" do
+    it "should log a deprecation notice" do
+      Puppet.expects(:warning)
+      Puppet.settings[:catalog_format] = 'marshal'
+    end
+    it "should copy the value to :preferred_serialization_format" do
+      Puppet.settings[:catalog_format] = 'marshal'
+      Puppet.settings[:preferred_serialization_format].should == 'marshal'
+    end
+  end
+
+  it "should have a clientyamldir setting" do
+    Puppet.settings[:clientyamldir].should_not be_nil
+  end
+
+  it "should have different values for the yamldir and clientyamldir" do
+    Puppet.settings[:yamldir].should_not == Puppet.settings[:clientyamldir]
+  end
+
+  it "should have a client_datadir setting" do
+    Puppet.settings[:client_datadir].should_not be_nil
+  end
+
+  it "should have different values for the server_datadir and client_datadir" do
+    Puppet.settings[:server_datadir].should_not == Puppet.settings[:client_datadir]
+  end
+
+  # See #1232
+  it "should not specify a user or group for the clientyamldir" do
+    Puppet.settings.setting(:clientyamldir).owner.should be_nil
+    Puppet.settings.setting(:clientyamldir).group.should be_nil
+  end
+
+  it "should use the service user and group for the yamldir" do
+    Puppet.settings.stubs(:service_user_available?).returns true
+    Puppet.settings.setting(:yamldir).owner.should == Puppet.settings[:user]
+    Puppet.settings.setting(:yamldir).group.should == Puppet.settings[:group]
+  end
+
+  # See #1232
+  it "should not specify a user or group for the rundir" do
+    Puppet.settings.setting(:rundir).owner.should be_nil
+    Puppet.settings.setting(:rundir).group.should be_nil
+  end
+
+  it "should specify that the host private key should be owned by the service user" do
+    Puppet.settings.stubs(:service_user_available?).returns true
+    Puppet.settings.setting(:hostprivkey).owner.should == Puppet.settings[:user]
+  end
+
+  it "should specify that the host certificate should be owned by the service user" do
+    Puppet.settings.stubs(:service_user_available?).returns true
+    Puppet.settings.setting(:hostcert).owner.should == Puppet.settings[:user]
+  end
+
+  it "should use a bind address of ''" do
+    Puppet.settings.clear
+    Puppet.settings[:bindaddress].should == ""
+  end
+
+  [:factdest].each do |setting|
+    it "should force the :factdest to be a directory" do
+      Puppet.settings[setting].should =~ /\/$/
+    end
+  end
+
+  [:modulepath, :factpath].each do |setting|
+    it "should configure '#{setting}' not to be a file setting, so multi-directory settings are acceptable" do
+      Puppet.settings.setting(setting).should be_instance_of(Puppet::Util::Settings::Setting)
+    end
+  end
+
+  it "should add /usr/sbin and /sbin to the path if they're not there" do
+    withenv("PATH" => "/usr/bin:/usr/local/bin") do
+      Puppet.settings[:path] = "none" # this causes it to ignore the setting
+      ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/usr/sbin")
+      ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/sbin")
+    end
+  end
+
+  it "should default to pson for the preferred serialization format" do
+    Puppet.settings.value(:preferred_serialization_format).should == "pson"
+  end
+
+  describe "when enabling storeconfigs" do
+    before do
+      Puppet::Resource::Catalog.stubs(:cache_class=)
+      Puppet::Node::Facts.stubs(:cache_class=)
+      Puppet::Node.stubs(:cache_class=)
+
+      Puppet.features.stubs(:rails?).returns true
+    end
+
+    it "should set the Catalog cache class to :active_record" do
+      Puppet::Resource::Catalog.expects(:cache_class=).with(:active_record)
+      Puppet.settings[:storeconfigs] = true
+    end
+
+    it "should not set the Catalog cache class to :active_record if asynchronous storeconfigs is enabled" do
+      Puppet::Resource::Catalog.expects(:cache_class=).with(:active_record).never
+      Puppet.settings.expects(:value).with(:async_storeconfigs).returns true
+      Puppet.settings[:storeconfigs] = true
+    end
+
+    it "should set the Facts cache class to :active_record" do
+      Puppet::Node::Facts.expects(:cache_class=).with(:active_record)
+      Puppet.settings[:storeconfigs] = true
+    end
+
+    it "should set the Node cache class to :active_record" do
+      Puppet::Node.expects(:cache_class=).with(:active_record)
+      Puppet.settings[:storeconfigs] = true
+    end
+
+    it "should fail if rails is not available" do
+      Puppet.features.stubs(:rails?).returns false
+      lambda { Puppet.settings[:storeconfigs] = true }.should raise_error
+    end
+  end
+
+  describe "when enabling asynchronous storeconfigs" do
+    before do
+      Puppet::Resource::Catalog.stubs(:cache_class=)
+      Puppet::Node::Facts.stubs(:cache_class=)
+      Puppet::Node.stubs(:cache_class=)
+      Puppet.features.stubs(:rails?).returns true
+    end
+
+    it "should set storeconfigs to true" do
+      Puppet.settings[:async_storeconfigs] = true
+      Puppet.settings[:storeconfigs].should be_true
+    end
+
+    it "should set the Catalog cache class to :queue" do
+      Puppet::Resource::Catalog.expects(:cache_class=).with(:queue)
+      Puppet.settings[:async_storeconfigs] = true
+    end
+
+    it "should set the Facts cache class to :active_record" do
+      Puppet::Node::Facts.expects(:cache_class=).with(:active_record)
+      Puppet.settings[:storeconfigs] = true
+    end
+
+    it "should set the Node cache class to :active_record" do
+      Puppet::Node.expects(:cache_class=).with(:active_record)
+      Puppet.settings[:storeconfigs] = true
+    end
+  end
+
+  describe "when enabling thin storeconfigs" do
+    before do
+      Puppet::Resource::Catalog.stubs(:cache_class=)
+      Puppet::Node::Facts.stubs(:cache_class=)
+      Puppet::Node.stubs(:cache_class=)
+      Puppet.features.stubs(:rails?).returns true
+    end
+
+    it "should set storeconfigs to true" do
+      Puppet.settings[:thin_storeconfigs] = true
+      Puppet.settings[:storeconfigs].should be_true
+    end
+  end
+
+  it "should have a setting for determining the configuration version and should default to an empty string" do
+    Puppet.settings[:config_version].should == ""
+  end
+
+  describe "when enabling reports" do
+    it "should use the default server value when report server is unspecified" do
+      Puppet.settings[:server] = "server"
+      Puppet.settings[:report_server].should == "server"
+    end
+
+    it "should use the default masterport value when report port is unspecified" do
+      Puppet.settings[:masterport] = "1234"
+      Puppet.settings[:report_port].should == "1234"
+    end
+
+    it "should set report_server when reportserver is set" do
+      Puppet.settings[:reportserver] = "reportserver"
+      Puppet.settings[:report_server].should == "reportserver"
+    end
+
+    it "should use report_port when set" do
+      Puppet.settings[:masterport] = "1234"
+      Puppet.settings[:report_port] = "5678"
+      Puppet.settings[:report_port].should == "5678"
+    end
+
+    it "should prefer report_server over reportserver" do
+      Puppet.settings[:reportserver] = "reportserver"
+      Puppet.settings[:report_server] = "report_server"
+      Puppet.settings[:report_server].should == "report_server"
+    end
+  end
+
+  it "should have a :caname setting that defaults to the cert name" do
+    Puppet.settings[:certname] = "foo"
+    Puppet.settings[:ca_name].should == "foo"
+  end
+
+  it "should have a 'prerun_command' that defaults to the empty string" do
+    Puppet.settings[:prerun_command].should == ""
+  end
+
+  it "should have a 'postrun_command' that defaults to the empty string" do
+    Puppet.settings[:postrun_command].should == ""
+  end
+
+  it "should have a 'certificate_revocation' setting that defaults to true" do
+    Puppet.settings[:certificate_revocation].should be_true
+  end
+
+  it "should have an http_compression setting that defaults to false" do
+    Puppet.settings[:http_compression].should be_false
+  end
+
+  describe "reportdir" do
+    subject { Puppet.settings[:reportdir] }
+    it { should == "#{Puppet[:vardir]}/reports" }
+  end
+
+  describe "reporturl" do
+    subject { Puppet.settings[:reporturl] }
+    it { should == "http://localhost:3000/reports" }
+  end
+end