From e4de25d78eefc7df70a35dee22a3e0dc1b7e1d0b Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 20 Nov 2012 18:52:32 -0500
Subject: remove params.pp, I was mistaken to think that you could pass a
 variable to a parameterized class and then act on it when that class inherits
 another class (in this case params.pp)

---
 manifests/init.pp   | 51 +++++++++++++++++++++++++++++++++++++++++++--------
 manifests/params.pp | 47 -----------------------------------------------
 2 files changed, 43 insertions(+), 55 deletions(-)
 delete mode 100644 manifests/params.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index 6a62838..2b9b265 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -19,19 +19,54 @@
 # To install a specific version of ruby, simply do:
 #
 # class { 'ruby':
-#    version => '1.8.7',
+#    ruby_version => '1.8.7',
 # }
 #
-# Supported version: 1.8, 1.8.7, 1.9, 1.9.1, 1.9.3
+# Supported versions: 1.8, 1.8.7, 1.9, 1.9.1, 1.9.3
+#
+# To install the development files, you can do:
+#
+# class { 'ruby': install_dev => true }
 
 class ruby (
-  $version      = $ruby::params::version,
-  $ruby_dev     = $ruby::params::ruby_dev,
-  $ruby_package = $ruby::params::ruby_package
-) inherits ruby::params {
+  $ruby_version      = '',
+  $version           = 'installed',
+  $install_dev       = false
+)
+{
+
+  case $::osfamily {
+    'redhat', 'suse': {
+      $ruby_package='ruby'
+      $ruby_dev='ruby-devel'
+    }
+    'debian': {
+      case $ruby_version {
+        '1.8', '1.8.7': {
+          $ruby_package = 'ruby1.8'
+          $ruby_dev = [ 'ruby1.8-dev', 'rake' ]
+        }
+        '1.9.1': {
+          $ruby_package = 'ruby1.9.1'
+          $ruby_dev = [ 'ruby1.9.1-dev', 'rake' ]
+        }
+        '1.9', '1.9.3': {
+          $ruby_package = 'ruby1.9.3'
+          $ruby_dev = [ 'ruby-dev', 'rake' ]
+        }
+        default: {
+          $ruby_package = 'ruby'
+          $ruby_dev = [ 'ruby-dev', 'rake' ]
+        }
+      }
+    }
+  }
 
-  package{ 'ruby':
+  package{ $ruby_package:
     ensure => $version,
-    name   => $ruby_package
+  }
+
+  if $install_dev {
+    package { $ruby_dev: ensure => installed }
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
deleted file mode 100644
index e0ae681..0000000
--- a/manifests/params.pp
+++ /dev/null
@@ -1,47 +0,0 @@
-# Class: ruby::params
-#
-# This class handles the Ruby module parameters
-#
-# Parameters:
-# $ruby_dev = the name of the Ruby development libraries
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class ruby::params {
-
-  $version = 'installed'
-
-  case $::osfamily {
-    'redhat', 'suse': {
-      $ruby_dev='ruby-devel'
-    }
-    'debian': {
-      case $version {
-        '1.8', '1.8.7': {
-          $ruby_package = 'ruby1.8'
-          $ruby_dev = [ 'ruby1.8-dev', 'rake' ]
-        }
-        '1.9.1': {
-          $ruby_package = 'ruby1.9.1'
-          $ruby_dev = [ 'ruby1.9.1-dev', 'rake' ]
-        }
-        '1.9', '1.9.3': {
-          $ruby_package = 'ruby1.9'
-          $ruby_dev = [ 'ruby-dev', 'rake' ]
-        }
-        default: {
-          $ruby_package = 'ruby'
-          $ruby_dev = [ 'ruby-dev', 'rake' ]
-        }
-      }
-    }
-    default: {
-      fail("Unsupported OS family: ${::osfamily}")
-    }
-  }
-}
-
-- 
cgit v1.2.3