rconf 0.6.22 → 0.6.23

data/bin/rconf

@@ -55,6 +55,7 @@ where [options] are:
           Trollop::die :output, "Failed to initialize output file: #{e.message}"
         end
       end
+      Command.set_verbose if opts[:verbose]
       if opts[:configurators]
         new.list_configurators
       elsif opts[:update]
@@ -119,17 +120,19 @@ where [options] are:
       rubies.each do |ruby|
         ruby =~ /(\s+| =>)([^ ]*)\s.*/
         ruby = Regexp.last_match(2)
-        report_check("Checking rconf for #{ruby}")
-        gemsets = Command.execute('rvm', 'gemset', 'list').output.split("\n")[2..-2] + [ 'global' ]
-        gemsets.each do |gemset| 
-          rconf = Command.execute('rvm', "#{ruby}@#{gemset}", 'exec', 'gem', 'list', 'rconf').output
-          if rconf =~ /rconf \(#{version}\)/
+        gemsets = Command.execute('rvm', ruby, 'gemset', 'list').output.split("\n")
+        i = gemsets.index { |gs| gs =~ /^gemsets for #{ruby} / }
+        gemsets = gemsets[i + 1..-1]
+        gemsets.each do |gs| 
+          report_check("Checking rconf for #{ruby}@#{gs}")
+          rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'exec', 'gem', 'list', 'rconf').output
+          if rconf =~ /rconf \(#{version}/
             report_success
             next
           else
             report_failure
-            report_check("Updating rconf for #{ruby}@#{gemset}")
-            res = Command.execute('rvm', "#{ruby}@#{gemset}", 'exec', 'gem', 'install', 'rconf')
+            report_check("Updating rconf for #{ruby}@#{gs}")
+            res = Command.execute('rvm', "#{ruby}@#{gs}", 'exec', 'gem', 'install', 'rconf')
             report_result(res.success?)
           end
         end
@@ -149,7 +152,6 @@ where [options] are:
       Profile.reset if options[:force]
       ProgressReporter.report_to_stdout
       ProgressReporter.report_to_file(options[:output]) if options[:output]
-      Command.set_verbose if options[:verbose]
       begin
         lang = Language.load(options[:config])
         report_fatal("Validation of configuration file failed:\n  -#{lang.validation_errors.join("\n  -").map(&:red)}") unless lang.validation_errors.empty?

data/lib/rconf/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.22
+  version: 0.6.23
 platform: ruby
 authors: 
 - Raphael Simon