Fix executable paths to use a bindir

Author: dgoodlad

data/Darwin.yaml

@@ -2,6 +2,7 @@
 mysql::configdir:          "%{::boxen::config::configdir}/mysql"
 mysql::globalconfigprefix: "%{::boxen::config::homebrewdir}"
 mysql::datadir:            "%{::boxen::config::datadir}/mysql"
+mysql::bindir:             "%{::boxen::config::homebrewdir}/bin"
 mysql::executable:         "%{::boxen::config::homebrewdir}/bin/mysqld_safe"
 mysql::client:             "%{::boxen::config::homebrewdir}/bin/mysql"
 mysql::logdir:             "%{::boxen::config::logdir}/mysql"

manifests/config.pp

@@ -8,6 +8,7 @@
   $ensure,
 
   $configdir,
+  $bindir,
   $globalconfigprefix,
   $datadir,
   $executable,
@@ -40,7 +41,7 @@
 
   ->
   exec { 'init-mysql-db':
-    command  => "mysql_install_db \
+    command  => "${bindir}/mysql_install_db \
       --verbose \
       --basedir=${globalconfigprefix} \
       --datadir=${datadir} \

manifests/db.pp

@@ -12,14 +12,14 @@
 
   if $ensure == 'present' {
     exec { "create mysql db ${name}":
-      command => "mysqladmin -h${mysql::host} -uroot -p${mysql::port} create ${name} --password=''",
+      command => "${mysql::bindir}/mysqladmin -h${mysql::host} -uroot -p${mysql::port} create ${name} --password=''",
       creates => "${mysql::datadir}/${name}",
-      unless  => "mysql -h${mysql::host} -uroot -p${mysql::port} -e 'show databases' \
+      unless  => "${mysql::bindir}/mysql -h${mysql::host} -uroot -p${mysql::port} -e 'show databases' \
         --password='' | grep -w '${name}'"
     }
   } elsif $ensure == 'absent' {
     exec { "delete mysql db ${name}":
-      command => "mysqladmin -h${mysql::host} -uroot -p${mysql::port} drop ${name} --password=''",
+      command => "${mysql::bindir}/mysqladmin -h${mysql::host} -uroot -p${mysql::port} drop ${name} --password=''",
     }
   }
 }

manifests/init.pp

@@ -10,6 +10,7 @@
   $configdir = undef,
   $globalconfigprefix = undef,
   $datadir = undef,
+  $bindir = undef,
   $executable = undef,
   $client = undef,
   $logdir = undef,
@@ -30,6 +31,7 @@
     $configdir,
     $globalconfigprefix,
     $datadir,
+    $bindir,
     $executable,
     $client,
     $logdir,
@@ -39,7 +41,7 @@
     $port,
     $socket,
     $package,
-    $version
+    $version,
   )
 
   validate_bool($enable)
@@ -55,6 +57,7 @@
     ensure             => $ensure,
 
     configdir          => $configdir,
+    bindir             => $bindir,
     globalconfigprefix => $globalconfigprefix,
     datadir            => $datadir,
     executable         => $executable,
@@ -78,6 +81,7 @@
 
   ~>
   class { 'mysql::setup':
+    bindir  => $bindir,
     datadir => $datadir,
     host    => $host,
     port    => $port,

manifests/setup.pp

@@ -1,4 +1,5 @@
-class mysql::setup(
+class mysql::setup (
+  $bindir  = undef,
   $datadir = undef,
   $host    = undef,
   $port    = undef,
@@ -14,18 +15,18 @@
 
   ~>
   exec { 'mysql-tzinfo-to-sql':
-    command     => "mysql_tzinfo_to_sql /usr/share/zoneinfo | \
-      mysql -u root mysql -h${host} -P${port} -S${socket}",
+    command     => "${bindir}/mysql_tzinfo_to_sql /usr/share/zoneinfo | \
+      ${bindir}/mysql -u root mysql -h${host} -P${port} -S${socket}",
     provider    => shell,
     creates     => "${datadir}/.tz_info_created",
     refreshonly => true
   }
 
   ~>
   exec { 'grant root user privileges':
-    command     => "mysql -uroot --password='' -h${host} -P${port} -S${socket} \
+    command     => "${bindir}/mysql -uroot --password='' -h${host} -P${port} -S${socket} \
       -e 'grant all privileges on *.* to \'root\'@\'localhost\''",
-    unless      => "mysql -uroot -h${host} -P${port} \
+    unless      => "${bindir}/mysql -uroot -h${host} -P${port} \
       -e \"select * from mysql.user where User = 'root' and Host = 'localhost'\" \
       --password='' | grep root",
     provider    => shell,

manifests/user.pp

@@ -19,15 +19,15 @@
 
   if $ensure == 'present' {
     exec { "create mysql user ${name}":
-      command => "mysql -h${mysql::host} -uroot -p${mysql::port} --password=''\
+      command => "${mysql::bindir}/mysql -h${mysql::host} -uroot -p${mysql::port} --password=''\
         -e \"create user '${name}'@'${host}' identified by '${password}';\"",
       require => Exec['wait-for-mysql'],
-      unless  => "mysql -h${mysql::host} -uroot -p${mysql::port} -e 'SELECT User,Host FROM mysql.user;' \
+      unless  => "${mysql::bindir}/mysql -h${mysql::host} -uroot -p${mysql::port} -e 'SELECT User,Host FROM mysql.user;' \
         --password='' | grep -w '${name}' | grep -w '${host}'"
     }
   } elsif $ensure == 'absent' {
     exec { "delete mysql user ${name}":
-      command => "mysql -h${mysql::host} -uroot -p${mysql::port} --password='' -e 'drop user ${name}'",
+      command => "${mysql::bindir}/mysql -h${mysql::host} -uroot -p${mysql::port} --password='' -e 'drop user ${name}'",
       require => Exec['wait-for-mysql']
     }
   }

spec/classes/mysql__config_spec.rb

@@ -7,6 +7,7 @@
       "ensure" => "present",
       "configdir" => "/test/boxen/config/mysql",
       "globalconfigprefix" => "/test/boxen/homebrew",
+      "bindir" => "/test/boxen/homebrew/bin"
       "datadir" => "/test/boxen/data/mysql",
       "executable" => "/test/boxen/homebrew/bin/mysql",
       "logdir" => "/test/boxen/log/mysql",

spec/defines/db_spec.rb

@@ -14,7 +14,7 @@
     it "creates the database" do
       should contain_exec("create mysql db #{title}").
              with(
-               :command => "mysqladmin -h127.0.0.1 -uroot -p13306 create #{title} --password=''",
+               :command => "/test/boxen/homebrew/bin/mysqladmin -h127.0.0.1 -uroot -p13306 create #{title} --password=''",
                :creates => "/test/boxen/data/mysql/#{title}"
              )
     end
@@ -31,7 +31,7 @@
     it "destroys the database" do
       should contain_exec("delete mysql db #{title}").
              with(
-               :command => "mysqladmin -h127.0.0.1 -uroot -p13306 drop #{title} --password=''"
+               :command => "/test/boxen/homebrew/bin/mysqladmin -h127.0.0.1 -uroot -p13306 drop #{title} --password=''"
              )
     end
   end

spec/defines/user_spec.rb

@@ -14,7 +14,7 @@
     it "creates the user" do
       should contain_exec("create mysql user #{title}").
              with(
-               :command => "mysql -h127.0.0.1 -uroot -p13306 --password=''\
+               :command => "/test/boxen/homebrew/bin/mysql -h127.0.0.1 -uroot -p13306 --password=''\
         -e \"create user '#{title}'@'localhost' identified by '';\""
         )
     end
@@ -31,7 +31,7 @@
     it "destroys the database" do
       should contain_exec("delete mysql user #{title}").
              with(
-               :command => "mysql -h127.0.0.1 -uroot -p13306 --password='' -e 'drop user #{title}'"
+               :command => "/test/boxen/homebrew/bin/mysql -h127.0.0.1 -uroot -p13306 --password='' -e 'drop user #{title}'"
              )
     end
   end