rconf 0.9.7 → 0.9.8
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.
|
@@ -86,7 +86,15 @@ module RightConf
|
|
|
86
86
|
report_check("Creating gemset #{gemset} for #{version}")
|
|
87
87
|
Command.execute('rvm', version, 'exec', 'rvm', 'gemset', 'create', gemset,
|
|
88
88
|
:abort_on_failure => "Failed to create gemset '#{gemset}'")
|
|
89
|
-
|
|
89
|
+
end
|
|
90
|
+
report_check("Checking whether rconf is installed")
|
|
91
|
+
res = Command.execute('rconf', '--version')
|
|
92
|
+
if res.output =~ /VERSION/
|
|
93
|
+
report_success
|
|
94
|
+
else
|
|
95
|
+
report_failure
|
|
96
|
+
report_check("Installing rconf")
|
|
97
|
+
Command.execute_in_ruby('gem', 'install', 'rconf', :abort_on_failure => "Failed to install rconf")
|
|
90
98
|
report_success
|
|
91
99
|
end
|
|
92
100
|
report_check("Switching to gemset #{gemset}")
|
data/lib/rconf/version.rb
CHANGED
|
@@ -29,7 +29,6 @@ describe RightConf::RubyConfigurator do
|
|
|
29
29
|
it 'should succeed on linux when rvm succeeds' do
|
|
30
30
|
should_execute('rvm', '--version').once.and_return(success_result("rvm #{RVM_VERSION}"))
|
|
31
31
|
should_execute('rvm', 'current').once.and_return(success_result("0@"))
|
|
32
|
-
#should_execute('rvm', 'use', '0', Hash).once.and_return(success_result('Using '))
|
|
33
32
|
should_execute('rvm', '0@', 'gem', '--version').once.and_return(success_result('1'))
|
|
34
33
|
@configurator.run_linux
|
|
35
34
|
end
|
|
@@ -50,7 +49,6 @@ describe RightConf::RubyConfigurator do
|
|
|
50
49
|
it 'should install rubygems if needed' do
|
|
51
50
|
should_execute('rvm', '--version').once.and_return(success_result("rvm #{RVM_VERSION}"))
|
|
52
51
|
should_execute('rvm', 'current').once.and_return(success_result("0@"))
|
|
53
|
-
#should_execute('rvm', 'use', '0', Hash).once.and_return(success_result('Using '))
|
|
54
52
|
should_execute('rvm', '0@', 'gem', '--version').once.and_return(success_result('0'))
|
|
55
53
|
should_execute('rvm', '0@', 'rubygems', '1',
|
|
56
54
|
{:abort_on_failure=>'Failed to install rubygems'}).once.and_return(success_result)
|