rconf 0.9.7 → 0.9.8

data/lib/rconf/configurators/ruby_configurator.rb

@@ -86,7 +86,15 @@ module RightConf
           report_check("Creating gemset #{gemset} for #{version}")
           Command.execute('rvm', version, 'exec', 'rvm', 'gemset', 'create',  gemset,
                           :abort_on_failure => "Failed to create gemset '#{gemset}'") 
-          Command.execute_in_ruby('gem', 'install', 'rconf')
+        end
+        report_check("Checking whether rconf is installed")
+        res = Command.execute('rconf', '--version')
+        if res.output =~ /VERSION/
+          report_success
+        else
+          report_failure
+          report_check("Installing rconf")
+          Command.execute_in_ruby('gem', 'install', 'rconf', :abort_on_failure => "Failed to install rconf")
           report_success
         end
         report_check("Switching to gemset #{gemset}")

data/lib/rconf/version.rb

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

data/spec/configurators/ruby_configurator_spec.rb

@@ -29,7 +29,6 @@ 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', '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
@@ -50,7 +49,6 @@ 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', '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
-  - 7
+  - 8
   segments_generated: true
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Raphael Simon