rvm 1.1.1 → 1.1.2
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.
- data/binscripts/rvm-prompt +2 -0
- data/config/known +3 -0
- data/contrib/install-system-wide +19 -2
- data/install +1 -1
- data/lib/VERSION.yml +1 -1
- data/lib/rvm/install_command_dumper.rb +1 -1
- data/rvm.gemspec +2 -2
- data/scripts/alias +2 -1
- data/scripts/base +0 -4
- data/scripts/cli +2 -2
- data/scripts/install +1 -1
- data/scripts/manage +144 -2
- data/scripts/rubygems +1 -1
- data/scripts/rvm +7 -2
- data/scripts/rvm-install +1 -1
- data/scripts/selector +58 -32
- data/scripts/update +1 -1
- data/scripts/utility +4 -4
- metadata +4 -4
data/binscripts/rvm-prompt
CHANGED
data/config/known
CHANGED
data/contrib/install-system-wide
CHANGED
@@ -44,6 +44,22 @@ __rvm_create_user_group() {
|
|
44
44
|
case "$os_type" in
|
45
45
|
"FreeBSD") pw groupadd -q "$rvm_group_name";;
|
46
46
|
"Linux") groupadd -f "$rvm_group_name";;
|
47
|
+
"Darwin")
|
48
|
+
gid="501" #only gids > 500 show up in user preferences
|
49
|
+
|
50
|
+
#Find an open gid
|
51
|
+
while true; do
|
52
|
+
name=$(dscl . search /groups PrimaryGroupID $gid | cut -f1 -s)
|
53
|
+
if [ -z "$name" ] ; then
|
54
|
+
break
|
55
|
+
fi
|
56
|
+
gid=$[$gid +1]
|
57
|
+
done
|
58
|
+
|
59
|
+
#Create the group
|
60
|
+
dscl . -create "/Groups/$rvm_group_name"
|
61
|
+
dscl . -create "/Groups/$rvm_group_name" gid "$gid"
|
62
|
+
;;
|
47
63
|
esac
|
48
64
|
fi
|
49
65
|
|
@@ -58,6 +74,7 @@ __rvm_add_user_to_group() {
|
|
58
74
|
case "$os_type" in
|
59
75
|
"FreeBSD") pw usermod "$1" -G "$2";;
|
60
76
|
"Linux") usermod -a -G "$2" "$1";;
|
77
|
+
"Darwin") dscl . -append "/Groups/$2" GroupMembership "$1";;
|
61
78
|
esac
|
62
79
|
|
63
80
|
return 0
|
@@ -75,8 +92,8 @@ elif [[ -z "$(command -v git)" ]] ; then
|
|
75
92
|
echo "Please ensure git is installed and available in PATH to continue." >&2
|
76
93
|
exit 1
|
77
94
|
|
78
|
-
elif [[ "$os_type" != "Linux" && "$os_type" != "FreeBSD" ]]; then
|
79
|
-
echo "The rvm system wide installer currently only supports Linux and
|
95
|
+
elif [[ "$os_type" != "Linux" && "$os_type" != "FreeBSD" && "$os_type" != "Darwin" ]]; then
|
96
|
+
echo "The rvm system wide installer currently only supports Linux, FreeBSD, and Darwin." >&2
|
80
97
|
exit 1
|
81
98
|
fi
|
82
99
|
|
data/install
CHANGED
@@ -475,7 +475,7 @@ fi
|
|
475
475
|
#
|
476
476
|
mkdir -p "${rvm_rubies_path:-"$rvm_path/rubies"}/"
|
477
477
|
|
478
|
-
for ruby in $rvm_path/ruby-* $rvm_path/jruby-* \
|
478
|
+
for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/goruby\
|
479
479
|
$rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
|
480
480
|
|
481
481
|
if [[ -d "$ruby" ]] ; then
|
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.1.
|
8
|
+
s.version = "1.1.2"
|
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-
|
12
|
+
s.date = %q{2010-12-01}
|
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/alias
CHANGED
@@ -34,7 +34,8 @@ alias_conflicts_with_ruby() {
|
|
34
34
|
)"
|
35
35
|
|
36
36
|
if [[ "0" == "$alias_check_result" ]]; then
|
37
|
-
"$rvm_path/scripts"/log "error"
|
37
|
+
"$rvm_path/scripts"/log "error" \
|
38
|
+
"\nYou have attempted to create an alias called '$1', which is recognized as a rvm ruby.\n"
|
38
39
|
return 0
|
39
40
|
fi
|
40
41
|
|
data/scripts/base
CHANGED
data/scripts/cli
CHANGED
@@ -68,7 +68,7 @@ __rvm_parse_args()
|
|
68
68
|
;;
|
69
69
|
|
70
70
|
# Can likely remove this due to the *) case
|
71
|
-
jruby*|ree*|macruby*|rbx*|rubinius*|ironruby*|default*|maglev*|all)
|
71
|
+
jruby*|ree*|macruby*|rbx*|rubinius*|goruby|ironruby*|default*|maglev*|all)
|
72
72
|
if [[ "rubinius" = "$rvm_token" ]] ; then rvm_token="rbx"; fi
|
73
73
|
rvm_ruby_interpreter="$rvm_token"
|
74
74
|
rvm_ruby_string="$rvm_token"
|
@@ -241,7 +241,7 @@ __rvm_parse_args()
|
|
241
241
|
else
|
242
242
|
case "$next_token" in
|
243
243
|
|
244
|
-
ruby|rbx|jruby|macruby|ree|rubinius|maglev|ironruby)
|
244
|
+
ruby|rbx|jruby|macruby|ree|rubinius|maglev|goruby|ironruby)
|
245
245
|
rvm_ruby_strings=$next_token
|
246
246
|
rvm_ruby_interpreter=$next_token
|
247
247
|
if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
|
data/scripts/install
CHANGED
@@ -475,7 +475,7 @@ fi
|
|
475
475
|
#
|
476
476
|
mkdir -p "${rvm_rubies_path:-"$rvm_path/rubies"}/"
|
477
477
|
|
478
|
-
for ruby in $rvm_path/ruby-* $rvm_path/jruby-* \
|
478
|
+
for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/goruby\
|
479
479
|
$rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
|
480
480
|
|
481
481
|
if [[ -d "$ruby" ]] ; then
|
data/scripts/manage
CHANGED
@@ -1041,6 +1041,125 @@ RubyWrapper
|
|
1041
1041
|
"Installing $rvm_gem_name to $dir"
|
1042
1042
|
;;
|
1043
1043
|
|
1044
|
+
goruby)
|
1045
|
+
|
1046
|
+
if [[ ${rvm_make_flags_flag:-0} -eq 1 ]] ; then __rvm_make_flags ; fi
|
1047
|
+
|
1048
|
+
unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
|
1049
|
+
|
1050
|
+
__rvm_remove_rvm_from_path
|
1051
|
+
|
1052
|
+
__rvm_conditionally_add_bin_path ; export PATH
|
1053
|
+
|
1054
|
+
builtin hash -r
|
1055
|
+
|
1056
|
+
rvm_ruby_home="$rvm_path/rubies/$rvm_ruby_interpreter"
|
1057
|
+
|
1058
|
+
__rvm_fetch_from_github "ruby" "trunk"
|
1059
|
+
|
1060
|
+
__rvm_apply_patches ; result=$?
|
1061
|
+
|
1062
|
+
if [[ "$result" -gt 0 ]] ; then
|
1063
|
+
"$rvm_path/scripts/log" "error" \
|
1064
|
+
"There has been an error while trying to apply patches to goruby. \
|
1065
|
+
\nHalting the installation."
|
1066
|
+
return $result
|
1067
|
+
fi
|
1068
|
+
|
1069
|
+
if [[ ! -s "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/configure" ]] ; then
|
1070
|
+
|
1071
|
+
if command -v autoconf &> /dev/null ; then
|
1072
|
+
|
1073
|
+
__rvm_run "autoconf" "autoconf" "Running autoconf"
|
1074
|
+
|
1075
|
+
else
|
1076
|
+
"$rvm_path/scripts/log" "fail" \
|
1077
|
+
"rvm expects autoconf to install this ruby interpreter, autoconf was not found in PATH. \
|
1078
|
+
\nHalting installation."
|
1079
|
+
return $result
|
1080
|
+
fi
|
1081
|
+
fi
|
1082
|
+
|
1083
|
+
if [[ -s ./Makefile && -z "$rvm_reconfigure_flag" ]] ; then
|
1084
|
+
|
1085
|
+
if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
|
1086
|
+
"$rvm_path/scripts/log" "debug" \
|
1087
|
+
"Skipping configure step, Makefile exists so configure must have already been run."
|
1088
|
+
fi
|
1089
|
+
|
1090
|
+
elif [[ -n "$rvm_ruby_configure" ]] ; then
|
1091
|
+
|
1092
|
+
__rvm_run "configure" "$rvm_ruby_configure"
|
1093
|
+
result=$?
|
1094
|
+
|
1095
|
+
if [[ "$result" -gt 0 ]] ; then
|
1096
|
+
"$rvm_path/scripts/log" "error" \
|
1097
|
+
"There has been an error while trying to configure the source. \
|
1098
|
+
\nHalting the installation."
|
1099
|
+
return $result
|
1100
|
+
fi
|
1101
|
+
|
1102
|
+
elif [[ -s ./configure ]] ; then
|
1103
|
+
local configure_command="./configure --prefix=$rvm_ruby_home $rvm_configure_flags"
|
1104
|
+
|
1105
|
+
__rvm_run "configure" "$configure_command" \
|
1106
|
+
"Configuring $rvm_ruby_string using $rvm_configure_flags, this may take a while depending on your cpu(s)..."
|
1107
|
+
result=$?
|
1108
|
+
|
1109
|
+
if [[ "$result" -gt 0 ]] ; then
|
1110
|
+
"$rvm_path/scripts/log" "error" \
|
1111
|
+
"There has been an error while trying to configure the source.\
|
1112
|
+
\nHalting the installation."
|
1113
|
+
return $result
|
1114
|
+
fi
|
1115
|
+
|
1116
|
+
else
|
1117
|
+
"$rvm_path/scripts/log" "error" \
|
1118
|
+
"Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
|
1119
|
+
fi
|
1120
|
+
|
1121
|
+
rvm_ruby_make=${rvm_ruby_make:-"make"}
|
1122
|
+
|
1123
|
+
__rvm_run "make" "$rvm_ruby_make golf $rvm_make_flags" \
|
1124
|
+
"Compiling $rvm_ruby_string, this may take a while depending on your cpu(s)..."
|
1125
|
+
result=$?
|
1126
|
+
|
1127
|
+
if [[ "$result" -gt 0 ]] ; then
|
1128
|
+
"$rvm_path/scripts/log" "error" \
|
1129
|
+
"There has been an error while trying to run make.\
|
1130
|
+
\nHalting the installation."
|
1131
|
+
return $result
|
1132
|
+
fi
|
1133
|
+
|
1134
|
+
rvm_ruby_make_install=${rvm_ruby_make_install:-"make install"}
|
1135
|
+
|
1136
|
+
__rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string"
|
1137
|
+
result=$?
|
1138
|
+
|
1139
|
+
if [[ "$result" -gt 0 ]] ; then
|
1140
|
+
"$rvm_path/scripts/log" "error" \
|
1141
|
+
"There has been an error while trying to run make install. \
|
1142
|
+
\nHalting the installation."
|
1143
|
+
return $result
|
1144
|
+
fi
|
1145
|
+
|
1146
|
+
"$rvm_path/scripts/log" "info" \
|
1147
|
+
"Installation of $rvm_ruby_string is complete."
|
1148
|
+
|
1149
|
+
export GEM_HOME="$rvm_ruby_gem_home"
|
1150
|
+
export GEM_PATH="$rvm_ruby_gem_path"
|
1151
|
+
|
1152
|
+
__rvm_rubygems_setup
|
1153
|
+
|
1154
|
+
__rvm_bin_script
|
1155
|
+
|
1156
|
+
__rvm_run "chmod.bin" "chmod +x $rvm_ruby_home/bin/*"
|
1157
|
+
|
1158
|
+
__rvm_post_install
|
1159
|
+
rm $rvm_ruby_home/bin/ruby
|
1160
|
+
ln -s $rvm_ruby_home/bin/goruby $rvm_ruby_home/bin/ruby
|
1161
|
+
;;
|
1162
|
+
|
1044
1163
|
ruby)
|
1045
1164
|
|
1046
1165
|
__rvm_check_for_bison # && Run like hell...
|
@@ -1097,13 +1216,34 @@ __rvm_fetch_from_github()
|
|
1097
1216
|
__rvm_run "$1.repo" "git clone --depth 1 $rvm_ruby_repo_http_url ${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string" "Cloning $rvm_ruby_repo_http_url"
|
1098
1217
|
fi
|
1099
1218
|
else
|
1100
|
-
local branch="${
|
1219
|
+
local branch="${rvm_ruby_repo_branch:-"master"}"
|
1101
1220
|
|
1102
1221
|
builtin cd "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string"
|
1103
1222
|
|
1104
1223
|
__rvm_run "$1.repo" "git pull origin $branch" "Pulling from origin $branch"
|
1105
1224
|
fi
|
1106
1225
|
|
1226
|
+
(
|
1227
|
+
remote="origin"
|
1228
|
+
|
1229
|
+
cd "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string"
|
1230
|
+
|
1231
|
+
if [[ -z "$(git branch | awk "/$rvm_ruby_repo_branch$/")" ]] ; then
|
1232
|
+
|
1233
|
+
git checkout -b "$rvm_ruby_repo_branch" --track "$remote/$rvm_ruby_repo_branch" 2>/dev/null
|
1234
|
+
|
1235
|
+
elif [[ -z "$(git branch | awk "/\* $rvm_ruby_repo_branch$/")" ]] ; then
|
1236
|
+
|
1237
|
+
if ! git checkout $rvm_ruby_repo_branch 2>/dev/null ; then
|
1238
|
+
|
1239
|
+
"$rvm_path/scripts/log" "error" \
|
1240
|
+
"Branch $remote/$rvm_ruby_repo_branch not found."
|
1241
|
+
|
1242
|
+
fi
|
1243
|
+
|
1244
|
+
fi
|
1245
|
+
)
|
1246
|
+
|
1107
1247
|
rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
|
1108
1248
|
|
1109
1249
|
__rvm_run "$1.copy" "\\cp -R \"${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string\" \"${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string\"" "Copying from repo to source..."
|
@@ -1709,7 +1849,9 @@ __rvm_rubygems_setup()
|
|
1709
1849
|
{
|
1710
1850
|
local home path dir directory_name version_number ruby_lib_gem_path
|
1711
1851
|
|
1712
|
-
if [[ -n "$(echo "$rvm_ruby_version" | awk '/^1\.9/')"
|
1852
|
+
if [[ -n "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" \
|
1853
|
+
|| -n "$(echo "$rvm_ruby_interpreter" | awk '/^goruby/')" ]] ; then
|
1854
|
+
|
1713
1855
|
install=0
|
1714
1856
|
|
1715
1857
|
elif [[ "$rvm_ruby_string" = "ruby-head" ]] ; then
|
data/scripts/rubygems
CHANGED
@@ -12,7 +12,7 @@ rubygems_setup()
|
|
12
12
|
|
13
13
|
unset RUBYOPT
|
14
14
|
|
15
|
-
if [[ -n "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" ]] ; then
|
15
|
+
if [[ -n "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" || ! -z "$(echo $ruby_ruby_interpreter | awk '/^goruy/')" ]] ; then
|
16
16
|
install=0
|
17
17
|
elif [[ "$rvm_ruby_string" = "ruby-head" ]] ; then
|
18
18
|
install=0
|
data/scripts/rvm
CHANGED
@@ -52,10 +52,15 @@ if ! declare -f rvm > /dev/null || [[ ${rvm_reload_flag:-0} -eq 1 ]] ; then
|
|
52
52
|
|
53
53
|
rvm_prefix="/usr/local/"
|
54
54
|
|
55
|
-
|
55
|
+
elif [[ -n "$HOME" ]] ; then
|
56
56
|
|
57
57
|
rvm_prefix="$HOME/."
|
58
58
|
|
59
|
+
else
|
60
|
+
|
61
|
+
echo "No \$rvm_prefix was provided and $(id -un) has no \$HOME defined to find it with. Exploding violently."
|
62
|
+
exit 1
|
63
|
+
|
59
64
|
fi
|
60
65
|
|
61
66
|
fi
|
@@ -111,7 +116,7 @@ if ! declare -f rvm > /dev/null || [[ ${rvm_reload_flag:-0} -eq 1 ]] ; then
|
|
111
116
|
__rvm_conditionally_add_bin_path
|
112
117
|
|
113
118
|
else
|
114
|
-
printf "\n\$rvm_path
|
119
|
+
printf "\n\$rvm_path ($rvm_path) does not exist."
|
115
120
|
fi
|
116
121
|
|
117
122
|
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
|
data/scripts/rvm-install
CHANGED
@@ -475,7 +475,7 @@ fi
|
|
475
475
|
#
|
476
476
|
mkdir -p "${rvm_rubies_path:-"$rvm_path/rubies"}/"
|
477
477
|
|
478
|
-
for ruby in $rvm_path/ruby-* $rvm_path/jruby-* \
|
478
|
+
for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/goruby\
|
479
479
|
$rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
|
480
480
|
|
481
481
|
if [[ -d "$ruby" ]] ; then
|
data/scripts/selector
CHANGED
@@ -162,6 +162,16 @@ __rvm_select()
|
|
162
162
|
fi
|
163
163
|
;;
|
164
164
|
|
165
|
+
goruby)
|
166
|
+
rvm_ruby_interpreter="goruby"
|
167
|
+
rvm_ruby_version="head"
|
168
|
+
rvm_ruby_string="goruby"
|
169
|
+
rvm_ruby_patch_level=""
|
170
|
+
rvm_ruby_repo_url=${rvm_mput_repo_url:-"$(__rvm_db "goruby_repo_url")"}
|
171
|
+
rvm_ruby_url=$rvm_ruby_repo_url
|
172
|
+
rvm_ruby_configure="" ; rvm_ruby_make="" ; rvm_ruby_make_install=""
|
173
|
+
;;
|
174
|
+
|
165
175
|
ruby)
|
166
176
|
if [[ -z "${rvm_ruby_version:-""}" && ${rvm_head_flag:-0} -eq 0 ]]; then
|
167
177
|
"$rvm_path/scripts/log" "fail" "Ruby version was not specified!"
|
@@ -246,55 +256,61 @@ __rvm_select()
|
|
246
256
|
fi
|
247
257
|
}
|
248
258
|
|
249
|
-
|
250
|
-
{
|
251
|
-
local new_path binary full_binary_path rvm_ruby_gem_home
|
259
|
+
__rvm_use_system() {
|
252
260
|
|
253
|
-
|
254
|
-
__rvm_select "$@"
|
261
|
+
unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
|
255
262
|
|
256
|
-
|
263
|
+
new_path="$(__rvm_remove_rvm_from_path ; printf "$PATH"):${rvm_bin_path:-"$rvm_path/bin"}"
|
257
264
|
|
258
|
-
if [[
|
265
|
+
if [[ -s "$rvm_path/config/system" ]] ; then
|
259
266
|
|
260
|
-
|
267
|
+
\grep "MY_RUBY_HOME='$rvm_path/rubies" "$rvm_path/config/system" > /dev/null
|
261
268
|
|
262
|
-
|
269
|
+
if [[ $? -eq 0 ]] ; then
|
270
|
+
# 'system' should *not* point to an rvm ruby.
|
271
|
+
[[ -f "$rvm_path/config/system" ]] && \rm -f "$rvm_path/config/system"
|
272
|
+
else
|
273
|
+
source "$rvm_path/config/system"
|
274
|
+
fi
|
275
|
+
fi
|
263
276
|
|
264
|
-
|
277
|
+
# Check binaries, remove under the condition they're symlinks.
|
278
|
+
if [[ ${rvm_selfcontained:-1} -eq 0 ]] ; then
|
265
279
|
|
266
|
-
|
280
|
+
for binary in ruby gem irb ri rdoc rake erb testrb ; do
|
267
281
|
|
268
|
-
|
269
|
-
# 'system' should *not* point to an rvm ruby.
|
270
|
-
[[ -f "$rvm_path/config/system" ]] && \rm -f "$rvm_path/config/system"
|
271
|
-
else
|
272
|
-
source "$rvm_path/config/system"
|
273
|
-
fi
|
274
|
-
fi
|
282
|
+
full_binary_path="${rvm_bin_path:-"$rvm_path/bin"}/$binary"
|
275
283
|
|
276
|
-
|
277
|
-
if [[ ${rvm_selfcontained:-1} -eq 0 ]] ; then
|
284
|
+
[[ -L "$full_binary_path" ]] && \rm -f "$full_binary_path"
|
278
285
|
|
279
|
-
|
286
|
+
done
|
280
287
|
|
281
|
-
|
288
|
+
fi
|
282
289
|
|
283
|
-
|
290
|
+
if [[ ${rvm_verbose_flag:-0} -gt 0 ]] ; then
|
291
|
+
"$rvm_path/scripts/log" "info" "Now using system ruby."
|
292
|
+
fi
|
284
293
|
|
285
|
-
|
294
|
+
__rvm_remove_rvm_from_path
|
286
295
|
|
287
|
-
|
296
|
+
new_path="$PATH:${rvm_bin_path:-"$rvm_path/bin"}"
|
288
297
|
|
289
|
-
|
290
|
-
"$rvm_path/scripts/log" "info" "Now using system ruby."
|
291
|
-
fi
|
298
|
+
export rvm_ruby_string="system"
|
292
299
|
|
293
|
-
|
300
|
+
}
|
301
|
+
|
302
|
+
__rvm_use()
|
303
|
+
{
|
304
|
+
local new_path binary full_binary_path rvm_ruby_gem_home
|
294
305
|
|
295
|
-
|
306
|
+
#if [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] ; then __rvm_select "$@" ; fi
|
307
|
+
__rvm_select "$@"
|
296
308
|
|
297
|
-
|
309
|
+
if [[ -z "${rvm_ruby_interpreter:-""}" ]] ; then rvm_ruby_interpreter="system" ; fi
|
310
|
+
|
311
|
+
if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
|
312
|
+
|
313
|
+
__rvm_use_system
|
298
314
|
|
299
315
|
else
|
300
316
|
unset BUNDLE_PATH # Ensure that BUNDLE_PATH is not set!
|
@@ -361,6 +377,7 @@ __rvm_use()
|
|
361
377
|
"$rvm_path/scripts/wrapper" "$rvm_ruby_string" "default"
|
362
378
|
fi
|
363
379
|
|
380
|
+
|
364
381
|
if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
|
365
382
|
"$rvm_path/scripts/alias" delete default &> /dev/null
|
366
383
|
\find "${rvm_bin_path:-"$rvm_path/bin"}" -name 'default_*' -maxdepth 0 -delete
|
@@ -400,6 +417,15 @@ __rvm_use()
|
|
400
417
|
if [[ $result -eq 1 ]] ; then "$rvm_ruby_home/bin/maglev" start ; fi
|
401
418
|
fi
|
402
419
|
fi
|
420
|
+
|
421
|
+
else
|
422
|
+
|
423
|
+
if [[ ${rvm_default_flag:-0} -eq 1 ]] ; then
|
424
|
+
|
425
|
+
__rvm_reset
|
426
|
+
|
427
|
+
fi
|
428
|
+
|
403
429
|
fi
|
404
430
|
|
405
431
|
rvm_hook="after_use" ; source "$rvm_path/scripts/hook"
|
@@ -595,7 +621,7 @@ __rvm_ruby_string()
|
|
595
621
|
rvm_ruby_name="${string/n/}"
|
596
622
|
;;
|
597
623
|
|
598
|
-
ruby|rbx|jruby|macruby|ree|rubinius|maglev|ironruby)
|
624
|
+
ruby|rbx|jruby|macruby|ree|rubinius|maglev|ironruby|goruby)
|
599
625
|
rvm_ruby_interpreter="$string"
|
600
626
|
;;
|
601
627
|
|
data/scripts/update
CHANGED
@@ -475,7 +475,7 @@ fi
|
|
475
475
|
#
|
476
476
|
mkdir -p "${rvm_rubies_path:-"$rvm_path/rubies"}/"
|
477
477
|
|
478
|
-
for ruby in $rvm_path/ruby-* $rvm_path/jruby-* \
|
478
|
+
for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/goruby\
|
479
479
|
$rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
|
480
480
|
|
481
481
|
if [[ -d "$ruby" ]] ; then
|
data/scripts/utility
CHANGED
@@ -48,7 +48,7 @@ __rvm_teardown()
|
|
48
48
|
|
49
49
|
fi
|
50
50
|
|
51
|
-
unset rvm_ruby_strings rvm_head_flag rvm_prior_cc next_token rvm_bin_path rvm_error_message rvm_gems_cache_path rvm_gems_path rvm_gemset_name rvm_interactive_flag rvm_man_path rvm_parse_break rvm_rc_files rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_selfcontained rvm_token rvm_ruby_load_path rvm_path_flag rvm_ruby_require rvm_action rvm_ruby_package_file
|
51
|
+
unset rvm_ruby_strings rvm_head_flag rvm_prior_cc next_token rvm_bin_path rvm_error_message rvm_gems_cache_path rvm_gems_path rvm_gemset_name rvm_interactive_flag rvm_man_path rvm_parse_break rvm_rc_files rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_selfcontained rvm_token rvm_ruby_load_path rvm_path_flag rvm_ruby_require rvm_action rvm_ruby_package_file rvm_ruby_name
|
52
52
|
|
53
53
|
[[ ${rvm_dump_environment_flag:-0} -eq 1 ]] && __rvm_dump_environment
|
54
54
|
|
@@ -355,7 +355,7 @@ __rvm_nuke_rvm_variables()
|
|
355
355
|
__rvm_unset_ruby_variables()
|
356
356
|
{
|
357
357
|
# unset rvm_ruby_flag $(env | awk -F= '/^rvm_ruby_/{printf $1" "}')
|
358
|
-
unset rvm_ruby_string rvm_ruby_strings rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_ruby_load_path rvm_ruby_require rvm_head_flag rvm_ruby_package_file rvm_ruby_configure
|
358
|
+
unset rvm_ruby_string rvm_ruby_strings rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_ruby_load_path rvm_ruby_require rvm_head_flag rvm_ruby_package_file rvm_ruby_configure rvm_ruby_name
|
359
359
|
}
|
360
360
|
|
361
361
|
# TODO: Should be able to...
|
@@ -643,7 +643,7 @@ __rvm_reset()
|
|
643
643
|
done
|
644
644
|
|
645
645
|
# Go back to a clean state.
|
646
|
-
|
646
|
+
__rvm_use_system
|
647
647
|
|
648
648
|
__rvm_unset_ruby_variables
|
649
649
|
|
@@ -767,7 +767,7 @@ __rvm_update()
|
|
767
767
|
if [[ ${rvm_head_flag:-0} -eq 1 || ${rvm_self_flag:-0} -eq 1 \
|
768
768
|
|| "update" = "${rvm_action:-""}" || ${rvm_update_flag:-0} -eq 1 ]] ; then
|
769
769
|
"$rvm_path/scripts/log" "warn" \
|
770
|
-
"'rvm update --head' is
|
770
|
+
"'rvm update --head' is deprecated, use 'rvm get head' instead"
|
771
771
|
"$rvm_path/scripts/get" head
|
772
772
|
fi
|
773
773
|
|
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: 23
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 1
|
9
|
-
-
|
10
|
-
version: 1.1.
|
9
|
+
- 2
|
10
|
+
version: 1.1.2
|
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-
|
18
|
+
date: 2010-12-01 00:00:00 -05:00
|
19
19
|
default_executable: rvm-install
|
20
20
|
dependencies: []
|
21
21
|
|