Add user attr on all resources.

thedeeno · Aug 9, 2011 · ab05430 · ab05430
1 parent b434934
commit ab05430
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 7 deletions.
diff --git a/providers/default_ruby.rb b/providers/default_ruby.rb
@@ -26,7 +26,7 @@ def load_current_resource
   @rubie        = normalize_ruby_string(select_ruby(new_resource.ruby_string))
   @gemset       = select_gemset(new_resource.ruby_string)
   @ruby_string  = @gemset.nil? ? @rubie : "#{@rubie}@#{@gemset}"
-  @rvm_env      = ::RVM::ChefUserEnvironment.new()
+  @rvm_env      = ::RVM::ChefUserEnvironment.new(new_resource.user)
 end
 
 action :create do

diff --git a/providers/environment.rb b/providers/environment.rb
@@ -27,7 +27,7 @@ def load_current_resource
   @rubie        = normalize_ruby_string(select_ruby(new_resource.ruby_string))
   @gemset       = select_gemset(new_resource.ruby_string)
   @ruby_string  = @gemset.nil? ? @rubie : "#{@rubie}@#{@gemset}"
-  @rvm_env      = ::RVM::ChefUserEnvironment.new()
+  @rvm_env      = ::RVM::ChefUserEnvironment.new(new_resource.user)
 end
 
 action :create do

diff --git a/providers/gemset.rb b/providers/gemset.rb
@@ -32,7 +32,7 @@ def load_current_resource
     @gemset     = select_gemset(new_resource.gemset)
   end
   @ruby_string  = "#{@rubie}@#{@gemset}"
-  @rvm_env      = ::RVM::ChefUserEnvironment.new()
+  @rvm_env      = ::RVM::ChefUserEnvironment.new(new_resource.user)
 end
 
 action :create do

diff --git a/providers/global_gem.rb b/providers/global_gem.rb
@@ -22,7 +22,7 @@
 include Chef::RVM::RubyHelpers
 
 def load_current_resource
-  @rvm_env      = ::RVM::ChefUserEnvironment.new()
+  @rvm_env      = ::RVM::ChefUserEnvironment.new(new_resource.user)
 end
 
 action :install do

diff --git a/providers/ruby.rb b/providers/ruby.rb
@@ -25,7 +25,7 @@
 def load_current_resource
   @rubie        = normalize_ruby_string(select_ruby(new_resource.ruby_string))
   @ruby_string  = @rubie
-  @rvm_env      = ::RVM::ChefUserEnvironment.new()
+  @rvm_env      = ::RVM::ChefUserEnvironment.new(new_resource.user)
 end
 
 action :install do

diff --git a/providers/shell.rb b/providers/shell.rb
@@ -27,7 +27,7 @@ def load_current_resource
   @rubie        = normalize_ruby_string(select_ruby(new_resource.ruby_string))
   @gemset       = select_gemset(new_resource.ruby_string)
   @ruby_string  = @gemset.nil? ? @rubie : "#{@rubie}@#{@gemset}"
-  @rvm_env      = ::RVM::ChefUserEnvironment.new()
+  @rvm_env      = ::RVM::ChefUserEnvironment.new(new_resource.user)
 end
 
 action :run do

diff --git a/providers/wrapper.rb b/providers/wrapper.rb
@@ -26,7 +26,7 @@ def load_current_resource
   @rubie        = normalize_ruby_string(select_ruby(new_resource.ruby_string))
   @gemset       = select_gemset(new_resource.ruby_string)
   @ruby_string  = @gemset.nil? ? @rubie : "#{@rubie}@#{@gemset}"
-  @rvm_env      = ::RVM::ChefUserEnvironment.new()
+  @rvm_env      = ::RVM::ChefUserEnvironment.new(new_resource.user)
 
   if new_resource.binary.nil?
     @binaries = new_resource.binaries || []

diff --git a/resources/default_ruby.rb b/resources/default_ruby.rb
@@ -22,6 +22,7 @@
 actions :create
 
 attribute :ruby_string, :kind_of => String, :name_attribute => true
+attribute :user,        :kind_of => String
 
 def initialize(*args)
   super

diff --git a/resources/environment.rb b/resources/environment.rb
@@ -22,6 +22,7 @@
 actions :create
 
 attribute :ruby_string, :kind_of => String, :name_attribute => true
+attribute :user,        :kind_of => String
 
 def initialize(*args)
   super

diff --git a/resources/gem.rb b/resources/gem.rb
@@ -28,6 +28,7 @@
 attribute :source,        :kind_of => String
 attribute :options,       :kind_of => Hash
 attribute :gem_binary,    :kind_of => String
+attribute :user,          :kind_of => String
 
 def initialize(*args)
   super

diff --git a/resources/gemset.rb b/resources/gemset.rb
@@ -23,6 +23,7 @@
 
 attribute :gemset,      :kind_of => String, :name_attribute => true
 attribute :ruby_string, :kind_of => String, :regex => /^[^@]+$/
+attribute :user,        :kind_of => String
 
 def initialize(*args)
   super

diff --git a/resources/global_gem.rb b/resources/global_gem.rb
@@ -26,6 +26,7 @@
 attribute :source,        :kind_of => String
 attribute :options,       :kind_of => Hash
 attribute :gem_binary,    :kind_of => String
+attribute :user,          :kind_of => String
 
 def initialize(*args)
   super

diff --git a/resources/ruby.rb b/resources/ruby.rb
@@ -22,6 +22,7 @@
 actions :install, :uninstall, :remove
 
 attribute :ruby_string, :kind_of => String, :name_attribute => true
+attribute :user,        :kind_of => String
 
 def initialize(*args)
   super

diff --git a/resources/wrapper.rb b/resources/wrapper.rb
@@ -25,6 +25,7 @@
 attribute :ruby_string, :kind_of => String
 attribute :binary,      :kind_of => String
 attribute :binaries,    :kind_of => Array
+attribute :user,        :kind_of => String
 
 def initialize(*args)
   super