Merge remote-tracking branch 'camptocamp/master'

Conflicts:
	README
	manifests/debian.pp
	manifests/files.pp
	manifests/init.pp
	manifests/lens.pp
	manifests/redhat.pp

7 files changed, 97 insertions, 57 deletions

diff --git a/manifests/debian.pp b/manifests/debian.pp
deleted file mode 100644
index 5bc1bb5..0000000
--- a/manifests/debian.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-# manage debian specific things
-class augeas::debian inherits augeas::base {
-
-  package {
-    ['augeas-lenses', 'libaugeas0', 'augeas-tools']:
-      ensure => $augeas::version,
-      before => File['/usr/share/augeas/lenses'],
-  }
-
-  $augeas_ruby = $::lsbdistcodename ? {
-    'wheezy' => 'libaugeas-ruby1.9.1',
-    default  => 'libaugeas-ruby1.8',
-  }
-
-  package {$augeas_ruby:
-    ensure => $augeas::rubylib_version,
-  }
-
-}
diff --git a/manifests/base.pp b/manifests/files.pp
index 0db9b50..4f36a57 100644
--- a/manifests/base.pp
+++ b/manifests/files.pp
@@ -1,7 +1,12 @@
-# basic things to manage augeas
-class augeas::base {
+# Class: augeas::files
+#
+# Sets up directories and files for Augeas
+#
+class augeas::files {
+  $lens_dir = $augeas::lens_dir
+
   # ensure no file not managed by puppet ends up in there.
-  file { $augeas::lens_dir:
+  file { $lens_dir:
     ensure       => directory,
     purge        => true,
     force        => true,
@@ -12,7 +17,7 @@ class augeas::base {
     group        => 'root',
   }
 
-  file { "${augeas::lens_dir}/dist":
+  file { "${lens_dir}/dist":
     ensure => directory,
     purge  => false,
     mode   => '0644',
@@ -20,7 +25,7 @@ class augeas::base {
     group  => 'root',
   }
 
-  file { "${augeas::lens_dir}/tests":
+  file { "${lens_dir}/tests":
     ensure  => directory,
     purge   => true,
     force   => true,
diff --git a/manifests/init.pp b/manifests/init.pp
index f2db659..80fbbd8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,13 +1,20 @@
-# Basic class to manage augeas
-class augeas(
-  $version          = 'installed',
-  $rubylib_version  = 'installed'
-) {
-  $lens_dir = '/usr/share/augeas/lenses'
+# Class: augeas
+#
+# Install and configure Augeas
+#
+# Parameters:
+#   ['version']      - the desired version of Augeas
+#   ['ruby_version'] - the desired version of the Ruby bindings for Augeas
+#   ['lens_dir']     - the lens directory to use
+class augeas (
+  $version = $augeas_version,
+  $ruby_version = $augeas_ruby_version,
+  $lens_dir = $augeas::params::lens_dir,
+) inherits augeas::params {
 
-  case $::operatingsystem {
-    /RedHat|CentOS|Fedora/:   { include augeas::redhat }
-    /Debian|Ubuntu|kFreeBSD/: { include augeas::debian }
-    default:                  { include augeas::base }
-  }
+  class {'::augeas::packages': } ->
+  class {'::augeas::files': } ->
+  Class['augeas']
+
+  Package['ruby-augeas'] -> Augeas <| |>
 }
diff --git a/manifests/lens.pp b/manifests/lens.pp
index 7c55b7a..ac4fddf 100644
--- a/manifests/lens.pp
+++ b/manifests/lens.pp
@@ -1,15 +1,16 @@
-# == Definition: augeas::lens
+# Definition: augeas::lens
 #
 # Deploy an Augeas lens (and its test file).
 # Check the lens (and run the unit tests) automatically and remove the files if
 # the checks fail.
 #
 # Parameters:
-# - *ensure*: present/absent
-# - *lens_source*: the source for the lens
-# - *test_source*: optionally, the source for the test file.
-# - *stock_since*: optionally, indicate in which version of Augeas
-#   the lens became stock, so it will not be deployed above that version.
+#   ['ensure']       - present/absent
+#   ['lens_source']  - the source for the lens
+#   ['test_source']  - optionally, the source for the test file.
+#   ['stock_since']  - optionally, indicate in which version of Augeas
+#                      the lens became stock, so it will not be deployed
+#                      above that version.
 #
 # Example usage:
 #
@@ -18,15 +19,24 @@
 #     test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug',
 #     stock_since => '1.0.0',
 #   }
+#
 define augeas::lens (
   $lens_source,
   $ensure=present,
   $test_source=false,
   $stock_since=false,
 ) {
+  if !defined(Class['augeas']) {
+    fail('You must declare the augeas class before using augeas::lens')
+  }
+
+  if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) {
 
-  if (!$stock_since or !versioncmp($::augeasversion, $stock_since)) {
-    include augeas
+    validate_re(
+      $augeas::lens_dir,
+      '/.*',
+      "'${augeas::lens_dir}' is not a valid path for lens ${name}"
+    )
 
     $lens_dest = "${augeas::lens_dir}/${name}.aug"
     $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug"
diff --git a/manifests/packages.pp b/manifests/packages.pp
new file mode 100644
index 0000000..91dbb74
--- /dev/null
+++ b/manifests/packages.pp
@@ -0,0 +1,26 @@
+# Class: augeas::packages
+#
+# Sets up packages for Augeas
+#
+class augeas::packages {
+  # Augeas packages
+  $augeas_ensure = $augeas::version ? {
+    ''      => 'present',
+    default => $augeas::version
+  }
+
+  package { $augeas::params::augeas_pkgs:
+    ensure => $augeas_ensure,
+  }
+
+  # Ruby package
+  $ruby_ensure = $augeas::ruby_version ? {
+    ''      => 'present',
+    default => $augeas::ruby_version
+  }
+
+  package { 'ruby-augeas':
+    ensure => $ruby_ensure,
+    name   => $augeas::params::ruby_pkg,
+  }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
new file mode 100644
index 0000000..9998308
--- /dev/null
+++ b/manifests/params.pp
@@ -0,0 +1,25 @@
+# Class: augeas::params
+#
+# Default parameters for the Augeas module
+#
+class augeas::params {
+  $lens_dir = '/usr/share/augeas/lenses'
+
+  case $::osfamily {
+    'RedHat': {
+      $ruby_pkg = 'ruby-augeas'
+      $augeas_pkgs = ['augeas', 'augeas-libs']
+    }
+
+    'Debian': {
+      if versioncmp($::rubyversion, '1.9.1') >= 0 {
+        $ruby_pkg = 'libaugeas-ruby1.9.1'
+      } else {
+        $ruby_pkg = 'libaugeas-ruby1.8'
+      }
+      $augeas_pkgs = ['augeas-lenses', 'libaugeas0', 'augeas-tools']
+    }
+
+    default:  { fail("Unsupported OS family: ${::osfamily}") }
+  }
+}
diff --git a/manifests/redhat.pp b/manifests/redhat.pp
deleted file mode 100644
index 23974e6..0000000
--- a/manifests/redhat.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-# manage things for redhat based things
-class augeas::redhat inherits augeas::base {
-
-  package {
-    ['augeas', 'augeas-libs']:
-      ensure => $augeas::version,
-      before => File['/usr/share/augeas/lenses'],
-  }
-
-  package { 'ruby-augeas':
-    ensure => $augeas::rubylib_version,
-  }
-
-}