add nssdb base class to ensure package deps

This will prevent duplicate package type declarations when using one of
the defined types multiple times in the same manifest.

.fixtures.yml

@@ -2,6 +2,6 @@ fixtures:
   repositories:
     'stdlib':
       repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
-      ref: '3.0.0'
+      ref: '4.0.0'
   symlinks:
     nssdb: "#{source_dir}"

Modulefile

@@ -7,4 +7,4 @@ summary 'NSS database Puppet Module'
 description 'This module manages NSS databases.'
 project_page 'https://github.com/rcritten/puppet-nssdb'
 
-dependency 'puppetlabs/stdlib', '>= 3.0.0'
+dependency 'puppetlabs/stdlib', '>= 4.0.0'

manifests/add_cert_and_key.pp

@@ -28,7 +28,7 @@
   $key,
   $certdir = $title
 ) {
-  package { 'openssl': ensure => present }
+  include nssdb
 
   # downcase and change spaces into _s
   $pkcs12_name = downcase(regsubst("${nickname}.p12", '[\s]', '_', 'GM'))
@@ -38,7 +38,7 @@
     require     => [
       File["${certdir}/password.conf"],
       File["${certdir}/cert8.db"],
-      Package['openssl'],
+      Class['nssdb'],
     ],
     before      => Exec['load_pkcs12'],
     notify      => Exec['load_pkcs12'],
@@ -50,7 +50,7 @@
     command     => "/usr/bin/pk12util -i '${certdir}/${pkcs12_name}' -d '${certdir}' -w '${certdir}/password.conf' -k '${certdir}/password.conf'",
     require     => [
       Exec['generate_pkcs12'],
-      Package['nss-tools'],
+      Class['nssdb'],
     ],
     refreshonly => true,
   }

manifests/create.pp

@@ -41,7 +41,7 @@
   $canickname     = 'CA',
   $catrust        = 'CT,CT,'
 ) {
-  package { 'nss-tools': ensure => present }
+  include nssdb
 
   if $manage_certdir {
     file { $certdir:
@@ -83,7 +83,7 @@
     require => [
       File[$certdir],
       File["${certdir}/password.conf"],
-      Package['nss-tools'],
+      Class['nssdb'],
     ],
     notify  => [
       Exec['add_ca_cert'],
@@ -93,7 +93,7 @@
   exec {'add_ca_cert':
     command     => "/usr/bin/certutil -A -n ${canickname} -d ${certdir} -t ${catrust} -a -i ${cacert}",
     require     => [
-      Package['nss-tools'],
+      Class['nssdb'],
     ],
     refreshonly => true,
     onlyif      => "/usr/bin/test -e ${cacert}",

manifests/init.pp

@@ -0,0 +1,10 @@
+# utility class
+class nssdb {
+  include nssdb::params
+
+  ensure_packages($::nssdb::params::package_name)
+
+  anchor{ 'nssdb::begin': } ->
+  Package[$::nssdb::params::package_name] ->
+  anchor{ 'nssdb::end': }
+}

manifests/params.pp

@@ -0,0 +1,4 @@
+# this class should be considered private
+class nssdb::params {
+  $package_name = ['nss-tools', 'openssl']
+}

spec/classes/nssdb_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe 'nssdb', :type => :class do
+  it { should contain_package('nss-tools') }
+  it { should contain_package('openssl') }
+end

spec/defines/nssdb_add_cert_and_key_spec.rb

@@ -17,7 +17,7 @@
         :require   => [
           'File[/dne/password.conf]',
           'File[/dne/cert8.db]',
-          'Package[openssl]'
+          'Class[Nssdb]'
         ],
         :subscribe => 'File[/dne/password.conf]'
       )
@@ -27,7 +27,11 @@
   context 'load_pkcs12' do
     it do
       contain_exec('load_pkcs12').with(
-        :command => "/usr/bin/pk12util -i '/dne/${pkcs12_name}' -d '/dne' -w '/dne/password.conf' -k '/dne/password.conf'"
+        :command => "/usr/bin/pk12util -i '/dne/${pkcs12_name}' -d '/dne' -w '/dne/password.conf' -k '/dne/password.conf'",
+        :require => [
+          'Exec[generate_pkcs12]',
+          'Class[Nssdb]'
+        ]
       )
     end
   end

spec/defines/nssdb_create_spec.rb

@@ -59,7 +59,7 @@
           :require => [
             'File[/obsolete]',
             'File[/obsolete/password.conf]',
-            'Package[nss-tools]'
+            'Class[Nssdb]'
           ]
         )
       end
@@ -133,7 +133,7 @@
           :require => [
             'File[/obsolete]',
             'File[/obsolete/password.conf]',
-            'Package[nss-tools]'
+            'Class[Nssdb]'
           ]
         )
       end