rconf 0.8.11 → 0.8.12

data/lib/rconf/configurators/ruby_configurator.rb

@@ -30,7 +30,7 @@ module RightConf
              :rubygems  => 'Rubygems version, e.g. "1.3.7"',
              :gemset    => 'Gemset to be used for platforms supporting rvm'
 
-    validate_has_settings :version, :rubygems
+    validate_has_settings :version
 
     # Let configurator run, it is idempotent
     #
@@ -49,6 +49,7 @@ module RightConf
     # true:: Always return true
     def run_linux
       check_rvm(RVM_VERSION)
+      return true if aborting
       Command.set_ruby(version, gemset)
       report_check("Checking whether #{version} is the active ruby")
       out = Command.execute('rvm', 'list').output
@@ -93,15 +94,17 @@ module RightConf
                         :abort_on_failure => "Failed to switch to gemset '#{gemset}'") 
         report_success
       end
-      report_check("Checking whether rubygems #{rubygems} is installed")
-      res = Command.execute_in_ruby('gem', '--version')
-      if res.success? && res.output =~ /^#{rubygems}$/
-        report_success
-      else
-        report_failure
-        report_check("Installing rubygems #{rubygems}")
-        Command.execute_in_ruby('rubygems', rubygems, :abort_on_failure => 'Failed to install rubygems')
-        report_success
+      if rubygems
+        report_check("Checking whether rubygems #{rubygems} is installed")
+        res = Command.execute_in_ruby('gem', '--version')
+        if res.success? && res.output =~ /^#{rubygems}$/
+          report_success
+        else
+          report_failure
+          report_check("Installing rubygems #{rubygems}")
+          Command.execute_in_ruby('rubygems', rubygems, :abort_on_failure => 'Failed to install rubygems')
+          report_success
+        end
       end
       true
     end
@@ -159,6 +162,8 @@ module RightConf
         Dir.chdir(File.join(rvm_src, "rvm-#{version}")) do
           Command.execute('./install', :abort_on_failure => "Failed to install rvm #{version}")
         end
+        post_note "Configuration required installing RVM, please start a new shell to activate it and re-run rconf to finish configuration".green
+        aborting(true)
         report_success
       end
       setup_bashrc
@@ -248,7 +253,7 @@ module RightConf
     # true:: Always return true
     def setup_bashrc
       if EnvironmentUpdater.update(rvm_bash_activation, ['PATH'])
-        post_note 'rvm was installed, please reload your shell to activate it and re-run rconf'
+        post_note '.rvmrc was updated, please reload your shell to activate it and re-run rconf'
         aborting(true)
       end
     end

data/lib/rconf/version.rb

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

data/spec/configurators/ruby_configurator_spec.rb

@@ -23,6 +23,7 @@ describe RightConf::RubyConfigurator do
     @configurator = create_configurator('ruby { version "0"; rubygems "1" }')
     flexmock(File).should_receive(:exist?).with('.rvmrc').and_return(true)
     flexmock(IO).should_receive(:read).with('.rvmrc').and_return("anything")
+    flexmock(File).should_receive(:open).with('.rvmrc', 'w').and_yield(FlexMock.undefined) # Don't override rconf's .rvmrc...
   end
 
   it 'should succeed on linux when rvm succeeds' do
@@ -36,16 +37,13 @@ describe RightConf::RubyConfigurator do
   it 'should install rvm if needed' do
     rvm_tar = "rvm-#{RVM_VERSION}.tar.gz" 
     should_execute('rvm', '--version').once.and_return(success_result("rvm"))
-    should_execute('rvm', 'list').once.and_return(success_result("=> rvm #{RVM_VERSION}"))
     should_execute('curl', '-O', '-f', "https://rvm.beginrescueend.com/releases/#{rvm_tar}",
       {:abort_on_failure=>"Failed to download rvm #{RVM_VERSION}"}).once.and_return(success_result)
     should_execute('tar', 'zxf', rvm_tar, 
       {:abort_on_failure=>"Failed to extract rvm tgz from #{File.expand_path(File.join(File.dirname(__FILE__), '..', '..', "rvm-#{RVM_VERSION}.tar.gz"))}"}).once.and_return(success_result)
     flexmock(Dir).should_receive(:chdir).and_yield
     should_execute('./install', {:abort_on_failure=>"Failed to install rvm #{RVM_VERSION}"}).once.and_return(success_result)
-    should_execute('rvm', 'use', '0').once.and_return(success_result('Using '))
-    should_execute('rvm', '0@', 'gem', '--version').once.and_return(success_result('1'))
-    flexmock(@configurator).should_receive(:setup_bashrc).once.and_return(true)
+    should_execute('rvm', 'use', '0').never
     @configurator.run_linux
   end
 

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors: 
 - Raphael Simon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 -07:00
+date: 2011-07-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency