rvm 0.1.27 → 0.1.29

Sign up to get free protection for your applications and to get access to all the features.
Files changed (52) hide show
  1. data/README +50 -44
  2. data/binscripts/rvm +13 -4
  3. data/binscripts/rvm-prompt +3 -2
  4. data/config/db +7 -7
  5. data/config/md5 +11 -43
  6. data/help/alias +46 -0
  7. data/help/benchmark +17 -0
  8. data/help/debug +8 -0
  9. data/help/fetch +5 -0
  10. data/help/gem +0 -0
  11. data/help/gemdir +0 -0
  12. data/help/gemset +0 -0
  13. data/help/implode +0 -0
  14. data/help/info +0 -0
  15. data/help/install +0 -0
  16. data/help/list +0 -0
  17. data/help/monitor +0 -0
  18. data/help/notes +0 -0
  19. data/help/package +0 -0
  20. data/help/rake +0 -0
  21. data/help/remove +0 -0
  22. data/help/reset +0 -0
  23. data/help/ruby +0 -0
  24. data/help/rvmrc +0 -0
  25. data/help/specs +0 -0
  26. data/help/srcdir +0 -0
  27. data/help/tests +0 -0
  28. data/help/uninstall +0 -0
  29. data/help/update +0 -0
  30. data/help/use +0 -0
  31. data/install +21 -9
  32. data/lib/VERSION.yml +1 -1
  33. data/rvm.gemspec +30 -5
  34. data/scripts/cli +108 -79
  35. data/scripts/db +2 -2
  36. data/scripts/fetch +2 -2
  37. data/scripts/gemsets +16 -12
  38. data/scripts/initialize +2 -1
  39. data/scripts/install +21 -9
  40. data/scripts/irbrc.rb +3 -2
  41. data/scripts/log +1 -1
  42. data/scripts/manage +62 -49
  43. data/scripts/monitor +4 -5
  44. data/scripts/notes +13 -7
  45. data/scripts/package +34 -5
  46. data/scripts/rvm +10 -2
  47. data/scripts/rvm-install +21 -9
  48. data/scripts/selector +25 -17
  49. data/scripts/set +7 -9
  50. data/scripts/update +21 -9
  51. data/scripts/utility +95 -73
  52. metadata +38 -6
data/lib/VERSION.yml CHANGED
@@ -1,4 +1,4 @@
1
1
  ---
2
2
  :major: 0
3
3
  :minor: 1
4
- :patch: 27
4
+ :patch: 29
data/rvm.gemspec CHANGED
@@ -5,13 +5,13 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{rvm}
8
- s.version = "0.1.27"
8
+ s.version = "0.1.29"
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-04-11}
12
+ s.date = %q{2010-05-04}
13
13
  s.default_executable = %q{rvm-install}
14
- s.description = %q{Manages Ruby interpreter environments and switching between them.}
14
+ s.description = %q{Manages Ruby Environments.}
15
15
  s.email = %q{wayneeseguin@gmail.com}
16
16
  s.executables = ["rvm-install"]
17
17
  s.extra_rdoc_files = [
@@ -66,7 +66,32 @@ Gem::Specification.new do |s|
66
66
  "scripts/symlink",
67
67
  "scripts/update",
68
68
  "scripts/utility",
69
- "scripts/version"
69
+ "scripts/version",
70
+ "help/alias",
71
+ "help/benchmark",
72
+ "help/debug",
73
+ "help/fetch",
74
+ "help/gem",
75
+ "help/gemdir",
76
+ "help/gemset",
77
+ "help/implode",
78
+ "help/info",
79
+ "help/install",
80
+ "help/list",
81
+ "help/monitor",
82
+ "help/notes",
83
+ "help/package",
84
+ "help/rake",
85
+ "help/remove",
86
+ "help/reset",
87
+ "help/ruby",
88
+ "help/rvmrc",
89
+ "help/specs",
90
+ "help/srcdir",
91
+ "help/tests",
92
+ "help/uninstall",
93
+ "help/update",
94
+ "help/use"
70
95
  ]
71
96
  s.homepage = %q{http://github.com/wayneeseguin/rvm}
72
97
  s.post_install_message = %q{********************************************************************************
@@ -82,7 +107,7 @@ Gem::Specification.new do |s|
82
107
  s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
83
108
  s.require_paths = ["lib"]
84
109
  s.rubyforge_project = %q{rvm}
85
- s.rubygems_version = %q{1.3.5}
110
+ s.rubygems_version = %q{1.3.6}
86
111
  s.summary = %q{Ruby Version Manager (rvm)}
87
112
 
88
113
  if s.respond_to? :specification_version then
data/scripts/cli CHANGED
@@ -8,7 +8,7 @@ __rvm_parse_args() {
8
8
  while [[ $# -gt 0 ]] ; do
9
9
  rvm_token="$1" ; shift
10
10
  case "$rvm_token" in
11
- fetch|version|srcdir|reset|debug|reload|implode|seppuku|update|monitor|notes)
11
+ fetch|version|srcdir|reset|debug|reload|update|monitor|notes|implode|seppuku|question|answer)
12
12
  rvm_action=$rvm_token
13
13
  ;;
14
14
 
@@ -20,7 +20,7 @@ __rvm_parse_args() {
20
20
 
21
21
  use)
22
22
  rvm_action=$rvm_token
23
- export rvm_verbose_flag=1
23
+ rvm_verbose_flag=1
24
24
  if [[ "ruby" = "$1" ]] ; then shift ; fi
25
25
  ;;
26
26
 
@@ -37,13 +37,13 @@ __rvm_parse_args() {
37
37
 
38
38
  rm|remove)
39
39
  rvm_action="remove"
40
- export rvm_remove_flag=1
40
+ rvm_remove_flag=1
41
41
  ;;
42
42
 
43
43
  # Can likely remove this due to the *) case
44
44
  jruby|ree|macruby|rbx|rubinius|mput|shyouhei|ironruby|default|maglev|all)
45
- export rvm_ruby_interpreter="$rvm_token"
46
- export rvm_ruby_string="$rvm_token"
45
+ rvm_ruby_interpreter="$rvm_token"
46
+ rvm_ruby_string="$rvm_token"
47
47
  rvm_action="${rvm_action:-use}"
48
48
  if $rvm_scripts_path/match "$1" "^[0-9]\.[0-9]" ; then rvm_ruby_version=$1 ; shift ; fi
49
49
  ;;
@@ -51,7 +51,7 @@ __rvm_parse_args() {
51
51
  gemset)
52
52
  rvm_action=$rvm_token
53
53
 
54
- export rvm_ruby_gem_home="$GEM_HOME"
54
+ rvm_ruby_gem_home="$GEM_HOME"
55
55
 
56
56
  if [[ "clear" = "$1" ]] ; then
57
57
  __rvm_gemset_clear
@@ -59,42 +59,34 @@ __rvm_parse_args() {
59
59
  elif [[ "use" = "$1" ]] ; then
60
60
  rvm_use_flag=1
61
61
  rvm_ruby_args="$@" ; shift
62
- export rvm_use_flag rvm_ruby_args
63
- rvm_gemset_name="$1"; shift
62
+ rvm_gemset_name="$1" ; shift
64
63
  if [[ ! -z "$(echo $rvm_gemset_name | grep $rvm_gemset_separator)" ]] ; then
65
64
  rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)'${rvm_gemset_separator}'.*/\1/')
66
65
  rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*'${rvm_gemset_separator}'\(.*\)/\1/')
67
66
  if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then
68
- export rvm_ruby_string="$rvm_ruby_string${rvm_gemset_separator}$rvm_gemset_name"
69
- else
70
- unset rvm_ruby_string
67
+ rvm_ruby_string="$rvm_ruby_string${rvm_gemset_separator}$rvm_gemset_name"
71
68
  fi
72
- export rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator}$rvm_gemset_name"
69
+ rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator}$rvm_gemset_name"
73
70
  fi
74
- if [[ ! -z "$rvm_gemset_name" ]] ; then export rvm_gemset_name ; fi
75
71
  elif [[ "delete" = "$1" ]] ; then
76
72
  rvm_delete_flag=1
77
73
  rvm_ruby_args="$@" ; shift
78
74
  rvm_gemset_name="$1"; shift
79
- export rvm_delete_flag rvm_ruby_args rvm_gemset_name
80
75
  if [[ ! -z "$(echo $rvm_gemset_name | grep $rvm_gemset_separator)" ]] ; then
81
76
  rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)'${rvm_gemset_separator}'.*/\1/')
82
77
  rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*'${rvm_gemset_separator}'\(.*\)/\1/')
83
78
  if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then
84
- export rvm_ruby_string="$rvm_ruby_string${rvm_gemset_separator}$rvm_gemset_name"
85
- else
86
- unset rvm_ruby_string
79
+ rvm_ruby_string="$rvm_ruby_string${rvm_gemset_separator}$rvm_gemset_name"
87
80
  fi
88
- export rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator}$rvm_gemset_name"
81
+ rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator}$rvm_gemset_name"
89
82
  fi
90
- if [[ ! -z "$rvm_gemset_name" ]] ; then export rvm_gemset_name ; fi
91
83
  else
92
84
  if [[ -z "$1" ]] ; then
93
85
  rvm_action="error"
94
86
  rvm_error_message="'gemset' must be followed by a gemset action, see http://rvm.beginrescueend.com/gemsets/ for details."
95
87
  else
96
- if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then export rvm_ruby_string ; else unset rvm_ruby_string ; fi
97
- rvm_ruby_args="$@" ; export rvm_ruby_args
88
+ if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then __rvm_ruby_string ; fi
89
+ rvm_ruby_args="$@"
98
90
  fi
99
91
  fi
100
92
  rvm_parse_break=1
@@ -103,47 +95,55 @@ __rvm_parse_args() {
103
95
  gemdir)
104
96
  rvm_action=$rvm_token
105
97
  rvm_gemdir_flag=1
106
- if [[ "system" = "$1" ]] ; then export rvm_system_flag=1 ; shift ; fi
107
- if [[ "user" = "$1" ]] ; then export rvm_user_flag=1 ; shift ; fi
98
+ if [[ "system" = "$1" ]] ; then rvm_system_flag=1 ; shift ; fi
99
+ if [[ "user" = "$1" ]] ; then rvm_user_flag=1 ; shift ; fi
108
100
  ;;
109
101
 
110
- list|info|strings)
102
+ list|info|docs|alias)
111
103
  rvm_action="$rvm_token"
112
- export rvm_ruby_args="$@"
104
+ rvm_ruby_args="$@"
113
105
  rvm_parse_break=1
114
106
  ;;
115
107
 
116
108
  -S)
117
109
  rvm_action="ruby"
118
- export rvm_ruby_args="$rvm_token $@"
110
+ rvm_ruby_args="$rvm_token $@"
119
111
  rvm_parse_break=1
120
112
  ;;
121
113
 
122
114
  -e)
123
115
  rvm_action="ruby"
124
- export rvm_ruby_args="$rvm_token \"$@\""
116
+ rvm_ruby_args="$rvm_token \"$@\""
125
117
  rvm_parse_break=1
126
118
  ;;
127
119
 
128
120
  do|ruby|rake|gem|rubydo|rakedo|gemdo)
129
121
  if [[ "do" = "$rvm_action" ]] ; then rvm_action="ruby" ; fi
130
- export rvm_action=$(echo $rvm_token | sed 's#do##g')
122
+ rvm_action=$(echo $rvm_token | sed 's#do##g')
131
123
  if [[ "rake" = "$rvm_action" ]] || [[ "gem" = "$rvm_action" ]] || [[ "ruby" = "$rvm_action" ]] ; then
132
124
  if [[ -z "$1" ]] ; then
133
- if [[ "gem" = "$rvm_action" ]] || [[ "ruby" = "$rvm_action" ]] ; then
125
+ if [[ "gem" = "$rvm_action" ]] ; then
134
126
  rvm_action="error"
135
- rvm_error_message="the '$rvm_action' actions must be followed by arguments."
127
+ rvm_error_message="'rvm $rvm_action' must be followed by arguments."
128
+ elif [[ "ruby" = "$rvm_action" ]] ; then
129
+ if [[ -z "$(echo "$rvm_ruby_version" | awk '/,/')" ]] ; then
130
+ rvm_action="ruby"
131
+ rvm_ruby_args=""
132
+ else
133
+ rvm_action="error"
134
+ rvm_error_message="rvm X,Y,Z '$rvm_action' must be followed by arguments."
135
+ fi
136
136
  fi
137
137
  elif [[ "-S" = "$1" ]] ; then
138
- export rvm_action="ruby"
139
- export rvm_ruby_args="$flag $@"
138
+ rvm_action="ruby"
139
+ rvm_ruby_args="$flag $@"
140
140
  rvm_parse_break=1
141
141
  elif [[ "-e" = "$1" ]] ; then
142
- export rvm_action="ruby"
143
- export rvm_ruby_args="$flag '$@'"
142
+ rvm_action="ruby"
143
+ rvm_ruby_args="$flag '$@'"
144
144
  rvm_parse_break=1
145
145
  else
146
- export rvm_ruby_args="$*"
146
+ rvm_ruby_args="$*"
147
147
  rvm_parse_break=1
148
148
  fi
149
149
  else
@@ -196,21 +196,21 @@ __rvm_parse_args() {
196
196
  ;;
197
197
 
198
198
  # For use with --patch
199
- --patch-name) export rvm_ruby_patch_name="$1" ; shift ;;
199
+ --patch-name) rvm_ruby_patch_name="$1" ; shift ;;
200
200
  -h|--patch)
201
201
  if [[ -z "$rvm_ruby_patch" ]] ; then
202
- export rvm_ruby_patch="$1"
202
+ rvm_ruby_patch="$1"
203
203
  else
204
- export rvm_ruby_patch="$rvm_ruby_patch,$1";
204
+ rvm_ruby_patch="$rvm_ruby_patch,$1";
205
205
  fi ; shift
206
206
  rvm_action="${rvm_action:-use}"
207
207
  ;;
208
208
 
209
- --head) export rvm_head_flag=1 ;;
209
+ --head) rvm_head_flag=1 ;;
210
210
 
211
211
  --bin)
212
212
  if [[ "update" = "$rvm_action" ]] ; then
213
- export rvm_bin_flag=1
213
+ rvm_bin_flag=1
214
214
  else
215
215
  rvm_bin_path="$1" ; shift
216
216
  fi
@@ -228,7 +228,7 @@ __rvm_parse_args() {
228
228
 
229
229
  -C|--configure)
230
230
  if [[ ! -z "$1" ]] ; then
231
- export rvm_ruby_configure_flags="$(echo $1 | tr ',' ' ')"
231
+ rvm_ruby_configure_flags="$(echo $1 | tr ',' ' ')"
232
232
  shift
233
233
  else
234
234
  rvm_action="error"
@@ -256,6 +256,11 @@ __rvm_parse_args() {
256
256
  fi
257
257
  ;;
258
258
 
259
+ --rdoc|--yard)
260
+ rvm_docs_type="$rvm_token"
261
+ rvm_docs_type
262
+ ;;
263
+
259
264
  -f|--file)
260
265
  rvm_action="ruby"
261
266
  rvm_ruby_file="$1"
@@ -264,11 +269,16 @@ __rvm_parse_args() {
264
269
 
265
270
  system|default)
266
271
  rvm_action=${rvm_action:-use}
267
- export rvm_ruby_interpreter="$rvm_token"
268
- export rvm_ruby_string="$rvm_token"
272
+ rvm_ruby_interpreter="$rvm_token"
273
+ rvm_ruby_string="$rvm_token"
269
274
  ;;
270
275
 
271
- -h|--help|usage|help) rvm_action=help ;;
276
+ help)
277
+ rvm_action="$rvm_token"
278
+ rvm_ruby_args="$@"
279
+ rvm_parse_break=1
280
+ ;;
281
+ -h|--help|usage) rvm_action=help ;;
272
282
  -G|--gems) rvm_gems_path="$1" ; shift ;;
273
283
  --source) rvm_src_path="$1" ; shift ;;
274
284
  --archives) rvm_archives_path="$1" ; shift ;;
@@ -280,16 +290,22 @@ __rvm_parse_args() {
280
290
  --sdk) rvm_sdk="$1" ; shift ;;
281
291
  --archflags) rvm_archflags="$1" ; shift ;;
282
292
  --symlink) rvm_symlink_name="$1" ; shift ;;
283
- --install) export rvm_install_on_use_flag=1 ;;
284
- --trace) export rvm_trace_flag=1 ; set -x ;;
285
- --proxy) export rvm_proxy="$1" ; shift ;;
286
- --disable-llvm|--disable-jit) export rvm_llvm_flag=0 ;;
287
- --enable-llvm|--enable-jit) export rvm_llvm_flag=1 ;;
293
+ --install) rvm_install_on_use_flag=1 ;;
294
+ --trace) rvm_trace_flag=1 ; set -x ;;
295
+ --proxy) rvm_proxy="$1" ; shift ;;
296
+ --disable-llvm|--disable-jit) rvm_llvm_flag=0 ;;
297
+ --enable-llvm|--enable-jit) rvm_llvm_flag=1 ;;
298
+
299
+ --name)
300
+ rvm_ruby_name="$1"
301
+ shift
302
+ ;;
303
+
288
304
  reboot|damnit|wtf|argh|BOOM|boom|wth) $rvm_action="reboot" ;;
289
305
 
290
306
  --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|--gems)
291
307
  export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
292
- if [[ "--debug" = "$rvm_token" ]] ; then export rvm_debug_flag ; fi
308
+ if [[ "--debug" = "$rvm_token" ]] ; then rvm_debug_flag ; fi
293
309
  ;;
294
310
 
295
311
  --) rvm_ruby_args="$*" ; rvm_parse_break=1 ;;
@@ -297,35 +313,38 @@ __rvm_parse_args() {
297
313
  if [[ ! -z "$rvm_token" ]] ; then
298
314
  if [[ "gemset" = "$rvm_action" ]] ; then
299
315
  if $rvm_scripts_path/match "$rvm_token" "^.+${rvm_gemset_separator}.+$" ; then
300
- export rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
301
- export rvm_ruby_string="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $1}')"
316
+ rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
317
+ rvm_ruby_string="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $1}')"
302
318
  elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
303
- export rvm_file_name="$(echo "$rvm_token" | sed 's#\.gems##g').gems"
319
+ rvm_file_name="$(echo "$rvm_token" | sed 's#\.gems##g').gems"
304
320
  # elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
305
321
  else
306
- export rvm_gemset_name="$(echo "$rvm_token" | sed 's#\.gems##g')"
307
- export rvm_file_name="$rvm_gemset_name.gems"
322
+ rvm_gemset_name="$(echo "$rvm_token" | sed 's#\.gems##g')"
323
+ rvm_file_name="$rvm_gemset_name.gems"
308
324
  fi
309
325
  elif [[ ! -z "$(echo "$rvm_token" | awk '/,/')" ]] ; then
310
- export rvm_ruby_version="$rvm_token"
326
+ rvm_ruby_version="$rvm_token"
311
327
  if [[ -z "$rvm_action" ]] ; then
312
328
  rvm_action="ruby" # Not sure if we really want to do this but we'll try it out.
313
329
  fi
314
330
  elif $rvm_scripts_path/match "$rvm_token" "^.+${rvm_gemset_separator}.+$" ; then
315
- export rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
316
- export rvm_ruby_string="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $1}')"
331
+ rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
332
+ rvm_ruby_string="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $1}')"
317
333
  elif $rvm_scripts_path/match "$rvm_token" "-" ; then
318
- export rvm_ruby_string="$rvm_token"
334
+ rvm_ruby_string="$rvm_token"
319
335
  elif $rvm_scripts_path/match "$rvm_token" "^[0-9].[0-9]" ; then
320
- export rvm_ruby_string="$rvm_token"
321
- export rvm_action="${rvm_action:-use}"
336
+ rvm_ruby_string="$rvm_token"
337
+ rvm_action="${rvm_action:-use}"
322
338
  elif $rvm_scripts_path/match "$rvm_token" "^ree-" ; then
323
- export rvm_ruby_string="$rvm_token"
324
- export rvm_action="${rvm_action:-use}"
339
+ rvm_ruby_string="$rvm_token"
340
+ rvm_action="${rvm_action:-use}"
341
+ elif [[ -L "$rvm_rubies_path/$rvm_token" ]] ; then # Alias
342
+ rvm_ruby_string=$rvm_token
343
+ rvm_action="${rvm_action:-use}"
325
344
  else
326
345
  if $rvm_scripts_path/match "$rvm_token" "\.rb$" ; then # we have a specified ruby script
327
- export rvm_ruby_args=$rvm_token
328
- export rvm_ruby_file=$rvm_token
346
+ rvm_ruby_args=$rvm_token
347
+ rvm_ruby_file=$rvm_token
329
348
  if [[ -z "$rvm_action" ]] ; then
330
349
  rvm_action="ruby"
331
350
  fi
@@ -372,22 +391,31 @@ rvm() {
372
391
  __rvm_load_defaults
373
392
  __rvm_parse_args $@
374
393
 
394
+ export BUNDLE_PATH GEM_HOME GEM_PATH rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_ruby_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_patch rvm_ruby_patch_name rvm_ruby_string rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag
395
+ export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_symlink_path
396
+
375
397
  result=0
376
398
  case "$rvm_action" in
377
- use) __rvm_use ; result=$? ;;
378
- srcdir) __rvm_source_dir ; result=$? ;;
379
- list) __rvm_list ; result=$? ;;
380
- strings) __rvm_strings ; result=$? ;;
381
- info) __rvm_info ; result=$? ;;
382
- debug) __rvm_debug ; result=$? ;;
383
- version) __rvm_version ; result=$? ;;
384
- reset) __rvm_reset ; result=$? ;;
385
- update) __rvm_update ; result=$? ;;
386
- reboot) __rvm_reboot ; result=$? ;;
387
- usage|help) __rvm_usage ; result=$? ;;
388
- benchmark) __rvm_benchmark ; result=$? ;;
389
- inspect) __rvm_inspect ; result=$? ;;
390
- implode|seppuku) __rvm_implode ; result=$? ;;
399
+ use) __rvm_use ; result=$? ;;
400
+ srcdir) __rvm_source_dir ; result=$? ;;
401
+ list) __rvm_list ; result=$? ;;
402
+ strings) __rvm_strings ; result=$? ;;
403
+ info) __rvm_info ; result=$? ;;
404
+ debug) __rvm_debug ; result=$? ;;
405
+ version) __rvm_version ; result=$? ;;
406
+ reset) __rvm_reset ; result=$? ;;
407
+ update) __rvm_update ; result=$? ;;
408
+ reboot) __rvm_reboot ; result=$? ;;
409
+ usage) __rvm_usage ; result=$? ;;
410
+ benchmark) __rvm_benchmark ; result=$? ;;
411
+ inspect) __rvm_inspect ; result=$? ;;
412
+ implode|seppuku) __rvm_implode ; result=$? ;;
413
+ docs) $rvm_scripts_path/docs ; result=$? ;;
414
+ alias) $rvm_scripts_path/alias ; result=$? ;;
415
+ help) $rvm_scripts_path/help $rvm_ruby_args ; result=$? ;;
416
+
417
+ answer) __rvm_Answer_to_the_Ultimate_Question_of_Life_the_Universe_and_Everything ; result=42 ;;
418
+ question) __rvm_ultimate_question ; result=42 ;;
391
419
 
392
420
  gemdir)
393
421
  $rvm_scripts_path/gemsets gemdir
@@ -398,6 +426,7 @@ rvm() {
398
426
  $rvm_scripts_path/set $rvm_action $rvm_ruby_args
399
427
  result=$?
400
428
  ;;
429
+
401
430
  gemset)
402
431
  #if $rvm_scripts_path/match $rvm_ruby_args use ; then
403
432
  if [[ "$rvm_use_flag" -eq 1 ]] ; then
data/scripts/db CHANGED
@@ -7,13 +7,13 @@ if [[ -f "$1" ]] ; then
7
7
  touch $database_file
8
8
  fi
9
9
  else
10
- echo "usage: $0 database key [value]"
10
+ echo "Database file $1 does not exist." >&2
11
11
  exit 1
12
12
  fi
13
13
 
14
14
  key="$1" ; shift
15
15
  if [[ -z "$key" ]] ; then
16
- echo "usage: $0 database key [value]"
16
+ echo "usage: $0 database key [value]" >&2
17
17
  exit 1
18
18
  else
19
19
  value="$*"
data/scripts/fetch CHANGED
@@ -19,8 +19,8 @@ if [[ -z "$1" ]] ; then $rvm_scripts_path/log "fail" "BUG: $0 called without an
19
19
 
20
20
  url="$1"; download=1 ; package_name="$2"
21
21
 
22
- if ! which curl &> /dev/null; then
23
- $rvm_scripts_path/log "fail" "rvm requires curl, which does not seem to exist in your path :("
22
+ if ! command -v curl > /dev/null ; then
23
+ $rvm_scripts_path/log "fail" "rvm requires curl. curl was not found in your active path."
24
24
  exit 1
25
25
  elif [[ ! -z ${rvm_proxy} ]] ; then
26
26
  fetch_command="curl -x${rvm_proxy} -L --create-dirs -C - " # -s for silent