You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@buildr.apache.org by do...@apache.org on 2012/05/21 07:12:14 UTC

svn commit: r1340899 - /buildr/trunk/rakelib/rspec.rake

Author: donaldp
Date: Mon May 21 05:12:13 2012
New Revision: 1340899

URL: http://svn.apache.org/viewvc?rev=1340899&view=rev
Log:
Simplify the way we use rvm+bundler to invoke the tests

Modified:
    buildr/trunk/rakelib/rspec.rake

Modified: buildr/trunk/rakelib/rspec.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/rspec.rake?rev=1340899&r1=1340898&r2=1340899&view=diff
==============================================================================
--- buildr/trunk/rakelib/rspec.rake (original)
+++ buildr/trunk/rakelib/rspec.rake Mon May 21 05:12:13 2012
@@ -67,11 +67,8 @@ begin
 
   def rvm_run_in(version, command)
     if !(Config::CONFIG['host_os'] =~ /mswin|win32|dos/i)
-      prefix = "[[ -s \"~/.rvm/scripts/rvm\" ]] && source \"~/.rvm/scripts/rvm\""
       cmd_prefix = "rvm #{version} exec"
-      bundle = "rm Gemfile.lock; #{cmd_prefix} bundle install"
-      cmd = "#{cmd_prefix} #{command}"
-      sh "#{prefix}; #{bundle}; #{cmd}"
+      sh "rm -f Gemfile.lock; #{cmd_prefix} bundle install; #{cmd_prefix} bundle exec #{command}"
     else
       sh "#{version =~ /jruby/ ? "j" : ""}ruby -S #{command}"
     end