rconf 0.9.9 → 0.9.10

data/bin/rconf

@@ -139,8 +139,7 @@ where [options] are:
       rubies.each do |ruby|
         ruby =~ /(\s+| =>)([^ ]*)\s.*/
         ruby = Regexp.last_match(2)
-        gemsets = Command.execute('rvm', ruby, 'exec', 'rvm', 'gemset', 'list',
-                                  :env => { 'rvm_is_not_a_shell_function' => '0' }).output.split("\n")
+        gemsets = Command.execute('rvm', ruby, 'exec', 'rvm', 'gemset', 'list').output.split("\n")
         i = gemsets.index { |gs| gs =~ /^gemsets for #{ruby} / }
         if i
           gemsets = gemsets[i + 1..-1]
@@ -164,16 +163,14 @@ where [options] are:
     def update_rconf(version)
       run_in_all_gemsets do |ruby, gs|
         report_check("Checking rconf for #{ruby}@#{gs}")
-        rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf',
-                                :env => { 'rvm_is_not_a_shell_function' => '0' }).output
+        rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf').output
         if rconf =~ /rconf \(#{version}/
           report_success
         elsif rconf =~ /^rconf /
           report_failure
           report_check("Updating rconf for #{ruby}@#{gs}")
           res = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'install', 
-                                'rconf', '-v', version, '--no-ri', '--no-rdoc',
-                                :env => { 'rvm_is_not_a_shell_function' => '0' })
+                                'rconf', '-v', version, '--no-ri', '--no-rdoc')
           report_result(res.success?)
         else
           report('SKIPPED (no rconf)')
@@ -188,12 +185,10 @@ where [options] are:
     def remove
       ProgressReporter.report_to_stdout
       run_in_all_gemsets do |ruby, gs|
-        rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf',
-                                :env => { 'rvm_is_not_a_shell_function' => '0' }).output
+        rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf').output
         if rconf =~ /^rconf /
           report_check("Removing rconf from #{ruby}@#{gs}")
-          res = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'uninstall', '-a', '-x', 'rconf',
-                                :env => { 'rvm_is_not_a_shell_function' => '0' })
+          res = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'uninstall', '-a', '-x', 'rconf')
           report_result(res.success?)
         end
       end

data/lib/rconf/command.rb

@@ -35,6 +35,8 @@ module RightConf
     # === Return
     # result(CommandResult):: Result of execution (output and exit status)
     def execute(command, *args)
+      ENV['rvm_is_not_a_shell_function'] = '0'
+      ENV['rvm_ignore_rvmrc'] = '1'
       opts = {}
       if !args.empty? && args[-1].is_a?(Hash)
         opts = args[-1]
@@ -76,6 +78,7 @@ module RightConf
                  end
       args = commands + args
       ENV['rvm_is_not_a_shell_function'] = '0'
+      ENV['rvm_ignore_rvmrc'] = '1'
       execute('rvm', *args)
     end
 

data/lib/rconf/configurators/ruby_configurator.rb

@@ -59,7 +59,7 @@ module RightConf
       else
         report_failure
         report_check("Switching to #{version}")
-        out = Command.execute('rvm', 'use', version, :env => { 'rvm_is_not_a_shell_function' => '0' }).output
+        out = Command.execute('rvm', 'use', version).output
         case out
         when /is not installed\./
           report_failure
@@ -87,6 +87,10 @@ module RightConf
           Command.execute('rvm', version, 'exec', 'rvm', 'gemset', 'create',  gemset,
                           :abort_on_failure => "Failed to create gemset '#{gemset}'") 
         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}'")
+        report_success
         report_check("Checking whether rconf is installed")
         res = Command.execute('rconf', '--version')
         if res.output =~ /VERSION/
@@ -97,11 +101,6 @@ module RightConf
           Command.execute_in_ruby('gem', 'install', 'rconf', :abort_on_failure => "Failed to install rconf")
           report_success
         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}'",
-                        :env => { 'rvm_is_not_a_shell_function' => '0' }) 
-        report_success
       end
       if rubygems
         report_check("Checking whether rubygems #{rubygems} is installed")

data/lib/rconf/version.rb

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

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 9
+  - 10
   segments_generated: true
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Raphael Simon