Merge pull request #141 from salimane/plugin

Fix plugin type throwing error when not installing through hiera yaml
boxen · May 29, 2016 · e34cf9f · e34cf9f
2 parents ed33a20 + a2ed663
commit e34cf9f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/manifests/rbenv.pp b/manifests/rbenv.pp
@@ -32,13 +32,6 @@
   }
 
   if !empty($plugins) and $ensure != 'absent'  {
-
-    file { "${prefix}/plugins":
-      ensure  => directory,
-      require => Repository[$prefix]
-    }
-
     create_resources('ruby::rbenv::plugin', $plugins)
-
   }
 }
diff --git a/manifests/rbenv/plugin.pp b/manifests/rbenv/plugin.pp
@@ -11,6 +11,13 @@
   require ruby
 
   if $ruby::provider == 'rbenv' {
+
+    $plugins_dir_params =  {
+      ensure  => directory,
+      require => Repository[$ruby::rbenv::prefix]
+    }
+    ensure_resource('file', "${ruby::rbenv::prefix}/plugins", $plugins_dir_params)
+
     repository { "${ruby::rbenv::prefix}/plugins/${name}":
       ensure  => $ensure,
       force   => true,

diff --git a/spec/defines/ruby_rbenv_plugin_spec.rb b/spec/defines/ruby_rbenv_plugin_spec.rb
@@ -17,6 +17,7 @@
   context "ensure => present" do
     it do
       should contain_class('ruby')
+      should contain_file('/test/boxen/rbenv/plugins')
       should contain_repository('/test/boxen/rbenv/plugins/rbenv-vars')
     end
   end