Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing NoMethodError when using system wide rvm and the gem_package resource. #66

Merged
merged 1 commit into from
Mar 12, 2012
Merged

Fixing NoMethodError when using system wide rvm and the gem_package resource. #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions libraries/rvm_rubygems_package.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def install_package(name, version)
ruby_strings.each do |rubie|
next if rubie == 'system'
e = rvm_environment rubie do
user new_resource.user if new_resource.respond_to?("user")
user gem_env.user if gem_env.user
action :nothing
end
e.run_action(:create)
Expand All @@ -144,13 +144,13 @@ def install_via_gem_command(name, version)
name = @new_resource.source
end

cmd = %{rvm #{ruby_strings.join(',')} #{rvm_do(new_resource.user)} #{gem_binary_path}}
cmd = %{rvm #{ruby_strings.join(',')} #{rvm_do(gem_env.user)} #{gem_binary_path}}
cmd << %{ install #{name} -q --no-rdoc --no-ri -v "#{version}"}
cmd << %{#{src}#{opts}}

if new_resource.respond_to?("user") && new_resource.user
user_dir = Etc.getpwnam(new_resource.user).dir
environment = { 'USER' => new_resource.user, 'HOME' => user_dir }
if gem_env.user
user_dir = Etc.getpwnam(gem_env.user).dir
environment = { 'USER' => gem_env.user, 'HOME' => user_dir }
else
user_dir = nil
environment = nil
Expand All @@ -164,17 +164,17 @@ def remove_package(name, version)
end

def uninstall_via_gem_command(name, version)
cmd = %{rvm #{ruby_strings.join(',')} #{rvm_do(new_resource.user)} #{gem_binary_path}}
cmd = %{rvm #{ruby_strings.join(',')} #{rvm_do(gem_env.user)} #{gem_binary_path}}
cmd << %{ uninstall #{name} -q -x -I}
if version
cmd << %{ -v "#{version}"#{opts}}
else
cmd << %{ -a#{opts}}
end

if new_resource.respond_to?("user") && new_resource.user
user_dir = Etc.getpwnam(new_resource.user).dir
environment = { 'USER' => new_resource.user, 'HOME' => user_dir }
if gem_env.user
user_dir = Etc.getpwnam(gem_env.user).dir
environment = { 'USER' => gem_env.user, 'HOME' => user_dir }
else
user_dir = nil
environment = nil
Expand Down