lib/rconf/configurators/ruby_configurator.rb in rconf-0.5.5 vs lib/rconf/configurators/ruby_configurator.rb in rconf-0.5.6

@@ -52,12 +52,10 @@
           run
           return true
         when /^Using /
           report_success
           check_rvmrc
-          Command.execute('rvm', version, 'exec', 'gem', 'install', 'rconf',
-                          :abort_on_failure => "Failed to install rconf gem in #{version}")
           post_note "Configuration required switching the active ruby\nPlease 'cd' into the project directory again to activate it"
         else
           report_fatal("Failed to use #{version}:\n#{out}")
         end
       end
@@ -69,10 +67,12 @@
         else
           report_fail
           report_check("Creating gemset #{gemset} for  #{version}")
           Command.execute('rvm', version, 'gemset', 'create',  gemset,
                           :abort_on_failure => "Failed to create gemset '#{gemset}'") 
+          Command.execute('rvm', "#{version}@#{gemset}", 'exec', 'gem', 'install', 'rconf',
+                          :abort_on_failure => "Failed to install rconf gem in #{version}@#{gemset}")
           report_success
         end
         report_check("Switching to gemset #{gemset}")
         Command.execute('rvm', version, 'gemset', 'use',  gemset,
                         :abort_on_failure => "Failed to switch to gemset '#{gemset}'") 
@@ -189,10 +189,10 @@
         File.open('.rvmrc', 'w') do |f|
           f.puts "rvm #{version}@#{gemset}"
           f.puts "type -P rconf &>/dev/null && { rconf; }"
           f.puts "type -P rconf &>/dev/null || { echo 'rconf not installed, skipping (see .rvmrc)'; }"
         end
-        Command.execute('rvm', 'trust', 'rvmrc')
+        Command.execute('rvm', "#{version}@#{gemset}", 'trust', 'rvmrc')
         report_success
       rescue Exception => e
         report_failure
         report_error(e.message)
       end