scripts/cli in rvm-0.1.32 vs scripts/cli in rvm-0.1.33
- old
+ new
@@ -12,20 +12,27 @@
rvm_action=$rvm_token
;;
package)
rvm_action="$rvm_token"
+ if [[ "$1" = "--only-path" ]]; then
+ shift; rvm_only_path_flag=1
+ fi
rvm_ruby_args="$@"
rvm_parse_break=1
;;
use)
rvm_action=$rvm_token
rvm_verbose_flag=1
if [[ "ruby" = "$1" ]] ; then shift ; fi
;;
+ env)
+ rvm_action=$rvm_token
+ ;;
+
inspect)
rvm_action=$rvm_token
rvm_ruby_args="$@"
rvm_parse_break=1
;;
@@ -80,31 +87,27 @@
rvm_ruby_string="$rvm_ruby_string${rvm_gemset_separator}$rvm_gemset_name"
fi
rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator}$rvm_gemset_name"
fi
else
- if [[ -z "$1" ]] ; then
- rvm_action="error"
- rvm_error_message="'gemset' must be followed by a gemset action, see http://rvm.beginrescueend.com/gemsets/ for details."
- else
- if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then __rvm_ruby_string ; fi
- rvm_ruby_args="$@"
- fi
+ if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then __rvm_ruby_string ; fi
+ rvm_ruby_args="$@"
fi
rvm_parse_break=1
;;
- gemdir)
+ gemdir|gempath|gemhome)
rvm_action=$rvm_token
rvm_gemdir_flag=1
if [[ "system" = "$1" ]] ; then rvm_system_flag=1 ; shift ; fi
if [[ "user" = "$1" ]] ; then rvm_user_flag=1 ; shift ; fi
;;
- list|info|docs|alias)
+ list|info|alias|docs)
rvm_action="$rvm_token"
rvm_ruby_args="$@"
+ if [[ "$rvm_token" = "info" ]] && [[ -z "$rvm_ruby_args" ]] ; then rvm_ruby_args="$rvm_ruby_string" ; fi
rvm_parse_break=1
;;
-S)
rvm_action="ruby"
@@ -196,11 +199,11 @@
fi
;;
# For use with --patch
--patch-name) rvm_ruby_patch_name="$1" ; shift ;;
- -h|--patch)
+ --patch)
if [[ -z "$rvm_ruby_patch" ]] ; then
rvm_ruby_patch="$1"
else
rvm_ruby_patch="$rvm_ruby_patch,$1";
fi ; shift
@@ -277,10 +280,28 @@
help)
rvm_action="$rvm_token"
rvm_ruby_args="$@"
rvm_parse_break=1
;;
+
+ --passenger|--editor)
+ rvm_wrapper_name="${rvm_token/--/}"
+ ;;
+
+ --symlink)
+ $rvm_scripts_path/log "warn" "--symlink has been removed, please see 'rvm wrapper'."
+ shift
+ ;;
+
+ wrapper)
+ rvm_action="$rvm_token"
+ rvm_ruby_string="$1" ; shift
+ rvm_wrapper_name="$1" ; shift
+ rvm_ruby_args="$@" # list of binaries, or none
+ rvm_parse_break=1
+ ;;
+
-h|--help|usage) 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 ;;
@@ -288,11 +309,10 @@
--nice) rvm_niceness="$1" ; shift ;;
-l|--level) rvm_ruby_patch_level="p$1" ; shift ;;
# TODO: handle this below better (if $1 is null)
--sdk) rvm_sdk="$1" ; shift ;;
--archflags) rvm_archflags="$1" ; shift ;;
- --symlink) rvm_symlink_name="$1" ; shift ;;
--install) rvm_install_on_use_flag=1 ;;
--trace) rvm_trace_flag=1 ; set -x ;;
--proxy) rvm_proxy="$1" ; shift ;;
--disable-llvm|--disable-jit) rvm_llvm_flag=0 ;;
--enable-llvm|--enable-jit) rvm_llvm_flag=1 ;;
@@ -302,11 +322,11 @@
shift
;;
reboot|damnit|wtf|argh|BOOM|boom|wth) $rvm_action="reboot" ;;
- --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)
+ --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--sticky|--create|--rvmrc|--gems)
export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
if [[ "--debug" = "$rvm_token" ]] ; then rvm_debug_flag ; fi
;;
--) rvm_ruby_args="$*" ; rvm_parse_break=1 ;;
@@ -323,10 +343,11 @@
rvm_gemset_name="$(echo "$rvm_token" | sed 's#\.gems##g')"
rvm_file_name="$rvm_gemset_name.gems"
fi
elif [[ ! -z "$(echo "$rvm_token" | awk '/,/')" ]] ; then
rvm_ruby_version="$rvm_token"
+ rvm_ruby_strings="$rvm_token" # Migrating to this from rvm_ruby_version
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" "^.+${rvm_gemset_separator}.+$" ; then
rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
@@ -380,51 +401,71 @@
fi
# Check that this is the current version.
disk_version=$(cat "${rvm_path:-$HOME/.rvm}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')
if [[ "${rvm_version}" != "${disk_version}" ]] && [[ "reload" != "$1" ]]; then
- echo -e "A newer version of rvm has been installed ($disk_version) than is loaded ($rvm_version), please do one of the following:\n * 'rvm reload'\n * open a new shell\n * source your shell init scripts"
+ printf "\nA newer version of rvm has been installed ($disk_version) than is loaded ($rvm_version), please do one of the following:\n * 'rvm reload'\n * open a new shell\n * source your shell init scripts"
return 1
fi
__rvm_cleanup_variables
__rvm_load_rvmrc
__rvm_initialize
- __rvm_load_defaults
__rvm_parse_args "$@"
- 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
- 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
+ export BUNDLE_PATH GEM_HOME GEM_PATH rvm_ruby_string 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_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag
+ 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
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=$? ;;
update) __rvm_update ; result=$? ;;
reboot) __rvm_reboot ; result=$? ;;
usage) __rvm_usage ; result=$? ;;
benchmark) __rvm_benchmark ; result=$? ;;
inspect) __rvm_inspect ; result=$? ;;
implode|seppuku) __rvm_implode ; result=$? ;;
+
+ list) $rvm_scripts_path/list $rvm_ruby_args ; result=$? ;;
+ # TODO: Make debug run in the current environment.
+ debug) $rvm_scripts_path/info '' debug ; result=$? ;;
+ info)
+ if [[ -z "$rvm_ruby_args" ]] ; then
+ . $rvm_scripts_path/info
+ else
+ $rvm_scripts_path/info $rvm_ruby_args
+ fi
+ result=$?
+ ;;
docs) $rvm_scripts_path/docs ; result=$? ;;
- alias) $rvm_scripts_path/alias ; result=$? ;;
- help) $rvm_scripts_path/help $rvm_ruby_args ; result=$? ;;
+ alias) $rvm_scripts_path/alias $rvm_ruby_args ; result=$? ;;
+ help) $rvm_scripts_path/help $rvm_ruby_args ; result=$? ;;
answer) __rvm_Answer_to_the_Ultimate_Question_of_Life_the_Universe_and_Everything ; result=42 ;;
question) __rvm_ultimate_question ; result=42 ;;
- gemdir)
- $rvm_scripts_path/gemsets gemdir
+ env)
+ $rvm_scripts_path/env "$rvm_ruby_string"
result=$?
;;
+ wrapper)
+ $rvm_scripts_path/wrapper "$rvm_ruby_string" "$rvm_wrapper_name" $rvm_ruby_args
+ result=$?
+ unset rvm_wrapper_name
+ ;;
+
+ gemdir|gemhome|gempath)
+ $rvm_scripts_path/gemsets $rvm_action
+ result=$?
+ ;;
+
ruby|gem|rake)
+ unset rvm_ruby_string
$rvm_scripts_path/set $rvm_action $rvm_ruby_args
result=$?
;;
gemset)