From db102093d01f636739a97c21cf950511ba4d776d Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Fri, 20 Apr 2012 13:39:27 +0300
Subject: [PATCH] Added dependencies for rubygems

---
 puppet/manifests/init.pp | 10 ++++++++--
 ruby/manifests/init.pp   | 11 ++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 2dbbcdf..5849d70 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -227,11 +227,17 @@ class puppet::server::common inherits puppet::client {
                     }
                 } else {
                     require ruby::rubygems
-                    package { "rails":
+                    package { "rubygem-rails":
+                        name     => "rails",
                         ensure   => "2.3.14",
                         provider => "gem",
                     }
-                    package { "sqlite3":
+                    package { [ "sqlite", "sqlite-devel", ]:
+                        ensure => installed,
+                        before => Package["rubygem-sqlite3"],
+                    }
+                    package { "rubygem-sqlite3":
+                        name     => "sqlite3",
                         ensure   => installed,
                         provider => "gem",
                     }
diff --git a/ruby/manifests/init.pp b/ruby/manifests/init.pp
index ff8d49d..7d0a62f 100644
--- a/ruby/manifests/init.pp
+++ b/ruby/manifests/init.pp
@@ -7,8 +7,17 @@ class ruby::rubygems {
     require gcc
     require gnu::make
 
-    package { "rubygems":
+    package { "ruby-devel":
         ensure => installed,
+        name   => $operatingsystem ? {
+            "ubuntu" => regsubst($rubyversion, '^([0-9]+\.[0-9]+)\..*', 'ruby\1-dev'),
+            default  => "ruby-devel",
+        },
+    }
+
+    package { "rubygems":
+        ensure  => installed,
+        require => Package["ruby-devel"],
     }
 
 }