Run psql and createdb from the right bindir

Author: dgoodlad

manifests/db.pp

@@ -10,12 +10,12 @@
 
   exec { "postgresql-db-${name}":
     command => join([
-      'createdb',
+      "${postgresql::binpath}/createdb",
       "-p${postgresql::port}",
       '-E UTF-8',
       "-O ${postgresql::user}",
       $name
     ], ' '),
-    unless  => "psql -aA -p${postgresql::port} -t -l | cut -d \\| -f 1 | grep -w '${name}'"
+    unless  => "${postgresql::binpath}/psql -aA -p${postgresql::port} -t -l | cut -d \\| -f 1 | grep -w '${name}'"
   }
 }

manifests/init.pp

@@ -6,6 +6,7 @@
 class postgresql(
   $ensure     = $postgresql::params::ensure,
 
+  $binpath    = $postgresql::params::binpath,
   $executable = $postgresql::params::executable,
 
   $host       = $postgresql::params::host,

manifests/params.pp

@@ -5,7 +5,8 @@
     Darwin: {
       include boxen::config
 
-      $executable = "${boxen::config::homebrewdir}/bin/postgres"
+      $binpath    = "${boxen::config::homebrewdir}/bin"
+      $executable = "${binpath}/postgres"
       $datadir    = "${boxen::config::datadir}/postgresql"
       $logdir     = "${boxen::config::logdir}/postgresql"
       $port       = 15432

spec/defines/postgresql_db_spec.rb

@@ -8,8 +8,8 @@
     should include_class("postgresql")
 
     should contain_exec("postgresql-db-#{title}").with({
-      :command => "createdb -p15432 -E UTF-8 -O testuser #{title}",
-      :unless  => "psql -aA -p15432 -t -l | cut -d \\| -f 1 | grep -w '#{title}'"
+      :command => "/test/boxen/homebrew/bin/createdb -p15432 -E UTF-8 -O testuser #{title}",
+      :unless  => "/test/boxen/homebrew/bin/psql -aA -p15432 -t -l | cut -d \\| -f 1 | grep -w '#{title}'"
     })
   end
 end