rvm 1.0.19 → 1.0.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/binscripts/rvm-update-head +29 -6
- data/config/db +1 -1
- data/config/known +1 -1
- data/config/md5 +4 -4
- data/install +1 -1
- data/lib/VERSION.yml +1 -1
- data/lib/rvm.rb +2 -0
- data/lib/rvm/environment.rb +5 -0
- data/lib/rvm/environment/env.rb +15 -2
- data/lib/rvm/environment/info.rb +4 -0
- data/lib/rvm/environment/list.rb +15 -0
- data/lib/rvm/environment/rubies.rb +4 -0
- data/rvm.gemspec +2 -2
- data/scripts/cd +20 -40
- data/scripts/cli +1 -1
- data/scripts/install +1 -1
- data/scripts/manage +11 -8
- data/scripts/notes +6 -0
- data/scripts/rubygems +1 -1
- data/scripts/rvm-install +1 -1
- data/scripts/selector +1 -1
- data/scripts/update +1 -1
- data/scripts/utility +2 -21
- metadata +4 -4
data/binscripts/rvm-update-head
CHANGED
@@ -15,17 +15,38 @@ fi
|
|
15
15
|
|
16
16
|
rvm_path="${rvm_path:-"$HOME/.rvm"}"
|
17
17
|
|
18
|
-
|
18
|
+
if [[ ! -d "$rvm_path/src" ]] ; then
|
19
|
+
mkdir -p "$rvm_path/src/"
|
20
|
+
fi
|
19
21
|
|
20
22
|
builtin cd "$rvm_path/src"
|
21
23
|
|
22
|
-
|
24
|
+
if [[ -d ./rvm ]] ; then
|
25
|
+
rm -rf ./rvm/
|
26
|
+
fi
|
27
|
+
|
28
|
+
http_url="http://github.com/wayneeseguin/rvm.git"
|
29
|
+
|
30
|
+
if ! git clone "$http_url" ; then
|
31
|
+
|
32
|
+
printf "
|
33
|
+
ERROR: Cloning from $http_url failed,
|
34
|
+
perhaps your git version does not support the http protocol?
|
35
|
+
Trying git:// protocol now.
|
36
|
+
"
|
23
37
|
|
24
|
-
|
38
|
+
git_url="git://github.com/wayneeseguin/rvm.git"
|
39
|
+
|
40
|
+
if ! git clone "$git_url" ; then
|
41
|
+
|
42
|
+
printf "
|
43
|
+
ERROR: Cloning from $git_url failed, out of ideas... halting.
|
44
|
+
"
|
45
|
+
|
46
|
+
exit 1
|
47
|
+
|
48
|
+
fi
|
25
49
|
|
26
|
-
if ! git clone "$url" ; then
|
27
|
-
printf "ERROR: Cloning from $url failed.\n"
|
28
|
-
exit 1
|
29
50
|
fi
|
30
51
|
|
31
52
|
builtin cd rvm
|
@@ -33,3 +54,5 @@ builtin cd rvm
|
|
33
54
|
chmod +x "$PWD/scripts/install"
|
34
55
|
|
35
56
|
exec "$PWD/scripts/install"
|
57
|
+
|
58
|
+
exit $?
|
data/config/db
CHANGED
@@ -48,7 +48,7 @@ macruby_version=0.7.1
|
|
48
48
|
macruby_url=http://www.macruby.org/files
|
49
49
|
macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
|
50
50
|
macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg
|
51
|
-
maglev_version=
|
51
|
+
maglev_version=24566
|
52
52
|
maglev_url=http://glass-downloads.gemstone.com/maglev
|
53
53
|
maglev_repo_url=git://github.com/MagLev/maglev.git
|
54
54
|
shyouhei_repo_url=git://github.com/shyouhei/ruby.git
|
data/config/known
CHANGED
data/config/md5
CHANGED
@@ -1,11 +1,11 @@
|
|
1
|
-
GemStone-
|
2
|
-
GemStone-
|
1
|
+
GemStone-24566.Darwin-i386.tar.gz=2cbde6a9d498d350191ef8621a928fa1
|
2
|
+
GemStone-24566.Linux-x86_64.tar.gz=fe0c71ad2043742a9c7d2ddc6d9f5e10
|
3
|
+
MagLev-24566.Darwin-i386.tar.gz=45956e388aa928f513b613dde677a658
|
4
|
+
MagLev-24566.Linux-x86_64.tar.gz=8e5e05757f6fee215530afc2c88ceb84
|
3
5
|
MacRuby%200.5.zip=675454a8c7bc19d606d90a726e08427c
|
4
6
|
MacRuby%200.6.zip=a80afd3700c88cf95c539fc63b272faf
|
5
7
|
MacRuby%200.7.1.zip=e8245dcd03c0757dfae7e6fee913947a
|
6
8
|
MacRuby%200.7.zip=0bb60588c9ec9b1517665743bb05132f
|
7
|
-
MagLev-24407.Darwin-i386.tar.gz=4aa0a3c35c63c876c8f786691a20dcb5
|
8
|
-
MagLev-24407.Linux-x86_64.tar.gz=ab6928f5a39231efb86253e8b8e00134
|
9
9
|
curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
|
10
10
|
ironruby-1.0.zip=7a92888837b3507355ed391dbfc0ab83
|
11
11
|
jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
|
data/install
CHANGED
@@ -145,7 +145,7 @@ question, I will respond as soon as I am back. It is best to talk in
|
|
145
145
|
#rvm itself as then other users can help out should I be offline.
|
146
146
|
|
147
147
|
Be sure to get head often as rvm development happens fast,
|
148
|
-
you can do this by running 'rvm
|
148
|
+
you can do this by running 'rvm get head' followed by 'rvm reload'
|
149
149
|
or opening a new shell
|
150
150
|
|
151
151
|
w⦿‿⦿t
|
data/lib/VERSION.yml
CHANGED
data/lib/rvm.rb
CHANGED
@@ -79,6 +79,8 @@ module RVM
|
|
79
79
|
# RVM.environments("ree@rails3,rbx@rails3") do |env|
|
80
80
|
# puts "Full environment: #{env.expanded_name}"
|
81
81
|
# end
|
82
|
+
# # => "ree-1.8.7@rails3"
|
83
|
+
# # => "rbx-1.1.0@rails3" # Suppose that you are installed rbx 1.1.0
|
82
84
|
#
|
83
85
|
# Alternatively, you can use the more ruby-like fashion:
|
84
86
|
#
|
data/lib/rvm/environment.rb
CHANGED
@@ -34,6 +34,11 @@ module RVM
|
|
34
34
|
end
|
35
35
|
|
36
36
|
# Returns the expanded name, using the same method as used by the rvm command line.
|
37
|
+
#
|
38
|
+
# Suppose that you are in the 1.9.2 patchlevel Environment.
|
39
|
+
#
|
40
|
+
# env.expanded_name # => "ruby-1.9.2-p0"
|
41
|
+
#
|
37
42
|
def expanded_name
|
38
43
|
@expanded_name ||= tools_identifier.to_s
|
39
44
|
end
|
data/lib/rvm/environment/env.rb
CHANGED
@@ -2,13 +2,20 @@ module RVM
|
|
2
2
|
class Environment
|
3
3
|
|
4
4
|
# Returns the contents of the env file.
|
5
|
+
#
|
6
|
+
# env.env_contents # => ['export PATH= ....', ...]
|
7
|
+
#
|
5
8
|
def env_contents
|
6
|
-
rvm(:env, environment_name).stdout
|
9
|
+
rvm(:env, environment_name).stdout.split
|
7
10
|
end
|
8
11
|
|
9
12
|
# Returns the path to the env file
|
13
|
+
# Suppose that you are in the 1.9.2 environment.
|
14
|
+
#
|
15
|
+
# env.env_path # => "~/.rvm/environments/ruby-1.9.2-p0"
|
16
|
+
#
|
10
17
|
def env_path
|
11
|
-
rvm(:env, environment_name, :path => true).stdout
|
18
|
+
normalize_array rvm(:env, environment_name, :path => true).stdout
|
12
19
|
end
|
13
20
|
|
14
21
|
# Returns a ruby-like wrapper for the env functions
|
@@ -17,6 +24,12 @@ module RVM
|
|
17
24
|
end
|
18
25
|
|
19
26
|
# Returns the path for the given command
|
27
|
+
#
|
28
|
+
# Suppose that you are in the 1.9.2 environment.
|
29
|
+
#
|
30
|
+
# env.path_for(:rspec) # => '~/.rvm/gems/ruby-1.9.2-p0/bin/rspec'
|
31
|
+
# env.path_for(:ruby) # => '~/.rvm/rubies/ruby-1.9.2-p0/bin/ruby'
|
32
|
+
#
|
20
33
|
def path_for(command)
|
21
34
|
run(:command, "-v", command).stdout.strip
|
22
35
|
end
|
data/lib/rvm/environment/info.rb
CHANGED
data/lib/rvm/environment/list.rb
CHANGED
@@ -2,41 +2,56 @@ module RVM
|
|
2
2
|
class Environment
|
3
3
|
|
4
4
|
# Returns a raw array list of ruby + gemset combinations.
|
5
|
+
#
|
6
|
+
# env.list_gemsets # => ['ruby-1.9.2-p0@my_gemset', 'jruby@my_gemset', ...]
|
7
|
+
#
|
5
8
|
def list_gemsets
|
6
9
|
normalize_listing_output rvm(:list, :gemsets, :strings).stdout
|
7
10
|
end
|
8
11
|
|
9
12
|
# Returns a raw array list of installed ruby strings, including aliases.
|
13
|
+
#
|
14
|
+
# env.list_strings # => ["ruby-1.9.2-p0", "jruby-1.5.3"]
|
15
|
+
#
|
10
16
|
def list_strings
|
11
17
|
normalize_listing_output rvm(:list, :strings).stdout.tr(' ', "\n")
|
12
18
|
end
|
13
19
|
|
14
20
|
# Lists the default ruby (minus gemset)
|
21
|
+
# Suppose that Ruby 1.9.2 patchlevel 0, is the default:
|
22
|
+
#
|
23
|
+
# env.list_default # => "ruby-1.9.2-p0"
|
24
|
+
#
|
15
25
|
def list_default
|
16
26
|
normalize rvm(:list, :default, :string).stdout
|
17
27
|
end
|
18
28
|
|
19
29
|
# Lists all known ruby strings (raw, filtered output)
|
30
|
+
#
|
20
31
|
def list_known
|
21
32
|
normalize_listing_output rvm(:list, :known).stdout
|
22
33
|
end
|
23
34
|
|
24
35
|
# Lists all known ruby strings
|
36
|
+
#
|
25
37
|
def list_known_strings
|
26
38
|
normalize_listing_output rvm(:list, :known_strings).stdout
|
27
39
|
end
|
28
40
|
|
29
41
|
# Lists all known svn tags.
|
42
|
+
#
|
30
43
|
def list_ruby_svn_tags
|
31
44
|
normalize_listing_output rvm(:list, :ruby_svn_tags).stdout
|
32
45
|
end
|
33
46
|
|
34
47
|
# Returns an interface to a more Ruby-like interface for list.
|
48
|
+
#
|
35
49
|
def list
|
36
50
|
@list_helper ||= ListWrapper.new(self)
|
37
51
|
end
|
38
52
|
|
39
53
|
# Provides a ruby-like interface to make listing rubies easier.
|
54
|
+
#
|
40
55
|
class ListWrapper
|
41
56
|
|
42
57
|
def initialize(parent)
|
data/rvm.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{rvm}
|
8
|
-
s.version = "1.0.
|
8
|
+
s.version = "1.0.20"
|
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-11-
|
12
|
+
s.date = %q{2010-11-05}
|
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/cd
CHANGED
@@ -45,46 +45,26 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
|
|
45
45
|
return $result
|
46
46
|
}
|
47
47
|
|
48
|
-
#
|
49
|
-
#
|
50
|
-
#
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
# item="${item}/"
|
70
|
-
|
71
|
-
# COMPREPLY[index++]=${item#$directory/}
|
72
|
-
|
73
|
-
# done
|
74
|
-
|
75
|
-
# done
|
76
|
-
|
77
|
-
# COMPREPLY=( $(echo ${COMPREPLY} | uniq | sort) )
|
78
|
-
|
79
|
-
# else
|
80
|
-
|
81
|
-
# COMPREPLY=( $(compgen -d ${current}) )
|
82
|
-
|
83
|
-
# fi
|
84
|
-
|
85
|
-
# }
|
86
|
-
|
87
|
-
# complete -o filenames -o dirnames -o nospace -F _rvm_cd_complete cd
|
48
|
+
# If $CDPATH is set, bash should tab-complete based on directories in those paths,
|
49
|
+
# but with the cd function above, the built-in tab-complete ignores $CDPATH. This
|
50
|
+
# function returns that functionality.
|
51
|
+
_rvm_cd_complete ()
|
52
|
+
{
|
53
|
+
local directory current matches item index
|
54
|
+
COMPREPLY=()
|
55
|
+
current="${COMP_WORDS[COMP_CWORD]}"
|
56
|
+
if [[ -n "$CDPATH" && ${current:0:1} != "/" ]] ; then
|
57
|
+
index=0
|
58
|
+
for directory in $(printf "$CDPATH" | tr -s ':' ' ') ; do
|
59
|
+
for item in $( compgen -d "$directory/$current" ) ; do
|
60
|
+
COMPREPLY[index++]=${item#$directory/}
|
61
|
+
done
|
62
|
+
done
|
63
|
+
else
|
64
|
+
COMPREPLY=( $(compgen -d ${current}) )
|
65
|
+
fi
|
66
|
+
}
|
67
|
+
complete -o bashdefault -o default -o filenames -o dirnames -o nospace -F _rvm_cd_complete cd
|
88
68
|
|
89
69
|
fi
|
90
70
|
|
data/scripts/cli
CHANGED
@@ -649,7 +649,7 @@ rvm()
|
|
649
649
|
|
650
650
|
rvm_action="${rvm_action:-usage}"
|
651
651
|
|
652
|
-
|
652
|
+
export BUNDLE_PATH GEM_HOME GEM_PATH rvm_action rvm_archflags rvm_bin_flag rvm_bin_path rvm_clang_flag rvm_configure_flags rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_dump_environment_flag rvm_error_message rvm_file_name rvm_gemdir_flag rvm_gemset_name rvm_head_flag rvm_install_arguments rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_loaded_flag rvm_make_flags rvm_niceness rvm_only_path_flag rvm_parse_break rvm_patch_names rvm_patch_original_pwd rvm_pretty_print_flag rvm_prior_cc rvm_proxy rvm_quiet_flag rvm_ree_options rvm_reload_flag rvm_remove_flag rvm_ruby_alias rvm_ruby_aliases rvm_ruby_args rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_load_path rvm_ruby_make rvm_ruby_make_install rvm_ruby_patch_level rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_require rvm_ruby_string rvm_ruby_strings rvm_ruby_version rvm_script_name rvm_sdk rvm_silent_flag rvm_system_flag rvm_token rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_wrapper_name
|
653
653
|
|
654
654
|
case "$rvm_action" in
|
655
655
|
use) __rvm_use ;;
|
data/scripts/install
CHANGED
@@ -145,7 +145,7 @@ question, I will respond as soon as I am back. It is best to talk in
|
|
145
145
|
#rvm itself as then other users can help out should I be offline.
|
146
146
|
|
147
147
|
Be sure to get head often as rvm development happens fast,
|
148
|
-
you can do this by running 'rvm
|
148
|
+
you can do this by running 'rvm get head' followed by 'rvm reload'
|
149
149
|
or opening a new shell
|
150
150
|
|
151
151
|
w⦿‿⦿t
|
data/scripts/manage
CHANGED
@@ -22,7 +22,7 @@ __rvm_check_for_bison()
|
|
22
22
|
if [[ ${rvm_head_flag:-0} -gt 0 ]]; then
|
23
23
|
command -v bison > /dev/null
|
24
24
|
result=$?
|
25
|
-
if [[
|
25
|
+
if [[ $result -gt 0 ]] ; then
|
26
26
|
"$rvm_path/scripts/log" "fail" \
|
27
27
|
"\nbison is not available in your path. \nPlease ensure bison is installed before compiling from head.\n"
|
28
28
|
fi
|
@@ -169,7 +169,7 @@ __rvm_install_source()
|
|
169
169
|
__rvm_apply_patches
|
170
170
|
result="$?"
|
171
171
|
|
172
|
-
if [[
|
172
|
+
if [[ $result -gt 0 ]]; then
|
173
173
|
"$rvm_path/scripts/log" "fail" \
|
174
174
|
"There has been an error applying the specified patches. Halting the installation."
|
175
175
|
return $result
|
@@ -194,7 +194,7 @@ __rvm_install_source()
|
|
194
194
|
__rvm_run "configure" "$rvm_ruby_configure"
|
195
195
|
result=$?
|
196
196
|
|
197
|
-
if [[
|
197
|
+
if [[ $result -gt 0 ]] ; then
|
198
198
|
"$rvm_path/scripts/log" "error" \
|
199
199
|
"There has been an error while configuring. Halting the installation."
|
200
200
|
return $result
|
@@ -223,7 +223,7 @@ __rvm_install_source()
|
|
223
223
|
__rvm_run "configure" "$configure_command" "$rvm_ruby_string - #configuring "
|
224
224
|
result=$?
|
225
225
|
|
226
|
-
if [[
|
226
|
+
if [[ $result -gt 0 ]] ; then
|
227
227
|
"$rvm_path/scripts/log" "error" \
|
228
228
|
"There has been an error while running configure. Halting the installation."
|
229
229
|
return $result
|
@@ -239,7 +239,7 @@ __rvm_install_source()
|
|
239
239
|
__rvm_run "make" "$rvm_ruby_make ${rvm_make_flags:-""}" "$rvm_ruby_string - #compiling "
|
240
240
|
result=$?
|
241
241
|
|
242
|
-
if [[
|
242
|
+
if [[ $result -gt 0 ]] ; then
|
243
243
|
"$rvm_path/scripts/log" "error" \
|
244
244
|
"There has been an error while running make. Halting the installation."
|
245
245
|
return $result
|
@@ -254,7 +254,7 @@ __rvm_install_source()
|
|
254
254
|
__rvm_run "install" "$rvm_ruby_make_install" "$rvm_ruby_string - #installing "
|
255
255
|
result=$?
|
256
256
|
|
257
|
-
if [[
|
257
|
+
if [[ $result -gt 0 ]] ; then
|
258
258
|
"$rvm_path/scripts/log" "error" \
|
259
259
|
"There has been an error while running make install. Halting the installation."
|
260
260
|
return $result
|
@@ -290,7 +290,7 @@ __rvm_install_ruby()
|
|
290
290
|
|
291
291
|
# Check for clang if the flag is set
|
292
292
|
__rvm_check_for_clang
|
293
|
-
result
|
293
|
+
result=$?
|
294
294
|
|
295
295
|
[[ $result -gt 0 ]] && return $result
|
296
296
|
|
@@ -1084,7 +1084,7 @@ RubyWrapper
|
|
1084
1084
|
fi
|
1085
1085
|
fi
|
1086
1086
|
|
1087
|
-
if [[ -s ./Makefile
|
1087
|
+
if [[ -s ./Makefile && -z "$rvm_reconfigure_flag" ]] ; then
|
1088
1088
|
|
1089
1089
|
if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
|
1090
1090
|
"$rvm_path/scripts/log" "debug" \
|
@@ -1335,6 +1335,9 @@ __rvm_fetch_ruby()
|
|
1335
1335
|
;;
|
1336
1336
|
esac
|
1337
1337
|
|
1338
|
+
if [[ -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" ]] ; then
|
1339
|
+
rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
|
1340
|
+
fi
|
1338
1341
|
mv "/tmp/rvm_src_$$/$(builtin cd /tmp/rvm_src_$$ ; ls)" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" ; rm -rf "/tmp/rvm_src_$$"
|
1339
1342
|
|
1340
1343
|
if [[ -n "${rvm_ruby_name:-""}" && -d "${rvm_src_path:-"$rvm_path/src"}/$(echo $rvm_ruby_string | sed -e 's/-n.*//')" ]] ; then
|
data/scripts/notes
CHANGED
@@ -126,6 +126,12 @@ elif [[ "Darwin" = "$system" ]] ; then
|
|
126
126
|
If you intend on installing MacRuby you must install LLVM first.
|
127
127
|
If you intend on installing JRuby you must install the JDK.
|
128
128
|
If you intend on installing IronRuby you must install Mono (version 2.6 or greater is recommended).
|
129
|
+
|
130
|
+
To seamlessly abandon the Apple-installed system ruby (ruby 1.8.7 patchlevel 174 for Snow Leopard):
|
131
|
+
|
132
|
+
rvm install 1.8.7 # installs patch 302: closest supported version
|
133
|
+
rvm system ; rvm gemset export system.gems ; rvm 1.8.7 ; rvm gemset import system # migrate your gems
|
134
|
+
rvm --default 1.8.7
|
129
135
|
"
|
130
136
|
fi
|
131
137
|
|
data/scripts/rubygems
CHANGED
@@ -85,7 +85,7 @@ rubygems_setup()
|
|
85
85
|
builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name"
|
86
86
|
|
87
87
|
__rvm_run "rubygems.install" \
|
88
|
-
"GEM_PATH=\"$rvm_ruby_gem_path:$rvm_ruby_global_gems_path\" GEM_HOME=\"$rvm_ruby_gem_home\"
|
88
|
+
"GEM_PATH=\"$rvm_ruby_gem_path:$rvm_ruby_global_gems_path\" GEM_HOME=\"$rvm_ruby_gem_home\" \"$rvm_ruby_home/bin/ruby\" \"${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name/setup.rb\"" \
|
89
89
|
"Installing rubygems for $rvm_ruby_home/bin/ruby"
|
90
90
|
result=$?
|
91
91
|
|
data/scripts/rvm-install
CHANGED
@@ -145,7 +145,7 @@ question, I will respond as soon as I am back. It is best to talk in
|
|
145
145
|
#rvm itself as then other users can help out should I be offline.
|
146
146
|
|
147
147
|
Be sure to get head often as rvm development happens fast,
|
148
|
-
you can do this by running 'rvm
|
148
|
+
you can do this by running 'rvm get head' followed by 'rvm reload'
|
149
149
|
or opening a new shell
|
150
150
|
|
151
151
|
w⦿‿⦿t
|
data/scripts/selector
CHANGED
@@ -4,7 +4,7 @@
|
|
4
4
|
__rvm_select()
|
5
5
|
{
|
6
6
|
# Set Variable Defaults
|
7
|
-
|
7
|
+
export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
|
8
8
|
|
9
9
|
if [[ -z "${rvm_ruby_string:-""}" ]] ; then
|
10
10
|
[[ -n "${rvm_ruby_interpreter:-""}" ]] && rvm_ruby_string="$rvm_ruby_interpreter"
|
data/scripts/update
CHANGED
@@ -145,7 +145,7 @@ question, I will respond as soon as I am back. It is best to talk in
|
|
145
145
|
#rvm itself as then other users can help out should I be offline.
|
146
146
|
|
147
147
|
Be sure to get head often as rvm development happens fast,
|
148
|
-
you can do this by running 'rvm
|
148
|
+
you can do this by running 'rvm get head' followed by 'rvm reload'
|
149
149
|
or opening a new shell
|
150
150
|
|
151
151
|
w⦿‿⦿t
|
data/scripts/utility
CHANGED
@@ -48,7 +48,7 @@ __rvm_teardown()
|
|
48
48
|
|
49
49
|
fi
|
50
50
|
|
51
|
-
unset rvm_ruby_strings rvm_head_flag rvm_prior_cc next_token rvm_bin_path rvm_error_message rvm_gems_cache_path rvm_gems_path rvm_gemset_name rvm_interactive_flag rvm_man_path rvm_parse_break rvm_rc_files rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_selfcontained rvm_token rvm_ruby_load_path rvm_path_flag rvm_ruby_require rvm_action
|
51
|
+
unset rvm_ruby_strings rvm_head_flag rvm_prior_cc next_token rvm_bin_path rvm_error_message rvm_gems_cache_path rvm_gems_path rvm_gemset_name rvm_interactive_flag rvm_man_path rvm_parse_break rvm_rc_files rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_selfcontained rvm_token rvm_ruby_load_path rvm_path_flag rvm_ruby_require rvm_action rvm_ruby_package_file
|
52
52
|
|
53
53
|
[[ ${rvm_dump_environment_flag:-0} -eq 1 ]] && __rvm_dump_environment
|
54
54
|
|
@@ -364,7 +364,7 @@ __rvm_nuke_rvm_variables()
|
|
364
364
|
__rvm_unset_ruby_variables()
|
365
365
|
{
|
366
366
|
# unset rvm_ruby_flag $(env | awk -F= '/^rvm_ruby_/{printf $1" "}')
|
367
|
-
unset rvm_ruby_strings rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_ruby_load_path rvm_ruby_require rvm_head_flag
|
367
|
+
unset rvm_ruby_strings rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_ruby_load_path rvm_ruby_require rvm_head_flag rvm_ruby_package_file rvm_ruby_configure
|
368
368
|
}
|
369
369
|
|
370
370
|
# TODO: Should be able to...
|
@@ -1504,22 +1504,3 @@ __rvm_expand_ruby_string()
|
|
1504
1504
|
|
1505
1505
|
return $?
|
1506
1506
|
}
|
1507
|
-
|
1508
|
-
# My concern here is that this will slow things down quite a bit.
|
1509
|
-
# This is originally from
|
1510
|
-
# http://github.com/teleological/rvm/commit/21d6083db3fffc5fa92b9ea8814f3f28f7e48c7f#commitcomment-178001
|
1511
|
-
# Is there a zsh setting to counter the issue instead of this?
|
1512
|
-
__rvm_export_if_set()
|
1513
|
-
{
|
1514
|
-
local parameter value
|
1515
|
-
|
1516
|
-
for parameter in $* ; do
|
1517
|
-
eval "value=\${$parameter:-\"\"}"
|
1518
|
-
|
1519
|
-
if [[ -n "$value" ]] ; then
|
1520
|
-
export $parameter
|
1521
|
-
fi
|
1522
|
-
done
|
1523
|
-
|
1524
|
-
return 0
|
1525
|
-
}
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rvm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 63
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 0
|
9
|
-
-
|
10
|
-
version: 1.0.
|
9
|
+
- 20
|
10
|
+
version: 1.0.20
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Wayne E. Seguin
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2010-11-
|
18
|
+
date: 2010-11-05 00:00:00 -04:00
|
19
19
|
default_executable: rvm-install
|
20
20
|
dependencies: []
|
21
21
|
|