scripts/cli in rvm-0.1.18 vs scripts/cli in rvm-0.1.19
- old
+ new
@@ -6,14 +6,20 @@
if echo "$*" | grep -q 'trace' ; then echo "$*" ; __rvm_version ; fi
while [[ $# -gt 0 ]] ; do
rvm_token="$1" ; shift
case "$rvm_token" in
- fetch|version|srcdir|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|monitor|notes|mono)
+ fetch|version|srcdir|reset|debug|reload|implode|seppuku|update|monitor|notes)
rvm_action=$rvm_token
;;
+ package)
+ rvm_action="$rvm_token"
+ export rvm_ruby_args="$@"
+ rvm_parse_break=1
+ ;;
+
use)
rvm_action=$rvm_token
export rvm_verbose_flag=1
if [[ "ruby" = "$1" ]] ; then shift ; fi
;;
@@ -32,46 +38,40 @@
rm|remove)
rvm_action="remove"
export rvm_remove_flag=1
;;
- system|default)
- rvm_action=${rvm_action:-use}
- rvm_ruby_interpreter="$rvm_token"
- rvm_ruby_string="$rvm_token"
- ;;
-
# Can likely remove this due to the *) case
jruby|ree|macruby|rbx|rubinius|mput|shyouhei|ironruby|default|maglev|all)
- rvm_ruby_interpreter="$rvm_token"
- rvm_ruby_string="$rvm_token"
+ export rvm_ruby_interpreter="$rvm_token"
+ export rvm_ruby_string="$rvm_token"
rvm_action="${rvm_action:-use}"
if $rvm_scripts_path/match "$1" "^[0-9]\.[0-9]" ; then rvm_ruby_version=$1 ; shift ; fi
;;
- gems|gemset)
- rvm_action="gems"
+ gemset)
+ rvm_action=$rvm_token
if [[ "clear" = "$1" ]] ; then
- unset rvm_gem_set_name ; shift
+ unset rvm_gemset_name ; shift
export rvm_ruby_gem_home="$(echo $GEM_HOME | sed 's/%.*$//')"
export GEM_HOME="$rvm_ruby_gem_home"
export BUNDLE_PATH="$rvm_ruby_gem_home"
export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home%global/bin"
rvm_ruby_args="clear"
rvm_parse_break=1
elif [[ "delete" = "$1" ]] || [[ "use" = "$1" ]] ; then
export rvm_${1}_flag=1
export rvm_ruby_args="$*" ; shift
- rvm_gem_set_name="$1"; shift
- rvm_ruby_string=$(echo $rvm_gem_set_name | sed 's/\(.*\)%.*/\1/')
- rvm_gem_set_name=$(echo $rvm_gem_set_name | sed 's/.*%\(.*\)/\1/')
- if [[ "$rvm_ruby_string" != "$rvm_gem_set_name" ]] ; then export rvm_ruby_string ; fi
- if [[ ! -z "$rvm_gem_set_name" ]] ; then export rvm_gem_set_name ; fi
+ rvm_gemset_name="$1"; shift
+ export rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)%.*/\1/')
+ export rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*%\(.*\)/\1/')
+ if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then export rvm_ruby_string ; fi
+ if [[ ! -z "$rvm_gemset_name" ]] ; then export rvm_gemset_name ; fi
else
if [[ -z "$1" ]] ; then
rvm_action="error"
- rvm_error_message="'gems' must be followed by a gems(et) action, see http://rvm.beginrescueend.com/gemsets/#managing for details."
+ rvm_error_message="'gems' must be followed by a gemset action, see http://rvm.beginrescueend.com/gemsets/ for details."
else
export rvm_ruby_args="$*" ; export rvm_${1}_flag=1 ; shift
fi
fi
;;
@@ -101,24 +101,27 @@
rvm_parse_break=1
;;
do|ruby|rake|gem|rubydo|rakedo|gemdo)
if [[ "do" = "$rvm_action" ]] ; then rvm_action="ruby" ; fi
- rvm_action=$(echo $rvm_token | sed 's#do##g')
+ export rvm_action=$(echo $rvm_token | sed 's#do##g')
if [[ "rake" = "$rvm_action" ]] || [[ "gem" = "$rvm_action" ]] || [[ "ruby" = "$rvm_action" ]] ; then
if [[ -z "$1" ]] ; then
if [[ "gem" = "$rvm_action" ]] || [[ "ruby" = "$rvm_action" ]] ; then
rvm_action="error"
rvm_error_message="the '$rvm_action' actions must be followed by arguments."
fi
- elif [[ "-S" = "$1" ]] || [[ "-e" = "$1" ]] ; then
- rvm_action="ruby"
- flag="$1" ; shift
- rvm_ruby_args="$flag '$@'"
+ elif [[ "-S" = "$1" ]] ; then
+ export rvm_action="ruby"
+ export rvm_ruby_args="$flag $@"
rvm_parse_break=1
+ elif [[ "-e" = "$1" ]] ; then
+ export rvm_action="ruby"
+ export rvm_ruby_args="$flag '$@'"
+ rvm_parse_break=1
else
- rvm_ruby_args="$*"
+ export rvm_ruby_args="$*"
rvm_parse_break=1
fi
else
if $rvm_scripts_path/match "$1" "^-" ; then
unset rvm_ruby_version
@@ -185,11 +188,11 @@
fi ; shift
rvm_action="${rvm_action:-use}"
;;
--head)
- if [[ -z "$rvm_ruby_string" ]] ; then rvm_ruby_string="head"; else rvm_ruby_string="${rvm_ruby_string}-head" ; fi
+ if [[ -z "$rvm_ruby_string" ]] ; then export rvm_ruby_string="head"; else export rvm_ruby_string="${rvm_ruby_string}-head" ; fi
rvm_ruby_revision="head"
export rvm_head_flag=1
rvm_action="${rvm_action:-use}"
;;
@@ -257,30 +260,30 @@
rvm_action="ruby"
rvm_ruby_file="$1"
shift
;;
- default|system)
- rvm_action="use"
- rvm_ruby_interpreter="$rvm_token"
- rvm_ruby_string="$rvm_token"
+ system|default)
+ rvm_action=${rvm_action:-use}
+ export rvm_ruby_interpreter="$rvm_token"
+ export rvm_ruby_string="$rvm_token"
;;
+
-h|--help|usage|help) rvm_action=help ;;
-G|--gems) rvm_gems_path="$1" ; shift ;;
--source) rvm_src_path="$1" ; shift ;;
--archives) rvm_archives_path="$1" ; shift ;;
--make) rvm_ruby_make="$1" ; shift ;;
--make-install) rvm_ruby_make_install="$1" ; shift ;;
--nice) rvm_niceness="$1" ; shift ;;
-l|--level) rvm_ruby_patch_level="p$1" ; shift ;;
# TODO: handle this below better (if $1 is null)
- -m|--gem-set) rvm_gem_set_name="$1" ; shift ;;
+ -m|--gemset) rvm_gemset_name="$1" ; shift ;;
--sdk) rvm_sdk="$1" ; shift ;;
--archflags) rvm_archflags="$1" ; shift ;;
--symlink) rvm_symlink_name="$1" ; shift ;;
- tests|specs) rvm_action="tests" ;;
--install) export rvm_install_on_use_flag=1 ;;
--trace) export rvm_trace_flag=1 ; set -x ;;
--proxy) export rvm_proxy="$1" ; shift ;;
--disable-llvm|--disable-jit) export rvm_llvm_flag=0 ;;
--enable-llvm|--enable-jit) export rvm_llvm_flag=1 ;;
@@ -299,41 +302,41 @@
rvm_parse_break=1
;;
*)
if [[ ! -z "$rvm_token" ]] ; then
- if [[ "gems" = "$rvm_action" ]] ; then
+ if [[ "gemset" = "$rvm_action" ]] ; then
if $rvm_scripts_path/match "$rvm_token" "^.+%.+$" ; then
- rvm_gem_set_name="$(echo "$rvm_token" | awk -F'%' '{print $2}')"
- rvm_ruby_string="$(echo "$rvm_token" | awk -F'%' '{print $1}')"
+ export rvm_gemset_name="$(echo "$rvm_token" | awk -F'%' '{print $2}')"
+ export rvm_ruby_string="$(echo "$rvm_token" | awk -F'%' '{print $1}')"
elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
- rvm_file_name="$(echo "$rvm_token" | sed 's#\.gems##g').gems"
+ export rvm_file_name="$(echo "$rvm_token" | sed 's#\.gems##g').gems"
# elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
else
- rvm_gem_set_name="$(echo "$rvm_token" | sed 's#\.gems##g')"
- rvm_file_name="$rvm_gem_set_name.gems"
+ export rvm_gemset_name="$(echo "$rvm_token" | sed 's#\.gems##g')"
+ export rvm_file_name="$rvm_gemset_name.gems"
fi
elif [[ ! -z "$(echo "$rvm_token" | awk '/,/')" ]] ; then
- rvm_ruby_version="$rvm_token"
+ export rvm_ruby_version="$rvm_token"
if [[ -z "$rvm_action" ]] ; then
rvm_action="ruby" # Not sure if we really want to do this but we'll try it out.
fi
elif $rvm_scripts_path/match "$rvm_token" "^.+%.+$" ; then
- rvm_gem_set_name="$(echo "$rvm_token" | awk -F'%' '{print $2}')"
- rvm_ruby_string="$(echo "$rvm_token" | awk -F'%' '{print $1}')"
+ export rvm_gemset_name="$(echo "$rvm_token" | awk -F'%' '{print $2}')"
+ export rvm_ruby_string="$(echo "$rvm_token" | awk -F'%' '{print $1}')"
elif $rvm_scripts_path/match "$rvm_token" "-" ; then
- rvm_ruby_string="$rvm_token"
+ export rvm_ruby_string="$rvm_token"
elif $rvm_scripts_path/match "$rvm_token" "^[0-9].[0-9]" ; then
- rvm_ruby_string="$rvm_token"
- rvm_action="${rvm_action:-use}"
+ export rvm_ruby_string="$rvm_token"
+ export rvm_action="${rvm_action:-use}"
elif $rvm_scripts_path/match "$rvm_token" "^ree-" ; then
- rvm_ruby_string="$rvm_token"
- rvm_action="${rvm_action:-use}"
+ export rvm_ruby_string="$rvm_token"
+ export rvm_action="${rvm_action:-use}"
else
if $rvm_scripts_path/match "$rvm_token" "\.rb$" ; then # we have a specified ruby script
- rvm_ruby_args=$rvm_token
- rvm_ruby_file=$rvm_token
+ export rvm_ruby_args=$rvm_token
+ export rvm_ruby_file=$rvm_token
if [[ -z "$rvm_action" ]] ; then
rvm_action="ruby"
fi
else
rvm_action="error"
@@ -345,11 +348,10 @@
rvm_error_message="Unrecognized command line argument(s): '$rvm_token $@'"
fi
if [[ "error" = "$rvm_action" ]] ; then
break;
fi
-
esac
if [[ -z "$rvm_action" ]] && [[ ! -z "$rvm_ruby_string" ]] ; then rvm_action="use" ; fi
if [[ ! -z "$rvm_parse_break" ]] || [[ ! -z "$rvm_error_message" ]] ; then unset rvm_parse_break; break; fi
done
@@ -379,45 +381,54 @@
__rvm_load_defaults
__rvm_parse_args $@
result=0
case "$rvm_action" in
- use) __rvm_use ; result=$? ;;
- srcdir) __rvm_source_dir ; result=$? ;;
- list) __rvm_list ; result=$? ;;
- strings) __rvm_strings ; result=$? ;;
- info) __rvm_info ; result=$? ;;
- debug) __rvm_debug ; result=$? ;;
- version) __rvm_version ; result=$? ;;
- reset) __rvm_reset ; result=$? ;;
- implode) __rvm_implode ; result=$? ;;
- update) __rvm_update ; result=$? ;;
- reboot) __rvm_reboot ; result=$? ;;
- usage|help) __rvm_usage ; result=$? ;;
- benchmark) __rvm_benchmark ; result=$? ;;
- inspect) __rvm_inspect ; result=$? ;;
- ruby|gem|rake) __rvm_do ; result=$? ;;
- gemdir) $rvm_scripts_path/gems gemdir ; result=$? ;;
- gems)
+ use) __rvm_use ; result=$? ;;
+ srcdir) __rvm_source_dir ; result=$? ;;
+ list) __rvm_list ; result=$? ;;
+ strings) __rvm_strings ; result=$? ;;
+ info) __rvm_info ; result=$? ;;
+ debug) __rvm_debug ; result=$? ;;
+ version) __rvm_version ; result=$? ;;
+ reset) __rvm_reset ; result=$? ;;
+ update) __rvm_update ; result=$? ;;
+ reboot) __rvm_reboot ; result=$? ;;
+ usage|help) __rvm_usage ; result=$? ;;
+ benchmark) __rvm_benchmark ; result=$? ;;
+ inspect) __rvm_inspect ; result=$? ;;
+ implode|seppuku) __rvm_implode ; result=$? ;;
+
+ gemdir)
+ $rvm_scripts_path/gemsets gemdir
+ result=$?
+ ;;
+
+ ruby|gem|rake)
+ $rvm_scripts_path/set $rvm_action $rvm_ruby_args
+ result=$?
+ ;;
+ gemset)
if [[ "$rvm_use_flag" -eq 1 ]] ; then
- __rvm_gems_select
- result=$?
+ __rvm_gemset_select
+ result=$?
if [[ $result -eq 0 ]] ; then
- __rvm_gems_use
+ __rvm_gemset_use
fi
else
- $rvm_scripts_path/gems $rvm_ruby_args
+ $rvm_scripts_path/gemsets $rvm_ruby_args
fi
result=$?
;;
monitor)
export rvm_ruby_version rvm_ruby_string
$rvm_scripts_path/monitor ; result=$?
;;
notes) $rvm_scripts_path/notes ; result=$? ;;
reload) unset rvm_loaded_flag ; rvm_reload_flag=1 ;;
+
fetch|install|uninstall|remove)
if [[ ! -z "$rvm_ruby_string" ]] ; then
$rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_string"
elif $rvm_scripts_path/match "$rvm_ruby_version" "," ; then
$rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_version"
@@ -426,14 +437,13 @@
fi
result=$?
;;
tests|specs) rvm_action="rake" ; __rvm_do ; result=$? ;;
- iconv|openssl|ncurses|zlib|readline|curl|mono)
- __rvm_${rvm_action}_install
+ package)
+ $rvm_scripts_path/package $rvm_ruby_args
result=$?
;;
-
error)
$rvm_scripts_path/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
__rvm_pushpop
result=1