rvm 0.1.23 → 0.1.24
Sign up to get free protection for your applications and to get access to all the features.
- data/README +3 -9
- data/binscripts/rvm-prompt +40 -4
- data/config/db +3 -3
- data/config/md5 +4 -0
- data/install +1 -1
- data/lib/VERSION.yml +1 -1
- data/rvm.gemspec +2 -2
- data/scripts/cli +22 -22
- data/scripts/gemsets +4 -9
- data/scripts/initialize +2 -9
- data/scripts/install +1 -1
- data/scripts/log +11 -11
- data/scripts/manage +11 -4
- data/scripts/package +6 -5
- data/scripts/rvm-install +1 -1
- data/scripts/selector +2 -2
- data/scripts/update +1 -1
- data/scripts/utility +16 -29
- metadata +3 -3
data/README
CHANGED
@@ -18,6 +18,7 @@ Action
|
|
18
18
|
debug - show environment & configuration information for *current* ruby
|
19
19
|
|
20
20
|
install - install one or many ruby versions
|
21
|
+
See also: http://rvm.beginrescueend.com/rubies/installing/
|
21
22
|
uninstall - uninstall one or many ruby versions, leaves their sources
|
22
23
|
remove - uninstall one or many ruby versions and remove their sources
|
23
24
|
|
@@ -35,7 +36,7 @@ Action
|
|
35
36
|
|
36
37
|
fetch - Performs an archive / src fetch only of the selected ruby.
|
37
38
|
list - show currently installed rubies, interactive output.
|
38
|
-
http://rvm.beginrescueend.com/
|
39
|
+
http://rvm.beginrescueend.com/rubies/list/
|
39
40
|
package - Install a dependency package {readline,iconv,zlib,openssl}
|
40
41
|
http://rvm.beginrescueend.com/packages/
|
41
42
|
notes - Display notes, with operating system specifics.
|
@@ -52,6 +53,7 @@ Implementation
|
|
52
53
|
mput - shyouhei(mput)'s github repository
|
53
54
|
system - use the system ruby (eg. pre-rvm state)
|
54
55
|
default - use rvm set default ruby and system if it hasn't been set.
|
56
|
+
http://rvm.beginrescueend.com/rubies/default/
|
55
57
|
|
56
58
|
Flags
|
57
59
|
|
@@ -60,8 +62,6 @@ Flags
|
|
60
62
|
--default - with ruby select, sets a default ruby for new shells.
|
61
63
|
--debug - Toggle debug mode on for very verbose output.
|
62
64
|
--force - Force install, removes old install & source before install.
|
63
|
-
--dump - Used with gemset to dump the current ruby's gemset.
|
64
|
-
--load - Used with gemset to load a specified gemset file
|
65
65
|
--summary - Used with rubydo to print out a summary of the commands run.
|
66
66
|
--jit - Used with rubinius install to build with JIT
|
67
67
|
--latest - with gemset --dump skips version strings for latest gem.
|
@@ -73,8 +73,6 @@ Options
|
|
73
73
|
-v|--version - Emit rvm version loaded for current shell
|
74
74
|
-h|--help - Emit this output and exit
|
75
75
|
-l|--level - patch level to use with rvm use / install
|
76
|
-
--tag - subersion tag to use
|
77
|
-
--rev - repository revision # to use or 'head' for
|
78
76
|
|
79
77
|
--prefix - path for all rvm files (~/.rvm/), with trailing slash!
|
80
78
|
--bin - path for binaries to be placed (~/.rvm/bin/)
|
@@ -86,11 +84,7 @@ Options
|
|
86
84
|
-C|--configure - custom configure options, comma separated
|
87
85
|
default: --enable-shared=true
|
88
86
|
--reconfigure - Force installer to re-run configure if already run
|
89
|
-
--make - custom make command
|
90
|
-
--make-install - custom make install command
|
91
87
|
--nice - process niceness (for slow computers, default 0)
|
92
|
-
-m|--gem-set - use a named gem set, instead of the default set.
|
93
|
-
--rm-gem-set - Remove a named gem set
|
94
88
|
--ree-options - Options passed directly to ree's './installer' on the command line.
|
95
89
|
|
96
90
|
Resources:
|
data/binscripts/rvm-prompt
CHANGED
@@ -20,6 +20,8 @@ if [[ ! -z "$(which ruby 2>/dev/null | awk '/rvm/{print}')" ]] ; then
|
|
20
20
|
p|patchlevel) add "patchlevel" ;;
|
21
21
|
r|revision) add "revision" ;;
|
22
22
|
a|architecture) add "architecture" ;;
|
23
|
+
g|gemset) add "gemset" ;;
|
24
|
+
u|unicode) unicode_flag=1 ;;
|
23
25
|
*) echo "Unrecognized command line option '$token' for $0" ; exit 1 ;;
|
24
26
|
esac
|
25
27
|
done
|
@@ -28,26 +30,60 @@ if [[ ! -z "$(which ruby 2>/dev/null | awk '/rvm/{print}')" ]] ; then
|
|
28
30
|
add "interpreter"
|
29
31
|
add "version"
|
30
32
|
add "patchlevel"
|
33
|
+
add "gemset"
|
31
34
|
fi
|
32
35
|
|
33
36
|
ruby_string=$(dirname "$(which ruby 2>/dev/null)" | xargs dirname | xargs basename)
|
37
|
+
|
34
38
|
if [[ ! -z "$interpreter_flag" ]] ; then
|
35
39
|
interpreter="$(echo $ruby_string | awk -F'-' '{print $1}')"
|
36
40
|
fi
|
41
|
+
|
37
42
|
if [[ ! -z "$version_flag" ]] ; then
|
38
43
|
version="$(echo $ruby_string | awk -F'-' '{print $2}')"
|
39
44
|
fi
|
45
|
+
|
40
46
|
if [[ ! -z "$patchlevel_flag" ]] ; then
|
41
47
|
patchlevel=$(echo $ruby_string | awk -F'-' '{print $3}')
|
42
48
|
fi
|
49
|
+
|
43
50
|
if [[ ! -z "$architecture_flag" ]] ; then
|
44
51
|
architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
|
45
52
|
fi
|
46
53
|
|
47
|
-
|
48
|
-
|
49
|
-
|
54
|
+
if [[ ! -z "$gemset_flag" ]] ; then
|
55
|
+
gemset="$(gem env gemdir | awk -F% '{print $2}')"
|
56
|
+
if [[ ! -z "$gemset" ]] ; then gemset="%$gemset" ; fi
|
57
|
+
fi
|
58
|
+
|
59
|
+
if [[ ! -z "$unicode_flag" ]] ; then
|
60
|
+
case "$interpreter" in
|
61
|
+
jruby) unicode="☯" ;;
|
62
|
+
rbx) unicode="☃" ;;
|
63
|
+
ree) unicode="✈" ;;
|
64
|
+
macruby) unicode="⌘" ;;
|
65
|
+
maglev) unicode="㎖" ;;
|
66
|
+
ironruby) unicode="♭" ;;
|
67
|
+
mput) unicode="⎈" ;;
|
68
|
+
system) unicode="➆" ;;
|
69
|
+
ruby)
|
70
|
+
case "$version" in
|
71
|
+
1.8.6) unicode="❻" ;;
|
72
|
+
1.8.7) unicode="❼" ;;
|
73
|
+
1.9.1) unicode="❶" ;;
|
74
|
+
1.9.2) unicode="❷" ;;
|
75
|
+
*) unicode="♢" ;;
|
76
|
+
esac ;;
|
77
|
+
*) unicode="♢" ;;
|
78
|
+
esac
|
79
|
+
# TODO: Architecture
|
80
|
+
# TODO: gemset
|
81
|
+
echo $unicode
|
82
|
+
else
|
83
|
+
command="prompt=\"$format\""
|
84
|
+
eval "$command"
|
85
|
+
echo "$prompt" | sed 's#-\s*$##' | sed 's#-%#%#'
|
86
|
+
fi
|
50
87
|
fi
|
51
88
|
|
52
89
|
exit 0
|
53
|
-
|
data/config/db
CHANGED
@@ -8,8 +8,8 @@ rubygems_version=1.3.6
|
|
8
8
|
rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
|
9
9
|
rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
|
10
10
|
rbx_version=1.0.0
|
11
|
-
rbx_patch_level=
|
12
|
-
rbx_url=http://asset.rubini.us/rubinius-1.0.0-
|
11
|
+
rbx_patch_level=rc3
|
12
|
+
rbx_url=http://asset.rubini.us/rubinius-1.0.0-rc3-20100216.tar.gz
|
13
13
|
ree_version=1.8.7
|
14
14
|
ree_1.8.6_patch_level=20090610
|
15
15
|
ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677
|
@@ -29,7 +29,7 @@ macruby_version=0.5
|
|
29
29
|
macruby_url=http://www.macruby.org/files
|
30
30
|
macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
|
31
31
|
macruby_nightly_url=http://macruby.icoretech.org/latest/macruby_nightly-latest.pkg
|
32
|
-
maglev_version=
|
32
|
+
maglev_version=23082
|
33
33
|
maglev_url=http://glass-downloads.gemstone.com/maglev
|
34
34
|
maglev_repo_url=git://github.com/MagLev/maglev.git
|
35
35
|
rubinius_repo_url=git://github.com/evanphx/rubinius.git
|
data/config/md5
CHANGED
@@ -64,3 +64,7 @@ curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
|
|
64
64
|
pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
|
65
65
|
rubygems-1.3.6.tgz=789ca8e9ad1d4d3fe5f0534fcc038a0d
|
66
66
|
ironruby-ironruby-c912e86.tar.gz=80708c23577ff9bf557f63f0f716fe26
|
67
|
+
GemStone-23082.Darwin-i386.tar.gz=aa5f1768e5bad2bb687913c575f9cff6
|
68
|
+
GemStone-23082.Linux-x86_64.tar.gz=7b7fd0df5d1deacf7aa12ccc9a94a33f
|
69
|
+
MagLev-23082.Darwin-i386.tar.gz=d9027e7b7c8220573b1d3d588712ffc4
|
70
|
+
MagLev-23082.Linux-x86_64.tar.gz=d63c4c94a2eaf19b051182e974413fef
|
data/install
CHANGED
@@ -140,7 +140,7 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
|
|
140
140
|
new_path="$rvm_rubies_path/$(basename $ruby)"
|
141
141
|
for file in gem rake ; do
|
142
142
|
if [[ -s "$new_path/bin/$file" ]] ; then
|
143
|
-
sed -i -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
|
143
|
+
sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
|
144
144
|
rm -f "$new_path/bin/$file.orig"
|
145
145
|
chmod +x "$new_path/bin/$file"
|
146
146
|
fi
|
data/lib/VERSION.yml
CHANGED
data/rvm.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{rvm}
|
8
|
-
s.version = "0.1.
|
8
|
+
s.version = "0.1.24"
|
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-03-
|
12
|
+
s.date = %q{2010-03-21}
|
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
@@ -195,15 +195,8 @@ __rvm_parse_args() {
|
|
195
195
|
fi
|
196
196
|
;;
|
197
197
|
|
198
|
-
-t|--tag)
|
199
|
-
rvm_ruby_tag="$1";
|
200
|
-
rvm_action="${rvm_action:-use}"
|
201
|
-
shift
|
202
|
-
;;
|
203
|
-
|
204
198
|
# For use with --patch
|
205
199
|
--patch-name) export rvm_ruby_patch_name="$1" ; shift ;;
|
206
|
-
|
207
200
|
-h|--patch)
|
208
201
|
if [[ -z "$rvm_ruby_patch" ]] ; then
|
209
202
|
export rvm_ruby_patch="$1"
|
@@ -214,23 +207,30 @@ __rvm_parse_args() {
|
|
214
207
|
;;
|
215
208
|
|
216
209
|
--head)
|
217
|
-
if [[ -z "$rvm_ruby_string" ]] ; then export rvm_ruby_string="head"; else export rvm_ruby_string="${rvm_ruby_string}-head" ; fi
|
218
|
-
|
210
|
+
#if [[ -z "$rvm_ruby_string" ]] ; then export rvm_ruby_string="head"; else export rvm_ruby_string="${rvm_ruby_string}-head" ; fi
|
211
|
+
#rvm_action="${rvm_action:-use}"
|
212
|
+
#rvm_ruby_revision="head"
|
219
213
|
export rvm_head_flag=1
|
220
|
-
rvm_action="${rvm_action:-use}"
|
221
214
|
;;
|
222
215
|
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
216
|
+
#
|
217
|
+
# Legacy items, replaced with ruby strings.
|
218
|
+
#
|
219
|
+
#-t|--tag)
|
220
|
+
# rvm_ruby_tag="$1";
|
221
|
+
# rvm_action="${rvm_action:-use}"
|
222
|
+
# shift
|
223
|
+
#;;
|
224
|
+
#--rev|--revision)
|
225
|
+
# rvm_ruby_revision="$1";
|
226
|
+
# rvm_action="${rvm_action:-use}"
|
227
|
+
# shift
|
228
|
+
#;;
|
229
|
+
#-b|--branch)
|
230
|
+
# rvm_ruby_branch="$1";
|
231
|
+
# rvm_action="${rvm_action:-use}"
|
232
|
+
# shift
|
233
|
+
#;;
|
234
234
|
|
235
235
|
--bin)
|
236
236
|
if [[ "update" = "$rvm_action" ]] ; then
|
@@ -311,7 +311,7 @@ __rvm_parse_args() {
|
|
311
311
|
--disable-llvm|--disable-jit) export rvm_llvm_flag=0 ;;
|
312
312
|
--enable-llvm|--enable-jit) export rvm_llvm_flag=1 ;;
|
313
313
|
|
314
|
-
--self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--
|
314
|
+
--self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--passenger|--editor|--sticky|--create|--rvmrc)
|
315
315
|
export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
|
316
316
|
if [[ "--debug" = "$rvm_token" ]] ; then export rvm_debug_flag ; fi
|
317
317
|
;;
|
data/scripts/gemsets
CHANGED
@@ -3,11 +3,6 @@
|
|
3
3
|
source $rvm_scripts_path/utility
|
4
4
|
source $rvm_scripts_path/selector
|
5
5
|
|
6
|
-
color_green=$($rvm_scripts_path/color "green")
|
7
|
-
color_red=$($rvm_scripts_path/color "red")
|
8
|
-
color_yellow=$($rvm_scripts_path/color "yellow")
|
9
|
-
color_none=$($rvm_scripts_path/color "none")
|
10
|
-
|
11
6
|
if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
|
12
7
|
rvm_ruby_gem_home="${rvm_ruby_gem_home:-$GEM_HOME}"
|
13
8
|
if [[ ! -d "$rvm_ruby_gem_home" ]] && which gem &> /dev/null ; then rvm_ruby_gem_home="$(gem env home)" ; fi
|
@@ -15,7 +10,7 @@ if [[ ! -d "$rvm_ruby_gem_home" ]] && which gem &> /dev/null ; then rvm_ruby_gem
|
|
15
10
|
trap "if [[ -d $rvm_tmp_path/ ]] && [[ -s $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
|
16
11
|
|
17
12
|
__rvm_gemset_name() {
|
18
|
-
|
13
|
+
__rvm_gemset_gemdir | awk -F'%' '{print $2}'
|
19
14
|
}
|
20
15
|
|
21
16
|
__rvm_gemset_dir() {
|
@@ -236,7 +231,7 @@ __rvm_gem_install() {
|
|
236
231
|
# Now we determine if a .gem cache file is already installed
|
237
232
|
if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/$(basename $gem_file_name)spec" ]] ; then
|
238
233
|
unset gem
|
239
|
-
$rvm_scripts_path/log "info" "$
|
234
|
+
$rvm_scripts_path/log "info" "$gem_name $gem_version exists, skipping (--force to re-install)"
|
240
235
|
else
|
241
236
|
if [[ -s "$gem" ]] ; then
|
242
237
|
cache_file="$gem"
|
@@ -260,7 +255,7 @@ __rvm_gem_install() {
|
|
260
255
|
|
261
256
|
if [[ -z "$rvm_force_flag" ]] && [[ -s "${rvm_ruby_gem_home}/specifications/$(basename $gem_file_name)spec" ]] ; then
|
262
257
|
unset gem # already installed, not forcing reinstall.
|
263
|
-
$rvm_scripts_path/log "info" "$
|
258
|
+
$rvm_scripts_path/log "info" "$gem_name $gem_version exists, skipping (--force to re-install)"
|
264
259
|
else
|
265
260
|
if [[ -s "$rvm_gems_path/cache/$(basename $gem_file_name)" ]] ; then
|
266
261
|
mkdir -p "$rvm_tmp_path/$$/"
|
@@ -333,7 +328,7 @@ elif [[ "empty" = "$action" ]] ; then
|
|
333
328
|
__rvm_gemset_empty
|
334
329
|
elif [[ "delete" = "$action" ]] ; then
|
335
330
|
__rvm_gemset_delete
|
336
|
-
elif [[ "name" = "$action" ]] ; then
|
331
|
+
elif [[ "name" = "$action" ]] || [[ "string" = "$action" ]]; then
|
337
332
|
__rvm_gemset_name
|
338
333
|
elif [[ "dir" = "$action" ]] ; then
|
339
334
|
__rvm_gemset_dir
|
data/scripts/initialize
CHANGED
@@ -15,15 +15,8 @@ rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
|
|
15
15
|
rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
|
16
16
|
rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
|
17
17
|
rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
|
18
|
-
|
19
|
-
|
20
|
-
rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
|
21
|
-
rvm_gems_cache_path="${rvm_gems_cache_path:-"$rvm_gems_path/cache"}"
|
22
|
-
else
|
23
|
-
rvm_gems_path="${rvm_gems_path:-"$HOME/.rvm/gems"}"
|
24
|
-
rvm_gems_cache_path="${rvm_gems_cache_path:-"$HOME/.gem/cache"}"
|
25
|
-
fi
|
26
|
-
|
18
|
+
rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
|
19
|
+
rvm_gems_cache_path="${rvm_gems_cache_path:-"$rvm_gems_path/cache"}"
|
27
20
|
rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
|
28
21
|
rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
|
29
22
|
rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
|
data/scripts/install
CHANGED
@@ -140,7 +140,7 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
|
|
140
140
|
new_path="$rvm_rubies_path/$(basename $ruby)"
|
141
141
|
for file in gem rake ; do
|
142
142
|
if [[ -s "$new_path/bin/$file" ]] ; then
|
143
|
-
sed -i -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
|
143
|
+
sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
|
144
144
|
rm -f "$new_path/bin/$file.orig"
|
145
145
|
chmod +x "$new_path/bin/$file"
|
146
146
|
fi
|
data/scripts/log
CHANGED
@@ -6,22 +6,22 @@ if [[ ! -z "$2" ]] ; then level=$1 ; shift ; else level="info" ; fi
|
|
6
6
|
|
7
7
|
message=$1
|
8
8
|
|
9
|
-
if [[ -z "$rvm_interactive" ]] ; then
|
9
|
+
if [[ -z "$rvm_interactive" ]] || [[ -z "$TERM" ]] ; then
|
10
10
|
case "$level" in
|
11
|
-
debug) shift ; echo -e "
|
12
|
-
info) shift ; echo -e "
|
13
|
-
warn) shift ; echo -e "
|
14
|
-
error) shift ; echo -e "
|
15
|
-
fail) shift ; echo -e "
|
11
|
+
debug) shift ; echo -e "<d>$message </d>" ;;
|
12
|
+
info) shift ; echo -e "<i>$message </i>" ;;
|
13
|
+
warn) shift ; echo -e "<w>$message </w>" ;;
|
14
|
+
error) shift ; echo -e "<e>$message </e>" >&2 ;;
|
15
|
+
fail) shift ; echo -e "<f>$message </f>" >&2 ;;
|
16
16
|
*) echo -e "$message"
|
17
17
|
esac
|
18
18
|
else
|
19
19
|
case "$level" in
|
20
|
-
debug) shift ; echo -e "
|
21
|
-
info) shift ; echo -e "
|
22
|
-
warn) shift ; echo -e "
|
23
|
-
error) shift ; echo -e "
|
24
|
-
fail) shift ; echo -e "
|
20
|
+
debug) shift ; echo -e "$(tput setaf 5)$message$(tput sgr0)" ;;
|
21
|
+
info) shift ; echo -e "$(tput setaf 2)$message$(tput sgr0)" ;;
|
22
|
+
warn) shift ; echo -e "$(tput setaf 3)$message$(tput sgr0)" ;;
|
23
|
+
error) shift ; echo -e "$(tput setaf 1)$message$(tput sgr0)" >&2 ;;
|
24
|
+
fail) shift ; echo -e "$(tput setaf 1)$message$(tput sgr0)" >&2 ;;
|
25
25
|
*) echo -e "$message"
|
26
26
|
esac
|
27
27
|
fi
|
data/scripts/manage
CHANGED
@@ -127,7 +127,7 @@ __rvm_install_ruby() {
|
|
127
127
|
$rvm_scripts_path/log "error" "There has been an error while trying to install from source. Aborting the installation." ; return $result
|
128
128
|
fi
|
129
129
|
elif [[ "nightly" = "$rvm_ruby_version" ]] ; then
|
130
|
-
macruby_path="/usr/
|
130
|
+
macruby_path="/Library/Frameworks/MacRuby.framework/Versions/0.6/usr/bin"
|
131
131
|
# TODO: Separated nightly from head.
|
132
132
|
$rvm_scripts_path/log "info" "Retrieving the latest nightly macruby build..."
|
133
133
|
$rvm_scripts_path/fetch "$rvm_url"
|
@@ -138,9 +138,9 @@ __rvm_install_ruby() {
|
|
138
138
|
__rvm_run "macruby/extract" "sudo /usr/sbin/installer -pkg '$rvm_archives_path/macruby_nightly.pkg' -target '/'"
|
139
139
|
mkdir -p "$rvm_ruby_home/bin"
|
140
140
|
else
|
141
|
-
macruby_path="/usr/
|
141
|
+
macruby_path="/Library/Frameworks/MacRuby.framework/Versions/0.5/usr/bin"
|
142
142
|
# TODO: Separated nightly from head.
|
143
|
-
$rvm_scripts_path/log "info" "Retrieving
|
143
|
+
$rvm_scripts_path/log "info" "Retrieving MacRuby 0.5 ..."
|
144
144
|
$rvm_scripts_path/fetch "$rvm_url"
|
145
145
|
result=$? ; if [[ "$result" -gt 0 ]] ; then
|
146
146
|
$rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
|
@@ -871,6 +871,8 @@ __rvm_rubygems_setup() {
|
|
871
871
|
install=1
|
872
872
|
fi
|
873
873
|
|
874
|
+
__rvm_use
|
875
|
+
|
874
876
|
if [[ "$install" -eq 0 ]] ; then
|
875
877
|
# 1.9.X has it's own built-in gem command
|
876
878
|
__rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
|
@@ -938,6 +940,10 @@ __rvm_rubygems_setup() {
|
|
938
940
|
ln -nfs "$rvm_ruby_gem_home" "$ruby_lib_gem_path"
|
939
941
|
unset ruby_lib_gem_path
|
940
942
|
|
943
|
+
if [[ -s "$rvm_ruby_src_path/bin/rake" ]] ; then
|
944
|
+
__rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/rake"
|
945
|
+
fi
|
946
|
+
|
941
947
|
return $result
|
942
948
|
}
|
943
949
|
|
@@ -945,7 +951,8 @@ __rvm_inject_ruby_shebang() {
|
|
945
951
|
__rvm_actual_file $1
|
946
952
|
|
947
953
|
if [[ -f "$actual_file" ]] ; then
|
948
|
-
sed -i -e '1,1s=.*=#!'"$rvm_ruby_home/bin/ruby=" $actual_file
|
954
|
+
#sed -i.orig -e '1,1s=.*=#!'"$rvm_ruby_home/bin/ruby=" $actual_file
|
955
|
+
sed -e '1,1s=.*=#!'"/usr/bin/env ruby=" $actual_file > $actual+file.orig
|
949
956
|
rm -f $actual_file.orig ; chmod +x "$actual_file"
|
950
957
|
fi ; unset actual_file
|
951
958
|
}
|
data/scripts/package
CHANGED
@@ -86,7 +86,7 @@ openssl() {
|
|
86
86
|
}
|
87
87
|
|
88
88
|
zlib() {
|
89
|
-
package="zlib" ; version="1.2.
|
89
|
+
package="zlib" ; version="1.2.4" ; archive_format="tar.gz"
|
90
90
|
package_url="http://www.zlib.net"
|
91
91
|
install_package
|
92
92
|
}
|
@@ -144,12 +144,13 @@ llvm() {
|
|
144
144
|
__rvm_pushpop
|
145
145
|
}
|
146
146
|
|
147
|
-
if [[ ! -z "$library" ]]
|
148
|
-
$
|
149
|
-
|
150
|
-
|
147
|
+
if [[ ! -z "$library" ]] ; then
|
148
|
+
if [[ " readline iconv curl openssl zlib ncurses pkgconfig gettext glib mono llvm " =~ "$library" ]] ; then
|
149
|
+
${library}
|
150
|
+
else
|
151
151
|
$rvm_scripts_path/log "error" "Package '${library}' is unknown."
|
152
152
|
fi
|
153
|
+
else
|
153
154
|
$rvm_scripts_path/log "info" "Usage: 'rvm package {install,uninstall} {openssl,zlib,readline,iconv,ncurses}'"
|
154
155
|
exit 1
|
155
156
|
fi
|
data/scripts/rvm-install
CHANGED
@@ -140,7 +140,7 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
|
|
140
140
|
new_path="$rvm_rubies_path/$(basename $ruby)"
|
141
141
|
for file in gem rake ; do
|
142
142
|
if [[ -s "$new_path/bin/$file" ]] ; then
|
143
|
-
sed -i -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
|
143
|
+
sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
|
144
144
|
rm -f "$new_path/bin/$file.orig"
|
145
145
|
chmod +x "$new_path/bin/$file"
|
146
146
|
fi
|
data/scripts/selector
CHANGED
@@ -73,7 +73,7 @@ __rvm_select() {
|
|
73
73
|
rvm_ruby_package_file="${rvm_ruby_interpreter}-bin-${rvm_ruby_version}"
|
74
74
|
rvm_ruby_package_name="${rvm_ruby_interpreter}-${rvm_ruby_version}"
|
75
75
|
rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
|
76
|
-
rvm_url="http://jruby.
|
76
|
+
rvm_url="http://jruby.org.s3.amazonaws.com/downloads/${rvm_ruby_version}/${rvm_ruby_package_file}.tar.gz"
|
77
77
|
fi
|
78
78
|
alias jruby_ng="jruby --ng"
|
79
79
|
alias jruby_ng_server="jruby --ng-server"
|
@@ -295,7 +295,7 @@ __rvm_use() {
|
|
295
295
|
fi
|
296
296
|
|
297
297
|
if [[ ! -z "$rvm_verbose_flag" ]] ; then
|
298
|
-
$rvm_scripts_path/log "info" "
|
298
|
+
$rvm_scripts_path/log "info" "Using $(basename $GEM_HOME | tr '-' ' ' | sed 's/%/ with gemset /')"
|
299
299
|
fi
|
300
300
|
|
301
301
|
new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
|
data/scripts/update
CHANGED
@@ -140,7 +140,7 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
|
|
140
140
|
new_path="$rvm_rubies_path/$(basename $ruby)"
|
141
141
|
for file in gem rake ; do
|
142
142
|
if [[ -s "$new_path/bin/$file" ]] ; then
|
143
|
-
sed -i -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
|
143
|
+
sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
|
144
144
|
rm -f "$new_path/bin/$file.orig"
|
145
145
|
chmod +x "$new_path/bin/$file"
|
146
146
|
fi
|
data/scripts/utility
CHANGED
@@ -183,7 +183,7 @@ __rvm_cleanup_variables() {
|
|
183
183
|
|
184
184
|
if [[ "$rvm_sticky_flag" = "1" ]] ; then export rvm_gemset_name ; else unset rvm_gemset_name ; fi
|
185
185
|
|
186
|
-
unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_ruby_patch
|
186
|
+
unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_ruby_patch rvm_sticky_flagrvm_rvmrc_flag
|
187
187
|
}
|
188
188
|
|
189
189
|
# Unset ruby-specific variables
|
@@ -193,13 +193,20 @@ __rvm_unset_ruby_variables() {
|
|
193
193
|
|
194
194
|
__rvm_set_rvmrc() {
|
195
195
|
if [[ "$HOME" != "$(pwd)" ]] ; then
|
196
|
+
if [[ "$rvm_create_flag" -eq 1 ]] ; then flags="--create " ; fi
|
197
|
+
if [[ "$rvm_verbose_flag" -eq 1 ]] ; then flags="use " ; fi
|
198
|
+
|
196
199
|
if [[ -s .rvmrc ]] ; then
|
197
200
|
mv .rvmrc .rvmrc.$(date +%m.%d.%Y-%H:%M:%S)
|
201
|
+
$rvm_scripts_path/log "warning" ".rvmrc is not empty, moving aside to preserve."
|
198
202
|
fi
|
199
|
-
|
203
|
+
|
204
|
+
echo "rvm $flags $(basename $rvm_ruby_gem_home)" > .rvmrc
|
205
|
+
unset flags
|
200
206
|
else
|
201
|
-
|
207
|
+
$rvm_scripts_path/log "error" ".rvmrc cannot be set in your home directory. \n The home .rvmrc is for global rvm settings only."
|
202
208
|
fi
|
209
|
+
|
203
210
|
}
|
204
211
|
__rvm_load_rvmrc() {
|
205
212
|
if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
|
@@ -403,11 +410,11 @@ __rvm_list_known() {
|
|
403
410
|
echo "${prefix}-t${tag/\//}"
|
404
411
|
unset prefix tag
|
405
412
|
done < <(svn list http://svn.ruby-lang.org/repos/ruby/tags/ | awk '/^v1_[8|9]/')
|
406
|
-
echo -e "(ruby-)1.8.6(-
|
413
|
+
echo -e "(ruby-)1.8.6(-p399)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p248)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1(-p376)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1\nruby-head\n"
|
407
414
|
echo -e "jruby-1.2.0\njruby-1.3.1\njruby(-1.4.0) # the default\njruby-head"
|
408
415
|
echo -e "rbx(-prc1) # default\nrbx-head"
|
409
416
|
echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
|
410
|
-
echo -e "maglev(-
|
417
|
+
echo -e "maglev(-23082)\nmaglev-head"
|
411
418
|
echo -e "mput(-head) # shyouhei head, the default mput"
|
412
419
|
echo -e "ironruby-0.9.3\nironruby-1.0-rc2\nironruby-head"
|
413
420
|
if [[ "Darwin" = "$(uname)" ]] ; then
|
@@ -666,28 +673,6 @@ __rvm_gemset_select() {
|
|
666
673
|
|
667
674
|
rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
|
668
675
|
|
669
|
-
# TODO: Remove next section after a several releases.
|
670
|
-
# Migrate original rvm global gem cache directory to $HOME/.gem/cache
|
671
|
-
if [[ "$(whoami)" != "root" ]] ; then
|
672
|
-
if [[ -d "$rvm_path/gems/cache" ]] && [[ ! -L "$rvm_path/gems/cache" ]] ; then
|
673
|
-
if [[ ! -z "$(ls -A "$rvm_path"/gems/cache/)" ]] ; then
|
674
|
-
mv $rvm_path/gems/cache/* $HOME/.gem/cache/
|
675
|
-
fi
|
676
|
-
rmdir $rvm_path/gems/cache
|
677
|
-
fi
|
678
|
-
|
679
|
-
# Some sanity checking.
|
680
|
-
if [[ ! -d "$rvm_gems_cache_path" ]] ; then
|
681
|
-
mkdir -p $rvm_gems_cache_path
|
682
|
-
fi
|
683
|
-
if [[ "$rvm_gems_cache_path" != "$rvm_gems_path/cache" ]] ; then
|
684
|
-
rm -f "$rvm_gems_path/cache"
|
685
|
-
ln -nfs "$rvm_gems_cache_path" "$rvm_gems_path/cache"
|
686
|
-
fi
|
687
|
-
fi
|
688
|
-
chmod u+w "$rvm_gems_cache_path"
|
689
|
-
# /TODO
|
690
|
-
|
691
676
|
# Careful not to nuke system gems cache.
|
692
677
|
if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ ! -z "$(echo $rvm_ruby_gem_home | awk '/rvm/')" ]] ; then
|
693
678
|
# Ensure that the ruby gem home exists.
|
@@ -713,7 +698,7 @@ __rvm_gemset_select() {
|
|
713
698
|
__rvm_gemset_use() {
|
714
699
|
if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
|
715
700
|
if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
|
716
|
-
if [[ "$rvm_gemset_create_on_use_flag" -eq 1 ]] ; then
|
701
|
+
if [[ "$rvm_gemset_create_on_use_flag" -eq 1 ]] || [[ "$rvm_create_flag" -eq 1 ]]; then
|
717
702
|
$rvm_scripts_path/gemsets create $rvm_gemset_name
|
718
703
|
else
|
719
704
|
$rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
|
@@ -724,12 +709,14 @@ __rvm_gemset_use() {
|
|
724
709
|
if [[ "$rvm_interactive" -eq 1 ]] || [[ "$rvm_verbose_flag" -eq 1 ]] ; then
|
725
710
|
$rvm_scripts_path/log "info" "Now using gemset '${rvm_gemset_name:-default}'"
|
726
711
|
fi
|
712
|
+
|
727
713
|
rvm_ruby_gem_home="$(echo $GEM_HOME | sed 's/%.*$//')%$rvm_gemset_name"
|
728
714
|
GEM_HOME="$rvm_ruby_gem_home"
|
729
715
|
BUNDLE_PATH="$rvm_ruby_gem_home"
|
730
716
|
GEM_PATH="$rvm_ruby_gem_home/bin:$(echo $GEM_HOME | sed 's/%.*$//')%global/bin"
|
731
717
|
export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
|
732
|
-
|
718
|
+
|
719
|
+
__rvm_use # Now ensure the selection takes effect for the environment.
|
733
720
|
fi
|
734
721
|
return 0
|
735
722
|
}
|
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 0
|
7
7
|
- 1
|
8
|
-
-
|
9
|
-
version: 0.1.
|
8
|
+
- 24
|
9
|
+
version: 0.1.24
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Wayne E. Seguin
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2010-03-
|
17
|
+
date: 2010-03-21 00:00:00 -04:00
|
18
18
|
default_executable: rvm-install
|
19
19
|
dependencies: []
|
20
20
|
|