rconf 0.8.30 → 0.9.4

data/lib/rconf/command.rb

@@ -70,11 +70,12 @@ module RightConf
     def execute_in_ruby(command, *args)
       report_fatal('Failed to run in ruby context, no ruby specified') unless @rvm_prefix
       commands = if RVM_COMMANDS.include?(command)
-                   [ @rvm_prefix, command ]
+                   @rvm_prefix + [ command ]
                  else
-                   [ @rvm_prefix, 'exec', '--', command ]
+                   @rvm_prefix + [ 'exec', '--', command ]
                  end
       args = commands + args
+      ENV['rvm_is_not_a_shell_function'] = '0'
       execute('rvm', *args)
     end
 
@@ -132,7 +133,7 @@ module RightConf
     # === Return
     # true:: Always return true
     def set_ruby(ruby, gemset)
-      @rvm_prefix = "#{ruby}@#{gemset}"
+      @rvm_prefix = ["#{ruby}@#{gemset}"]
       true
     end
 

data/lib/rconf/configurators/ruby_configurator.rb

@@ -14,7 +14,7 @@ module RightConf
   class RubyConfigurator
 
     # RVM version used to install rubies
-    RVM_VERSION = '1.6.2'
+    RVM_VERSION = '1.10.2'
 
     # RVM releases URL
     RVM_RELEASES_URL = 'https://rvm.beginrescueend.com/releases'
@@ -59,7 +59,7 @@ module RightConf
       else
         report_failure
         report_check("Switching to #{version}")
-        out = Command.execute('rvm', 'use', version).output
+        out = Command.execute('rvm', 'use', version, :env => { 'rvm_is_not_a_shell_function' => '0' }).output
         case out
         when /is not installed\./
           report_failure
@@ -91,7 +91,8 @@ module RightConf
         end
         report_check("Switching to gemset #{gemset}")
         Command.execute('rvm', version, 'exec', 'rvm', 'gemset', 'use',  gemset,
-                        :abort_on_failure => "Failed to switch to gemset '#{gemset}'") 
+                        :abort_on_failure => "Failed to switch to gemset '#{gemset}'",
+                        :env => { 'rvm_is_not_a_shell_function' => '0' }) 
         report_success
       end
       if rubygems
@@ -281,19 +282,19 @@ then
   if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
   then
     . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
-  fi
+  fi  
 else
   # If the environment file has not yet been created, use the RVM CLI to select.
   if ! rvm --create  "$environment_id"
   then
     echo "Failed to create RVM environment '${environment_id}'."
     return 1
-  fi
+  fi  
 fi
 if [[ $- == *i* ]] # check for interactive shells
 then
     echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
-else 
+else
   echo "Using: $GEM_HOME" # don't use colors in interactive shells
 fi
     EOF

data/lib/rconf/version.rb

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

data/spec/configurators/ruby_configurator_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# Copyright (C) 2011-2012 RightScale, Inc, All Rights Reserved Worldwide.
 #
 # THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
 # AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
@@ -29,7 +29,7 @@ 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').once.and_return(success_result('Using '))
+    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 +50,7 @@ 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').once.and_return(success_result('Using '))
+    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

@@ -4,10 +4,10 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 30
+  - 9
+  - 4
   segments_generated: true
-  version: 0.8.30
+  version: 0.9.4
 platform: ruby
 authors: 
 - Raphael Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-29 00:00:00 -08:00
+date: 2012-02-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency