puppet 0.25.1 → 0.25.2

data/man/man8/puppetqd.8

@@ -0,0 +1,60 @@
+.TH Synopsis  "" "" ""
+.SH NAME
+Synopsis \- 
+.\" Man page generated from reStructeredText.
+Retrieve serialized records from a queue and process them in order.
+
+
+.SH USAGE
+.INDENT 0.0
+.INDENT 3.5
+puppetqd  [\-d|\-\-debug] [\-v|\-\-verbose]
+
+.UNINDENT
+.UNINDENT
+
+.SH DESCRIPTION
+This is a simple application that just processes entities in a queue as
+they are recieved.
+
+
+.SH OPTIONS
+Note that any configuration parameter that\'s valid in the configuration
+file is also a valid long argument. For example, \'server\' is a valid
+configuration parameter, so you can specify \'\-\-server <servername>\' as
+an argument.
+
+See the configuration file documentation at
+\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+full list of acceptable parameters. A commented list of all
+configuration options can also be generated by running puppetd with
+\'\-\-genconfig\'.
+
+debug:   Enable full debugging.
+
+help:    Print this help message
+
+verbose: Turn on verbose reporting.
+
+version: Print the puppet version number and exit.
+
+
+.SH EXAMPLE
+.INDENT 0.0
+.INDENT 3.5
+puppetqd
+
+.UNINDENT
+.UNINDENT
+
+.SH AUTHOR
+Luke Kanies
+
+
+.SH COPYRIGHT
+Copyright (c) 2009 Reductive Labs, LLC Licensed under the GNU Public
+License
+
+
+.\" Generated by docutils manpage writer on 2009-12-30 19:32.
+.\" 

data/man/man8/puppetrun.8

@@ -1,7 +1,6 @@
 .TH   "" "" ""
 .SH NAME
- \-
-
+ \- 
 .\" Man page generated from reStructeredText.
 
 .SH SYNOPSIS
@@ -9,16 +8,18 @@ Trigger a puppetd run on a set of hosts.
 
 
 .SH USAGE
-
-.\" visit_block_quote
+.INDENT 0.0
+.INDENT 3.5
+.INDENT 0.0
 
 .TP
 .B puppetrun [\-a|\-\-all] [\-c|\-\-class <class>] [\-d|\-\-debug] [\-f|\-\-foreground]
 [\-h|\-\-help] [\-\-host <host>] [\-\-no\-fqdn] [\-\-ignoreschedules]
-[\-t|\-\-tag <tag>] [\-\-test]
-
+[\-t|\-\-tag <tag>] [\-\-test] [\-p|\-\-ping]
 
-.\" depart_block_quote
+.UNINDENT
+.UNINDENT
+.UNINDENT
 
 .SH DESCRIPTION
 This script can be used to connect to a set of machines running
@@ -75,11 +76,12 @@ configuration parameter, so you can specify \'\-\-ssldir <directory>\' as an
 argument.
 
 See the configuration file documentation at
-http://reductivelabs.com/projects/puppet/reference/configref.html 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
 with \'\-\-genconfig\'.
 
+.INDENT 0.0
 
 .TP
 .B all:             Connect to all available hosts. Requires LDAP support
@@ -90,16 +92,20 @@ at this point.
 .B class:           Specify a class of machines to which to connect. This
 only works if you have LDAP configured, at the moment.
 
+.UNINDENT
 debug:           Enable full debugging.
 
+.INDENT 0.0
 
 .TP
 .B foreground:      Run each configuration in the foreground; that is, when
 connecting to a host, do not return until the host has
 finished its run. The default is false.
 
+.UNINDENT
 help:            Print this help message
 
+.INDENT 0.0
 
 .TP
 .B host:            A specific host to which to connect. This flag can be
@@ -129,14 +135,21 @@ not work with the \-\-test option.
 actually connect. This option requires LDAP support at
 this point.
 
+.UNINDENT
+ping:
 
-.SH EXAMPLE
 
-.\" visit_block_quote
-sudo puppetrun \-p 10 \-\-host host1 \-\-host host2 \-t remotefile \-t webserver
+.nf
+Do a ICMP echo against the target host. Skip hosts that don\'t respond to ping.
+.fi
 
+.SH EXAMPLE
+.INDENT 0.0
+.INDENT 3.5
+sudo puppetrun \-p 10 \-\-host host1 \-\-host host2 \-t remotefile \-t webserver
 
-.\" depart_block_quote
+.UNINDENT
+.UNINDENT
 
 .SH AUTHOR
 Luke Kanies
@@ -147,5 +160,5 @@ Copyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public
 License
 
 
-.\" Generated by docutils manpage writer on 2008-05-05 09:33.
-.\"
+.\" Generated by docutils manpage writer on 2009-12-30 19:31.
+.\" 

data/man/man8/ralsh.8

@@ -1,7 +1,6 @@
 .TH   "" "" ""
 .SH NAME
- \-
-
+ \- 
 .\" Man page generated from reStructeredText.
 vim: softtabstop=4 shiftwidth=4 expandtab
 
@@ -11,15 +10,17 @@ Use the Puppet RAL to directly interact with the system.
 
 
 .SH USAGE
-
-.\" visit_block_quote
+.INDENT 0.0
+.INDENT 3.5
+.INDENT 0.0
 
 .TP
 .B ralsh [\-h|\-\-help] [\-d|\-\-debug] [\-v|\-\-verbose] [\-e|\-\-edit] [\-H|\-\-host <host>]
 [\-p|\-\-param <param>] [\-t|\-\-types] type <name>
 
-
-.\" depart_block_quote
+.UNINDENT
+.UNINDENT
+.UNINDENT
 
 .SH DESCRIPTION
 This command provides simple facilities for converting current system
@@ -44,8 +45,8 @@ configuration parameter, so you can specify \'\-\-ssldir <directory>\' as an
 argument.
 
 See the configuration file documentation at
-http://reductivelabs.com/projects/puppet/reference/configref.html for
-the full list of acceptable parameters. A commented list of all
+\fI\%http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference\fP for the
+full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 \'\-\-genconfig\'.
 
@@ -53,60 +54,52 @@ debug: Enable full debugging.
 
 edit:
 
-
-.\" visit_block_quote
+.INDENT 0.0
+.INDENT 3.5
 Write the results of the query to a file, open the file in an editor,
 and read the file back in as an executable Puppet manifest.
 
-
-.\" depart_block_quote
+.UNINDENT
+.UNINDENT
 host:
 
-
-.\" visit_block_quote
+.INDENT 0.0
+.INDENT 3.5
 When specified, connect to the resource server on the named host
 and retrieve the list of resouces of the type specified.
 
-
-.\" depart_block_quote
+.UNINDENT
+.UNINDENT
 help:
 
-
-.\" visit_block_quote
+.INDENT 0.0
+.INDENT 3.5
 Print this help message.
 
-
-.\" depart_block_quote
+.UNINDENT
+.UNINDENT
 param:
 
-
-.\" visit_block_quote
+.INDENT 0.0
+.INDENT 3.5
 Add more parameters to be outputted from queries.
 
-
-.\" depart_block_quote
+.UNINDENT
+.UNINDENT
 types:
 
-
-.\" visit_block_quote
+.INDENT 0.0
+.INDENT 3.5
 List all available types.
 
-
-.\" depart_block_quote
+.UNINDENT
+.UNINDENT
 verbose: Print extra information.
 
 
 .SH EXAMPLE
-This example uses
-.\" visit_literal
-ralsh
-.\" depart_literal
- to return Puppet configuration for the user
-
-.\" visit_literal
-luke
-.\" depart_literal
-:
+This example uses \fBralsh\fP to return Puppet configuration for the user
+\fBluke\fP:
 
 
 .nf
@@ -131,5 +124,5 @@ Copyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU
 Public License
 
 
-.\" Generated by docutils manpage writer on 2008-05-05 09:33.
-.\"
+.\" Generated by docutils manpage writer on 2009-12-30 19:24.
+.\" 

data/spec/integration/bin/puppetmasterd.rb

@@ -51,7 +51,8 @@ describe "puppetmasterd" do
         args = arguments + addl_args
 
         bin = File.join(File.dirname(__FILE__), "..", "..", "..", "sbin", "puppetmasterd")
-        output = %x{#{bin} #{args}}.chomp
+        lib = File.join(File.dirname(__FILE__), "..", "..", "..", "lib")
+        output = %x{/usr/bin/env ruby -I #{lib} #{bin} #{args}}.chomp
     end
 
     def stop
@@ -72,7 +73,7 @@ describe "puppetmasterd" do
     it "should be serving status information over xmlrpc" do
         start
 
-        sleep 0.5
+        sleep 5
 
         client = Puppet::Network::Client.status.new(:Server => "localhost", :Port => @@port)
 

data/spec/integration/defaults.rb

@@ -29,6 +29,17 @@ describe "Puppet defaults" do
         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

data/spec/integration/file_serving/metadata.rb

@@ -7,6 +7,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/file_serving/metadata'
 require 'shared_behaviours/file_serving'
+require 'puppet/indirector/file_metadata/file_server'
 
 describe Puppet::FileServing::Metadata, " when finding files" do
     it_should_behave_like "Puppet::FileServing::Files"

data/spec/integration/indirector/file_content/file_server.rb

@@ -29,9 +29,10 @@ describe Puppet::Indirector::FileContent::FileServer, " when finding files" do
         file = File.join(modpath, "lib", "file.rb")
         File.open(file, "w") { |f| f.puts "1" }
 
+        Puppet.settings[:modulepath] = "/no/such/file"
+
         env = Puppet::Node::Environment.new("foo")
         env.stubs(:modulepath).returns [path]
-        Puppet.settings[:modulepath] = "/no/such/file"
 
         result = Puppet::FileServing::Content.search("plugins", :environment => "foo", :recurse => true)
 

data/spec/integration/ssl/certificate_request.rb

@@ -22,6 +22,8 @@ describe Puppet::SSL::CertificateRequest do
         Puppet.settings[:confdir] = @dir
         Puppet.settings[:vardir] = @dir
 
+        Puppet::SSL::Host.ca_location = :none
+
         @csr = Puppet::SSL::CertificateRequest.new("luke.madstop.com")
 
         @key = OpenSSL::PKey::RSA.new(512)

data/spec/integration/type/file.rb

@@ -223,7 +223,7 @@ describe Puppet::Type.type(:file) do
         end
 
         it "should not recursively manage files managed by a more specific explicit file" do
-            dir = tmpfile("file_source_integration_source")
+            dir = tmpfile("recursion_vs_explicit_1")
 
             subdir = File.join(dir, "subdir")
             file = File.join(subdir, "file")
@@ -242,6 +242,25 @@ describe Puppet::Type.type(:file) do
 
             (File.stat(file).mode & 007777).should == 0644
         end
+
+        it "should recursively manage files even if there is an explicit file whose name is a prefix of the managed file" do
+            dir = tmpfile("recursion_vs_explicit_2")
+
+            managed   = File.join(dir, "file")
+            generated = File.join(dir, "file_with_a_name_starting_with_the_word_file")
+
+            FileUtils.mkdir_p(dir)
+            File.open(managed,   "w") { |f| f.puts "" }
+            File.open(generated, "w") { |f| f.puts "" }
+
+            @catalog = Puppet::Resource::Catalog.new
+            @catalog.add_resource Puppet::Type::File.new(:name => dir,     :recurse => true, :backup => false, :mode => "755")
+            @catalog.add_resource Puppet::Type::File.new(:name => managed, :recurse => true, :backup => false, :mode => "644")
+
+            @catalog.apply
+
+            (File.stat(generated).mode & 007777).should == 0755
+        end
     end
 
     describe "when generating resources" do

data/spec/shared_behaviours/file_serving.rb

@@ -26,7 +26,7 @@ describe "Puppet::FileServing::Files", :shared => true do
 
     it "should use the file_server terminus when the 'puppet' URI scheme is used, no host name is present, and the process name is 'puppet'" do
         uri = "puppet:///fakemod/my/file"
-        Puppet::Node::Environment.stubs(:new).returns(stub("env", :name => "testing", :module => nil))
+        Puppet::Node::Environment.stubs(:new).returns(stub("env", :name => "testing", :module => nil, :modulepath => []))
         Puppet.settings.stubs(:value).returns ""
         Puppet.settings.stubs(:value).with(:name).returns("puppet")
         Puppet.settings.stubs(:value).with(:fileserverconfig).returns("/whatever")

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ end
 require 'puppettest'
 require 'puppettest/runnable_test'
 require 'mocha'
-gem 'rspec', '=1.2.2'
+gem 'rspec', '>=1.2.2'
 require 'spec/autorun'
 
 # So everyone else doesn't have to include this base constant.

data/spec/unit/application/puppet.rb

@@ -332,70 +332,51 @@ describe "Puppet" do
         end
 
         describe "the 'apply' command" do
-            confine "PSON library is missing; cannot test applying catalogs" => Puppet.features.pson?
-
-            before do
-                #Puppet::Resource::Catalog.stubs(:pson_create).returns Puppet::Resource::Catalog.new
-                PSON.stubs(:parse).returns Puppet::Resource::Catalog.new
-            end
-
             it "should read the catalog in from disk if a file name is provided" do
                 @puppet.options[:catalog] = "/my/catalog.pson"
-
                 File.expects(:read).with("/my/catalog.pson").returns "something"
-
+                Puppet::Resource::Catalog.stubs(:convert_from).with(:pson,'something').returns Puppet::Resource::Catalog.new
                 @puppet.apply
             end
 
             it "should read the catalog in from stdin if '-' is provided" do
                 @puppet.options[:catalog] = "-"
-
                 $stdin.expects(:read).returns "something"
-
+                Puppet::Resource::Catalog.stubs(:convert_from).with(:pson,'something').returns Puppet::Resource::Catalog.new
                 @puppet.apply
             end
 
-            it "should deserialize the catalog from pson" do
+            it "should deserialize the catalog from the default format" do
                 @puppet.options[:catalog] = "/my/catalog.pson"
-
-                File.expects(:read).returns "something"
-                PSON.expects(:parse).with("something").returns Puppet::Resource::Catalog.new
-
+                File.stubs(:read).with("/my/catalog.pson").returns "something"
+                Puppet::Resource::Catalog.stubs(:default_format).returns :rot13_piglatin
+                Puppet::Resource::Catalog.stubs(:convert_from).with(:rot13_piglatin,'something').returns Puppet::Resource::Catalog.new
                 @puppet.apply
             end
 
             it "should fail helpfully if deserializing fails" do
                 @puppet.options[:catalog] = "/my/catalog.pson"
-
-                File.expects(:read).returns "something"
-                PSON.expects(:parse).raises ArgumentError
-
+                File.stubs(:read).with("/my/catalog.pson").returns "something syntacically invalid"
                 lambda { @puppet.apply }.should raise_error(Puppet::Error)
             end
 
             it "should convert plain data structures into a catalog if deserialization does not do so" do
                 @puppet.options[:catalog] = "/my/catalog.pson"
-
-                File.expects(:read).returns "something"
-                PSON.expects(:parse).with("something").returns({:foo => "bar"})
+                File.stubs(:read).with("/my/catalog.pson").returns "something"
+                Puppet::Resource::Catalog.stubs(:convert_from).with(:pson,"something").returns({:foo => "bar"})
                 Puppet::Resource::Catalog.expects(:pson_create).with({:foo => "bar"}).returns(Puppet::Resource::Catalog.new)
-
                 @puppet.apply
             end
 
             it "should convert the catalog to a RAL catalog and use a Configurer instance to apply it" do
                 @puppet.options[:catalog] = "/my/catalog.pson"
-
-                File.expects(:read).returns "something"
-
+                File.stubs(:read).with("/my/catalog.pson").returns "something"
                 catalog = Puppet::Resource::Catalog.new
-                PSON.expects(:parse).returns catalog
-
+                Puppet::Resource::Catalog.stubs(:convert_from).with(:pson,'something').returns catalog
                 catalog.expects(:to_ral).returns "mycatalog"
 
                 configurer = stub 'configurer'
                 Puppet::Configurer.expects(:new).returns configurer
-
                 configurer.expects(:run).with(:catalog => "mycatalog")
 
                 @puppet.apply