rconf 0.9.6 → 0.9.7

data/lib/rconf/configurators/ruby_configurator.rb

@@ -52,8 +52,8 @@ module RightConf
       return true if aborting
       Command.set_ruby(version, gemset)
       report_check("Checking whether #{version} is the active ruby")
-      out = Command.execute('rvm', 'list').output
-      if out =~ /^=> #{version.gsub('.', '\\.')}/
+      out = Command.execute('rvm', 'current').output
+      if out =~ /^#{version.gsub('.', '\\.')}/
         report_success
         check_rvmrc
       else

data/lib/rconf/version.rb

@@ -13,7 +13,7 @@ module RightConf
 
   MAJOR = 0
   MINOR = 9
-  BUILD = 6
+  BUILD = 7
 
   VERSION = [MAJOR, MINOR, BUILD].map(&:to_s).join('.')
 

data/spec/configurators/ruby_configurator_spec.rb

@@ -28,8 +28,8 @@ describe RightConf::RubyConfigurator do
 
   it 'should succeed on linux when rvm succeeds' do
     should_execute('rvm', '--version').once.and_return(success_result("rvm #{RVM_VERSION}"))
-    should_execute('rvm', 'list').once.and_return(success_result("=> rvm #{RVM_VERSION}"))
-    should_execute('rvm', 'use', '0', Hash).once.and_return(success_result('Using '))
+    should_execute('rvm', 'current').once.and_return(success_result("0@"))
+    #should_execute('rvm', 'use', '0', Hash).once.and_return(success_result('Using '))
     should_execute('rvm', '0@', 'gem', '--version').once.and_return(success_result('1'))
     @configurator.run_linux
   end
@@ -49,8 +49,8 @@ describe RightConf::RubyConfigurator do
 
   it 'should install rubygems if needed' do
     should_execute('rvm', '--version').once.and_return(success_result("rvm #{RVM_VERSION}"))
-    should_execute('rvm', 'list').once.and_return(success_result("=> rvm #{RVM_VERSION}"))
-    should_execute('rvm', 'use', '0', Hash).once.and_return(success_result('Using '))
+    should_execute('rvm', 'current').once.and_return(success_result("0@"))
+    #should_execute('rvm', 'use', '0', Hash).once.and_return(success_result('Using '))
     should_execute('rvm', '0@', 'gem', '--version').once.and_return(success_result('0'))
     should_execute('rvm', '0@', 'rubygems', '1',
       {:abort_on_failure=>'Failed to install rubygems'}).once.and_return(success_result)

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 6
+  - 7
   segments_generated: true
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Raphael Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-02 00:00:00 -08:00
+date: 2012-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency