Merge remote-tracking branch 'camptocamp/master' into leap_master

Conflicts:
	README

7 files changed, 133 insertions, 87 deletions

diff --git a/manifests/debian.pp b/manifests/debian.pp
deleted file mode 100644
index bc2e3eb..0000000
--- a/manifests/debian.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-class augeas::debian inherits augeas::base {
-
-  package {
-    ['augeas-lenses', 'libaugeas0', 'augeas-tools']:
-      ensure => $augeas::base::version,
-      before => File['/usr/share/augeas/lenses'],
-  }
-
-  $augeas_ruby = $::lsbdistcodename ? {
-    'wheezy' => 'libaugeas-ruby1.9.1',
-    default  => 'libaugeas-ruby1.8',
-  }
-
-  package {$augeas_ruby:
-    ensure => $augeas::base::rubylib_version,
-  }
-
-}
diff --git a/manifests/base.pp b/manifests/files.pp
index 37ad0e2..c73c19b 100644
--- a/manifests/base.pp
+++ b/manifests/files.pp
@@ -1,20 +1,14 @@
-class augeas::base {
-  $lens_dir = '/usr/share/augeas/lenses'
-
-  $version = $augeas_version ? {
-    ''      => 'present',
-    default => $augeas_version
-  }
-
-  $rubylib_version = $augeas_ruby_version ? {
-    ''      => 'present',
-    default => $augeas_ruby_version
-  }
+# 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 { $lens_dir:
     ensure       => directory,
-    purge        => true,
+    purge        => $::augeas::purge,
     force        => true,
     recurse      => true,
     recurselimit => 1,
@@ -32,11 +26,11 @@ class augeas::base {
   }
 
   file { "${lens_dir}/tests":
-    ensure  => directory,
-    purge   => true,
-    force   => true,
-    mode    => '0644',
-    owner   => 'root',
-    group   => 'root',
+    ensure => directory,
+    purge  => $::augeas::purge,
+    force  => true,
+    mode   => '0644',
+    owner  => 'root',
+    group  => 'root',
   }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index e82e21c..41f4f87 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,7 +1,24 @@
-class augeas {
-  case $::operatingsystem {
-    /RedHat|CentOS|Fedora/:   { include augeas::redhat }
-    /Debian|Ubuntu|kFreeBSD/: { include augeas::debian }
-    default:                  { include augeas::base }
-  }
+# 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
+#   ['purge']        - whether to purge lens directories
+class augeas (
+  $version      = present,
+  $ruby_version = present,
+  $lens_dir     = $augeas::params::lens_dir,
+  $purge        = true,
+) inherits augeas::params {
+
+  class {'::augeas::packages': } ->
+  class {'::augeas::files': } ->
+  Class['augeas']
+
+  # lint:ignore:spaceship_operator_without_tag
+  Package['ruby-augeas', $augeas::params::augeas_pkgs] -> Augeas <| |>
+  # lint:endignore
 }
diff --git a/manifests/lens.pp b/manifests/lens.pp
index 55dc9ae..b5b9acd 100644
--- a/manifests/lens.pp
+++ b/manifests/lens.pp
@@ -1,40 +1,55 @@
-/*
-
-== 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.
-
-Example usage:
-
-  augeas::lens { 'networkmanager':
-    lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug',
-    test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug',
-    stock_since => '1.0.0',
-  }
-
-*/
-
+# 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.
+#
+# Example usage:
+#
+#   augeas::lens { 'networkmanager':
+#     lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug',
+#     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')
+  }
+
+  File {
+    owner => 'root',
+    group => 'root',
+    mode => '0644',
+  }
+
+  Exec {
+    path => $::path,
+  }
+
+  if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) {
 
-  if (!$stock_since or !versioncmp($::augeasversion, $stock_since)) {
-    include augeas::base
+    validate_re(
+      $augeas::lens_dir,
+      '/.*',
+      "'${augeas::lens_dir}' is not a valid path for lens ${name}"
+    )
 
-    $lens_dest = "${augeas::base::lens_dir}/${name}.aug"
-    $test_dest = "${augeas::base::lens_dir}/tests/test_${name}.aug"
+    $lens_dest = "${augeas::lens_dir}/${name}.aug"
+    $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug"
 
     file { $lens_dest:
       ensure => $ensure,
@@ -42,7 +57,7 @@ define augeas::lens (
     }
 
     exec { "Typecheck lens ${name}":
-      command     => "augparse -I ${augeas::base::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)",
+      command     => "augparse -I ${augeas::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)",
       refreshonly => true,
       subscribe   => File[$lens_dest],
     }
@@ -55,7 +70,7 @@ define augeas::lens (
       }
 
       exec { "Test lens ${name}":
-        command     => "augparse -I ${augeas::base::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)",
+        command     => "augparse -I ${augeas::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)",
         refreshonly => true,
         subscribe   => File[$lens_dest, $test_dest],
       }
diff --git a/manifests/packages.pp b/manifests/packages.pp
new file mode 100644
index 0000000..ff8628d
--- /dev/null
+++ b/manifests/packages.pp
@@ -0,0 +1,14 @@
+# Class: augeas::packages
+#
+# Sets up packages for Augeas
+#
+class augeas::packages {
+  package { $::augeas::params::augeas_pkgs:
+    ensure => $::augeas::version,
+  }
+
+  package { 'ruby-augeas':
+    ensure => $::augeas::ruby_version,
+    name   => $::augeas::params::ruby_pkg,
+  }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
new file mode 100644
index 0000000..e540033
--- /dev/null
+++ b/manifests/params.pp
@@ -0,0 +1,37 @@
+# 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']
+    }
+
+    'Suse': {
+        # RPM Sources: https://build.opensuse.org/project/show/systemsmanagement:puppet
+      # SLES 11 SP3
+      if versioncmp($::rubyversion, '1.8.7') >= 0 {
+        $ruby_pkg = 'ruby1.8-rubygem-ruby-augeas'
+      # SLES 12
+      } else {
+        $ruby_pkg = 'ruby2.1-rubygem-ruby-augeas'
+      }
+      $augeas_pkgs = ['augeas', 'augeas-lenses', 'libaugeas0' ]
+    }
+
+    '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 1e95728..0000000
--- a/manifests/redhat.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-class augeas::redhat inherits augeas::base {
-
-  package {
-    ['augeas', 'augeas-libs']:
-      ensure => $augeas::base::version,
-      before => File['/usr/share/augeas/lenses'],
-  }
-
-  package { 'ruby-augeas':
-    ensure => $augeas::base::rubylib_version,
-  }
-
-}