Improve module handling

Author: Alexander Schneider

Diff for: Modulefile

@@ -1,4 +1,4 @@
 name 'phpbrew'
-version '1.0.0'
+version '1.0.1'
 author 'Jankowfsky AG - Alexander Schneider'
 description 'Puppet module for phpbrew.'

Diff for: README.md

@@ -1 +1,53 @@
-Puppet module for phpbrew.
+# puppet-phpbrew
+
+Puppet module for phpbrew.
+
+
+## Usage
+
+	class { 'phpdecoder':
+		$php_version => '5.3',
+		$type        => 'zend',
+	}
+
+
+## Configuration
+
+You can additional define apache modules and php conf.d directory:
+
+	class { 'phpdecoder':
+	    $php_version => '5.3',
+	    $type        => 'zend',
+		$modules_dir => '/etc/apache2/modules/zgl/',
+        $php_ini_dir => '/etc/php5/apache2/conf.d/'
+	}
+
+
+Default values:
+
+    $php_version = '5.3'
+    $type        = 'zend'
+    $modules_dir = '/etc/apache2/modules/zgl/'
+    $php_ini_dir = '/etc/php5/apache2/conf.d/'
+
+
+## License
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+## Copyright
+
+	Alexander Schneider - Jankowfsky AG
+	www.jankowfsky.com

Diff for: manifests/extension.pp

@@ -26,7 +26,7 @@
   }
 
   if ! $php_version {
-    warning('No version for extension given. Install aborted.')
+    warning('No php version for extension given. Install aborted.')
   } else {
     exec { "phpbrew_extension_${extension_name}-${php_version}-${version}":
       command => "/root/.phpbrew/install_extension.sh ${php_version} ${extension_name} ${version}",

Diff for: manifests/init.pp

@@ -12,7 +12,7 @@
 #  class { 'phpbrew': }
 #
 class phpbrew (
-  $dependencies = undef
+
 ) {
   case $operatingsystem {
     centos, redhat: {
@@ -21,16 +21,16 @@
     debian, ubuntu: {
       exec { '/usr/bin/apt-get -y update': }
 
-      if ! $dependencies {
-        $neededDependencies = [ 'autoconf', 'automake', 'curl', 'build-essential', 'libxslt1-dev', 're2c', 'libxml2-dev', 'php5-cli', 'libmcrypt-dev' ]
-      } else {
-        $neededDependencies = $dependencies
-      }
+      $dependencies = [ 'autoconf', 'automake', 'curl', 'build-essential', 'libxslt1-dev', 're2c', 'libxml2-dev', 'php5-cli', 'libmcrypt-dev' ]
 
-      package { $neededDependencies:
-        ensure  => 'installed',
-        require => Exec['/usr/bin/apt-get -y update'],
-        before  => Exec['download phpbrew'],
+      each($dependencies) |$dependency| {
+        if ! defined(Package[$dependency]) {
+          package { $dependency:
+            ensure  => 'installed',
+            require => Exec['/usr/bin/apt-get -y update'],
+            before  => Exec['download phpbrew'],
+          }
+        }
       }
 
       exec { '/usr/bin/apt-get -y build-dep php5':

Diff for: manifests/install.pp

@@ -18,7 +18,7 @@
   $version = '',
   $default_path = '/opt/phpbrew'
 ) {
-  #require phpbrew
+  require phpbrew
 
   if $version == '' {
     $php_version = $title

Diff for: metadata.json

@@ -12,7 +12,5 @@
   ],
   "project_page": "http://github.com/GM-Alex/puppet-phpbrew",
   "license": "Apache License, Version 2.0",
-  "checksums": {
-  },
-  "name": "phpbrew"
+  "name": "puppet-phpbrew"
 }