bin/rconf in rconf-0.9.11 vs bin/rconf in rconf-0.9.12
- old
+ new
@@ -135,21 +135,22 @@
def run_in_all_gemsets(&callback)
rubies = Command.execute('rvm', 'list').output
rubies = rubies.split("\n")[3..-1]
report_fatal 'Failed to list install rubies (is rvm in your path?)' unless rubies
rubies.each do |ruby|
- ruby =~ /(\s+| =>)([^ ]*)\s.*/
- ruby = Regexp.last_match(2)
- 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]
- gemsets.each do |gs|
- gs = gs.lstrip
- callback.call(ruby, gs)
+ if ruby =~ /^(\s+| =>)((ruby|ree|jruby|rbx)[^ ]*)\s.*/
+ ruby = Regexp.last_match(2)
+ 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]
+ gemsets.each do |gs|
+ gs = gs.lstrip
+ callback.call(ruby, gs)
+ end
+ else
+ report_fatal "Failed to retrieve installed gemsets for '#{ruby}'"
end
- else
- report_fatal 'Failed to retrieve installed gemsets'
end
end
end
# Update rconf for given rubies if required