.gitignore

@@ -1 +1,2 @@
 pkg
+.DS_Store

CHANGELOG

@@ -1,2 +1,4 @@
+2013-07-11 - Zack Smith <zack@puppetlabs.com> - 0.0.2
+  * Restrict installed version of r10k to 0.0.9
 2013-06-12 - Zack Smith <zack@puppetlabs.com> - 0.0.1
   * Initial Release

Modulefile

@@ -9,4 +9,7 @@ project_page 'https://github.com/acidprime/r10k'
 
 ## Add dependencies, if any:
 dependency 'puppetlabs/stdlib', '>= 4.1.0'
-dependency 'puppetlabs/ruby', '>= 0.0.2'
+dependency 'puppetlabs/ruby',   '>= 0.0.2'
+dependency 'puppetlabs/gcc',    '>= 0.0.3'
+dependency 'puppetlabs/pe_gem', '>= 0.0.1'
+dependency 'mhuffnagle/make',   '>= 0.0.1'

manifests/config.pp

@@ -0,0 +1,58 @@
+# == Class: r10k::config
+#
+# Set up the root r10k config file (/etc/r10k.yaml).
+#
+# === Parameters
+#
+# * [*cachedir*]
+#   Path to a directory to be used by r10k for caching data.
+#   Default: /var/cache/r10k
+# * [*sources*]
+#   Hash containing data sources to be used by r10k to create dynamic Puppet
+#   environments. Default: {}
+# * [*purgedirs*]
+#   An Array of directory paths to purge of any subdirectories that do not
+#   correspond to a dynamic environment managed by r10k. Default: []
+#
+# === Examples
+#
+#  class { 'r10k::config':
+#    sources => {
+#      'somename' => {
+#        'remote'  => 'ssh://git@github.com/someuser/somerepo.git',
+#        'basedir' => "${::settings::confdir}/environments"
+#      },
+#      'someothername' => {
+#        'remote'  => 'ssh://git@github.com/someuser/someotherrepo.git',
+#        'basedir' => '/some/other/basedir'
+#      },
+#    },
+#    purgedirs => [
+#      "${::settings::confdir}/environments",
+#      '/some/other/basedir',
+#    ],
+#  }
+#
+# == Documentation
+#
+# * https://github.com/adrienthebo/r10k#dynamic-environment-configuration
+#
+# === Authors
+#
+# Charlie Sharpsteen <source@sharpsteen.net>
+# Zack Smith <zack@puppetlabs.com>
+class r10k::config (
+  $cachedir  = '/var/cache/r10k',
+  $sources   = {},
+  $purgedirs = [],
+  $configfile  = $r10k::params::r10k_config_file,
+) inherits r10k::params {
+  file { 'r10k.yaml':
+    ensure  => file,
+    owner   => 'root',
+    group   => 'root',
+    path    => $configfile,
+    content => template("${module_name}/${configfile}.erb"),
+  }
+
+}

manifests/init.pp

@@ -1,50 +1,29 @@
 # This class configures r10k
 class r10k (
-  $remote     = $r10k::params::remote,
-  $purgedirs  = $r10k::params::r10k_purgedirs,
-  $basedir    = $r10k::params::r10k_basedir,
-  $cachedir   = $r10k::params::r10k_cache_dir,
-  $configfile = $r10k::params::r10k_config_file,
+  $sources     = {},
+  $remote      = $r10k::params::remote,
+  $source_name = $r10k::params::source_name,
+  $purgedirs   = $r10k::params::r10k_purgedirs,
+  $basedir     = $r10k::params::r10k_basedir,
+  $cachedir    = $r10k::params::r10k_cache_dir,
+  $configfile  = $r10k::params::r10k_config_file,
+  $version     = $r10k::params::version,
+  $pe_ruby     = $r10k::params::pe_ruby,
 ) inherits r10k::params {
-
-  # Breaking up my chaining a little here
-  Class['ruby'] -> Class['ruby::dev'] -> Package['gcc']
-
-  # rubygems_update => false
-  # https://projects.puppetlabs.com/issues/19741
-  class {'ruby':
-    rubygems_update => false,
-  }
-  class { 'ruby::dev':
-    tag => 'amineeded',
-  }
-
-  # I am not sure this is required as I assumed the
-  # ruby::dev class would have taken care of it
-  Package['gcc'] -> Package['make'] -> Package['r10k']
-
-  # Install the r10k gem & dependacies
-  # Check for gcc and make as they might already be in the catalog
-  if ! defined(Package['gcc']) {
-    package { 'gcc':
-      ensure => installed,
+  if $pe_ruby {
+    class { 'r10k::pe_ruby' :
+      version => $version,
     }
-  }
-
-  if ! defined(Package['make']) {
-    package { 'make':
-      ensure => present,
+  } else {
+    class { 'r10k::ruby' :
+      version => $version,
     }
   }
 
-  package { 'r10k':
-    ensure   => '0.0.9',
-    provider => 'gem',
-  }
-
-  # Setup the r10k configuration file
-  file { $configfile :
-    ensure  => present,
-    content => template("${module_name}/${configfile}"),
+  class { 'r10k::conf':
+    cachedir   => $cachedir,
+    configfile => $configfile,
+    sources    => $sources,
+    purgedirs  => $purgedirs,
   }
 }

manifests/params.pp

@@ -1,5 +1,12 @@
 class r10k::params
 {
+  $version = '1.0.0'
+
+  $pe_ruby = $::is_pe ? {
+    'true'  => true,
+    'false' => false,
+  }
+
   # Puppet Enterprise specific settings
   if $::is_pe == 'true' {
     # Mcollective configuration dynamic
@@ -23,6 +30,7 @@
   $git_server          = $::settings::ca_server
   $repo_path           = '/var/repos'
   $remote              = "ssh://${git_server}${repo_path}/modules.git"
+  $source_name         = 'jiminy'
 
   # Mcollective configuration static
   $mc_agent_name       = "${module_name}.rb"

manifests/pe_ruby.pp

@@ -0,0 +1,11 @@
+class r10k::pe_ruby (
+  $version,
+) {
+  require gcc
+  require make
+
+  package { 'r10k':
+    ensure   => $version,
+    provider => 'pe_gem',
+  }
+}

manifests/ruby.pp

@@ -0,0 +1,38 @@
+class r10k::ruby(
+  $version,
+) {
+  # Breaking up my chaining a little here
+  Class['ruby'] -> Class['ruby::dev'] -> Package['gcc']
+
+  # rubygems_update => false
+  # https://projects.puppetlabs.com/issues/19741
+  class {'ruby':
+    rubygems_update => false,
+  }
+  class { 'ruby::dev':
+    tag => 'amineeded',
+  }
+
+  # I am not sure this is required as I assumed the
+  # ruby::dev class would have taken care of it
+  Package['gcc'] -> Package['make'] -> Package['r10k']
+
+  # Install the r10k gem & dependacies
+  # Check for gcc and make as they might already be in the catalog
+  if ! defined(Package['gcc']) {
+    package { 'gcc':
+      ensure => installed,
+    }
+  }
+
+  if ! defined(Package['make']) {
+    package { 'make':
+      ensure => present,
+    }
+  }
+
+  package { 'r10k':
+    ensure   => $version,
+    provider => 'gem',
+  }
+}

templates/etc/r10k.yaml.erb

@@ -0,0 +1,16 @@
+:cachedir: <%= @cachedir %>
+:sources:
+<% if @sources.empty? -%>
+  :<%= @source_name %>:
+    remote: <%= @remote %>
+    basedir: <%= @basedir %>
+<% else -%>
+  :sources:
+    <%# The splitting/joining monkeybuisness trims the YAML document header: `---` -%>
+      <%= @sources.to_yaml.split("\n")[1..-1].join("\n") %>
+<% end %>
+<%# The Array boxing/flattening ensures we don't get bitten by bug #15813 -%>
+<% unless [@purgedirs].flatten.empty? -%>
+  :purgedirs:
+  <%= [@purgedirs].flatten.to_yaml.split("\n")[1..-1].join("\n") %>
+<% end -%>

tests/init.pp

@@ -9,5 +9,7 @@
 # Learn more about module testing here: http://docs.puppetlabs.com/guides/tests_smoke.html
 #
 class { 'r10k':
-  remote => 'git@github.com:someuser/puppet.git',
+  remote  => 'git@github.com:someuser/puppet.git',
+  pe_ruby => false,
+  version => '0.0.9',
 }