rconf 0.6.22 → 0.6.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/bin/rconf +10 -8
  2. data/lib/rconf/version.rb +1 -1
  3. metadata +1 -1
data/bin/rconf CHANGED
@@ -55,6 +55,7 @@ where [options] are:
55
55
  Trollop::die :output, "Failed to initialize output file: #{e.message}"
56
56
  end
57
57
  end
58
+ Command.set_verbose if opts[:verbose]
58
59
  if opts[:configurators]
59
60
  new.list_configurators
60
61
  elsif opts[:update]
@@ -119,17 +120,19 @@ where [options] are:
119
120
  rubies.each do |ruby|
120
121
  ruby =~ /(\s+| =>)([^ ]*)\s.*/
121
122
  ruby = Regexp.last_match(2)
122
- report_check("Checking rconf for #{ruby}")
123
- gemsets = Command.execute('rvm', 'gemset', 'list').output.split("\n")[2..-2] + [ 'global' ]
124
- gemsets.each do |gemset|
125
- rconf = Command.execute('rvm', "#{ruby}@#{gemset}", 'exec', 'gem', 'list', 'rconf').output
126
- if rconf =~ /rconf \(#{version}\)/
123
+ gemsets = Command.execute('rvm', ruby, 'gemset', 'list').output.split("\n")
124
+ i = gemsets.index { |gs| gs =~ /^gemsets for #{ruby} / }
125
+ gemsets = gemsets[i + 1..-1]
126
+ gemsets.each do |gs|
127
+ report_check("Checking rconf for #{ruby}@#{gs}")
128
+ rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'exec', 'gem', 'list', 'rconf').output
129
+ if rconf =~ /rconf \(#{version}/
127
130
  report_success
128
131
  next
129
132
  else
130
133
  report_failure
131
- report_check("Updating rconf for #{ruby}@#{gemset}")
132
- res = Command.execute('rvm', "#{ruby}@#{gemset}", 'exec', 'gem', 'install', 'rconf')
134
+ report_check("Updating rconf for #{ruby}@#{gs}")
135
+ res = Command.execute('rvm', "#{ruby}@#{gs}", 'exec', 'gem', 'install', 'rconf')
133
136
  report_result(res.success?)
134
137
  end
135
138
  end
@@ -149,7 +152,6 @@ where [options] are:
149
152
  Profile.reset if options[:force]
150
153
  ProgressReporter.report_to_stdout
151
154
  ProgressReporter.report_to_file(options[:output]) if options[:output]
152
- Command.set_verbose if options[:verbose]
153
155
  begin
154
156
  lang = Language.load(options[:config])
155
157
  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 CHANGED
@@ -13,7 +13,7 @@ module RightConf
13
13
 
14
14
  MAJOR = 0
15
15
  MINOR = 6
16
- BUILD = 22
16
+ BUILD = 23
17
17
 
18
18
  VERSION = [MAJOR, MINOR, BUILD].map(&:to_s).join('.')
19
19
 
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: rconf
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.6.22
5
+ version: 0.6.23
6
6
  platform: ruby
7
7
  authors:
8
8
  - Raphael Simon