rconf 0.9.8 → 0.9.9
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/rconf +10 -5
- data/lib/rconf/version.rb +1 -1
- metadata +2 -2
data/bin/rconf
CHANGED
@@ -139,7 +139,8 @@ where [options] are:
|
|
139
139
|
rubies.each do |ruby|
|
140
140
|
ruby =~ /(\s+| =>)([^ ]*)\s.*/
|
141
141
|
ruby = Regexp.last_match(2)
|
142
|
-
gemsets = Command.execute('rvm', ruby, 'exec', 'rvm', 'gemset', 'list'
|
142
|
+
gemsets = Command.execute('rvm', ruby, 'exec', 'rvm', 'gemset', 'list',
|
143
|
+
:env => { 'rvm_is_not_a_shell_function' => '0' }).output.split("\n")
|
143
144
|
i = gemsets.index { |gs| gs =~ /^gemsets for #{ruby} / }
|
144
145
|
if i
|
145
146
|
gemsets = gemsets[i + 1..-1]
|
@@ -163,14 +164,16 @@ where [options] are:
|
|
163
164
|
def update_rconf(version)
|
164
165
|
run_in_all_gemsets do |ruby, gs|
|
165
166
|
report_check("Checking rconf for #{ruby}@#{gs}")
|
166
|
-
rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf'
|
167
|
+
rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf',
|
168
|
+
:env => { 'rvm_is_not_a_shell_function' => '0' }).output
|
167
169
|
if rconf =~ /rconf \(#{version}/
|
168
170
|
report_success
|
169
171
|
elsif rconf =~ /^rconf /
|
170
172
|
report_failure
|
171
173
|
report_check("Updating rconf for #{ruby}@#{gs}")
|
172
174
|
res = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'install',
|
173
|
-
'rconf', '-v', version, '--no-ri', '--no-rdoc'
|
175
|
+
'rconf', '-v', version, '--no-ri', '--no-rdoc',
|
176
|
+
:env => { 'rvm_is_not_a_shell_function' => '0' })
|
174
177
|
report_result(res.success?)
|
175
178
|
else
|
176
179
|
report('SKIPPED (no rconf)')
|
@@ -185,10 +188,12 @@ where [options] are:
|
|
185
188
|
def remove
|
186
189
|
ProgressReporter.report_to_stdout
|
187
190
|
run_in_all_gemsets do |ruby, gs|
|
188
|
-
rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf'
|
191
|
+
rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf',
|
192
|
+
:env => { 'rvm_is_not_a_shell_function' => '0' }).output
|
189
193
|
if rconf =~ /^rconf /
|
190
194
|
report_check("Removing rconf from #{ruby}@#{gs}")
|
191
|
-
res = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'uninstall', '-a', '-x', 'rconf'
|
195
|
+
res = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'uninstall', '-a', '-x', 'rconf',
|
196
|
+
:env => { 'rvm_is_not_a_shell_function' => '0' })
|
192
197
|
report_result(res.success?)
|
193
198
|
end
|
194
199
|
end
|
data/lib/rconf/version.rb
CHANGED