rvm 1.0.14 → 1.0.15
Sign up to get free protection for your applications and to get access to all the features.
- data/binscripts/rvm-prompt +10 -6
- data/config/db +4 -4
- data/config/known +2 -2
- data/config/md5 +5 -4
- data/install +6 -4
- data/lib/VERSION.yml +1 -1
- data/rvm.gemspec +2 -2
- data/scripts/cli +6 -2
- data/scripts/gemsets +86 -11
- data/scripts/install +6 -4
- data/scripts/irbrc.rb +1 -1
- data/scripts/notes +4 -4
- data/scripts/package +2 -1
- data/scripts/rvm +3 -0
- data/scripts/rvm-install +6 -4
- data/scripts/selector +21 -7
- data/scripts/update +6 -4
- metadata +4 -4
data/binscripts/rvm-prompt
CHANGED
@@ -72,15 +72,19 @@ if [[ -n "$ruby" && -n "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
|
|
72
72
|
|
73
73
|
ruby_string=$(dirname "$ruby" | xargs dirname | xargs basename)
|
74
74
|
|
75
|
-
|
75
|
+
if [[ -n "$no_default" ]]; then
|
76
76
|
|
77
|
-
|
77
|
+
# Do not display anything if no default flag was provided
|
78
|
+
# and we are using the default ruby
|
78
79
|
|
79
|
-
|
80
|
-
|
81
|
-
if [[ -n "$no_default" && "$identifier" = "$default_alias" ]]; then
|
80
|
+
# Only people who explicitely ask for this will have the
|
81
|
+
# slight performance penalty associated.
|
82
82
|
|
83
|
-
|
83
|
+
if [[ "$(rvm tools identifier)" = "$(rvm alias show default)" ]] ; then
|
84
|
+
|
85
|
+
exit 0
|
86
|
+
|
87
|
+
fi
|
84
88
|
|
85
89
|
fi
|
86
90
|
|
data/config/db
CHANGED
@@ -25,7 +25,7 @@ ruby_1.8.7_patch_level=302
|
|
25
25
|
rubygems_version=1.3.7
|
26
26
|
rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
|
27
27
|
rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
|
28
|
-
rubygems_1.3.7_url=http://
|
28
|
+
rubygems_1.3.7_url=http://rvm.beginrescueend.com/src/
|
29
29
|
rbx_version=1.1.0
|
30
30
|
rbx_1.0.0_patch_level=20100514
|
31
31
|
rbx_1.0.1_patch_level=20100603
|
@@ -38,17 +38,17 @@ ree_configure_flags=--dont-install-useful-gems
|
|
38
38
|
ree_1.8.6_patch_level=20090610
|
39
39
|
ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677
|
40
40
|
ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
|
41
|
-
ree_1.8.7_url=http://
|
41
|
+
ree_1.8.7_url=http://rvm.beginrescueend.com/src/
|
42
42
|
ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
|
43
43
|
ree_1.8.7_patch_level=2010.02
|
44
44
|
jruby_version=1.5.3
|
45
45
|
jruby_repo_url=git://github.com/jruby/jruby.git
|
46
46
|
jruby_url=http://jruby.org.s3.amazonaws.com/downloads
|
47
|
-
macruby_version=0.7
|
47
|
+
macruby_version=0.7.1
|
48
48
|
macruby_url=http://www.macruby.org/files
|
49
49
|
macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
|
50
50
|
macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg
|
51
|
-
maglev_version=
|
51
|
+
maglev_version=24407
|
52
52
|
maglev_url=http://glass-downloads.gemstone.com/maglev
|
53
53
|
maglev_repo_url=git://github.com/MagLev/maglev.git
|
54
54
|
shyouhei_repo_url=git://github.com/shyouhei/ruby.git
|
data/config/known
CHANGED
@@ -36,7 +36,7 @@ ree-1.8.6-head
|
|
36
36
|
ree-1.8.7-head
|
37
37
|
|
38
38
|
# MagLev
|
39
|
-
maglev[-
|
39
|
+
maglev[-24407]
|
40
40
|
maglev-head
|
41
41
|
|
42
42
|
# Shyouhei head, the default mput
|
@@ -44,7 +44,7 @@ mput[-head]
|
|
44
44
|
|
45
45
|
# Mac OS X Snow Leopard Only
|
46
46
|
macruby-0.6
|
47
|
-
macruby-[0.7] # the default macruby
|
47
|
+
macruby-[0.7.1] # the default macruby
|
48
48
|
macruby-nightly
|
49
49
|
macruby-head # Build from the macruby git repository
|
50
50
|
|
data/config/md5
CHANGED
@@ -64,6 +64,7 @@ rubygems-1.3.7.tgz=e85cfadd025ff6ab689375adbf344bbe
|
|
64
64
|
MacRuby%200.5.zip=675454a8c7bc19d606d90a726e08427c
|
65
65
|
MacRuby%200.6.zip=a80afd3700c88cf95c539fc63b272faf
|
66
66
|
MacRuby%200.7.zip=0bb60588c9ec9b1517665743bb05132f
|
67
|
+
MacRuby%200.7.1.zip=e8245dcd03c0757dfae7e6fee913947a
|
67
68
|
jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
|
68
69
|
jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7
|
69
70
|
jruby-bin-1.5.0.RC1.tar.gz=47b4ca2a21659d36a2775ade0a2534c4
|
@@ -81,7 +82,7 @@ zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
|
|
81
82
|
curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
|
82
83
|
pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
|
83
84
|
ironruby-1.0.zip=7a92888837b3507355ed391dbfc0ab83
|
84
|
-
GemStone-
|
85
|
-
GemStone-
|
86
|
-
MagLev-
|
87
|
-
MagLev-
|
85
|
+
GemStone-24407.Darwin-i386.tar.gz=2f293e1927b8a1c5a060fe174f7ec614
|
86
|
+
GemStone-24407.Linux-x86_64.tar.gz=aa4436623199dba79eb5bc8652316b07
|
87
|
+
MagLev-24407.Darwin-i386.tar.gz=4aa0a3c35c63c876c8f786691a20dcb5
|
88
|
+
MagLev-24407.Linux-x86_64.tar.gz=ab6928f5a39231efb86253e8b8e00134
|
data/install
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
#!/usr/bin/env bash
|
2
2
|
|
3
3
|
set -o errtrace
|
4
|
-
set -o errexit
|
5
4
|
|
6
5
|
export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
|
7
6
|
|
@@ -170,6 +169,9 @@ Upgrade Notes
|
|
170
169
|
|
171
170
|
* If you wish to have the 'pretty colors' again, set in ~/.rvmrc:
|
172
171
|
export rvm_pretty_print_flag=1
|
172
|
+
|
173
|
+
* If you see the following error message: Unknown alias name: 'default'
|
174
|
+
re-set your default ruby, this is due to a change in how default works.
|
173
175
|
"
|
174
176
|
}
|
175
177
|
|
@@ -342,9 +344,9 @@ for file in "${files[@]}" ; do
|
|
342
344
|
|
343
345
|
cp -f "$source_path/binscripts/$file" "${rvm_bin_path:-"$rvm_path/bin"}/"
|
344
346
|
|
345
|
-
|
347
|
+
chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
|
346
348
|
|
347
|
-
|
349
|
+
done
|
348
350
|
|
349
351
|
#
|
350
352
|
# RC Files
|
@@ -564,7 +566,7 @@ for file in "${files[@]}" ; do
|
|
564
566
|
|
565
567
|
done
|
566
568
|
|
567
|
-
printf "\n Copying manpages into place
|
569
|
+
printf "\n Copying manpages into place.\n"
|
568
570
|
|
569
571
|
files=($(builtin cd "$install_source_path/man" ; \
|
570
572
|
find . -maxdepth 1 -mindepth 1 -type f -print))
|
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 = "1.0.
|
8
|
+
s.version = "1.0.15"
|
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-10-
|
12
|
+
s.date = %q{2010-10-19}
|
13
13
|
s.default_executable = %q{rvm-install}
|
14
14
|
s.description = %q{Manages Ruby interpreter environments and switching between them.}
|
15
15
|
s.email = %q{wayneeseguin@gmail.com}
|
data/scripts/cli
CHANGED
@@ -633,9 +633,13 @@ rvm()
|
|
633
633
|
|
634
634
|
__rvm_parse_args "$@"
|
635
635
|
|
636
|
-
|
636
|
+
result=$?
|
637
|
+
|
638
|
+
if [[ $result -gt 0 ]] ; then
|
639
|
+
return $result
|
640
|
+
fi
|
637
641
|
|
638
|
-
|
642
|
+
rvm_action="${rvm_action:-usage}"
|
639
643
|
|
640
644
|
export BUNDLE_PATH GEM_HOME GEM_PATH rvm_action rvm_archflags rvm_bin_flag rvm_bin_path rvm_clang_flag rvm_configure_flags rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_dump_environment_flag rvm_error_message rvm_file_name rvm_gemdir_flag rvm_gemset_name rvm_head_flag rvm_install_arguments rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_loaded_flag rvm_make_flags rvm_niceness rvm_only_path_flag rvm_parse_break rvm_patch_names rvm_patch_original_pwd rvm_pretty_print_flag rvm_prior_cc rvm_proxy rvm_quiet_flag rvm_ree_options rvm_reload_flag rvm_remove_flag rvm_ruby_alias rvm_ruby_aliases rvm_ruby_args rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_load_path rvm_ruby_make rvm_ruby_make_install rvm_ruby_patch_level rvm_ruby_repo_url rvm_ruby_require rvm_ruby_string rvm_ruby_strings rvm_ruby_version rvm_script_name rvm_sdk rvm_silent_flag rvm_system_flag rvm_token rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_wrapper_name
|
641
645
|
|
data/scripts/gemsets
CHANGED
@@ -15,7 +15,7 @@ usage()
|
|
15
15
|
|
16
16
|
Action:
|
17
17
|
|
18
|
-
{import,export,create,copy,empty,delete,name,dir,list,gemdir,install,pristine,clear,use,update,unpack,globalcache}
|
18
|
+
{import,export,create,copy,rename,empty,delete,name,dir,list,gemdir,install,pristine,clear,use,update,unpack,globalcache}
|
19
19
|
|
20
20
|
Description:
|
21
21
|
|
@@ -31,7 +31,11 @@ gemset_update()
|
|
31
31
|
|
32
32
|
"$rvm_path/scripts/log" "info" "Running gem update for all rubies and gemsets."
|
33
33
|
|
34
|
-
rvm_ruby_strings="$(
|
34
|
+
rvm_ruby_strings="$(
|
35
|
+
builtin cd "${rvm_gems_path:-"$rvm_path/gems"}" ;
|
36
|
+
find . -maxdepth 1 -mindepth 1 -type d -print 2>/dev/null \
|
37
|
+
| grep -v '^\(doc\|cache\|@\|system\)' | \tr '\n' ','
|
38
|
+
)"
|
35
39
|
|
36
40
|
rvm_ruby_strings="${rvm_ruby_strings/%,}"
|
37
41
|
|
@@ -76,13 +80,17 @@ gemset_globalcache()
|
|
76
80
|
"$rvm_path/scripts/log" "info" \
|
77
81
|
"Removing the global cache (note: this will empty the caches)"
|
78
82
|
|
79
|
-
directories=($(
|
83
|
+
directories=($(
|
84
|
+
builtin cd "${rvm_gems_path:-"$rvm_path/gems"}" ;
|
85
|
+
find . -maxdepth 1 -mindepth 1 -type d -print)
|
86
|
+
)
|
80
87
|
|
81
88
|
for directory_name in "${directories[@]//.\/}"; do
|
82
89
|
|
83
90
|
current_cache_path="${rvm_gems_path:-"$rvm_path/gems"}/$directory_name/cache"
|
84
91
|
|
85
|
-
if [[ -L "$current_cache_path"
|
92
|
+
if [[ -L "$current_cache_path" \
|
93
|
+
&& "$(readlink "$current_cache_path")" == "$rvm_gems_cache_path" ]]; then
|
86
94
|
|
87
95
|
"$rvm_path/scripts/log" "info" \
|
88
96
|
"Reverting the gem cache for $directory_name to an empty directory."
|
@@ -93,7 +101,8 @@ gemset_globalcache()
|
|
93
101
|
fi
|
94
102
|
done
|
95
103
|
|
96
|
-
"$rvm_path/scripts/db" "$rvm_path/config/user"
|
104
|
+
"$rvm_path/scripts/db" "$rvm_path/config/user" \
|
105
|
+
"use_gemset_globalcache" "delete"
|
97
106
|
|
98
107
|
elif [[ "$1" == "enable" ]]; then
|
99
108
|
|
@@ -102,7 +111,10 @@ gemset_globalcache()
|
|
102
111
|
|
103
112
|
mkdir -p "$rvm_gems_cache_path"
|
104
113
|
|
105
|
-
directories=($(
|
114
|
+
directories=($(
|
115
|
+
builtin cd "${rvm_gems_path:-"$rvm_path/gems"}" ;
|
116
|
+
find . -maxdepth 1 -mindepth 1 -type d -print)
|
117
|
+
)
|
106
118
|
|
107
119
|
for directory_name in "${directories[@]//.\/}" ; do
|
108
120
|
|
@@ -110,7 +122,8 @@ gemset_globalcache()
|
|
110
122
|
|
111
123
|
if [[ -d "$current_cache_path" && ! -L "$current_cache_path" ]]; then
|
112
124
|
|
113
|
-
"$rvm_path/scripts/log" "info"
|
125
|
+
"$rvm_path/scripts/log" "info" \
|
126
|
+
"Moving the gem cache for $directory_name to the global cache."
|
114
127
|
|
115
128
|
mv "$current_cache_path/"*.gem "$rvm_gems_cache_path/" 2>/dev/null
|
116
129
|
|
@@ -121,7 +134,8 @@ gemset_globalcache()
|
|
121
134
|
|
122
135
|
done
|
123
136
|
|
124
|
-
"$rvm_path/scripts/db" "$rvm_path/config/user"
|
137
|
+
"$rvm_path/scripts/db" "$rvm_path/config/user" \
|
138
|
+
"use_gemset_globalcache" "true"
|
125
139
|
|
126
140
|
else
|
127
141
|
printf "
|
@@ -211,7 +225,10 @@ gemset_list()
|
|
211
225
|
|
212
226
|
if [[ -n "${rvm_ruby_string:-""}" ]] ; then
|
213
227
|
|
214
|
-
ls "${rvm_gems_path:-"$rvm_path/gems"}/"
|
228
|
+
ls "${rvm_gems_path:-"$rvm_path/gems"}/" \
|
229
|
+
| awk -F"${rvm_gemset_separator:-"@"}" \
|
230
|
+
"/${rvm_ruby_string}${rvm_gemset_separator:-"@"}/{print \$2}" \
|
231
|
+
2>/dev/null
|
215
232
|
|
216
233
|
else
|
217
234
|
"$rvm_path/scripts/log" "error" \
|
@@ -249,7 +266,8 @@ gemset_delete()
|
|
249
266
|
|
250
267
|
elif [[ -d "$gemdir" ]] ; then
|
251
268
|
|
252
|
-
"$rvm_path/scripts/log" "warn"
|
269
|
+
"$rvm_path/scripts/log" "warn" \
|
270
|
+
"Are you SURE you wish to remove the entire gemset directory '$rvm_gemset_name' ($gemdir)?"
|
253
271
|
|
254
272
|
printf "(anything other than 'yes' will cancel) > "
|
255
273
|
|
@@ -387,6 +405,59 @@ gemset_copy()
|
|
387
405
|
fi
|
388
406
|
}
|
389
407
|
|
408
|
+
# Migrate gemsets from ruby X to ruby Y
|
409
|
+
gemset_rename()
|
410
|
+
{
|
411
|
+
local source_name destination_name source_path destination_path
|
412
|
+
|
413
|
+
source_name="${args[__array_start]:-""}"
|
414
|
+
args[$__array_start]="" ; args=(${args[@]})
|
415
|
+
|
416
|
+
destination_name="${args[__array_start]:-""}"
|
417
|
+
args[$__array_start]="" ; args=(${args[@]})
|
418
|
+
|
419
|
+
if [[ -z "$destination_name" || -z "$source_name" ]] ; then
|
420
|
+
"$rvm_path/scripts/log" "error" \
|
421
|
+
"Source and destination gemsets must be specified: 'rvm gemset rename X Y'"
|
422
|
+
return 1
|
423
|
+
fi
|
424
|
+
|
425
|
+
source_path="$(rvm_silence_logging=1 rvm "@$source_name" gem env gemdir)"
|
426
|
+
|
427
|
+
if [[ -z "$source_path" || ! -d "$source_path" ]]; then
|
428
|
+
"$rvm_path/scripts/log" "error" \
|
429
|
+
"'$source_name' does not exist."
|
430
|
+
return 1
|
431
|
+
fi
|
432
|
+
|
433
|
+
destination_path=${source_path/%$source_name/$destination_name}
|
434
|
+
|
435
|
+
if [[ -d "$source_path" ]] ; then
|
436
|
+
|
437
|
+
if [[ ! -d "$destination_path" ]] ; then
|
438
|
+
|
439
|
+
mv "$source_path" "$destination_path"
|
440
|
+
|
441
|
+
else
|
442
|
+
|
443
|
+
"$rvm_path/scripts/log" "error" \
|
444
|
+
"Gemset $destination_name already exists!"
|
445
|
+
|
446
|
+
return 1
|
447
|
+
|
448
|
+
fi
|
449
|
+
|
450
|
+
else
|
451
|
+
|
452
|
+
"$rvm_path/scripts/log" "error" \
|
453
|
+
"Gems directory does not exist for $source_path ($source_path)"
|
454
|
+
|
455
|
+
return 1
|
456
|
+
|
457
|
+
fi
|
458
|
+
}
|
459
|
+
|
460
|
+
|
390
461
|
gemset_unpack()
|
391
462
|
{
|
392
463
|
local gems name directory version versions
|
@@ -457,7 +528,8 @@ gemset_export()
|
|
457
528
|
|
458
529
|
touch "$rvm_file_name"
|
459
530
|
|
460
|
-
echo "# $rvm_file_name generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator"
|
531
|
+
echo "# $rvm_file_name generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator" \
|
532
|
+
> "$rvm_file_name"
|
461
533
|
|
462
534
|
gems=($(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | tr ' ' ';'))
|
463
535
|
|
@@ -894,6 +966,9 @@ case "$action" in
|
|
894
966
|
copy)
|
895
967
|
gemset_copy
|
896
968
|
;;
|
969
|
+
rename)
|
970
|
+
gemset_rename
|
971
|
+
;;
|
897
972
|
empty)
|
898
973
|
gemset_empty
|
899
974
|
;;
|
data/scripts/install
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
#!/usr/bin/env bash
|
2
2
|
|
3
3
|
set -o errtrace
|
4
|
-
set -o errexit
|
5
4
|
|
6
5
|
export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
|
7
6
|
|
@@ -170,6 +169,9 @@ Upgrade Notes
|
|
170
169
|
|
171
170
|
* If you wish to have the 'pretty colors' again, set in ~/.rvmrc:
|
172
171
|
export rvm_pretty_print_flag=1
|
172
|
+
|
173
|
+
* If you see the following error message: Unknown alias name: 'default'
|
174
|
+
re-set your default ruby, this is due to a change in how default works.
|
173
175
|
"
|
174
176
|
}
|
175
177
|
|
@@ -342,9 +344,9 @@ for file in "${files[@]}" ; do
|
|
342
344
|
|
343
345
|
cp -f "$source_path/binscripts/$file" "${rvm_bin_path:-"$rvm_path/bin"}/"
|
344
346
|
|
345
|
-
|
347
|
+
chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
|
346
348
|
|
347
|
-
|
349
|
+
done
|
348
350
|
|
349
351
|
#
|
350
352
|
# RC Files
|
@@ -564,7 +566,7 @@ for file in "${files[@]}" ; do
|
|
564
566
|
|
565
567
|
done
|
566
568
|
|
567
|
-
printf "\n Copying manpages into place
|
569
|
+
printf "\n Copying manpages into place.\n"
|
568
570
|
|
569
571
|
files=($(builtin cd "$install_source_path/man" ; \
|
570
572
|
find . -maxdepth 1 -mindepth 1 -type f -print))
|
data/scripts/irbrc.rb
CHANGED
@@ -32,7 +32,7 @@ begin
|
|
32
32
|
File::open(histfile, "w+") { |io| io.puts lines.join("\n") }
|
33
33
|
end
|
34
34
|
|
35
|
-
rescue
|
35
|
+
rescue LoadError
|
36
36
|
puts "Readline was unable to be required, if you need completion or history install readline then reinstall the ruby.\nYou may follow 'rvm notes' for dependencies and/or read the docs page http://rvm.beginrescueend.com/packages/readline/ . Be sure you 'rvm remove X ; rvm install X' to re-compile your ruby with readline support after obtaining the readline libraries."
|
37
37
|
end
|
38
38
|
|
data/scripts/notes
CHANGED
@@ -26,13 +26,13 @@ if [[ "Linux" = "$system" ]] ; then
|
|
26
26
|
printf "
|
27
27
|
dependencies:
|
28
28
|
# For RVM
|
29
|
-
rvm: bash curl git
|
29
|
+
rvm: bash curl git
|
30
30
|
|
31
31
|
# For JRuby (if you wish to use it) you will need:
|
32
32
|
jruby: aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk
|
33
33
|
|
34
34
|
# For MRI & ree (if you wish to use it) you will need (depending on what you are installing):
|
35
|
-
ruby: aptitude install build-essential bison openssl libreadline5 libreadline-dev curl git
|
35
|
+
ruby: aptitude install build-essential bison openssl libreadline5 libreadline-dev curl git zlib1g zlib1g-dev libssl-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev
|
36
36
|
ruby-head: git subversion autoconf
|
37
37
|
|
38
38
|
# For IronRuby (if you wish to use it) you will need:
|
@@ -109,8 +109,8 @@ elif [[ "Darwin" = "$system" ]] ; then
|
|
109
109
|
|
110
110
|
printf "
|
111
111
|
Notes for ${system} $release
|
112
|
-
# For Snow Leopard be sure to have
|
113
|
-
# You should download the latest
|
112
|
+
# For Snow Leopard be sure to have Xcode Tools Version 3.2.1 (1613) or later (there were bugs with the dvd release version).
|
113
|
+
# You should download the latest Xcode tools from developer.apple.com. This is necessary since the dvd install for Snow Leopard has bugs.
|
114
114
|
# If you intend on installing MacRuby you must install LLVM first.
|
115
115
|
# If you intend on installing JRuby you must install the JDK.
|
116
116
|
# If you intend on installing IronRuby you must install Mono (version 2.6 or greater is recommended).
|
data/scripts/package
CHANGED
@@ -164,7 +164,8 @@ openssl()
|
|
164
164
|
fi
|
165
165
|
configure_command="./Configure"
|
166
166
|
|
167
|
-
patches
|
167
|
+
# Anyone know WTF happened to these patches???
|
168
|
+
#patches="$rvm_path/patches/$package/Makefile.org.patch,$rvm_path/patches/$package/crypto-Makefile.patch"
|
168
169
|
|
169
170
|
# Don't use -j option for make OpenSSL
|
170
171
|
if [[ ! -z "$rvm_make_flags" ]] ; then
|
data/scripts/rvm
CHANGED
@@ -118,3 +118,6 @@ if [[ $? -gt 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
|
|
118
118
|
unset rvm_prefix_needs_trailing_slash rvm_bin_path rvm_man_path rvm_rc_files rvm_gems_path rvm_gems_cache_path rvm_interactive_flag rvm_gems_path rvm_project_rvmrc_default rvm_gemset_separator
|
119
119
|
|
120
120
|
fi
|
121
|
+
|
122
|
+
cd .
|
123
|
+
|
data/scripts/rvm-install
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
#!/usr/bin/env bash
|
2
2
|
|
3
3
|
set -o errtrace
|
4
|
-
set -o errexit
|
5
4
|
|
6
5
|
export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
|
7
6
|
|
@@ -170,6 +169,9 @@ Upgrade Notes
|
|
170
169
|
|
171
170
|
* If you wish to have the 'pretty colors' again, set in ~/.rvmrc:
|
172
171
|
export rvm_pretty_print_flag=1
|
172
|
+
|
173
|
+
* If you see the following error message: Unknown alias name: 'default'
|
174
|
+
re-set your default ruby, this is due to a change in how default works.
|
173
175
|
"
|
174
176
|
}
|
175
177
|
|
@@ -342,9 +344,9 @@ for file in "${files[@]}" ; do
|
|
342
344
|
|
343
345
|
cp -f "$source_path/binscripts/$file" "${rvm_bin_path:-"$rvm_path/bin"}/"
|
344
346
|
|
345
|
-
|
347
|
+
chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
|
346
348
|
|
347
|
-
|
349
|
+
done
|
348
350
|
|
349
351
|
#
|
350
352
|
# RC Files
|
@@ -564,7 +566,7 @@ for file in "${files[@]}" ; do
|
|
564
566
|
|
565
567
|
done
|
566
568
|
|
567
|
-
printf "\n Copying manpages into place
|
569
|
+
printf "\n Copying manpages into place.\n"
|
568
570
|
|
569
571
|
files=($(builtin cd "$install_source_path/man" ; \
|
570
572
|
find . -maxdepth 1 -mindepth 1 -type f -print))
|
data/scripts/selector
CHANGED
@@ -425,6 +425,8 @@ __rvm_ruby_string()
|
|
425
425
|
# * rvm_ruby_revision
|
426
426
|
# * rvm_ruby_tag
|
427
427
|
|
428
|
+
local ruby_string gemset_name
|
429
|
+
|
428
430
|
rvm_expanding_aliases=${rvm_expanding_aliases:-0}
|
429
431
|
|
430
432
|
rvm_ruby_version=${rvm_ruby_version:-""}
|
@@ -435,11 +437,18 @@ __rvm_ruby_string()
|
|
435
437
|
rvm_ruby_revision=${rvm_ruby_revision:-""}
|
436
438
|
rvm_ruby_tag=${rvm_ruby_tag:-""}
|
437
439
|
|
440
|
+
if echo "$rvm_ruby_string" | \grep -q "${rvm_gemset_separator:-"@"}" ; then
|
441
|
+
rvm_gemset_name="${rvm_ruby_string/*${rvm_gemset_separator:-"@"}/}"
|
442
|
+
rvm_ruby_string="${rvm_ruby_string/${rvm_gemset_separator:-"@"}*/}"
|
443
|
+
fi
|
444
|
+
|
438
445
|
# Alias'd rubies
|
439
|
-
if [[ ${rvm_expanding_aliases:-0} -eq 0 && -n ${rvm_ruby_string:-""}
|
440
|
-
|
446
|
+
if [[ ${rvm_expanding_aliases:-0} -eq 0 && -n ${rvm_ruby_string:-""}
|
447
|
+
&& $rvm_ruby_string != "system" ]] ; then
|
448
|
+
if expanded_alias_name="$("$rvm_path/scripts/alias" show "$rvm_ruby_string" 2>/dev/null)" \
|
449
|
+
&& [[ -n "$expanded_alias_name" ]] ; then
|
441
450
|
rvm_ruby_string="$expanded_alias_name"
|
442
|
-
elif [[ "$rvm_ruby_string" = default ]]; then
|
451
|
+
elif [[ "$rvm_ruby_string" = default ]] ; then
|
443
452
|
# Default is not a known value. Instead, we need to therefore set it to system.
|
444
453
|
rvm_ruby_string="system"
|
445
454
|
fi
|
@@ -448,14 +457,18 @@ __rvm_ruby_string()
|
|
448
457
|
if echo "$rvm_ruby_string" | \grep -q "${rvm_gemset_separator:-"@"}" ; then
|
449
458
|
rvm_gemset_name="${rvm_ruby_string/*${rvm_gemset_separator:-"@"}/}"
|
450
459
|
rvm_ruby_string="${rvm_ruby_string/${rvm_gemset_separator:-"@"}*/}"
|
451
|
-
rvm_sticky_flag=1
|
452
460
|
fi
|
453
461
|
|
454
|
-
|
462
|
+
# Stash the ruby string.
|
463
|
+
ruby_string=${rvm_ruby_string:-""}
|
464
|
+
gemset_name=${rvm_gemset_name:-""}
|
455
465
|
|
456
466
|
__rvm_unset_ruby_variables
|
457
467
|
|
458
|
-
|
468
|
+
if [[ ! -z "$gemset_name" ]] ; then
|
469
|
+
rvm_gemset_name="$gemset_name"
|
470
|
+
rvm_sticky_flag=1 # <- not sold on this.
|
471
|
+
fi
|
459
472
|
|
460
473
|
strings=($(echo ${ruby_string//-/ }))
|
461
474
|
|
@@ -778,7 +791,8 @@ __rvm_gemset_use()
|
|
778
791
|
fi
|
779
792
|
|
780
793
|
if [[ ${rvm_interactive_flag:-0} -gt 0 && ${rvm_verbose_flag:-1} -ne 0 ]] ; then
|
781
|
-
"$rvm_path/scripts/log" "info"
|
794
|
+
"$rvm_path/scripts/log" "info" \
|
795
|
+
"Now using gemset '${rvm_gemset_name:-default}'"
|
782
796
|
fi
|
783
797
|
|
784
798
|
rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
|
data/scripts/update
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
#!/usr/bin/env bash
|
2
2
|
|
3
3
|
set -o errtrace
|
4
|
-
set -o errexit
|
5
4
|
|
6
5
|
export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
|
7
6
|
|
@@ -170,6 +169,9 @@ Upgrade Notes
|
|
170
169
|
|
171
170
|
* If you wish to have the 'pretty colors' again, set in ~/.rvmrc:
|
172
171
|
export rvm_pretty_print_flag=1
|
172
|
+
|
173
|
+
* If you see the following error message: Unknown alias name: 'default'
|
174
|
+
re-set your default ruby, this is due to a change in how default works.
|
173
175
|
"
|
174
176
|
}
|
175
177
|
|
@@ -342,9 +344,9 @@ for file in "${files[@]}" ; do
|
|
342
344
|
|
343
345
|
cp -f "$source_path/binscripts/$file" "${rvm_bin_path:-"$rvm_path/bin"}/"
|
344
346
|
|
345
|
-
|
347
|
+
chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
|
346
348
|
|
347
|
-
|
349
|
+
done
|
348
350
|
|
349
351
|
#
|
350
352
|
# RC Files
|
@@ -564,7 +566,7 @@ for file in "${files[@]}" ; do
|
|
564
566
|
|
565
567
|
done
|
566
568
|
|
567
|
-
printf "\n Copying manpages into place
|
569
|
+
printf "\n Copying manpages into place.\n"
|
568
570
|
|
569
571
|
files=($(builtin cd "$install_source_path/man" ; \
|
570
572
|
find . -maxdepth 1 -mindepth 1 -type f -print))
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rvm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 9
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 0
|
9
|
-
-
|
10
|
-
version: 1.0.
|
9
|
+
- 15
|
10
|
+
version: 1.0.15
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Wayne E. Seguin
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2010-10-
|
18
|
+
date: 2010-10-19 00:00:00 -04:00
|
19
19
|
default_executable: rvm-install
|
20
20
|
dependencies: []
|
21
21
|
|