lib/rvm/capistrano/base.rb in rvm-capistrano-1.5.4 vs lib/rvm/capistrano/base.rb in rvm-capistrano-1.5.5

@@ -75,10 +75,15 @@
     end
     # evaluate :rvm_ruby_string => :local
     set :rvm_ruby_string_evaluated do
       value = fetch(:rvm_ruby_string, :default)
       if value.to_sym == :local
-        value = ENV['GEM_HOME'].gsub(/.*\//,"")
+        if ENV['RBENV_VERSION']
+          gem_set = ENV['GEM_HOME'].to_s.match(/(?:\/gemsets\/(.*))$/).to_a[1]
+          value = [ENV['RBENV_VERSION'], gem_set].compact.join("@")
+        else
+          value = ENV['GEM_HOME'].gsub(/.*\//,"")
+        end
       end
       value.to_s
     end
 
     # Use the default ruby on the server, by default :)