rvm 0.1.29 → 0.1.30
Sign up to get free protection for your applications and to get access to all the features.
- data/binscripts/rvm +1 -1
- data/config/db +4 -3
- data/config/md5 +7 -8
- data/help/rake +14 -0
- data/help/ruby +84 -0
- data/install +2 -2
- data/lib/VERSION.yml +1 -1
- data/rvm.gemspec +2 -2
- data/scripts/cli +2 -2
- data/scripts/gemsets +6 -0
- data/scripts/install +2 -2
- data/scripts/manage +9 -9
- data/scripts/notes +3 -0
- data/scripts/rvm-install +2 -2
- data/scripts/selector +2 -2
- data/scripts/update +2 -2
- data/scripts/utility +5 -5
- metadata +7 -4
data/binscripts/rvm
CHANGED
data/config/db
CHANGED
@@ -8,9 +8,10 @@ rubygems_version=1.3.6
|
|
8
8
|
rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
|
9
9
|
rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
|
10
10
|
rbx_version=1.0.0
|
11
|
-
rbx_patch_level=
|
11
|
+
rbx_patch_level=rc5
|
12
12
|
rbx_1.0.0_rc3_url=http://asset.rubini.us/rubinius-1.0.0-rc3-20100216.tar.gz
|
13
13
|
rbx_1.0.0_rc4_url=http://asset.rubini.us/rubinius-1.0.0-rc4-20100331.tar.gz
|
14
|
+
rbx_1.0.0_rc5_url=http://asset.rubini.us/rubinius-1.0.0-rc5-20100510.tar.gz
|
14
15
|
ree_version=1.8.7
|
15
16
|
ree_1.8.6_patch_level=20090610
|
16
17
|
ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677
|
@@ -23,14 +24,14 @@ ruby_1.9.2_patch_level=preview1
|
|
23
24
|
ruby_1.8.5_patch_level=231
|
24
25
|
ruby_1.8.6_patch_level=399
|
25
26
|
ruby_1.8.7_patch_level=249
|
26
|
-
jruby_version=1.5.0
|
27
|
+
jruby_version=1.5.0
|
27
28
|
jruby_repo_url=git://github.com/jruby/jruby.git
|
28
29
|
jruby_url=http://jruby.org.s3.amazonaws.com/downloads
|
29
30
|
macruby_version=0.6
|
30
31
|
macruby_url=http://www.macruby.org/files
|
31
32
|
macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
|
32
33
|
macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg
|
33
|
-
maglev_version=
|
34
|
+
maglev_version=23464
|
34
35
|
maglev_url=http://glass-downloads.gemstone.com/maglev
|
35
36
|
maglev_repo_url=git://github.com/MagLev/maglev.git
|
36
37
|
rubinius_repo_url=git://github.com/evanphx/rubinius.git
|
data/config/md5
CHANGED
@@ -1,5 +1,6 @@
|
|
1
1
|
rubinius-1.0.0-rc1-20091125.tar.gz=c1cf037f05caf1bc962c09e220b435f4
|
2
2
|
rubinius-1.0.0-rc4-20100331.tar.gz=c631131cc9542c548b4fc3791d8aa6b2
|
3
|
+
rubinius-1.0.0-rc5-20100510.tar.gz=d4fbb5b01aaeee3948cbe1cd38236524
|
3
4
|
ruby-1.8.5-p115.tar.gz=20ca6cc87eb077296806412feaac0356
|
4
5
|
ruby-1.8.5-p231.tar.gz=e900cf225d55414bffe878f00a85807c
|
5
6
|
ruby-1.8.6-p286.tar.gz=797ea136fe43e4286c9362ee4516674e
|
@@ -27,6 +28,8 @@ MacRuby%200.6.zip=a80afd3700c88cf95c539fc63b272faf
|
|
27
28
|
jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
|
28
29
|
jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7
|
29
30
|
jruby-bin-1.5.0.RC1.tar.gz=47b4ca2a21659d36a2775ade0a2534c4
|
31
|
+
jruby-bin-1.5.0.RC3.tar.gz=9c2758600de903b8ca07cb1341f4f1b3
|
32
|
+
jruby-bin-1.5.0.tar.gz=ee2b4e326e8b87858e5dd0c8e94102e6
|
30
33
|
libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
|
31
34
|
ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
|
32
35
|
openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3
|
@@ -37,11 +40,7 @@ curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
|
|
37
40
|
pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
|
38
41
|
rubygems-1.3.6.tgz=789ca8e9ad1d4d3fe5f0534fcc038a0d
|
39
42
|
ironruby-1.0.zip=7a92888837b3507355ed391dbfc0ab83
|
40
|
-
GemStone-
|
41
|
-
GemStone-
|
42
|
-
MagLev-
|
43
|
-
MagLev-
|
44
|
-
GemStone-23400.Darwin-i386.tar.gz=0ae86a5c26577965b960c14efe328aaf
|
45
|
-
GemStone-23400.Linux-x86_64.tar.gz=6286c3955ce0c0d4829be99e8009cb52
|
46
|
-
MagLev-23400.Darwin-i386.tar.gz=ea16e4e8dc1f43b9c02f3d7dc3f8ce8f
|
47
|
-
MagLev-23400.Linux-x86_64.tar.gz=9119b79aa354e7eed49f1d53658a68be
|
43
|
+
GemStone-23464.Darwin-i386.tar.gz=9e5d393d3daecad39404644b5384fec0
|
44
|
+
GemStone-23464.Linux-x86_64.tar.gz=93947d3b8dd651cf8b61753c2387cd19
|
45
|
+
MagLev-23464.Darwin-i386.tar.gz=0e10217c4a881b9e4f1fac3e969d0439
|
46
|
+
MagLev-23464.Linux-x86_64.tar.gz=bfdc0eab81d467e869b0ec837a44b047
|
data/help/rake
CHANGED
@@ -0,0 +1,14 @@
|
|
1
|
+
Rake
|
2
|
+
|
3
|
+
RVM allows you to run rake tasks across multiple ruby versions, for example:
|
4
|
+
|
5
|
+
∴ rvm 1.8.6,1.9.1 rake spec
|
6
|
+
|
7
|
+
JSON Summary
|
8
|
+
|
9
|
+
Adding a --json flag prior to the word 'rake' and a JSON summary will be printed out at the end of the run.
|
10
|
+
|
11
|
+
YAML Summary
|
12
|
+
|
13
|
+
Adding a --yaml flag prior to the word 'rake' and a YAML summary will be printed out at the end of the run.
|
14
|
+
|
data/help/ruby
CHANGED
@@ -0,0 +1,84 @@
|
|
1
|
+
'rvm ruby'
|
2
|
+
|
3
|
+
Given:
|
4
|
+
|
5
|
+
∴ cat test.rb
|
6
|
+
puts "patchlevel: #{RUBY_PATCHLEVEL}, release_date: #{RUBY_RELEASE_DATE}, ruby_version: #{RUBY_VERSION}, ruby_platform: #{RUBY_PLATFORM}"
|
7
|
+
|
8
|
+
∴ rvm list
|
9
|
+
|
10
|
+
ruby:
|
11
|
+
|
12
|
+
ruby-1.8.6-p383 [x86_64]
|
13
|
+
ruby-1.8.7-p174 [x86_64]
|
14
|
+
ruby-1.9.1-head [x86_64]
|
15
|
+
=> ruby-1.9.1-p243 [x86_64]
|
16
|
+
ruby-1.9.2-preview1 [x86_64]
|
17
|
+
|
18
|
+
jruby:
|
19
|
+
|
20
|
+
jruby-1.3.1 [x86_64]
|
21
|
+
jruby-1.4.0RC3 [x86_64]
|
22
|
+
|
23
|
+
ree:
|
24
|
+
|
25
|
+
ree-1.8.6-20090610 [x86_64]
|
26
|
+
ree-1.8.7-20090928 [x86_64]
|
27
|
+
|
28
|
+
|
29
|
+
We can run the ruby program 'test.rb' against all versions of ruby installed by RVM very simply:
|
30
|
+
|
31
|
+
∴ rvm ruby test.rb
|
32
|
+
|
33
|
+
jruby-1.3.1: jruby 1.3.1 (ruby 1.8.6p287) (2009-06-15 2fd6c3d) (Java HotSpot(TM) 64-Bit Server VM 1.6.0_15) [x86_64-java]
|
34
|
+
|
35
|
+
patchlevel: 287, release_date: 2009-06-15, ruby_version: 1.8.6, ruby_platform: java
|
36
|
+
|
37
|
+
|
38
|
+
jruby-1.4.0RC3: jruby 1.4.0RC3 (ruby 1.8.7 patchlevel 174) (2009-09-30 80c263b) (Java HotSpot(TM) 64-Bit Server VM 1.6.0_15) [x86_64-java]
|
39
|
+
|
40
|
+
patchlevel: 174, release_date: 2009-09-30, ruby_version: 1.8.7, ruby_platform: java
|
41
|
+
|
42
|
+
|
43
|
+
ree-1.8.6-20090610: ruby 1.8.6 (2008-08-11 patchlevel 287) [i686-darwin10.0.0] Ruby Enterprise Edition 20090610
|
44
|
+
|
45
|
+
patchlevel: 287, release_date: 2008-08-11, ruby_version: 1.8.6, ruby_platform: i686-darwin10.0.0
|
46
|
+
|
47
|
+
|
48
|
+
ree-1.8.7-20090928: ruby 1.8.7 (2009-06-12 patchlevel 174) [i686-darwin10.0.0], MBARI 0x6770, Ruby Enterprise Edition 20090928
|
49
|
+
|
50
|
+
patchlevel: 174, release_date: 2009-06-12, ruby_version: 1.8.7, ruby_platform: i686-darwin10.0.0
|
51
|
+
|
52
|
+
|
53
|
+
ruby-1.8.6-p383: ruby 1.8.6 (2009-08-04 patchlevel 383) [i686-darwin10.0.0]
|
54
|
+
|
55
|
+
patchlevel: 383, release_date: 2009-08-04, ruby_version: 1.8.6, ruby_platform: i686-darwin10.0.0
|
56
|
+
|
57
|
+
|
58
|
+
ruby-1.8.7-p174: ruby 1.8.7 (2009-06-12 patchlevel 174) [i686-darwin10.0.0]
|
59
|
+
|
60
|
+
patchlevel: 174, release_date: 2009-06-12, ruby_version: 1.8.7, ruby_platform: i686-darwin10.0.0
|
61
|
+
|
62
|
+
|
63
|
+
ruby-1.9.1-head: ruby 1.9.2dev (2009-09-26 trunk 25103) [x86_64-darwin10.0.0]
|
64
|
+
|
65
|
+
patchlevel: -1, release_date: 2009-09-26, ruby_version: 1.9.2, ruby_platform: x86_64-darwin10.0.0
|
66
|
+
|
67
|
+
|
68
|
+
ruby-1.9.1-p243: ruby 1.9.1p243 (2009-07-16 revision 24175) [i386-darwin10.0.0]
|
69
|
+
|
70
|
+
patchlevel: 243, release_date: 2009-07-16, ruby_version: 1.9.1, ruby_platform: i386-darwin10.0.0
|
71
|
+
|
72
|
+
|
73
|
+
ruby-1.9.2-preview1: ruby 1.9.2dev (2009-07-18 trunk 24186) [i386-darwin10.0.0]
|
74
|
+
|
75
|
+
patchlevel: -1, release_date: 2009-07-18, ruby_version: 1.9.2, ruby_platform: i386-darwin10.0.0
|
76
|
+
|
77
|
+
ree-1.8.7-20090928: ruby 1.8.7 (2009-06-12 patchlevel 174) [i686-darwin10.0.0], MBARI 0x6770, Ruby Enterprise Edition 20090928
|
78
|
+
|
79
|
+
patchlevel: 174, release_date: 2009-06-12, ruby_version: 1.8.7, ruby_platform: i686-darwin10.0.0
|
80
|
+
|
81
|
+
If we want we can also restrict the above to a subset of named top level selections:
|
82
|
+
|
83
|
+
∴ rvm 1.9.1,1.8.7,jruby test.rb
|
84
|
+
...
|
data/install
CHANGED
@@ -281,8 +281,8 @@ else
|
|
281
281
|
fi
|
282
282
|
if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
|
283
283
|
echo -e "\n\nWARNING: you have a 'return' statement in your .bashrc, likely this will cause untold havoc.
|
284
|
-
This means that if you see '[ -z "
|
285
|
-
if [[
|
284
|
+
This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:
|
285
|
+
if [[ -n "\$PS1" ]] ; then
|
286
286
|
... original content that was below the && return line ...
|
287
287
|
fi # <= be sure to close the if.
|
288
288
|
#EOF .bashrc
|
data/lib/VERSION.yml
CHANGED
data/rvm.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{rvm}
|
8
|
-
s.version = "0.1.
|
8
|
+
s.version = "0.1.30"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Wayne E. Seguin"]
|
12
|
-
s.date = %q{2010-05-
|
12
|
+
s.date = %q{2010-05-12}
|
13
13
|
s.default_executable = %q{rvm-install}
|
14
14
|
s.description = %q{Manages Ruby Environments.}
|
15
15
|
s.email = %q{wayneeseguin@gmail.com}
|
data/scripts/cli
CHANGED
@@ -188,7 +188,7 @@ __rvm_parse_args() {
|
|
188
188
|
|
189
189
|
--ree-options)
|
190
190
|
if [[ ! -z "$1" ]] ; then
|
191
|
-
rvm_ree_options="$(echo $1 | tr ',' ' ')" ; shift
|
191
|
+
export rvm_ree_options="$(echo $1 | tr ',' ' ')" ; shift
|
192
192
|
else
|
193
193
|
rvm_action="error"
|
194
194
|
rvm_error_message="--ree-options *must* be followed by... well... options."
|
@@ -389,7 +389,7 @@ rvm() {
|
|
389
389
|
__rvm_load_rvmrc
|
390
390
|
__rvm_initialize
|
391
391
|
__rvm_load_defaults
|
392
|
-
__rvm_parse_args $@
|
392
|
+
__rvm_parse_args "$@"
|
393
393
|
|
394
394
|
export BUNDLE_PATH GEM_HOME GEM_PATH rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_ruby_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_patch rvm_ruby_patch_name rvm_ruby_string rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag
|
395
395
|
export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_symlink_path
|
data/scripts/gemsets
CHANGED
@@ -309,6 +309,10 @@ __rvm_gemset_gemdir() {
|
|
309
309
|
fi
|
310
310
|
}
|
311
311
|
|
312
|
+
__rvm_gem_pristine() {
|
313
|
+
gem pristine --all
|
314
|
+
}
|
315
|
+
|
312
316
|
unset GEM_PATH
|
313
317
|
|
314
318
|
if ! command -v gem > /dev/null ; then
|
@@ -342,6 +346,8 @@ elif [[ "gemdir" = "$action" ]] ; then
|
|
342
346
|
__rvm_gemset_gemdir
|
343
347
|
elif [[ "install" = "$action" ]] ; then
|
344
348
|
__rvm_gem_install $*
|
349
|
+
elif [[ "pristine" = "$action" ]] ; then
|
350
|
+
__rvm_gem_pristine $*
|
345
351
|
elif [[ "clear" = "$action" ]] ; then
|
346
352
|
$rvm_scripts_path/log "info" "gemset cleared."
|
347
353
|
exit 0
|
data/scripts/install
CHANGED
@@ -281,8 +281,8 @@ else
|
|
281
281
|
fi
|
282
282
|
if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
|
283
283
|
echo -e "\n\nWARNING: you have a 'return' statement in your .bashrc, likely this will cause untold havoc.
|
284
|
-
This means that if you see '[ -z "
|
285
|
-
if [[
|
284
|
+
This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:
|
285
|
+
if [[ -n "\$PS1" ]] ; then
|
286
286
|
... original content that was below the && return line ...
|
287
287
|
fi # <= be sure to close the if.
|
288
288
|
#EOF .bashrc
|
data/scripts/manage
CHANGED
@@ -164,7 +164,7 @@ __rvm_install_ruby() {
|
|
164
164
|
export GEM_HOME="$rvm_ruby_gem_home"
|
165
165
|
export GEM_PATH="$rvm_ruby_gem_path"
|
166
166
|
export MY_RUBY_HOME="$rvm_ruby_home"
|
167
|
-
export PATH="$
|
167
|
+
export PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:\$PATH"
|
168
168
|
|
169
169
|
exec $macruby_path/mac$binary_name $prefix "\$@"
|
170
170
|
RubyWrapper
|
@@ -220,8 +220,7 @@ RubyWrapper
|
|
220
220
|
rvm_ree_options="${rvm_ree_options} --no-tcmalloc"
|
221
221
|
fi
|
222
222
|
|
223
|
-
|
224
|
-
__rvm_run "install" "./installer -a $rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options --dont-install-useful-gems $rvm_ruby_configure_flags --no-dev-docs" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
|
223
|
+
__rvm_run "install" "./installer -a $rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options --dont-install-useful-gems $rvm_ruby_configure_flags" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
|
225
224
|
result=$? ; if [[ "$result" -gt 0 ]] ; then
|
226
225
|
$rvm_scripts_path/log "error" "There has been an error while trying to run the ree installer. Aborting the installation." ; __rvm_pushpop ; return $result
|
227
226
|
fi
|
@@ -302,7 +301,7 @@ RubyWrapper
|
|
302
301
|
#fi
|
303
302
|
|
304
303
|
builtin cd "$rvm_ruby_src_path" ; chmod +x ./configure
|
305
|
-
rvm_ruby_configure="./configure --prefix=$rvm_ruby_home" ; message="Configuring rbx"
|
304
|
+
rvm_ruby_configure="./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags" ; message="Configuring rbx"
|
306
305
|
if [[ "$rvm_llvm_flag" = "0" ]] ; then
|
307
306
|
rvm_ruby_configure="$rvm_ruby_configure --disable-llvm"
|
308
307
|
else
|
@@ -563,7 +562,7 @@ RubyWrapper
|
|
563
562
|
chmod +x $rvm_ruby_home/bin/ir
|
564
563
|
ln -fs $rvm_ruby_home/bin/ir $rvm_ruby_home/bin/ruby
|
565
564
|
|
566
|
-
__rvm_run "gems.install" "PATH=$rvm_ruby_home/bin:$PATH GEM_HOME=$rvm_ruby_gem_home GEM_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/gem install --no-rdoc --no-ri rake $rvm_gem_options" "Installing $rvm_gem_name to $dir"
|
565
|
+
__rvm_run "gems.install" "PATH=$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:$PATH GEM_HOME=$rvm_ruby_gem_home GEM_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/gem install --no-rdoc --no-ri rake $rvm_gem_options" "Installing $rvm_gem_name to $dir"
|
567
566
|
|
568
567
|
binaries=() # Don't wrap any longer.
|
569
568
|
for binary_name in ${binaries[@]} ; do
|
@@ -578,7 +577,7 @@ export GEM_HOME="$rvm_ruby_gem_home"
|
|
578
577
|
export GEM_PATH="$rvm_ruby_gem_path"
|
579
578
|
export BUNDLE_PATH="$rvm_ruby_gem_home"
|
580
579
|
export MY_RUBY_HOME="$rvm_ruby_home"
|
581
|
-
export PATH="$
|
580
|
+
export PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:\$PATH"
|
582
581
|
|
583
582
|
exec mono $rvm_ruby_home/bin/ir.exe $binary_path "\$@"
|
584
583
|
RubyWrapper
|
@@ -759,7 +758,7 @@ __rvm_fetch_ruby() {
|
|
759
758
|
elif [[ -z "$rvm_ruby_version" ]] && [[ ! -z "$rvm_head_flag" ]] ; then
|
760
759
|
rvm_url="${rvm_url:-"$rvm_ruby_repo_url/trunk"}"
|
761
760
|
elif [[ "$rvm_major_version" = "9" ]] ; then
|
762
|
-
if [[ -z "$rvm_minor_version" ]] || [[ "$rvm_minor_version" =
|
761
|
+
if [[ -z "$rvm_minor_version" ]] || [[ "$rvm_minor_version" = 3 ]] ; then
|
763
762
|
rvm_url="${rvm_url:-"$rvm_ruby_repo_url/trunk"}"
|
764
763
|
else
|
765
764
|
rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}"}"
|
@@ -778,6 +777,7 @@ __rvm_fetch_ruby() {
|
|
778
777
|
if [[ -d "$rvm_ruby_src_path/.svn" ]] ; then
|
779
778
|
builtin cd $rvm_ruby_src_path
|
780
779
|
$rvm_scripts_path/log "info" "Updating ruby from $rvm_url"
|
780
|
+
__rvm_run "svn.switch" "svn switch $rvm_url"
|
781
781
|
__rvm_run "svn.update" "svn update"
|
782
782
|
if [[ ! -z "$rvm_rev" ]] ; then
|
783
783
|
$rvm_scripts_path/log "info" "Checking out revision ${rvm_rev/-r/-r } from $rvm_url"
|
@@ -998,9 +998,9 @@ __rvm_inject_gem_env() {
|
|
998
998
|
__rvm_actual_file $1
|
999
999
|
if [[ -f "$actual_file" ]] ; then
|
1000
1000
|
if [[ ! -z "$(head -n 1 $actual_file | awk '/[j]*ruby/')" ]] ; then
|
1001
|
-
string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_ruby_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_ruby_gem_path'\nENV['PATH']='$
|
1001
|
+
string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_ruby_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_ruby_gem_path'\nENV['PATH']='$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:' + ENV['PATH']\nENV['BUNDLE_PATH']=ENV['BUNDLE_PATH'] || '$rvm_ruby_gem_home'\n"
|
1002
1002
|
elif [[ ! -z "$(head -n 1 $actual_file | awk '/bash/')" ]] ; then
|
1003
|
-
string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_path'}\nPATH=$
|
1003
|
+
string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_path'}\nPATH=$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:\$PATH\nBUNDLE_PATH=\${BUNDLE_PATH:-'$rvm_ruby_gem_home'}\n"
|
1004
1004
|
fi
|
1005
1005
|
if [[ ! -z "$string" ]] ; then
|
1006
1006
|
awk "NR==2 {print \"$string\"} {print}" "$actual_file" > "$actual_file.new"
|
data/scripts/notes
CHANGED
@@ -34,6 +34,9 @@ if [[ "Linux" = "$system" ]] ; then
|
|
34
34
|
echo -e "\n $ emerge dev-lang/mono"
|
35
35
|
|
36
36
|
elif [[ ! -z "$rvm_pacman_binary" ]] ; then
|
37
|
+
echo -e " $item For MRI based rubies you will need:"
|
38
|
+
echo -e "\n $ pacman -Sy autoconf diffutils patch curl bison zlib readline libxml2 git"
|
39
|
+
|
37
40
|
echo -e " $item For JRuby (if you wish to use it) you will need:"
|
38
41
|
echo -e "\n $ pacman -Sy jdk jre curl"
|
39
42
|
|
data/scripts/rvm-install
CHANGED
@@ -281,8 +281,8 @@ else
|
|
281
281
|
fi
|
282
282
|
if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
|
283
283
|
echo -e "\n\nWARNING: you have a 'return' statement in your .bashrc, likely this will cause untold havoc.
|
284
|
-
This means that if you see '[ -z "
|
285
|
-
if [[
|
284
|
+
This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:
|
285
|
+
if [[ -n "\$PS1" ]] ; then
|
286
286
|
... original content that was below the && return line ...
|
287
287
|
fi # <= be sure to close the if.
|
288
288
|
#EOF .bashrc
|
data/scripts/selector
CHANGED
@@ -301,7 +301,7 @@ __rvm_use() {
|
|
301
301
|
fi
|
302
302
|
|
303
303
|
new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
|
304
|
-
new_path="$
|
304
|
+
new_path="$GEM_HOME/bin:$rvm_ruby_global_gems_path/bin:$MY_RUBY_HOME/bin:$rvm_bin_path:$new_path"
|
305
305
|
fi
|
306
306
|
|
307
307
|
if [[ ! -z "$rvm_default_flag" ]] && [[ "default" != "$rvm_ruby_interpreter" ]] ; then
|
@@ -321,7 +321,7 @@ __rvm_use() {
|
|
321
321
|
RUBY_VERSION="$($rvm_ruby_home/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
|
322
322
|
export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
|
323
323
|
|
324
|
-
echo "export PATH=\"$
|
324
|
+
echo "export PATH=\"$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:$rvm_bin_path:\$PATH\"" > $rvm_config_path/default
|
325
325
|
|
326
326
|
for variable in RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gemset_name MAGLEV_HOME ; do
|
327
327
|
eval "export $variable"
|
data/scripts/update
CHANGED
@@ -281,8 +281,8 @@ else
|
|
281
281
|
fi
|
282
282
|
if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
|
283
283
|
echo -e "\n\nWARNING: you have a 'return' statement in your .bashrc, likely this will cause untold havoc.
|
284
|
-
This means that if you see '[ -z "
|
285
|
-
if [[
|
284
|
+
This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:
|
285
|
+
if [[ -n "\$PS1" ]] ; then
|
286
286
|
... original content that was below the && return line ...
|
287
287
|
fi # <= be sure to close the if.
|
288
288
|
#EOF .bashrc
|
data/scripts/utility
CHANGED
@@ -262,7 +262,7 @@ export GEM_HOME="$rvm_ruby_gem_home"
|
|
262
262
|
export GEM_PATH="$rvm_ruby_gem_path"
|
263
263
|
export BUNDLE_PATH="$rvm_ruby_gem_home"
|
264
264
|
export MY_RUBY_HOME="$rvm_ruby_home"
|
265
|
-
export PATH="$
|
265
|
+
export PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:$rvm_bin_path:\$PATH"
|
266
266
|
|
267
267
|
exec "$rvm_ruby_binary" "\$@"
|
268
268
|
RubyWrapper
|
@@ -419,11 +419,11 @@ __rvm_list_known() {
|
|
419
419
|
echo "${prefix}-t${tag/\//}"
|
420
420
|
unset prefix tag
|
421
421
|
done < <(svn list http://svn.ruby-lang.org/repos/ruby/tags/ | awk '/^v1_[8|9]/')
|
422
|
-
echo -e "(ruby-)1.8.6(-p399)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-
|
423
|
-
echo -e "jruby-1.2.0\njruby-1.3.1\njruby
|
424
|
-
echo -e "rbx(-
|
422
|
+
echo -e "(ruby-)1.8.6(-p399)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p249)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1(-p376)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1\nruby-head\n"
|
423
|
+
echo -e "jruby-1.2.0\njruby-1.3.1\njruby-1.4.0\njruby(-1.5.0) # the default\njruby-head"
|
424
|
+
echo -e "rbx(-prc5) # default\nrbx-head"
|
425
425
|
echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
|
426
|
-
echo -e "maglev(-
|
426
|
+
echo -e "maglev(-23464)\nmaglev-head"
|
427
427
|
echo -e "mput(-head) # shyouhei head, the default mput"
|
428
428
|
echo -e "ironruby-0.9.3\nironruby-1.0-rc2\nironruby-head"
|
429
429
|
if [[ "Darwin" = "$(uname)" ]] ; then
|
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 0
|
7
7
|
- 1
|
8
|
-
-
|
9
|
-
version: 0.1.
|
8
|
+
- 30
|
9
|
+
version: 0.1.30
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Wayne E. Seguin
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2010-05-
|
17
|
+
date: 2010-05-12 00:00:00 -04:00
|
18
18
|
default_executable: rvm-install
|
19
19
|
dependencies: []
|
20
20
|
|
@@ -101,6 +101,7 @@ files:
|
|
101
101
|
- help/uninstall
|
102
102
|
- help/update
|
103
103
|
- help/use
|
104
|
+
- bin/rvm-install
|
104
105
|
has_rdoc: true
|
105
106
|
homepage: http://github.com/wayneeseguin/rvm
|
106
107
|
licenses: []
|
@@ -122,6 +123,7 @@ rdoc_options:
|
|
122
123
|
require_paths:
|
123
124
|
- lib
|
124
125
|
required_ruby_version: !ruby/object:Gem::Requirement
|
126
|
+
none: false
|
125
127
|
requirements:
|
126
128
|
- - ">="
|
127
129
|
- !ruby/object:Gem::Version
|
@@ -129,6 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
129
131
|
- 0
|
130
132
|
version: "0"
|
131
133
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
134
|
+
none: false
|
132
135
|
requirements:
|
133
136
|
- - ">="
|
134
137
|
- !ruby/object:Gem::Version
|
@@ -138,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
138
141
|
requirements: []
|
139
142
|
|
140
143
|
rubyforge_project: rvm
|
141
|
-
rubygems_version: 1.3.
|
144
|
+
rubygems_version: 1.3.7
|
142
145
|
signing_key:
|
143
146
|
specification_version: 3
|
144
147
|
summary: Ruby Version Manager (rvm)
|