rconf 0.9.6 → 0.9.7
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.
|
@@ -52,8 +52,8 @@ module RightConf
|
|
|
52
52
|
return true if aborting
|
|
53
53
|
Command.set_ruby(version, gemset)
|
|
54
54
|
report_check("Checking whether #{version} is the active ruby")
|
|
55
|
-
out = Command.execute('rvm', '
|
|
56
|
-
if out =~
|
|
55
|
+
out = Command.execute('rvm', 'current').output
|
|
56
|
+
if out =~ /^#{version.gsub('.', '\\.')}/
|
|
57
57
|
report_success
|
|
58
58
|
check_rvmrc
|
|
59
59
|
else
|
data/lib/rconf/version.rb
CHANGED
|
@@ -28,8 +28,8 @@ describe RightConf::RubyConfigurator do
|
|
|
28
28
|
|
|
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
|
-
should_execute('rvm', '
|
|
32
|
-
should_execute('rvm', 'use', '0', Hash).once.and_return(success_result('Using '))
|
|
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
33
|
should_execute('rvm', '0@', 'gem', '--version').once.and_return(success_result('1'))
|
|
34
34
|
@configurator.run_linux
|
|
35
35
|
end
|
|
@@ -49,8 +49,8 @@ describe RightConf::RubyConfigurator do
|
|
|
49
49
|
|
|
50
50
|
it 'should install rubygems if needed' do
|
|
51
51
|
should_execute('rvm', '--version').once.and_return(success_result("rvm #{RVM_VERSION}"))
|
|
52
|
-
should_execute('rvm', '
|
|
53
|
-
should_execute('rvm', 'use', '0', Hash).once.and_return(success_result('Using '))
|
|
52
|
+
should_execute('rvm', 'current').once.and_return(success_result("0@"))
|
|
53
|
+
#should_execute('rvm', 'use', '0', Hash).once.and_return(success_result('Using '))
|
|
54
54
|
should_execute('rvm', '0@', 'gem', '--version').once.and_return(success_result('0'))
|
|
55
55
|
should_execute('rvm', '0@', 'rubygems', '1',
|
|
56
56
|
{:abort_on_failure=>'Failed to install rubygems'}).once.and_return(success_result)
|
metadata
CHANGED
|
@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
|
|
|
5
5
|
segments:
|
|
6
6
|
- 0
|
|
7
7
|
- 9
|
|
8
|
-
-
|
|
8
|
+
- 7
|
|
9
9
|
segments_generated: true
|
|
10
|
-
version: 0.9.
|
|
10
|
+
version: 0.9.7
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Raphael Simon
|
|
@@ -15,7 +15,7 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2012-02-
|
|
18
|
+
date: 2012-02-05 00:00:00 -08:00
|
|
19
19
|
default_executable:
|
|
20
20
|
dependencies:
|
|
21
21
|
- !ruby/object:Gem::Dependency
|