puppet: Move ruby-augeas package to ruby module, clean obsolete dependencies

puppet/manifests/init.pp

@@ -30,43 +30,7 @@ class puppet::client {
         default:   { $vardir = "/var/lib/puppet" }
     }
 
-    case $::operatingsystem {
+    require ruby::augeas
-        "centos","redhat","fedora": {
-            package { "ruby-shadow":
-                ensure => installed,
-            }
-        }
-        "debian": {
-            package { "libaugeas-ruby":
-                ensure => installed,
-                name   => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'libaugeas-ruby\1'),
-                before => Service["puppet"],
-            }
-        }
-        "ubuntu": {
-            if versioncmp($::operatingsystemrelease, "13.10") < 0 {
-                $augeas_package = "libaugeas-ruby"
-            } else {
-                $augeas_package = "ruby-augeas"
-            }
-            package { $augeas_package:
-                ensure => installed,
-                before => Service["puppet"],
-            }
-        }
-        "openbsd": {
-            if $::operatingsystemrelease == "4.9" {
-                file { "/etc/rc.d/puppetd":
-                    ensure => present,
-                    source => "puppet:///modules/puppet/puppetd.rc",
-                    mode   => "0755",
-                    owner  => "root",
-                    group  => "wheel",
-                    before => Service["puppet"],
-                }
-            }
-        }
-    }
 
     file { "/etc/puppet/puppet.conf":
         ensure  => present,

ruby/manifests/init.pp

@@ -57,6 +57,38 @@ class ruby::activerecord {
 }
 
 
+# Install ruby-augeas.
+#
+class ruby::augeas {
+
+    case $::operatingsystem {
+        "openbsd": {
+            if versioncmp($::operatingsystemrelease, "5.6") >= 0 {
+                $package = "ruby20-augeas"
+            } else {
+                $package = "ruby19-augeas"
+            }
+        }
+        "ubuntu": {
+            if versioncmp($::operatingsystemrelease, "13.10") >= 0 {
+                $package = "ruby-augeas"
+            } else {
+                $package = "libaugeas-ruby"
+            }
+        }
+        default: {
+            $package = "ruby-augeas"
+        }
+    }
+
+    package { "ruby-augeas":
+        ensure => installed,
+        name   => $package,
+    }
+
+}
+
+
 # Install mysql ruby bindings.
 #
 class ruby::mysql {