Add documentation, rspec test and support for global overriding contrib package name

Author: kamilszymanski

README.md

@@ -116,6 +116,7 @@ Classes:
 * [postgresql](#class-postgresql)
 * [postgresql::server](#class-postgresqlserver)
 * [postgresql::client](#class-postgresqlclient)
+* [postgresql::contrib](#class-postgresqlcontrib)
 * [postgresql::devel](#class-postgresqldevel)
 * [postgresql::java](#class-postgresqljava)
 
@@ -179,6 +180,9 @@ This setting can be used to override the default postgresql client package name.
 ####`server_package_name`
 This setting can be used to override the default postgresql server package name. If not specified, the module will use whatever package name is the default for your OS distro.
 
+####`contrib_package_name`
+This setting can be used to override the default postgresql contrib package name. If not specified, the module will use whatever package name is the default for your OS distro.
+
 ####`devel_package_name`
 This setting can be used to override the default postgresql devel package name. If not specified, the module will use whatever package name is the default for your OS distro.
 
@@ -237,6 +241,15 @@ The name of the postgresql client package.
 ####`package_ensure`
 The ensure parameter passed on to postgresql client package resource.
 
+###Class: postgresql::contrib
+Installs the postgresql contrib package.
+
+####`package_name`
+The name of the postgresql client package.
+
+####`package_ensure`
+The ensure parameter passed on to postgresql contrib package resource.
+
 ###Class: postgresql::devel
 Installs the packages containing the development libraries for PostgreSQL.
 

manifests/init.pp

@@ -58,6 +58,11 @@
 #    postgresql server package name. If not specified, the module
 #    will use whatever package name is the default for your
 #    OS distro.
+# [*contrib_package_name*]
+#    This setting can be used to override the default
+#    postgresql contrib package name. If not specified, the module
+#    will use whatever package name is the default for your
+#    OS distro.
 # [*devel_package_name*]
 #    This setting can be used to override the default
 #    postgresql devel package name. If not specified, the module
@@ -99,40 +104,42 @@
 #
 #
 class postgresql (
-  $version             = $::postgres_default_version,
-  $manage_package_repo = false,
-  $package_source      = undef,
-  $locale              = undef,
-  $charset             = 'UTF8',
-  $datadir             = undef,
-  $confdir             = undef,
-  $bindir              = undef,
-  $client_package_name = undef,
-  $server_package_name = undef,
-  $devel_package_name  = undef,
-  $java_package_name   = undef,
-  $service_name        = undef,
-  $user                = undef,
-  $group               = undef,
-  $run_initdb          = undef
+  $version              = $::postgres_default_version,
+  $manage_package_repo  = false,
+  $package_source       = undef,
+  $locale               = undef,
+  $charset              = 'UTF8',
+  $datadir              = undef,
+  $confdir              = undef,
+  $bindir               = undef,
+  $client_package_name  = undef,
+  $server_package_name  = undef,
+  $contrib_package_name = undef,
+  $devel_package_name   = undef,
+  $java_package_name    = undef,
+  $service_name         = undef,
+  $user                 = undef,
+  $group                = undef,
+  $run_initdb           = undef
 ) {
 
   class { 'postgresql::params':
-    version                    => $version,
-    manage_package_repo        => $manage_package_repo,
-    package_source             => $package_source,
-    locale                     => $locale,
-    charset                    => $charset,
-    custom_datadir             => $datadir,
-    custom_confdir             => $confdir,
-    custom_bindir              => $bindir,
-    custom_client_package_name => $client_package_name,
-    custom_server_package_name => $server_package_name,
-    custom_devel_package_name  => $devel_package_name,
-    custom_java_package_name   => $java_package_name,
-    custom_service_name        => $service_name,
-    custom_user                => $user,
-    custom_group               => $group,
-    run_initdb                 => $run_initdb,
+    version                     => $version,
+    manage_package_repo         => $manage_package_repo,
+    package_source              => $package_source,
+    locale                      => $locale,
+    charset                     => $charset,
+    custom_datadir              => $datadir,
+    custom_confdir              => $confdir,
+    custom_bindir               => $bindir,
+    custom_client_package_name  => $client_package_name,
+    custom_server_package_name  => $server_package_name,
+    custom_contrib_package_name => $contrib_package_name,
+    custom_devel_package_name   => $devel_package_name,
+    custom_java_package_name    => $java_package_name,
+    custom_service_name         => $service_name,
+    custom_user                 => $user,
+    custom_group                => $group,
+    run_initdb                  => $run_initdb,
   }
 }

spec/unit/classes/contrib_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe 'postgresql::contrib', :type => :class do
+  let :facts do
+    {
+      :postgres_default_version => '8.4',
+      :osfamily => 'Debian',
+    }
+  end
+  it { should include_class("postgresql::contrib") }
+end

spec/unit/classes/init_spec.rb

@@ -21,6 +21,7 @@
       :bindir => '/opt/pg/bin',
       :client_package_name => 'my-postgresql-client',
       :server_package_name => 'my-postgresql-server',
+      :contrib_package_name => 'my-postgresql-contrib',
       :devel_package_name => 'my-postgresql-devel',
       :java_package_name => 'my-postgresql-java',
       :service_name => 'my-postgresql',