Implement debug setting everywhere

Author: pennycoders

Modulefile

@@ -14,4 +14,4 @@ dependency 'puppetlabs/apt','>=1.0.0'
 dependency 'example42/php','>=2.0.17'
 dependency 'example42/puppi','>=1.0.0'
 
-version '1.0.59'
+version '1.0.60'

manifests/deps/devtools.pp

@@ -3,30 +3,34 @@
 # Parameters:
 # [*version*] - desired devtools version  - See https://github.com/phalcon/phalcon-devtools/branches for valid branch names
 class phalconphp::deps::devtools (
-  $version = '1.3.x') {
+  $version = '1.3.x',
+  $debug   = false) {
   exec { 'git-clone-devtools':
-    command => "sudo git clone https://github.com/phalcon/phalcon-devtools.git -b ${version}",
-    cwd     => "/usr/share/php",
-    unless  => "test -d ./phalcon-devtools",
-    require => [
+    command   => "sudo git clone https://github.com/phalcon/phalcon-devtools.git -b ${version}",
+    cwd       => "/usr/share/php",
+    unless    => "test -d ./phalcon-devtools",
+    require   => [
       Package['php'],
-      Class['phalconphp::deps::sys']]
+      Class['phalconphp::deps::sys']],
+    logoutput => $debug
   }
 
   exec { 'git-pull-devtools':
-    command => "sudo git pull",
-    cwd     => "/usr/share/php/phalcon-devtools",
-    onlyif  => "sudo test -d ./phalcon-devtools",
-    require => [Exec['git-clone-devtools']]
+    command   => "sudo git pull",
+    cwd       => "/usr/share/php/phalcon-devtools",
+    onlyif    => "sudo test -d ./phalcon-devtools",
+    require   => [Exec['git-clone-devtools']],
+    logoutput => $debug
   }
 
   file { '/usr/bin/phalcon':
-    ensure  => link,
-    path    => '/usr/bin/phalcon',
-    target  => "/usr/share/php/phalcon-devtools/phalcon.php",
-    require => [
+    ensure   => link,
+    path     => '/usr/bin/phalcon',
+    target   => "/usr/share/php/phalcon-devtools/phalcon.php",
+    require  => [
       Class['phalconphp::framework'],
-      Exec['git-pull-devtools']]
+      Exec['git-pull-devtools']],
+    loglevel => 'notice'
   }
 
   file { '/usr/share/php/phalcon-devtools':
@@ -38,9 +42,10 @@
   }
 
   exec { 'chmod+x-devtools':
-    command => 'chmod ugo+x /usr/bin/phalcon',
-    require => [
+    command   => 'chmod ugo+x /usr/bin/phalcon',
+    require   => [
       File['/usr/share/php/phalcon-devtools'],
-      File['/usr/bin/phalcon']]
+      File['/usr/bin/phalcon']],
+    logoutput => $debug
   }
 }

manifests/deps/jsonc.pp

@@ -1,35 +1,36 @@
 # Class: phalconphp::deps::jsonc
 # Installs json-c (https://github.com/json-c/json-c)
 
-class phalconphp::deps::jsonc {
+class phalconphp::deps::jsonc (
+  $debug = false) {
   include phalconphp::deps::sys
 
   exec { 'git-clone-json-c':
     command   => 'git clone https://github.com/json-c/json-c.git',
     cwd       => '/tmp',
     unless    => 'test -d /tmp/json-c',
-    logoutput => true,
+    logoutput => $debug,
     require   => [Class['phalconphp::deps::sys']]
   } ->
   exec { 'git-pull-json-c':
     command   => 'git pull',
     cwd       => '/tmp/json-c',
     onlyif    => 'test -d /tmp/json-c',
     require   => [Exec['git-clone-json-c']],
-    logoutput => true
+    logoutput => $debug
   } ->
   exec { 'autogen-json-c':
     command   => 'sh ./autogen.sh',
     cwd       => '/tmp/json-c',
-    logoutput => true,
+    logoutput => $debug,
     require   => [Exec['git-pull-json-c']],
   } ->
   exec { 'configure-json-c':
     command   => '/tmp/json-c/configure',
     cwd       => '/tmp/json-c',
     onlyif    => 'test -f /tmp/json-c/configure',
     require   => [Exec['autogen-json-c']],
-    logoutput => true
+    logoutput => $debug
   } ->
   exec { 'make-json-c':
     command   => "make -j${::processorcount}",
@@ -40,7 +41,7 @@
   exec { 'install-json-c':
     command   => "sudo make -j${::processorcount} install",
     cwd       => '/tmp/json-c',
-    logoutput => true,
+    logoutput => $debug,
     require   => [Exec['make-json-c']]
   } ->
   exec { 'remove-json-c-source':

manifests/deps/zephir.pp

@@ -1,30 +1,31 @@
 # Class: phalconphp::deps::zephir
 # Installs Zephir (http://zephir-lang.com/)
-class phalconphp::deps::zephir {
-  include phalconphp::deps::jsonc
+class phalconphp::deps::zephir (
+  $debug = false) {
+  class { 'phalconphp::deps::jsonc': debug => $debug }
 
   exec { 'git-clone-zephir':
     command   => 'git clone https://github.com/phalcon/zephir.git',
     cwd       => '/tmp',
     unless    => 'test -d /tmp/zephir',
     require   => [Class['phalconphp::deps::sys']],
-    logoutput => true,
+    logoutput => $debug
   } ->
   exec { 'git-pull-zephir':
     command   => 'git pull',
     cwd       => '/tmp/zephir',
     onlyif    => 'test -d /tmp/zephir',
-    logoutput => true,
+    logoutput => $debug
   } ->
   exec { 'install-zephir':
     command   => './install -c',
     cwd       => '/tmp/zephir',
     require   => [Class['phalconphp::deps::jsonc']],
-    logoutput => true,
+    logoutput => $debug,
   } ->
   exec { 'check-zephir':
     command   => 'zephir version',
-    logoutput => true,
+    logoutput => $debug,
     require   => [Exec['install-zephir']]
   }
-}
+}

manifests/init.pp

@@ -64,7 +64,7 @@
 
   # Install zephir
 if $install_zephir == true {
-    include phalconphp::deps::zephir
+    class { 'phalconphp::deps::zephir': debug => $debug }
   }
 
   # Install the actual framework
@@ -77,6 +77,9 @@
 
   # Install the phalconphp dev tools
 if $install_devtools == true {
-    class { 'phalconphp::deps::devtools': version => $devtools_version }
+    class { 'phalconphp::deps::devtools':
+      version => $devtools_version,
+      debug   => $debug
+    }
   }
 }