rvm 0.0.84 → 0.0.85
Sign up to get free protection for your applications and to get access to all the features.
- data/config/md5 +25 -0
- data/examples/rvmrc +41 -28
- data/install +3 -1
- data/lib/VERSION.yml +1 -1
- data/rvm.gemspec +4 -2
- data/scripts/array +2 -0
- data/scripts/cli +5 -5
- data/scripts/hash +36 -0
- data/scripts/initialize +2 -2
- data/scripts/install +3 -1
- data/scripts/monitor +2 -0
- data/scripts/notes +1 -1
- data/scripts/ruby-installer +4 -4
- data/scripts/rvm +26 -26
- data/scripts/rvm-install +3 -1
- data/scripts/selector +17 -16
- data/scripts/update +3 -1
- data/scripts/utility +39 -17
- metadata +4 -2
data/config/md5
ADDED
@@ -0,0 +1,25 @@
|
|
1
|
+
curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
|
2
|
+
jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
|
3
|
+
jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7
|
4
|
+
libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
|
5
|
+
ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
|
6
|
+
openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3
|
7
|
+
readline-5.2.tar.gz=e39331f32ad14009b9ff49cc10c5e751
|
8
|
+
readline-6.0.tar.gz=b7f65a48add447693be6e86f04a63019
|
9
|
+
rubinius-1.0.0-rc1-20091125.tar.gz=c1cf037f05caf1bc962c09e220b435f4
|
10
|
+
ruby-1.8.5-p115.tar.gz=20ca6cc87eb077296806412feaac0356
|
11
|
+
ruby-1.8.5-p231.tar.gz=e900cf225d55414bffe878f00a85807c
|
12
|
+
ruby-1.8.6-p286.tar.gz=797ea136fe43e4286c9362ee4516674e
|
13
|
+
ruby-1.8.6-p287.tar.gz=6ff3420094711266c3201a0c7c2faa38
|
14
|
+
ruby-1.8.6-p369.tar.gz=8c140ae28b4c3947b92dfad69109d90b
|
15
|
+
ruby-1.8.6-p383.tar.gz=4f49544d4a4d0d34e9d86c41e853db2e
|
16
|
+
ruby-1.8.7-p160.tar.gz=945398f97e2de6dd8ab6df68d10bb1a1
|
17
|
+
ruby-1.8.7-p174.tar.gz=18dcdfef761a745ac7da45b61776afa5
|
18
|
+
ruby-1.9.1-p129.tar.gz=c71f413514ee6341c627be2957023a5c
|
19
|
+
ruby-1.9.1-p243.tar.gz=515bfd965814e718c0943abf3dde5494
|
20
|
+
ruby-1.9.2-preview1.tar.gz=e2b8cdbf300f53472be09699a5837fd1
|
21
|
+
ruby-enterprise-1.8.6-20090610.tar.gz=0bf66ee626918464a6eccdd83c99d63a
|
22
|
+
ruby-enterprise-1.8.7-2009.10.tar.gz=3727eef7b6b1b2f31db7d091328d966e
|
23
|
+
ruby-enterprise-1.8.7-20090928.tar.gz=ae00018ce89d95419dfde370fcd485ac
|
24
|
+
rubygems-1.3.5.tgz=6e317335898e73beab15623cdd5f8cff
|
25
|
+
zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
|
data/examples/rvmrc
CHANGED
@@ -1,38 +1,51 @@
|
|
1
|
-
# Example
|
1
|
+
# Example ~/.rvmrc file.
|
2
|
+
#
|
2
3
|
# This file shows some examples of setting defaults to your own tastes.
|
3
|
-
|
4
|
-
#
|
5
|
-
#
|
6
|
-
|
7
|
-
#
|
8
|
-
#
|
9
|
-
|
10
|
-
#
|
11
|
-
#
|
12
|
-
|
13
|
-
|
14
|
-
#
|
15
|
-
|
16
|
-
# Default prefix path (~/, or /usr/local/src/ for example.)
|
17
|
-
#rvm_prefix_path="$HOME/."
|
18
|
-
|
19
|
-
# Default Install Path
|
20
|
-
#rvm_path="${rvm_prefix_path}rvm"
|
21
|
-
|
22
|
-
# Default Archives Path
|
4
|
+
#
|
5
|
+
# If you wish to adjust the default ruby interpreter/version/patchlevel
|
6
|
+
# settings they can be found in the $rvm_path/config/db file.
|
7
|
+
# Beware that currently that file is overwritten on install so
|
8
|
+
# back it up if you change anything.
|
9
|
+
#
|
10
|
+
|
11
|
+
# rvm Path
|
12
|
+
# This is where rvm installs and manages everything in by default.
|
13
|
+
#rvm_path="$HOME/.rvm"
|
14
|
+
|
15
|
+
# Archives Path
|
16
|
+
# This is where all tarballs/zipfiles/packagefiles are downladed to
|
23
17
|
#rvm_archives_path="${rvm_path}/archives"
|
24
18
|
|
25
|
-
#
|
19
|
+
# Source Path
|
20
|
+
# This is where rvm extracts to for compiling & installing.
|
26
21
|
#rvm_source_path="${rvm_path}/src"
|
27
22
|
|
28
|
-
#
|
23
|
+
# Log Path
|
24
|
+
# This is where rvm logs all of it's actions to
|
25
|
+
# (not including the 'do' actions)
|
29
26
|
#rvm_log_path="${rvm_path}/log"
|
30
27
|
|
31
|
-
#
|
32
|
-
#
|
28
|
+
# Bin Path
|
29
|
+
# This is where rvm places all of it's executable/wrapper scripts.
|
30
|
+
#rvm_bin_path="${$rvm_path}/bin"
|
31
|
+
|
32
|
+
# Gem Path
|
33
|
+
# This is where rvm installs all gems to for each ruby
|
34
|
+
# interpreter/version%gemset
|
35
|
+
#rvm_gem_path="$rvm_path/.gem"
|
36
|
+
|
37
|
+
# Hooks Path
|
38
|
+
# This is where rvm rubs custom hook files from.
|
39
|
+
#rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
|
33
40
|
|
34
|
-
#
|
41
|
+
# Temp Path
|
42
|
+
# This is where rvm stores all of its temporary files.
|
43
|
+
#rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
|
44
|
+
|
45
|
+
# Install On Use Flag
|
46
|
+
# Install rubies when used if are not installed.
|
35
47
|
#ruby_install_on_use=1
|
36
48
|
|
37
|
-
# Make Flags, I have
|
38
|
-
#rvm_make_flags="-j
|
49
|
+
# Make Flags, I have 8 cpu's so I might use 7 make threads:
|
50
|
+
#rvm_make_flags="-j 7"
|
51
|
+
|
data/install
CHANGED
@@ -85,6 +85,8 @@ echo -e "\n$(tput setaf 2)RTFM:\n $(tput sgr0) http://rvm.beginrescueend.com/
|
|
85
85
|
echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
|
86
86
|
echo -e "\n ~ Wayne\n"
|
87
87
|
|
88
|
-
$
|
88
|
+
if [[ -x "$rvm_path/scripts/rvm" ]] ; then
|
89
|
+
"$rvm_path/scripts/rvm" -v
|
90
|
+
fi
|
89
91
|
|
90
92
|
exit 0
|
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.0.
|
8
|
+
s.version = "0.0.85"
|
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{2009-11-
|
12
|
+
s.date = %q{2009-11-30}
|
13
13
|
s.default_executable = %q{rvm-install}
|
14
14
|
s.description = %q{Manages Ruby interpreter installations and switching between them.}
|
15
15
|
s.email = %q{wayneeseguin@gmail.com}
|
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
|
|
22
22
|
"README",
|
23
23
|
"binscripts/rvm-prompt",
|
24
24
|
"config/db",
|
25
|
+
"config/md5",
|
25
26
|
"examples/rvmrc",
|
26
27
|
"install",
|
27
28
|
"lib/VERSION.yml",
|
@@ -40,6 +41,7 @@ Gem::Specification.new do |s|
|
|
40
41
|
"scripts/fetch",
|
41
42
|
"scripts/functions",
|
42
43
|
"scripts/gems",
|
44
|
+
"scripts/hash",
|
43
45
|
"scripts/initialize",
|
44
46
|
"scripts/install",
|
45
47
|
"scripts/irbrc",
|
data/scripts/array
CHANGED
data/scripts/cli
CHANGED
@@ -104,7 +104,7 @@ __rvm_parse_args() {
|
|
104
104
|
rvm_ruby_version=$(echo "$1" | tr ',' ' ') ; shift
|
105
105
|
unset rvm_ruby_interpreter
|
106
106
|
else
|
107
|
-
if
|
107
|
+
if $rvm_scripts_path/match "rbx jruby rubinius macruby ree mput shyouhei" "$1" ; then
|
108
108
|
rvm_ruby_interpreter=$1 ; shift
|
109
109
|
else
|
110
110
|
unset rvm_ruby_interpreter rvm_ruby_version
|
@@ -358,10 +358,7 @@ rvm() {
|
|
358
358
|
$rvm_scripts_path/monitor ; result=$?
|
359
359
|
;;
|
360
360
|
notes) $rvm_scripts_path/notes ; result=$? ;;
|
361
|
-
reload)
|
362
|
-
shift;shift;unset rvm_action;
|
363
|
-
source "$rvm_path/scripts/rvm"
|
364
|
-
;;
|
361
|
+
reload) rvm_reload_flag=1 ; break ;;
|
365
362
|
install|uninstall) __rvm_manage_rubies ; result=$? ;;
|
366
363
|
tests|specs) rvm_action="rake" ; __rvm_do ; result=$? ;;
|
367
364
|
|
@@ -391,6 +388,9 @@ rvm() {
|
|
391
388
|
result=1
|
392
389
|
esac
|
393
390
|
|
391
|
+
|
392
|
+
if [[ "$rvm_reload_flag" -eq 1 ]] ; then source "$rvm_path/scripts/rvm" ; fi
|
393
|
+
|
394
394
|
if [[ "1" = "$rvm_trace_flag" ]] ; then set +x ; unset rvm_trace_flag ; fi
|
395
395
|
|
396
396
|
return $result
|
data/scripts/hash
ADDED
@@ -0,0 +1,36 @@
|
|
1
|
+
#!/usr/bin/env bash
|
2
|
+
|
3
|
+
#
|
4
|
+
# The idea is that we emulate a hash using two methods
|
5
|
+
#
|
6
|
+
# The first method is providing functions by sourcing this file
|
7
|
+
#
|
8
|
+
# The second method is where this script is called directly,
|
9
|
+
# we then provide functionality of a file based hash
|
10
|
+
#
|
11
|
+
|
12
|
+
if [[ -z "$rvm_trace_flag" ]] ; then set +x ; else set -x ; fi
|
13
|
+
|
14
|
+
if [[ ! -z "$ZSH_VERSION" ]] ; then __array_start=1 ; else __array_start=0 ; fi
|
15
|
+
|
16
|
+
hash() {
|
17
|
+
hash_name=$1 ; hash_key=$2 ; hash_value=$3
|
18
|
+
|
19
|
+
eval "_hash_${hash_name}_keys=\${_hash_${hash_name}_keys:-()} ; _hash_${hash_name}_values=\${_hash_${hash_name}_values:-()}"
|
20
|
+
if [[ -z "$hash_value" ]] ; then
|
21
|
+
eval "length=\${#_hash_${hash_name}_keys[@]}"
|
22
|
+
for (( index=$__array_start ; index < $length; index++ )) ; do
|
23
|
+
eval "key=\"\${_hash_${hash_name}_keys[$index]}\""
|
24
|
+
if [[ "$hash_key" = "$key" ]] ; then
|
25
|
+
eval "echo -n \${_hash_${hash_name}_values[$index]}"
|
26
|
+
break
|
27
|
+
fi
|
28
|
+
done
|
29
|
+
else
|
30
|
+
eval "index=\$((\${#_hash_${hash_name}_keys[*]} + $__array_start))"
|
31
|
+
eval "_hash_${hash_name}_keys[$index]=\"$hash_key\""
|
32
|
+
eval "_hash_${hash_name}_values[$index]=\"$hash_value\""
|
33
|
+
fi
|
34
|
+
set +x
|
35
|
+
}
|
36
|
+
|
data/scripts/initialize
CHANGED
@@ -14,7 +14,7 @@ rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
|
|
14
14
|
rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
|
15
15
|
rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
|
16
16
|
rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
|
17
|
-
|
17
|
+
rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
|
18
18
|
|
19
|
-
export rvm_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gem_path rvm_config_path
|
19
|
+
export rvm_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gem_path rvm_config_path rvm_tmp_path
|
20
20
|
|
data/scripts/install
CHANGED
@@ -85,6 +85,8 @@ echo -e "\n$(tput setaf 2)RTFM:\n $(tput sgr0) http://rvm.beginrescueend.com/
|
|
85
85
|
echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
|
86
86
|
echo -e "\n ~ Wayne\n"
|
87
87
|
|
88
|
-
$
|
88
|
+
if [[ -x "$rvm_path/scripts/rvm" ]] ; then
|
89
|
+
"$rvm_path/scripts/rvm" -v
|
90
|
+
fi
|
89
91
|
|
90
92
|
exit 0
|
data/scripts/monitor
CHANGED
data/scripts/notes
CHANGED
@@ -35,7 +35,7 @@ if [[ "Linux" = "$system" ]] ; then
|
|
35
35
|
echo -e "\n The SUN java runtime environment and development kit."
|
36
36
|
fi
|
37
37
|
elif [[ "Darwin" = "$system" ]] ; then
|
38
|
-
echo -e " $item
|
38
|
+
echo -e " $item For Snow Leopard be sure to have XCode Tools Version 3.2.1 (1613) or later (there were bugs with the dvd release version)."
|
39
39
|
echo -e "\n $item You should download the latest XCode tools from developer.apple.com. This will be necessary with the dvd install for Snow Leopard which has bugs."
|
40
40
|
echo -e "\n $item If you intend on installing MacRuby you must install LLVM first."
|
41
41
|
fi
|
data/scripts/ruby-installer
CHANGED
@@ -131,13 +131,13 @@ __rvm_install_ruby() {
|
|
131
131
|
rvm_ruby_configure=" true "
|
132
132
|
rvm_ruby_make="rake"
|
133
133
|
rvm_ruby_make_install="sudo rake install"
|
134
|
-
|
134
|
+
__rvm_db "${rvm_ruby_interpreter}_repo_url" "rvm_url"
|
135
135
|
rvm_ruby_repo_url=$rvm_url
|
136
136
|
__rvm_install_source $*
|
137
137
|
else # if [[ "nightly" = "$rvm_ruby_version" ]] ; then
|
138
138
|
macruby_path="/usr/local/bin"
|
139
139
|
# TODO: Separated nightly from head.
|
140
|
-
|
140
|
+
__rvm_db "macruby_nightly_url" "rvm_url"
|
141
141
|
$rvm_scripts_path/log "info" "Retrieving the latest nightly macruby build..."
|
142
142
|
$rvm_scripts_path/fetch "$rvm_url"
|
143
143
|
result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
|
@@ -176,7 +176,7 @@ RubyWrapper
|
|
176
176
|
|
177
177
|
ree)
|
178
178
|
if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.8/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
|
179
|
-
rvm_url="$(
|
179
|
+
rvm_url="$(__rvm_db "ree_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
|
180
180
|
$rvm_scripts_path/log "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
|
181
181
|
__rvm_pushpop "$rvm_src_path"
|
182
182
|
if [[ -z "$rvm_force_flag" ]] && [[ -d "$rvm_ruby_src_path" ]] && [[ ! -x "$rvm_ruby_src_path/installer" ]] ; then
|
@@ -219,7 +219,7 @@ RubyWrapper
|
|
219
219
|
__rvm_post_install
|
220
220
|
__rvm_pushpop
|
221
221
|
else
|
222
|
-
|
222
|
+
__rvm_db "ree_${rvm_ruby_version}_repo_url" "rvm_url"
|
223
223
|
if [[ -z "$rvm_url" ]] ; then
|
224
224
|
$rvm_scripts_path/log "fail" "rvm does not know the rvm repo url for 'ree_${rvm_ruby_version}'"
|
225
225
|
result=1
|
data/scripts/rvm
CHANGED
@@ -1,44 +1,44 @@
|
|
1
1
|
#!/usr/bin/env bash
|
2
2
|
|
3
|
-
#
|
4
3
|
# rvm : Ruby Version Manager
|
5
4
|
# http://rvm.beginrescueend.com
|
6
5
|
# http://gitub.com/wayneeseguin/rvm
|
7
|
-
#
|
8
6
|
|
9
|
-
if [[
|
10
|
-
if [[ -f
|
11
|
-
if [[ -
|
7
|
+
if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
|
8
|
+
if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
|
9
|
+
if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
|
10
|
+
if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
|
12
11
|
|
13
|
-
if [[ "root" = "$(whoami)" ]] ; then
|
14
|
-
rvm_path="${rvm_path:-/usr/local/rvm}"
|
15
|
-
else
|
16
|
-
if [[ -d "$HOME/.rvm" ]] ; then
|
17
|
-
rvm_path="${rvm_path:-$HOME/.rvm}"
|
18
|
-
else
|
12
|
+
if [[ "root" = "$(whoami)" ]] ; then
|
19
13
|
rvm_path="${rvm_path:-/usr/local/rvm}"
|
14
|
+
else
|
15
|
+
if [[ -d "$HOME/.rvm" ]] ; then
|
16
|
+
rvm_path="${rvm_path:-$HOME/.rvm}"
|
17
|
+
else
|
18
|
+
rvm_path="${rvm_path:-/usr/local/rvm}"
|
19
|
+
fi
|
20
20
|
fi
|
21
|
-
fi
|
22
21
|
|
23
|
-
source $rvm_path/scripts/array
|
24
|
-
source $rvm_path/scripts/initialize
|
25
|
-
source $rvm_path/scripts/utility
|
26
|
-
source $rvm_path/scripts/selector
|
27
|
-
source $rvm_path/scripts/ruby-installer # TODO: Script not function.
|
28
|
-
source $rvm_path/scripts/cli
|
29
|
-
source $rvm_path/scripts/gems
|
30
|
-
source $rvm_path/scripts/libraries
|
22
|
+
source $rvm_path/scripts/array
|
23
|
+
source $rvm_path/scripts/initialize
|
24
|
+
source $rvm_path/scripts/utility
|
25
|
+
source $rvm_path/scripts/selector
|
26
|
+
source $rvm_path/scripts/ruby-installer # TODO: Script not function.
|
27
|
+
source $rvm_path/scripts/cli
|
28
|
+
source $rvm_path/scripts/gems
|
29
|
+
source $rvm_path/scripts/libraries
|
31
30
|
|
32
|
-
|
31
|
+
unset rvm_reload_flag ; rvm_loaded_flag=1
|
33
32
|
|
34
|
-
rvm_version="$(cat "${rvm_path}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')" ; export rvm_version
|
33
|
+
rvm_version="$(cat "${rvm_path}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')" ; export rvm_version
|
35
34
|
|
36
|
-
|
35
|
+
if [[ -f "$rvm_path/default" ]] ; then source "$rvm_path/default" ; fi
|
37
36
|
|
38
|
-
|
37
|
+
# Source a .rvmrc file in a directory after changing to it, if it exists.
|
38
|
+
cd() { builtin cd "$@" ; if [[ -f .rvmrc ]] ; then source .rvmrc ; fi ; }
|
39
39
|
|
40
|
-
|
41
|
-
|
40
|
+
alias rvm-restart="source '${rvm_path}/scripts/rvm'"
|
41
|
+
fi
|
42
42
|
|
43
43
|
# Ok now we determine if we were called or sourced... under assumption of course ;)
|
44
44
|
if [[ $# -gt 0 ]] && [[ -z "$(echo "$*" | awk '/completion-/')" ]] ; then rvm "$*" ; fi
|
data/scripts/rvm-install
CHANGED
@@ -85,6 +85,8 @@ echo -e "\n$(tput setaf 2)RTFM:\n $(tput sgr0) http://rvm.beginrescueend.com/
|
|
85
85
|
echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
|
86
86
|
echo -e "\n ~ Wayne\n"
|
87
87
|
|
88
|
-
$
|
88
|
+
if [[ -x "$rvm_path/scripts/rvm" ]] ; then
|
89
|
+
"$rvm_path/scripts/rvm" -v
|
90
|
+
fi
|
89
91
|
|
90
92
|
exit 0
|
data/scripts/selector
CHANGED
@@ -18,14 +18,14 @@ __rvm_select() {
|
|
18
18
|
if [[ "$rvm_head_flag" -eq 1 ]] ; then
|
19
19
|
unset rvm_ruby_version rvm_ruby_tag
|
20
20
|
rvm_ruby_revision="head"
|
21
|
-
|
21
|
+
__rvm_db "macruby_repo_url" "rvm_ruby_repo_url"
|
22
22
|
rvm_url="$rvm_ruby_repo_url"
|
23
23
|
rvm_ruby_string="${rvm_ruby_interpreter}-head"
|
24
24
|
elif [[ "nightly" = "$rvm_ruby_version" ]] ; then
|
25
25
|
rvm_url="http://macruby.icoretech.org/latest"
|
26
26
|
rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
|
27
27
|
else
|
28
|
-
|
28
|
+
__rvm_db "macruby_version" "rvm_ruby_version"
|
29
29
|
rvm_ruby_package_name="${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}"
|
30
30
|
rvm_ruby_package_file="MacRuby%200.5%20beta%201.zip"
|
31
31
|
rvm_url="http://www.macruby.org/files/MacRuby%200.5%20beta%201.zip"
|
@@ -40,11 +40,11 @@ __rvm_select() {
|
|
40
40
|
|
41
41
|
rbx|rubinius)
|
42
42
|
rvm_ruby_interpreter="rbx"
|
43
|
-
rvm_ruby_version=${rvm_ruby_version
|
44
|
-
rvm_ruby_patch_level=${rvm_ruby_patch_level
|
45
|
-
rvm_ruby_repo_url=${rvm_rbx_repo_url
|
46
|
-
|
47
|
-
|
43
|
+
rvm_ruby_version=${rvm_ruby_version:-$(__rvm_db "rbx_version")}
|
44
|
+
rvm_ruby_patch_level=${rvm_ruby_patch_level:-$(__rvm_db "rbx_patch_level")}
|
45
|
+
rvm_ruby_repo_url=${rvm_rbx_repo_url:-$(__rvm_db "rubinius_repo_url")}
|
46
|
+
__rvm_db "rbx_url" "rvm_url"
|
47
|
+
|
48
48
|
rvm_ruby_file="rubinius-$rvm_ruby_version-$rvm_ruby_patch_level"
|
49
49
|
;;
|
50
50
|
|
@@ -53,10 +53,10 @@ __rvm_select() {
|
|
53
53
|
if [[ "$rvm_head_flag" -eq 1 ]] ; then
|
54
54
|
rvm_ruby_version="head"
|
55
55
|
rvm_ruby_string="jruby-head"
|
56
|
-
rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(
|
57
|
-
rvm_url="${rvm_ruby_repo_url:-$(
|
56
|
+
rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
|
57
|
+
rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
|
58
58
|
else
|
59
|
-
rvm_ruby_version="${rvm_ruby_version:-"$(
|
59
|
+
rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
|
60
60
|
rvm_package_file="${rvm_ruby_interpreter}-bin-${rvm_ruby_version}"
|
61
61
|
rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
|
62
62
|
rvm_url="http://jruby.kenai.com/downloads/${rvm_ruby_version}/${rvm_package_file}.tar.gz"
|
@@ -67,7 +67,7 @@ __rvm_select() {
|
|
67
67
|
|
68
68
|
ree)
|
69
69
|
rvm_ruby_interpreter=ree
|
70
|
-
rvm_ruby_version=${rvm_ruby_version:-"$(
|
70
|
+
rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ree_version")"}
|
71
71
|
if [[ ! -z "$rvm_ruby_patch_level" ]] ; then
|
72
72
|
rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^p##')"
|
73
73
|
rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}-${rvm_ruby_patch_level}"
|
@@ -81,7 +81,7 @@ __rvm_select() {
|
|
81
81
|
rvm_ruby_package_name="ree-$rvm_ruby_version-$rvm_ruby_revision"
|
82
82
|
else
|
83
83
|
rvm_ruby_package_file="ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level"
|
84
|
-
rvm_url="${rvm_url:-$(
|
84
|
+
rvm_url="${rvm_url:-$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")}/$rvm_ruby_package_file.tar.gz"
|
85
85
|
fi
|
86
86
|
fi
|
87
87
|
|
@@ -95,13 +95,13 @@ __rvm_select() {
|
|
95
95
|
rvm_ruby_version="head"
|
96
96
|
rvm_ruby_string="mput-head"
|
97
97
|
unset rvm_ruby_patch_level
|
98
|
-
rvm_ruby_repo_url=${rvm_mput_repo_url:-"$(
|
98
|
+
rvm_ruby_repo_url=${rvm_mput_repo_url:-"$(__rvm_db "shyouhei_repo_url")"}
|
99
99
|
rvm_url=$rvm_ruby_repo_url
|
100
100
|
unset rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install
|
101
101
|
;;
|
102
102
|
|
103
103
|
ruby)
|
104
|
-
rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(
|
104
|
+
rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "ruby_repo_url")"}"
|
105
105
|
if [[ -z "$rvm_ruby_version" ]] ; then $rvm_scripts_path/log "fail" "Unknown ruby version: $rvm_ruby_version" ; fi
|
106
106
|
;;
|
107
107
|
|
@@ -366,8 +366,9 @@ __rvm_ruby_string() {
|
|
366
366
|
|
367
367
|
# Unspecified version
|
368
368
|
if [[ -z "$rvm_ruby_version" ]] ; then
|
369
|
-
rvm_ruby_version=${rvm_ruby_version:-"$(
|
369
|
+
rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "${rvm_ruby_interpreter}_version")"}
|
370
370
|
fi
|
371
|
+
|
371
372
|
if [[ -z "$rvm_ruby_version" ]] ; then
|
372
373
|
rvm_ruby_string="${rvm_ruby_interpreter}"
|
373
374
|
else
|
@@ -383,7 +384,7 @@ __rvm_ruby_string() {
|
|
383
384
|
elif [[ ! -z "$rvm_ruby_patch_level" ]] ; then
|
384
385
|
rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
|
385
386
|
else
|
386
|
-
patch_level="$(
|
387
|
+
patch_level="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
|
387
388
|
if [[ ! -z "$patch_level" ]] ; then rvm_ruby_patch_level="p${patch_level}" ; fi
|
388
389
|
if [[ ! -z "$rvm_ruby_patch_level" ]] ; then
|
389
390
|
rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^pp#p#')"
|
data/scripts/update
CHANGED
@@ -85,6 +85,8 @@ echo -e "\n$(tput setaf 2)RTFM:\n $(tput sgr0) http://rvm.beginrescueend.com/
|
|
85
85
|
echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
|
86
86
|
echo -e "\n ~ Wayne\n"
|
87
87
|
|
88
|
-
$
|
88
|
+
if [[ -x "$rvm_path/scripts/rvm" ]] ; then
|
89
|
+
"$rvm_path/scripts/rvm" -v
|
90
|
+
fi
|
89
91
|
|
90
92
|
exit 0
|
data/scripts/utility
CHANGED
@@ -1,5 +1,24 @@
|
|
1
1
|
#!/usr/bin/env bash
|
2
2
|
|
3
|
+
__rvm_db() {
|
4
|
+
key=$1 ; variable=$2
|
5
|
+
if [[ -f "$rvm_config_path/user" ]] ; then
|
6
|
+
value="$($rvm_scripts_path/db "$rvm_config_path/user" "$key")"
|
7
|
+
fi
|
8
|
+
|
9
|
+
if [[ -z "$value" ]] ; then
|
10
|
+
value="$($rvm_scripts_path/db "$rvm_config_path/db" "$key")"
|
11
|
+
fi
|
12
|
+
|
13
|
+
if [[ ! -z "$value" ]] ; then
|
14
|
+
if [[ -z $variable ]] ; then
|
15
|
+
echo $value
|
16
|
+
else
|
17
|
+
eval "$variable=$value"
|
18
|
+
fi
|
19
|
+
fi
|
20
|
+
}
|
21
|
+
|
3
22
|
__rvm_info() {
|
4
23
|
if [[ ! -z "$(which ruby 2>/dev/null)" ]] ; then full_version=$(ruby -v) ; fi
|
5
24
|
|
@@ -166,25 +185,25 @@ __rvm_load_defaults() {
|
|
166
185
|
done
|
167
186
|
fi
|
168
187
|
|
169
|
-
|
188
|
+
__rvm_db "system_ruby" "rvm_system_ruby"
|
170
189
|
if [[ ! -z "$rvm_system_ruby" ]] ; then
|
171
190
|
rvm_system_ruby=$(which ruby 2>/dev/null)
|
172
191
|
if [[ $? -ne 0 ]] ; then
|
173
192
|
$rvm_scripts_path/log "info" "System ruby not found, no system default will be stored."
|
174
193
|
else
|
175
|
-
$rvm_scripts_path/db "$rvm_config_path/
|
194
|
+
$rvm_scripts_path/db "$rvm_config_path/user" "system_ruby" "$rvm_system_ruby"
|
176
195
|
|
177
196
|
# Now store system system & user gem paths
|
178
197
|
if [[ ! -z "$(which gem 2>/dev/null)" ]] ; then
|
179
|
-
|
198
|
+
__rvm_db "system_user_gem_path" "rvm_system_user_gem_path"
|
180
199
|
if [[ -z "$rvm_system_user_gem_path" ]] ; then
|
181
200
|
rvm_system_user_gem_path=$( rvm system ; gem env gemdir user; )
|
182
|
-
$rvm_scripts_path/db "$rvm_config_path/
|
201
|
+
$rvm_scripts_path/db "$rvm_config_path/user" "system_user_gem_path" "$rvm_system_user_gem_path"
|
183
202
|
fi
|
184
|
-
|
203
|
+
__rvm_db "system_gem_path" "rvm_system_gem_path"
|
185
204
|
if [[ -z "$rvm_system_gem_path" ]] ; then
|
186
205
|
rvm_system_gem_path=$( rvm system ; gem env gemdir; )
|
187
|
-
$rvm_scripts_path/db "$rvm_config_path/
|
206
|
+
$rvm_scripts_path/db "$rvm_config_path/user" "system_gem_path" "$rvm_system_gem_path"
|
188
207
|
fi
|
189
208
|
fi
|
190
209
|
fi
|
@@ -204,7 +223,7 @@ __rvm_reset() {
|
|
204
223
|
__rvm_select
|
205
224
|
|
206
225
|
for system_config in system_ruby system_gem_path system_user_gem_path ; do
|
207
|
-
$rvm_scripts_path/db "$rvm_config_path/
|
226
|
+
$rvm_scripts_path/db "$rvm_config_path/user" "$system_config" "delete"
|
208
227
|
done ; unset system_config variable
|
209
228
|
|
210
229
|
rm -f $rvm_path/bin/ruby $rvm_path/bin/gem $rvm_path/bin/rake $rvm_path/bin/irb $rvm_path/bin/default*
|
@@ -344,16 +363,19 @@ __rvm_list() {
|
|
344
363
|
fi ; unset version
|
345
364
|
fi
|
346
365
|
|
347
|
-
|
348
|
-
if [[ ! -z "$
|
349
|
-
|
366
|
+
system_ruby="$(rvm system ; which ruby 2>/dev/null)"
|
367
|
+
if [[ ! -z "$system_ruby" ]] ; then
|
368
|
+
system_version=$($system_ruby -v)
|
369
|
+
if [[ ! -z "$(which ruby 2>/dev/null)" ]] && [[ "$($(which ruby 2>/dev/null) -v)" = "$system_version" ]] ; then
|
350
370
|
echo -e "=> $(tput setaf 2)system$(tput sgr0) ( ruby -v # => $system_version )\n"
|
351
371
|
else
|
352
372
|
echo -e " $(tput setaf 2)system$(tput sgr0) ( ruby -v # => $system_version )\n"
|
353
373
|
fi
|
354
374
|
else
|
355
375
|
$rvm_scripts_path/log "info" "No system ruby found."
|
356
|
-
fi
|
376
|
+
fi
|
377
|
+
|
378
|
+
unset current_ruby version selected system_ruby system_version string
|
357
379
|
fi
|
358
380
|
}
|
359
381
|
|
@@ -368,7 +390,7 @@ __rvm_initialize() {
|
|
368
390
|
PATH=$rvm_bin_path:$PATH ; export PATH
|
369
391
|
fi
|
370
392
|
|
371
|
-
mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $
|
393
|
+
mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $rvm_tmp_path
|
372
394
|
}
|
373
395
|
|
374
396
|
__rvm_update() {
|
@@ -570,14 +592,14 @@ __rvm_json() {
|
|
570
592
|
|
571
593
|
__rvm_benchmark() {
|
572
594
|
code="require \"benchmark\" \n Benchmark.bmbm do |benchmark| \n benchmark.report(\"${rvm_ruby_file}\") do \n"
|
573
|
-
echo -e "$code" > "$
|
595
|
+
echo -e "$code" > "$rvm_tmp_path/$$.rb"
|
574
596
|
unset code
|
575
|
-
cat $rvm_ruby_file >> "$
|
576
|
-
echo -e "\n end \nend\n" >> "$
|
577
|
-
rvm_ruby_args="$
|
597
|
+
cat $rvm_ruby_file >> "$rvm_tmp_path/$$.rb"
|
598
|
+
echo -e "\n end \nend\n" >> "$rvm_tmp_path/$$.rb"
|
599
|
+
rvm_ruby_args="$rvm_tmp_path/$$.rb"
|
578
600
|
rvm_benchmark_flag=1
|
579
601
|
rvm_action="ruby"
|
580
|
-
if [[ ! -z "$rvm_debug_flag" ]] ; then echo -e "$
|
602
|
+
if [[ ! -z "$rvm_debug_flag" ]] ; then echo -e "$rvm_tmp_path/$$.rb:\n$(cat $rvm_tmp_path/$$.rb)" ; fi
|
581
603
|
__rvm_do
|
582
604
|
}
|
583
605
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rvm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.85
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Wayne E. Seguin
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2009-11-
|
12
|
+
date: 2009-11-30 00:00:00 -05:00
|
13
13
|
default_executable: rvm-install
|
14
14
|
dependencies: []
|
15
15
|
|
@@ -26,6 +26,7 @@ files:
|
|
26
26
|
- README
|
27
27
|
- binscripts/rvm-prompt
|
28
28
|
- config/db
|
29
|
+
- config/md5
|
29
30
|
- examples/rvmrc
|
30
31
|
- install
|
31
32
|
- lib/VERSION.yml
|
@@ -44,6 +45,7 @@ files:
|
|
44
45
|
- scripts/fetch
|
45
46
|
- scripts/functions
|
46
47
|
- scripts/gems
|
48
|
+
- scripts/hash
|
47
49
|
- scripts/initialize
|
48
50
|
- scripts/install
|
49
51
|
- scripts/irbrc
|