modernize the module

4 files changed, 40 insertions, 16 deletions

diff --git a/manifests/bcrypt.pp b/manifests/bcrypt.pp
index 93bd9b0..e83bc66 100644
--- a/manifests/bcrypt.pp
+++ b/manifests/bcrypt.pp
@@ -1,7 +1,14 @@
 class rubygems::bcrypt {
-  require rubygems
-  package{'bcrypt-ruby':
-    ensure => present,
-    provider => gem,
+  if ($::osfamily == 'RedHat') and
+    versioncmp($::operatingsystemmajrelease,'6') > 0 {
+    package{'rubygem-bcrypt':
+      ensure => present,
+    }
+  } else {
+    require rubygems
+    package{'bcrypt-ruby':
+      ensure => present,
+      provider => gem,
+    }
   }
 }
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 4afa0c7..17de50e 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -1,11 +1,19 @@
+# manage the mail rubygem
 class rubygems::mail {
-  require rubygems::devel
-  package{'mail':
-    ensure => present,
-    provider => gem,
-  }
+  if ($::osfamily == 'RedHat') and
+    versioncmp($::operatingsystemmajrelease,'6') > 0 {
+    package{'rubygem-mail':
+      ensure => present,
+    }
+  } else {
+    require rubygems::devel
+    package{'mail':
+      ensure   => present,
+      provider => gem,
+    }
 
-  if $rubyversion == '1.8.6' {
-    require rubygems::tlsmail
+    if $::rubyversion == '1.8.6' {
+      require rubygems::tlsmail
+    }
   }
 }
diff --git a/manifests/maildir.pp b/manifests/maildir.pp
index 1bdcc05..14bbc62 100644
--- a/manifests/maildir.pp
+++ b/manifests/maildir.pp
@@ -1,7 +1,15 @@
+# manage maildir rubygem
 class rubygems::maildir {
-  require rubygems::devel
-  package{'maildir':
-    ensure => present,
-    provider => gem,
+  if ($::osfamily == 'RedHat') and
+    versioncmp($::operatingsystemmajrelease,'6') > 0 {
+    package{'rubygem-maildir':
+      ensure => present,
+    }
+  } else {
+    require rubygems::devel
+    package{'maildir':
+      ensure   => present,
+      provider => gem,
+    }
   }
 }
diff --git a/manifests/postgres.pp b/manifests/postgres.pp
index f43c360..af7c563 100644
--- a/manifests/postgres.pp
+++ b/manifests/postgres.pp
@@ -1,5 +1,6 @@
 class rubygems::postgres {
-  if $::operatingsystem == 'CentOS' and $::operatingsystemmajrelease > 5 {
+  if $::osfamily == 'RedHat' and
+    versioncmp($::operatingsystemmajrelease,'5') > 0 {
     package{'rubygem-pg':
       ensure => installed,
     }