rvm 0.0.50 → 0.0.51
Sign up to get free protection for your applications and to get access to all the features.
- data/config/db +6 -4
- data/install +7 -7
- data/lib/VERSION.yml +1 -1
- data/rvm.gemspec +2 -2
- data/scripts/cli +5 -2
- data/scripts/install +7 -7
- data/scripts/ruby-installer +62 -93
- data/scripts/rvm-install +7 -7
- data/scripts/selector +2 -1
- data/scripts/update +7 -7
- data/scripts/utility +17 -17
- metadata +2 -2
data/config/db
CHANGED
@@ -2,7 +2,7 @@ niceness=0
|
|
2
2
|
ruby_repo_url=http://svn.ruby-lang.org/repos/ruby
|
3
3
|
rubinius_repo_url=git://github.com/evanphx/rubinius.git
|
4
4
|
macruby_repo_url=http://svn.macosforge.org/repository/ruby/MacRuby
|
5
|
-
macruby_nightly_url=http://
|
5
|
+
macruby_nightly_url=http://macruby.icoretech.org/latest
|
6
6
|
jruby_repo_url=git://kenai.com/jruby~main
|
7
7
|
ruby_configure=--enable-shared
|
8
8
|
interpreter=ruby
|
@@ -10,11 +10,13 @@ ruby_version=1.8.6
|
|
10
10
|
ruby_patchlevel=383
|
11
11
|
jruby_version=1.3.1
|
12
12
|
ree_interpreter=ruby-enterprise
|
13
|
-
ree_version=1.8.
|
14
|
-
|
13
|
+
ree_version=1.8.7
|
14
|
+
ree_1.8.6_patch_level=20090610
|
15
|
+
ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677
|
15
16
|
ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
|
17
|
+
ree_1.8.7_url=http://rubyforge.org/frs/download.php/64475
|
16
18
|
ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
|
17
|
-
|
19
|
+
ree_1.8.7_patch_level=20090928
|
18
20
|
ruby_1.9.1_patch_level=243
|
19
21
|
ruby_1.9.2_patch_level=preview1
|
20
22
|
ruby_1.8.5_patch_level=115
|
data/install
CHANGED
@@ -12,23 +12,23 @@ cwd=$(pwd)
|
|
12
12
|
source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
|
13
13
|
if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
|
14
14
|
source_dir="${source_dir:-$cwd}"
|
15
|
-
|
15
|
+
rvm_path=~/.rvm
|
16
16
|
|
17
17
|
# State what is required to use rvm
|
18
18
|
echo -e "\n\033[0;32mrvm\033[0m\n\n shell scripts that allows a user to manage multiple ruby versions in their own account."
|
19
19
|
echo -e "\n Installing rvm to ~/.rvm/ ..."
|
20
20
|
for dir_name in src scripts bin log archives config gems examples ; do
|
21
|
-
mkdir -p $
|
21
|
+
mkdir -p $rvm_path/$dir_name
|
22
22
|
done
|
23
23
|
|
24
24
|
for dir_name in config scripts examples lib ; do
|
25
|
-
mkdir -p $
|
26
|
-
/bin/cp -Rf $source_dir/$dir_name $
|
25
|
+
mkdir -p $rvm_path/$dir_name
|
26
|
+
/bin/cp -Rf $source_dir/$dir_name $rvm_path
|
27
27
|
done ; unset dir_name
|
28
28
|
|
29
29
|
for file_name in rvm-prompt gemsync ; do
|
30
|
-
mv $
|
31
|
-
chmod +x $
|
30
|
+
mv $rvm_path/scripts/$file_name $rvm_path/bin/
|
31
|
+
chmod +x $rvm_path/bin/$file_name
|
32
32
|
done ; unset file_name
|
33
33
|
|
34
34
|
results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
|
@@ -167,7 +167,7 @@ echo -e "\n \033[0;33mRTFM: \033[0m http://rvm.beginrescueend.com/ \n"
|
|
167
167
|
echo -e '\033[0;32mw⦿‿⦿t!\033[0m'
|
168
168
|
echo -e "\n ~ Wayne\n"
|
169
169
|
|
170
|
-
source $
|
170
|
+
source $rvm_path/scripts/rvm
|
171
171
|
rvm -v
|
172
172
|
echo
|
173
173
|
|
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.51"
|
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-09-
|
12
|
+
s.date = %q{2009-09-29}
|
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}
|
data/scripts/cli
CHANGED
@@ -5,7 +5,7 @@ function __rvm_meta {
|
|
5
5
|
rvm_meta_author_email="wayneeseguin@gmail.com"
|
6
6
|
rvm_meta_website="http://rvm.beginrescueend.com/"
|
7
7
|
rvm_meta_version="`cat $rvm_path/lib/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`"
|
8
|
-
rvm_meta_updated="2009.09.
|
8
|
+
rvm_meta_updated="2009.09.29"
|
9
9
|
}
|
10
10
|
|
11
11
|
function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
|
@@ -428,7 +428,7 @@ function rvm {
|
|
428
428
|
info|debug)
|
429
429
|
__rvm_version
|
430
430
|
__rvm_info
|
431
|
-
if [ "$rvm_action" = "debug" ] ; then __rvm_debug ; fi
|
431
|
+
if [ "$rvm_action" = "debug" ] ; then rvm_debug_flag=1 ; __rvm_debug ; fi
|
432
432
|
;;
|
433
433
|
|
434
434
|
error)
|
@@ -436,6 +436,7 @@ function rvm {
|
|
436
436
|
__rvm_pushpop
|
437
437
|
result=1;
|
438
438
|
;;
|
439
|
+
|
439
440
|
*)
|
440
441
|
if [ ! -z "$rvm_action" ] ; then
|
441
442
|
__rvm_log "fail" "unknown action '$rvm_action'"
|
@@ -444,7 +445,9 @@ function rvm {
|
|
444
445
|
fi
|
445
446
|
result=1
|
446
447
|
esac
|
448
|
+
|
447
449
|
if [ "$rvm_trace_flag" = "1" ] ; then set +x ; unset rvm_trace_flag ; fi
|
450
|
+
|
448
451
|
return $result
|
449
452
|
}
|
450
453
|
|
data/scripts/install
CHANGED
@@ -12,23 +12,23 @@ cwd=$(pwd)
|
|
12
12
|
source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
|
13
13
|
if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
|
14
14
|
source_dir="${source_dir:-$cwd}"
|
15
|
-
|
15
|
+
rvm_path=~/.rvm
|
16
16
|
|
17
17
|
# State what is required to use rvm
|
18
18
|
echo -e "\n\033[0;32mrvm\033[0m\n\n shell scripts that allows a user to manage multiple ruby versions in their own account."
|
19
19
|
echo -e "\n Installing rvm to ~/.rvm/ ..."
|
20
20
|
for dir_name in src scripts bin log archives config gems examples ; do
|
21
|
-
mkdir -p $
|
21
|
+
mkdir -p $rvm_path/$dir_name
|
22
22
|
done
|
23
23
|
|
24
24
|
for dir_name in config scripts examples lib ; do
|
25
|
-
mkdir -p $
|
26
|
-
/bin/cp -Rf $source_dir/$dir_name $
|
25
|
+
mkdir -p $rvm_path/$dir_name
|
26
|
+
/bin/cp -Rf $source_dir/$dir_name $rvm_path
|
27
27
|
done ; unset dir_name
|
28
28
|
|
29
29
|
for file_name in rvm-prompt gemsync ; do
|
30
|
-
mv $
|
31
|
-
chmod +x $
|
30
|
+
mv $rvm_path/scripts/$file_name $rvm_path/bin/
|
31
|
+
chmod +x $rvm_path/bin/$file_name
|
32
32
|
done ; unset file_name
|
33
33
|
|
34
34
|
results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
|
@@ -167,7 +167,7 @@ echo -e "\n \033[0;33mRTFM: \033[0m http://rvm.beginrescueend.com/ \n"
|
|
167
167
|
echo -e '\033[0;32mw⦿‿⦿t!\033[0m'
|
168
168
|
echo -e "\n ~ Wayne\n"
|
169
169
|
|
170
|
-
source $
|
170
|
+
source $rvm_path/scripts/rvm
|
171
171
|
rvm -v
|
172
172
|
echo
|
173
173
|
|
data/scripts/ruby-installer
CHANGED
@@ -16,12 +16,10 @@ function __rvm_install_source {
|
|
16
16
|
if [ -z "$rvm_ruby_tag" -a -z "$rvm_ruby_rev" ] ; then
|
17
17
|
if [ ! -d $rvm_ruby_src_path ] ; then
|
18
18
|
rvm_url="${rvm_url:-"ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_name.tar.gz"}"
|
19
|
-
|
20
|
-
__rvm_fetch $rvm_url
|
19
|
+
__rvm_run "fetch" "__rvm_fetch $rvm_url" "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
|
21
20
|
if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
|
22
|
-
__rvm_log "info" "Extracting $rvm_ruby_package_name ..."
|
23
21
|
mkdir -p $rvm_ruby_src_path # Is this line necessary considering -C below? v
|
24
|
-
__rvm_run "extract" tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path
|
22
|
+
__rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path" "Extracting $rvm_ruby_package_name ..."
|
25
23
|
if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
|
26
24
|
fi
|
27
25
|
else
|
@@ -75,21 +73,20 @@ function __rvm_install_source {
|
|
75
73
|
if [ ! -s "$rvm_ruby_src_path/configure" ] ; then
|
76
74
|
rvm_autoconf=`which autoconf`
|
77
75
|
if [ $? -gt 0 ] ; then __rvm_log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
|
78
|
-
__rvm_run "autoconf" "$rvm_autoconf"
|
76
|
+
__rvm_run "autoconf" "$rvm_autoconf" "Running autoconf"
|
79
77
|
# if [ $? -gt 0 ] ; then result=$? ; return $result ; fi # Don't barf on autoconf fail...
|
80
78
|
fi
|
81
79
|
|
82
80
|
if [ -s ./Makefile -a -z "$rvm_reconfigure_flag" ] ; then
|
83
81
|
__rvm_log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
|
84
82
|
elif [ -s ./configure ] ; then
|
85
|
-
__rvm_log "info" "Configuring $rvm_ruby_package_name using $rvm_ruby_configure, this may take a while depending on your cpu(s)..."
|
86
83
|
if [ -d $rvm_path/usr/include/readline/ ] ; then
|
87
|
-
configure_parameters="$configure_parameters --with-readline-dir=$rvm_path/usr/include/readline/
|
84
|
+
configure_parameters="$configure_parameters --with-readline-dir=$rvm_path/usr/include/readline/"
|
88
85
|
fi
|
89
86
|
if [ -d $rvm_path/usr/include/iconv/ ] ; then
|
90
|
-
configure_parameters="$configure_parameters --with-iconv-dir=$rvm_path/usr/include/iconv/
|
87
|
+
configure_parameters="$configure_parameters --with-iconv-dir=$rvm_path/usr/include/iconv/"
|
91
88
|
fi
|
92
|
-
__rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure $configure_parameters
|
89
|
+
__rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure $configure_parameters" "Configuring $rvm_ruby_package_name using $rvm_ruby_configure, this may take a while depending on your cpu(s)..."
|
93
90
|
if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
|
94
91
|
unset configure_parameters
|
95
92
|
elif [ ! -z "rvm_ruby_configure" ] ; then
|
@@ -98,14 +95,12 @@ function __rvm_install_source {
|
|
98
95
|
__rvm_log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
|
99
96
|
fi
|
100
97
|
|
101
|
-
__rvm_log "info" "Compiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
|
102
98
|
rvm_ruby_make=${rvm_ruby_make:-"/usr/bin/make"}
|
103
|
-
__rvm_run "make" "$rvm_ruby_make $rvm_make_flags"
|
99
|
+
__rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
|
104
100
|
if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
|
105
101
|
|
106
|
-
__rvm_log "info" "Installing $rvm_ruby_package_name"
|
107
102
|
rvm_ruby_make_install=${rvm_ruby_make_install:-"/usr/bin/make install"}
|
108
|
-
__rvm_run "install" "$rvm_ruby_make_install"
|
103
|
+
__rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_package_name"
|
109
104
|
if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
|
110
105
|
|
111
106
|
__rvm_log "info" "Installation of $rvm_ruby_package_name is complete."
|
@@ -115,7 +110,7 @@ function __rvm_install_source {
|
|
115
110
|
|
116
111
|
__rvm_rubygems_setup
|
117
112
|
__rvm_bin_script
|
118
|
-
__rvm_run "chmod.bin" chmod +x $rvm_ruby_home/bin/*
|
113
|
+
__rvm_run "chmod.bin" "chmod +x $rvm_ruby_home/bin/*"
|
119
114
|
__rvm_post_install
|
120
115
|
__rvm_pushpop
|
121
116
|
}
|
@@ -129,40 +124,10 @@ function __rvm_install_ruby {
|
|
129
124
|
case "$rvm_ruby_interpreter" in
|
130
125
|
macruby)
|
131
126
|
if [ "`uname`" = "Darwin" ] ; then
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
__rvm_gi "rake" # Make sure that rake is present
|
137
|
-
#rvm_macruby_repo_url="${rvm_macruby_repo_url:-"http://svn.macosforge.org/repository/ruby/MacRuby"}"
|
138
|
-
rvm_macruby_repo_url="${rvm_macruby_repo_url:-"git://github.com/masterkain/macruby.git"}"
|
139
|
-
rvm_ruby_repo_url=$rvm_macruby_repo_url
|
140
|
-
#rvm_macruby_nightly_url=`__rvm_db "macruby_nightly_url"`
|
141
|
-
rvm_ruby_configure=" "
|
142
|
-
rvm_make_flags=" "
|
143
|
-
rvm_ruby_make="cd $rvm_ruby_src_path; /usr/bin/rake macruby:build framework_instdir=$rvm_path/macruby-head framework_name=/macruby-head --trace"
|
144
|
-
rvm_ruby_make_install="cd $rvm_ruby_src_path; /usr/bin/rake framework:install"
|
145
|
-
rvm_ruby_rev="${rvm_ruby_rev:-head}" # Hard coding this for now
|
146
|
-
rvm_url=$rvm_ruby_repo_url
|
147
|
-
|
148
|
-
DESTDIR="$rvm_ruby_home" ; export DESTDIR
|
149
|
-
if [ -z "$rvm_ruby_rev" ] ; then
|
150
|
-
# TODO: Check if tag v is valid
|
151
|
-
#rvm_ruby_repo_url=$rvm_ruby_repo_url/tags/$rvm_ruby_tag
|
152
|
-
rvm_ruby_rev="head" # For now, until nightly release are available.
|
153
|
-
else
|
154
|
-
if [ "$rvm_ruby_rev" = "head" -o "$rvm_ruby_rev" = "trunk" ] ; then
|
155
|
-
#rvm_ruby_repo_url=$rvm_ruby_repo_url/trunk
|
156
|
-
rvm_ruby_rev="head"
|
157
|
-
else
|
158
|
-
#rvm_ruby_repo_url=$rvm_ruby_repo_url/trunk
|
159
|
-
rvm_ruby_rev="-r $rvm_ruby_rev"
|
160
|
-
fi
|
161
|
-
fi
|
162
|
-
#__rvm_fetch $rvm_url
|
163
|
-
#__rvm_run /usr/sbin/installer -pkg $rvm_ruby_package_name.pkg -target "$rvm_path/$rvm_ruby_package_name/"
|
164
|
-
__rvm_install_source
|
165
|
-
unset DESTDIR
|
127
|
+
rvm_url=`__rvm_db "macruby_nightly_url"`
|
128
|
+
__rvm_run "macruby/fetch" "__rvm_fetch $rvm_url" "Retrieving latest macruby" # $rvm_archives_path/macruby_nightly.pkg
|
129
|
+
mv $rvm_archives_path/latest $rvm_archives_path/macruby_nightly.pkg
|
130
|
+
__rvm_run "macruby/extract" "xar -x -f $rvm_archives_path/macruby_nightly.pkg -C $rvm_ruby_home" "Extracting macruby nightly package."
|
166
131
|
else
|
167
132
|
__rvm_log "fail" "MacRuby can only be installed on a Darwin OS."
|
168
133
|
fi
|
@@ -170,37 +135,34 @@ function __rvm_install_ruby {
|
|
170
135
|
;;
|
171
136
|
|
172
137
|
ruby-enterprise|ree)
|
173
|
-
if [ "$rvm_ruby_version
|
174
|
-
|
138
|
+
if [ ! -z "$(echo $rvm_ruby_version | awk '/^1\.8/')" -a -z "$rvm_head_flag" ] ; then
|
139
|
+
# ruby-enterprise-1.8.7-20090928.tar.gz
|
140
|
+
rvm_url="`__rvm_db "ree_${rvm_ruby_version}_url"`/$rvm_ruby_package_name.tar.gz"
|
175
141
|
__rvm_log "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
|
176
142
|
__rvm_pushpop $rvm_source_path
|
177
143
|
if [ -d $rvm_ruby_src_path ] ; then
|
178
144
|
cd $rvm_ruby_src_path
|
179
145
|
else
|
180
|
-
|
181
|
-
__rvm_fetch $rvm_url
|
146
|
+
__rvm_run "fetch" "__rvm_fetch $rvm_url" "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
|
182
147
|
if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
|
183
|
-
__rvm_log "info" "Extracting $rvm_ruby_package_name..."
|
184
148
|
mkdir -p $rvm_ruby_src_path
|
185
|
-
__rvm_run "extract" tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path
|
149
|
+
__rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path" "Extracting $rvm_ruby_package_name..."
|
186
150
|
if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
|
187
151
|
fi
|
188
152
|
|
189
|
-
__rvm_log "info" "Installing $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
|
190
153
|
mkdir -p $rvm_ruby_log_path
|
191
154
|
|
192
155
|
cd $rvm_ruby_src_path
|
193
156
|
mkdir -p $rvm_ruby_home/lib/ruby/gems/1.8/gems
|
194
157
|
if [ ! -z "$rvm_ruby_configure" ] ; then rvm_ruby_configure="-c $rvm_ruby_configure"; fi
|
195
|
-
__rvm_run "install" ./installer -a $rvm_path/ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level --dont-install-useful-gems --no-tcmalloc $rvm_ruby_configure
|
158
|
+
__rvm_run "install" "./installer -a $rvm_path/ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level --dont-install-useful-gems --no-tcmalloc $rvm_ruby_configure" "Installing $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
|
196
159
|
if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
|
197
160
|
chmod +x $rvm_ruby_home/bin/*
|
198
161
|
|
199
162
|
__rvm_rubygems_setup
|
200
163
|
|
201
164
|
for rvm_gem_name in rake ; do
|
202
|
-
|
203
|
-
__rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q
|
165
|
+
__rvm_run "gems" "$rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q" "Installing $rvm_gem_name"
|
204
166
|
done
|
205
167
|
__rvm_irbrc
|
206
168
|
__rvm_bin_scripts
|
@@ -231,28 +193,37 @@ function __rvm_install_ruby {
|
|
231
193
|
rvm_ruby_make_install="rake install"
|
232
194
|
rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
|
233
195
|
#rvm_ruby_rev="head"
|
234
|
-
# TODO: Check if already git repo, then git pull origin master && build
|
235
196
|
|
236
197
|
if [ ! -d $rvm_ruby_home -o ! -d $rvm_ruby_home/.git ] ; then
|
237
198
|
rm -rf $rvm_ruby_home
|
238
199
|
git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_home
|
200
|
+
cd $rvm_ruby_home
|
201
|
+
else
|
202
|
+
cd $rvm_ruby_home
|
203
|
+
git pull origin master
|
239
204
|
fi
|
240
|
-
cd $rvm_ruby_home
|
241
205
|
|
242
206
|
# prereqs, 1.8.6 w/ParseTree & rake. Yes this could all be one line... not pushing our luck.
|
243
|
-
echo `rvm
|
207
|
+
echo `export rvm_install_on_use_flag=1 ; rvm 1.8.6` # This should install if missing.
|
244
208
|
echo `rvm 1.8.6 -m rbx ; gem install --no-rdoc --no-ri rake ParseTree` # This should install if missing.
|
209
|
+
rvm_ruby_interpreter="rbx"
|
210
|
+
__rvm_select
|
245
211
|
if [ ! -z "$rvm_jit_flag" ]; then
|
246
|
-
__rvm_run "build" "\`rvm 1.8.6 -m rbx ; RBX_LLVM=1 rake build\`"
|
212
|
+
__rvm_run "build" "\`rvm 1.8.6 -m rbx ; RBX_LLVM=1 rake build\`" "Building rbx with RBX_LLVM=1"
|
247
213
|
else
|
248
|
-
__rvm_run "build" "\`rvm 1.8.6 -m rbx ; rake build\`"
|
214
|
+
__rvm_run "build" "\`rvm 1.8.6 -m rbx ; rake build\`" "Building rbx"
|
249
215
|
fi
|
250
216
|
|
251
|
-
|
217
|
+
binaries="ruby irb"
|
218
|
+
for binary in $(echo $binaries) ; do
|
252
219
|
ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary
|
253
|
-
done
|
220
|
+
done ; unset binary binaries
|
221
|
+
|
254
222
|
$rvm_ruby_home/bin/rbx -S gem install rake --no-rdoc --no-ri
|
255
223
|
|
224
|
+
binaries="erb ri rdoc"
|
225
|
+
__rvm_post_install
|
226
|
+
|
256
227
|
for binary_name in gem rake ; do
|
257
228
|
ruby_wrapper=$(cat <<RubyWrapper
|
258
229
|
#!/bin/bash
|
@@ -265,12 +236,12 @@ PATH="$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH" ; export PATH
|
|
265
236
|
exec $rvm_ruby_home/bin/rbx -S $binary_name "\$@"
|
266
237
|
RubyWrapper
|
267
238
|
)
|
268
|
-
rm -f $rvm_path/bin/$binary-$rvm_ruby_package_name
|
269
239
|
for file_name in $rvm_path/bin/$binary-$rvm_ruby_package_name $rvm_ruby_home/bin/$binary ; do
|
240
|
+
rm -f $file_name
|
270
241
|
echo "$ruby_wrapper" > $file_name
|
271
242
|
if [ -f $file_name ] ; then chmod +x $file_name ; fi
|
272
|
-
done
|
273
|
-
unset ruby_wrapper binary_name
|
243
|
+
done ; unset file_name
|
244
|
+
unset ruby_wrapper binary_name
|
274
245
|
done
|
275
246
|
__rvm_irbrc
|
276
247
|
__rvm_bin_scripts
|
@@ -281,7 +252,6 @@ RubyWrapper
|
|
281
252
|
rvm_url="http://dist.codehaus.org/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.zip"
|
282
253
|
rvm_jruby_repo_url="${rvm_jruby_repo_url:-"git://kenai.com/jruby~main"}"
|
283
254
|
|
284
|
-
__rvm_log "info" "Installing JRuby to: $rvm_ruby_home"
|
285
255
|
mkdir -p $rvm_ruby_log_path
|
286
256
|
__rvm_pushpop $rvm_source_path
|
287
257
|
|
@@ -297,28 +267,25 @@ RubyWrapper
|
|
297
267
|
if [ -z "$rvm_force_flag" -a -f $rvm_package_file -a -s $rvm_package_file ] ; then
|
298
268
|
__rvm_log "info" "It appears that $rvm_package_file has already been downloaded, skipping. Use --force to force re-download."
|
299
269
|
else
|
300
|
-
|
301
|
-
__rvm_fetch $rvm_url
|
270
|
+
__rvm_run "fetch" "__rvm_fetch $rvm_url" "Downloading $rvm_package_file, this may take a while depending on your connection..."
|
302
271
|
fi
|
303
|
-
__rvm_log "info" "Extracting $rvm_package_file..."
|
304
272
|
rvm_unzip=`which unzip`
|
305
273
|
if [ $? -ne 0 ] ; then
|
306
274
|
__rvm_log "error" "'unzip' was not found in your PATH. jRuby official release comes as a .zip file, hence 'unzip' is required to extract it. Please install 'unzip' and try again."
|
307
275
|
else
|
308
|
-
__rvm_run "extract" unzip -q $rvm_archives_path/$rvm_package_file.zip -d $rvm_source_path
|
276
|
+
__rvm_run "extract" "unzip -q $rvm_archives_path/$rvm_package_file.zip -d $rvm_source_path" "Extracting $rvm_package_file..."
|
309
277
|
fi
|
310
278
|
cd $rvm_ruby_src_path
|
311
279
|
fi
|
312
280
|
fi
|
313
281
|
|
314
|
-
__rvm_log "info" "Installing $rvm_ruby_package_name..."
|
315
282
|
mkdir -p $rvm_ruby_home/bin/
|
316
|
-
__rvm_run "nailgun" "cd $rvm_ruby_src_path/tool/nailgun && /usr/bin/make $rvm_make_flags"
|
283
|
+
__rvm_run "nailgun" "cd $rvm_ruby_src_path/tool/nailgun && /usr/bin/make $rvm_make_flags" "Installing $rvm_ruby_package_name..."
|
317
284
|
__rvm_pushpop
|
318
285
|
|
319
286
|
if [ -z "$rvm_ruby_home" -o "$rvm_ruby_home" = "/" ] ; then echo "WTH?!?! rvm_ruby_home == / ??? not removing." ; return 1000000 ; fi
|
320
287
|
rm -rf $rvm_ruby_home
|
321
|
-
__rvm_run "
|
288
|
+
__rvm_run "install" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home" "Installing JRuby to $rvm_ruby_home"
|
322
289
|
|
323
290
|
__rvm_pushpop $rvm_ruby_home/bin/
|
324
291
|
for binary in jirb jruby jgem ; do
|
@@ -333,15 +300,13 @@ RubyWrapper
|
|
333
300
|
chmod +x $rvm_ruby_home/bin/$binary
|
334
301
|
done ; unset binary
|
335
302
|
|
336
|
-
|
337
|
-
|
303
|
+
__rvm_rubygems_setup
|
338
304
|
__rvm_irbrc
|
339
305
|
__rvm_bin_script
|
340
306
|
__rvm_use
|
341
307
|
|
342
308
|
for rvm_gem_name in jruby-openssl ; do
|
343
|
-
|
344
|
-
__rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q
|
309
|
+
__rvm_run "gems" "$rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q" "Installing $rvm_gem_name"
|
345
310
|
done ; unset rvm_gem_name
|
346
311
|
;;
|
347
312
|
|
@@ -450,7 +415,8 @@ function __rvm_remove_ruby {
|
|
450
415
|
}
|
451
416
|
|
452
417
|
function __rvm_post_install {
|
453
|
-
|
418
|
+
binaries="${binaries:-"gem irb erb ri rdoc testrb rake"}"
|
419
|
+
for binary in $(echo $binaries) ; do
|
454
420
|
if [ -e $rvm_ruby_home/bin/$binary -o -e $rvm_ruby_src_path/bin/$binary ] ; then
|
455
421
|
if [ "$rvm_ruby_src_path" != "$rvm_ruby_home" -a -f $rvm_ruby_src_path/bin/$binary ] ; then
|
456
422
|
cp -f $rvm_ruby_src_path/bin/$binary $rvm_ruby_home/bin/$binary
|
@@ -461,13 +427,12 @@ function __rvm_post_install {
|
|
461
427
|
__rvm_inject_ruby_shebang $rvm_ruby_home/bin/$binary
|
462
428
|
chmod +x $rvm_ruby_home/bin/$binary
|
463
429
|
fi
|
464
|
-
done ; unset binary
|
430
|
+
done ; unset binary binaries
|
465
431
|
|
466
432
|
__rvm_log "info" "Installing gems for $rvm_ruby_package_name."
|
467
433
|
|
468
434
|
for rvm_gem_name in rake ; do
|
469
|
-
|
470
|
-
__rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q
|
435
|
+
__rvm_run "gems.install" "$rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q" "Installing $rvm_gem_name"
|
471
436
|
done ; unset rvm_gem_name
|
472
437
|
|
473
438
|
__rvm_log "info" "Installation of gems for $rvm_ruby_package_name is complete."
|
@@ -486,13 +451,15 @@ function __rvm_rubygems_setup {
|
|
486
451
|
if [ ! -z "`echo $rvm_ruby_version | awk '/^1\.9/'`" ] ; then
|
487
452
|
# 1.9 has it's own built-in gem command
|
488
453
|
__rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
|
454
|
+
__rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
|
489
455
|
cp $rvm_ruby_src_path/bin/gem $rvm_ruby_home/bin/gem
|
490
|
-
__rvm_run "rubygems.update" $rvm_ruby_home/bin/gem update --system
|
491
|
-
|
492
|
-
|
493
|
-
|
494
|
-
|
495
|
-
|
456
|
+
__rvm_run "rubygems.update" "$rvm_ruby_home/bin/gem update --system" "Updating rubygems for $rvm_ruby_string"
|
457
|
+
__rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
|
458
|
+
__rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
|
459
|
+
|
460
|
+
elif [ ! -z "`echo $rvm_ruby_interpreter | awk '/^rbx|jruby/'`" ] ; then
|
461
|
+
__rvm_log "debug" "Skipping rubygems update for $rvm_ruby_version"
|
462
|
+
|
496
463
|
else
|
497
464
|
__rvm_log "info" "Installing rubygems dedicated to $rvm_ruby_package_name..."
|
498
465
|
rvm_gem_package_name="rubygems-1.3.5"
|
@@ -500,14 +467,16 @@ function __rvm_rubygems_setup {
|
|
500
467
|
if [ -d $rvm_source_path/$rvm_gem_package_name ] ; then
|
501
468
|
cd $rvm_source_path/$rvm_gem_package_name
|
502
469
|
else
|
503
|
-
__rvm_fetch $rvm_gem_url
|
470
|
+
__rvm_run "rubygems.fetch" "__rvm_fetch $rvm_gem_url" "Retrieving $rvm_gem_package_name"
|
504
471
|
mkdir -p $rvm_source_path/$rvm_gem_package_name
|
505
|
-
__rvm_run "rubygems.extract" tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_source_path
|
472
|
+
__rvm_run "rubygems.extract" "tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_source_path" "Extracting $rvm_gem_package_name"
|
506
473
|
fi
|
507
|
-
__rvm_run "rubygems.install" GEM_PATH=$rvm_gem_path GEM_HOME=$rvm_gem_home $rvm_ruby_home/bin/ruby $rvm_source_path/$rvm_gem_package_name/setup.rb
|
474
|
+
__rvm_run "rubygems.install" "GEM_PATH=$rvm_gem_path GEM_HOME=$rvm_gem_home $rvm_ruby_home/bin/ruby $rvm_source_path/$rvm_gem_package_name/setup.rb" "Installing rubygems for $rvm_ruby_home/bin/ruby"
|
508
475
|
result=$?
|
509
476
|
if [ $result -eq 0 ] ; then
|
510
477
|
__rvm_log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
|
478
|
+
else
|
479
|
+
__rvm_log "warning" "Installation of rubygems $rvm_ruby_package_name did not complete successfully."
|
511
480
|
fi
|
512
481
|
__rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
|
513
482
|
fi
|
data/scripts/rvm-install
CHANGED
@@ -12,23 +12,23 @@ cwd=$(pwd)
|
|
12
12
|
source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
|
13
13
|
if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
|
14
14
|
source_dir="${source_dir:-$cwd}"
|
15
|
-
|
15
|
+
rvm_path=~/.rvm
|
16
16
|
|
17
17
|
# State what is required to use rvm
|
18
18
|
echo -e "\n\033[0;32mrvm\033[0m\n\n shell scripts that allows a user to manage multiple ruby versions in their own account."
|
19
19
|
echo -e "\n Installing rvm to ~/.rvm/ ..."
|
20
20
|
for dir_name in src scripts bin log archives config gems examples ; do
|
21
|
-
mkdir -p $
|
21
|
+
mkdir -p $rvm_path/$dir_name
|
22
22
|
done
|
23
23
|
|
24
24
|
for dir_name in config scripts examples lib ; do
|
25
|
-
mkdir -p $
|
26
|
-
/bin/cp -Rf $source_dir/$dir_name $
|
25
|
+
mkdir -p $rvm_path/$dir_name
|
26
|
+
/bin/cp -Rf $source_dir/$dir_name $rvm_path
|
27
27
|
done ; unset dir_name
|
28
28
|
|
29
29
|
for file_name in rvm-prompt gemsync ; do
|
30
|
-
mv $
|
31
|
-
chmod +x $
|
30
|
+
mv $rvm_path/scripts/$file_name $rvm_path/bin/
|
31
|
+
chmod +x $rvm_path/bin/$file_name
|
32
32
|
done ; unset file_name
|
33
33
|
|
34
34
|
results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
|
@@ -167,7 +167,7 @@ echo -e "\n \033[0;33mRTFM: \033[0m http://rvm.beginrescueend.com/ \n"
|
|
167
167
|
echo -e '\033[0;32mw⦿‿⦿t!\033[0m'
|
168
168
|
echo -e "\n ~ Wayne\n"
|
169
169
|
|
170
|
-
source $
|
170
|
+
source $rvm_path/scripts/rvm
|
171
171
|
rvm -v
|
172
172
|
echo
|
173
173
|
|
data/scripts/selector
CHANGED
@@ -65,7 +65,8 @@ function __rvm_select {
|
|
65
65
|
rvm_ruby_interpreter="ree"
|
66
66
|
rvm_ruby_interpreter=`__rvm_db "ree_interpreter"`
|
67
67
|
rvm_ruby_version=${rvm_ruby_version:-`__rvm_db "ree_version"`}
|
68
|
-
rvm_ruby_patch_level="${3:-`__rvm_db "
|
68
|
+
rvm_ruby_patch_level="${3:-`__rvm_db "ree_${rvm_ruby_version}_patch_level"`}"
|
69
|
+
rvm_ruby_package_name="ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level"
|
69
70
|
if [ -z "$(echo $rvm_ruby_version | awk '/^1\.8/')" ] ; then
|
70
71
|
__rvm_log "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
|
71
72
|
fi
|
data/scripts/update
CHANGED
@@ -12,23 +12,23 @@ cwd=$(pwd)
|
|
12
12
|
source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
|
13
13
|
if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
|
14
14
|
source_dir="${source_dir:-$cwd}"
|
15
|
-
|
15
|
+
rvm_path=~/.rvm
|
16
16
|
|
17
17
|
# State what is required to use rvm
|
18
18
|
echo -e "\n\033[0;32mrvm\033[0m\n\n shell scripts that allows a user to manage multiple ruby versions in their own account."
|
19
19
|
echo -e "\n Installing rvm to ~/.rvm/ ..."
|
20
20
|
for dir_name in src scripts bin log archives config gems examples ; do
|
21
|
-
mkdir -p $
|
21
|
+
mkdir -p $rvm_path/$dir_name
|
22
22
|
done
|
23
23
|
|
24
24
|
for dir_name in config scripts examples lib ; do
|
25
|
-
mkdir -p $
|
26
|
-
/bin/cp -Rf $source_dir/$dir_name $
|
25
|
+
mkdir -p $rvm_path/$dir_name
|
26
|
+
/bin/cp -Rf $source_dir/$dir_name $rvm_path
|
27
27
|
done ; unset dir_name
|
28
28
|
|
29
29
|
for file_name in rvm-prompt gemsync ; do
|
30
|
-
mv $
|
31
|
-
chmod +x $
|
30
|
+
mv $rvm_path/scripts/$file_name $rvm_path/bin/
|
31
|
+
chmod +x $rvm_path/bin/$file_name
|
32
32
|
done ; unset file_name
|
33
33
|
|
34
34
|
results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
|
@@ -167,7 +167,7 @@ echo -e "\n \033[0;33mRTFM: \033[0m http://rvm.beginrescueend.com/ \n"
|
|
167
167
|
echo -e '\033[0;32mw⦿‿⦿t!\033[0m'
|
168
168
|
echo -e "\n ~ Wayne\n"
|
169
169
|
|
170
|
-
source $
|
170
|
+
source $rvm_path/scripts/rvm
|
171
171
|
rvm -v
|
172
172
|
echo
|
173
173
|
|
data/scripts/utility
CHANGED
@@ -80,10 +80,11 @@ function __rvm_remove-rvm-from-path {
|
|
80
80
|
function __rvm_gi { gem install -q --no-rdoc --no-ri $* ; }
|
81
81
|
|
82
82
|
function __rvm_run {
|
83
|
-
log_file_name="$1" ;
|
84
|
-
command="$*"
|
83
|
+
log_file_name="$1" ; command="$2" ; message="$3"
|
85
84
|
rvm_ruby_log_path=${rvm_ruby_log_path:-$rvm_path/log}
|
86
|
-
mkdir -p $rvm_ruby_log_path
|
85
|
+
mkdir -p `dirname $rvm_ruby_log_path/$log_file_name.log`
|
86
|
+
|
87
|
+
if [ ! -z "$message" ] ; then __rvm_log "info" "$message" ; fi
|
87
88
|
__rvm_log "debug" "Executing: $command"
|
88
89
|
touch $rvm_ruby_log_path/$log_file_name.log $rvm_ruby_log_path/$log_file_name.error.log # for zsh :(
|
89
90
|
echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee $rvm_ruby_log_path/$log_file_name.log > $rvm_ruby_log_path/$log_file_name.error.log
|
@@ -540,7 +541,6 @@ function __rvm_ruby_do {
|
|
540
541
|
fi
|
541
542
|
eval "rubies=(${rubies[*]} $rvm_ruby_string)"
|
542
543
|
eval "statuses=(${statuses[*]} $result)"
|
543
|
-
# TODO: keep track of and re-set the previous selected ruby ;)
|
544
544
|
else
|
545
545
|
__rvm_log "warn" "'$rvm_ruby_home/bin/$binary' either does not exist or is not executable? :("
|
546
546
|
fi
|
@@ -799,33 +799,33 @@ function __rvm_inspect {
|
|
799
799
|
#
|
800
800
|
function __rvm_readline_install {
|
801
801
|
__rvm_pushpop $rvm_source_path
|
802
|
-
package="readline" ; version="5.2"
|
802
|
+
package="readline" ; version="5.2" ; archive_format="tar.gz"
|
803
803
|
# TODO: Figure out how to list, grab and apply the patches
|
804
|
-
__rvm_fetch
|
805
|
-
__rvm_run "$package
|
804
|
+
__rvm_run "$package/fetch" "__rvm_fetch ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format" "Retrieving $package-$version.$archive_format"
|
805
|
+
__rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_source_path" "Extracting $package-$version.$archive_format"
|
806
806
|
cd $rvm_source_path/$package-$version
|
807
807
|
if [ "`uname`" = "Darwin" ] ; then
|
808
808
|
sdk=`ls -t /Developer/SDKs/ | head -n 1`
|
809
809
|
CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
|
810
810
|
LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/$sdk -arch i386 -arch x86_64"
|
811
811
|
export CFLAGS LDFLAGS
|
812
|
-
__rvm_run "$package
|
812
|
+
__rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
|
813
813
|
else
|
814
|
-
__rvm_run "$package
|
814
|
+
__rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
|
815
815
|
fi
|
816
|
-
__rvm_run "$package
|
817
|
-
__rvm_run "$package
|
816
|
+
__rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
|
817
|
+
__rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
|
818
818
|
__rvm_pushpop
|
819
819
|
}
|
820
820
|
|
821
821
|
function __rvm_iconv_install {
|
822
822
|
__rvm_pushpop $rvm_source_path
|
823
|
-
package="libiconv" ; version=1.13.1
|
824
|
-
__rvm_fetch
|
825
|
-
__rvm_run "$package
|
823
|
+
package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
|
824
|
+
__rvm_run "$package/fetch" "__rvm_fetch http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format" "Retrieving $package-$version.$archive_format"
|
825
|
+
__rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_source_path" "Extracting $package-$version.$archive_format"
|
826
826
|
cd $rvm_source_path/$package-$version
|
827
|
-
__rvm_run "$package
|
828
|
-
__rvm_run "$package
|
829
|
-
__rvm_run "$package
|
827
|
+
__rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-static --enable-shared" "Configuring $package."
|
828
|
+
__rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
|
829
|
+
__rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
|
830
830
|
__rvm_pushpop
|
831
831
|
}
|
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.51
|
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-09-
|
12
|
+
date: 2009-09-29 00:00:00 -04:00
|
13
13
|
default_executable: rvm-install
|
14
14
|
dependencies: []
|
15
15
|
|