rvm 0.0.76 → 0.0.77
Sign up to get free protection for your applications and to get access to all the features.
- data/binscripts/gemsync +1 -1
- data/binscripts/rvm-prompt +1 -1
- data/install +1 -1
- data/lib/VERSION.yml +1 -1
- data/rvm.gemspec +2 -2
- data/scripts/cli +3 -3
- data/scripts/color +1 -1
- data/scripts/completion +1 -1
- data/scripts/functions +1 -10
- data/scripts/gems +1 -1
- data/scripts/install +1 -1
- data/scripts/ruby-installer +6 -1
- data/scripts/rvm +1 -1
- data/scripts/rvm-install +1 -1
- data/scripts/selector +1 -1
- data/scripts/update +1 -1
- data/scripts/utility +25 -10
- metadata +2 -2
data/binscripts/gemsync
CHANGED
data/binscripts/rvm-prompt
CHANGED
data/install
CHANGED
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.77"
|
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-12}
|
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
@@ -1,4 +1,4 @@
|
|
1
|
-
#!/bin/bash
|
1
|
+
#!/usr/bin/env bash
|
2
2
|
|
3
3
|
__rvm_meta() {
|
4
4
|
rvm_meta_author="Wayne E. Seguin"
|
@@ -17,7 +17,7 @@ __rvm_parse_args() {
|
|
17
17
|
while [[ $# -gt 0 ]] ; do
|
18
18
|
rvm_token="$1" ; shift
|
19
19
|
case "$rvm_token" in
|
20
|
-
install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|gemsync|update|iconv|openssl|ncurses|zlib|readline)
|
20
|
+
install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|gemsync|update|iconv|curl|openssl|ncurses|zlib|readline)
|
21
21
|
rvm_action=$rvm_token
|
22
22
|
;;
|
23
23
|
|
@@ -376,7 +376,7 @@ rvm() {
|
|
376
376
|
install|uninstall) __rvm_manage_rubies ; result=$? ;;
|
377
377
|
tests|specs) rvm_action="rake" ; __rvm_do ; result=$? ;;
|
378
378
|
|
379
|
-
iconv|openssl|ncurses|zlib|readline)
|
379
|
+
iconv|openssl|ncurses|zlib|readline|curl)
|
380
380
|
__rvm_${rvm_action}_install
|
381
381
|
result=$?
|
382
382
|
;;
|
data/scripts/color
CHANGED
data/scripts/completion
CHANGED
data/scripts/functions
CHANGED
data/scripts/gems
CHANGED
data/scripts/install
CHANGED
data/scripts/ruby-installer
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
#!/bin/bash
|
1
|
+
#!/usr/bin/env bash
|
2
2
|
|
3
3
|
__rvm_install_source() {
|
4
4
|
if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
|
@@ -197,6 +197,11 @@ RubyWrapper
|
|
197
197
|
if [[ ! -z "$rvm_ruby_configure_flags" ]] ; then
|
198
198
|
rvm_ruby_configure_flags="$(echo $rvm_ruby_configure_flags | sed 's#--#-c --#g')"
|
199
199
|
fi
|
200
|
+
|
201
|
+
if [[ "Darwin" = "$(uname)" ]] && [[ "1.8.6" = "$rvm_ruby_version" ]] && [[ -z "$rvm_ree_options" ]] ; then
|
202
|
+
rvm_ree_options="${rvm_ree_options} --no-tcmalloc"
|
203
|
+
fi
|
204
|
+
|
200
205
|
__rvm_run "install" "./installer -a $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options --dont-install-useful-gems $rvm_ruby_configure_flags" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..." # --no-tcmalloc
|
201
206
|
if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
|
202
207
|
chmod +x $rvm_ruby_home/bin/*
|
data/scripts/rvm
CHANGED
data/scripts/rvm-install
CHANGED
data/scripts/selector
CHANGED
data/scripts/update
CHANGED
data/scripts/utility
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
#!/bin/bash
|
1
|
+
#!/usr/bin/env bash
|
2
2
|
|
3
3
|
__rvm_info() {
|
4
4
|
full_version=$(ruby -v)
|
@@ -593,7 +593,7 @@ __rvm_ruby_do() {
|
|
593
593
|
fi
|
594
594
|
fi
|
595
595
|
rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_require -I$load_path $rvm_ruby_args"
|
596
|
-
elif [[ "gem" = "$binary" ]] && match "$rvm_ruby_args" 'install' ; then
|
596
|
+
elif [[ "gem" = "$binary" ]] && match "$rvm_ruby_args" '^install' ; then
|
597
597
|
rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args --no-rdoc --no-ri"
|
598
598
|
else
|
599
599
|
rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args"
|
@@ -604,7 +604,7 @@ __rvm_ruby_do() {
|
|
604
604
|
touch ./log/$rvm_ruby_string/$rvm_action.log ./log/$rvm_ruby_string/$rvm_action.error.log
|
605
605
|
eval "$rvm_command" >> ./log/$rvm_ruby_string/$rvm_action.log 2>> ./log/$rvm_ruby_string/$rvm_action.error.log
|
606
606
|
else
|
607
|
-
echo -e "\n\n\033[0;32m$rvm_ruby_string: $($rvm_ruby_home/bin
|
607
|
+
echo -e "\n\n\033[0;32m$rvm_ruby_string: $($rvm_ruby_home/bin/ruby -v | tr "\n" ' ')\033[0m\n"
|
608
608
|
eval "$rvm_command"
|
609
609
|
fi
|
610
610
|
result=$?
|
@@ -807,6 +807,21 @@ __rvm_iconv_install() {
|
|
807
807
|
__rvm_pushpop
|
808
808
|
}
|
809
809
|
|
810
|
+
__rvm_curl_install() {
|
811
|
+
__rvm_make_flags
|
812
|
+
__rvm_pushpop $rvm_src_path
|
813
|
+
package="curl" ; version=7.19.7 ; archive_format="tar.gz"
|
814
|
+
__rvm_log "info" "Retrieving $package-$version.$archive_format"
|
815
|
+
__rvm_fetch "http://curl.haxx.se/download/$package-$version.$archive_format"
|
816
|
+
__rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
|
817
|
+
cd "$rvm_src_path/$package-$version"
|
818
|
+
__rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
|
819
|
+
__rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
|
820
|
+
__rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
|
821
|
+
__rvm_pushpop
|
822
|
+
}
|
823
|
+
|
824
|
+
|
810
825
|
__rvm_openssl_install() {
|
811
826
|
__rvm_make_flags
|
812
827
|
if match "$rvm_archflags" "x86_64" ; then
|
@@ -952,16 +967,16 @@ array_push() {
|
|
952
967
|
}
|
953
968
|
|
954
969
|
match() {
|
955
|
-
if [[ ! -z "$BASH_VERSION" ]] && [[ ${BASH_VERSION:0:1} -gt 2 ]] && [[ ${BASH_VERSION:2:1} -ge 1 ]] ; then
|
956
|
-
[[ "$1" =~ $2 ]] ; return $?
|
970
|
+
#if [[ ! -z "$BASH_VERSION" ]] && [[ ${BASH_VERSION:0:1} -gt 2 ]] && [[ ${BASH_VERSION:2:1} -ge 1 ]] ; then
|
971
|
+
#[[ "$1" =~ $2 ]] ; return $?
|
957
972
|
# elif [[ ! -z "$ZSH_VERSION"]] && [[ ${ZSH_VERSION:0:1} -gt 3 ]] && [[ ${ZSH_VERSION:2:1} -ge 2 ]] && [[ ${ZSH_VERSION:4:1} -ge 4 ]] ; then
|
958
973
|
# return [[ "$1" =~ "$2" ]]
|
974
|
+
#else
|
975
|
+
if [ ! -z "$(echo "$1" | awk "/${2}/")" ] ; then
|
976
|
+
return 0
|
959
977
|
else
|
960
|
-
|
961
|
-
return 0
|
962
|
-
else
|
963
|
-
return 1
|
964
|
-
fi
|
978
|
+
return 1
|
965
979
|
fi
|
980
|
+
#fi
|
966
981
|
}
|
967
982
|
|
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.77
|
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-12 00:00:00 -05:00
|
13
13
|
default_executable: rvm-install
|
14
14
|
dependencies: []
|
15
15
|
|