voxpupuli / puppet-rvm

A puppet module for installing and using RVM (Ruby Version Manager)
https://forge.puppet.com/puppet/rvm
BSD 3-Clause "New" or "Revised" License
32 stars 103 forks source link

Support Environment Isolation #162

Closed joshperry closed 2 years ago

joshperry commented 4 years ago

Errors are generated when trying to enable environment isolation while using this module.

$ puppet generate types --environment pgproxy_update
Error: /srv/puppetmaster/current/environments/pgproxy_update/modules/rvm/lib/puppet/type/rvm_gem.rb: title patterns that use procs are not supported.
Error: /srv/puppetmaster/current/environments/pgproxy_update/modules/rvm/lib/puppet/type/rvm_gemset.rb: title patterns that use procs are not supported.

I'm attempting this change, similar to https://github.com/puppetlabs/puppetlabs-java_ks/commit/3526d1c0a0f7026ac0821faf08912506d3be8d11

diff --git a/modules/rvm/lib/puppet/type/rvm_gem.rb b/modules/rvm/lib/puppet/type/rvm_gem.rb
index 34b785317b..c1fcd3aa45 100644
--- a/modules/rvm/lib/puppet/type/rvm_gem.rb
+++ b/modules/rvm/lib/puppet/type/rvm_gem.rb
@@ -2,7 +2,7 @@ Puppet::Type.newtype(:rvm_gem) do
   @doc = "Ruby Gem support using RVM."

   def self.title_patterns
-    [ [ /^(?:(.*)\/)?(.*)$/, [ [ :ruby_version, lambda{|x| x} ], [ :name, lambda{|x| x} ] ] ] ]
+    [ [ /^(?:(.*)\/)?(.*)$/, [ [ :ruby_version ], [ :name ] ] ] ]
   end

   ensurable do
diff --git a/modules/rvm/lib/puppet/type/rvm_gemset.rb b/modules/rvm/lib/puppet/type/rvm_gemset.rb
index 4062946b18..8d8987deb0 100644
--- a/modules/rvm/lib/puppet/type/rvm_gemset.rb
+++ b/modules/rvm/lib/puppet/type/rvm_gemset.rb
@@ -2,7 +2,7 @@ Puppet::Type.newtype(:rvm_gemset) do
   @doc = "Manage RVM Gemsets."

   def self.title_patterns
-    [ [ /^(?:(.*)@)?(.*)$/, [ [ :ruby_version, lambda{|x| x} ], [ :name, lambda{|x| x} ] ] ] ]
+    [ [ /^(?:(.*)@)?(.*)$/, [ [ :ruby_version ], [ :name ] ] ] ]
   end

   ensurable
ekohl commented 2 years ago

Should be resolved via #163