rvm 1.0.2 → 1.0.3

data/binscripts/rvm

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-if [[ -z "$rvm_ignore_rvmrc" ]]; then
+rvm_ignore_rvmrc=${rvm_ignore_rvmrc:-0}
+if [[ $rvm_ignore_rvmrc -eq 0 ]]; then
   for rvmrc in /etc/rvmrc "$HOME/.rvmrc" ; do
     if [[ -f "$rvmrc" ]] ; then
       if \grep -q '^\s*rvm .*$' "$rvmrc" ; then
@@ -48,6 +49,6 @@ rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 
 source "$rvm_scripts_path/rvm"
 
-unset rvm_interactive
+unset rvm_interactive_flag
 
 rvm "$@"

data/binscripts/rvm-update-head

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-if [[ -z "$rvm_ignore_rvmrc" ]]; then
+rvm_ignore_rvmrc=${rvm_ignore_rvmrc:-0}
+if [[ $rvm_ignore_rvmrc -eq 0 ]]; then
   [[ -s /etc/rvmrc ]] && source /etc/rvmrc
   [[ -s "$HOME/.rvmrc" ]] && source "$HOME/.rvmrc"
 fi

data/binscripts/rvm-update-latest

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-if [[ -z "$rvm_ignore_rvmrc" ]]; then
+rvm_ignore_rvmrc=${rvm_ignore_rvmrc:-0}
+if [[ $rvm_ignore_rvmrc -eq 0 ]]; then
   [[ -s /etc/rvmrc ]] && source /etc/rvmrc
   [[ -s "$HOME/.rvmrc" ]] && source "$HOME/.rvmrc"
 fi

data/binscripts/rvmsudo

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 prefix="PATH='$PATH'"
-if [[ ! -z "$BUNDLE_PATH" ]] ; then prefix="BUNDLE_PATH='$BUNDLE_PATH' $prefix" ; fi
-if [[ ! -z "$GEM_HOME" ]] ; then prefix="GEM_HOME='$GEM_HOME' $prefix" ; fi
-if [[ ! -z "$GEM_PATH" ]] ; then prefix="GEM_PATH='$GEM_PATH' $prefix" ; fi
+if [[ -n "${BUNDLE_PATH:-""}" ]] ; then prefix="BUNDLE_PATH='$BUNDLE_PATH' $prefix" ; fi
+if [[ -n "${GEM_HOME:-""}" ]]    ; then prefix="GEM_HOME='$GEM_HOME' $prefix" ; fi
+if [[ -n "${GEM_PATH:-""}" ]]    ; then prefix="GEM_PATH='$GEM_PATH' $prefix" ; fi
 
 eval "sudo" "/usr/bin/env $prefix $@"
 # rvm_env_prefix="PATH='$PATH'"

data/contrib/install-system-wide

@@ -21,7 +21,8 @@ elif [[ "$(uname)" != "Linux" ]]; then
 fi
 
 # Load the rvm config.
-if [[ -z "$rvm_ignore_rvmrc" ]]; then
+rvm_ignore_rvmrc=${rvm_ignore_rvmrc:-0}
+if [[ $rvm_ignore_rvmrc -eq 0 ]]; then
   [[ -s /etc/rvmrc ]] && source /etc/rvmrc
   [[ -s "$HOME/.rvmrc" ]] && source "$HOME/.rvmrc"
 fi

data/install

@@ -201,7 +201,7 @@ fi
 spinner
 if [[ -d gemsets/ ]] ; then
   \mkdir -p "$rvm_gemsets_path"
-  for gemset_file in $(cd gemsets ; find \. -iname '*.gems' | sed 's/^\.\///') ; do
+  for gemset_file in $(builtin cd gemsets ; find \. -iname '*.gems' | sed 's/^\.\///') ; do
     destination="$rvm_gemsets_path/$gemset_file"
     destination_path="$(dirname "$destination")"
     if [[ ! -s "$destination" ]] ; then
@@ -214,7 +214,7 @@ fi
 spinner
 if [[ -d patchsets/ ]] ; then
   \mkdir -p "$rvm_patchsets_path"
-  for patchset_file in $(cd patchsets ; find \. -iname '*' | sed 's/^\.\///') ; do
+  for patchset_file in $(builtin cd patchsets ; find \. -iname '*' | sed 's/^\.\///') ; do
     destination="$rvm_patchsets_path/$patchset_file"
     destination_path="$(dirname "$destination")"
     if [[ ! -s "$destination" ]] ; then
@@ -318,6 +318,7 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n  * 'rvm notes' tells you OS dependency packages for installing rubies."
   printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
   printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
+  printf "\n  * If you wish to have the 'pretty colors' again, set 'export rvm_pretty_print=1' in ~/.rvmrc.\n"
   printf "\n$(tput sgr0)\n"
   check_rubyopt_conditions
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 2
+:patch: 3

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-09-03}
+  s.date = %q{2010-09-06}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -125,7 +125,6 @@ Gem::Specification.new do |s|
      "scripts/list",
      "scripts/log",
      "scripts/maglev",
-     "scripts/man",
      "scripts/manage",
      "scripts/match",
      "scripts/md5",

data/scripts/alias

@@ -47,16 +47,21 @@ show_alias() {
 delete_alias() {
   echo "Deleting alias: $alias_name"
   for link in "$rvm_rubies_path/$alias_name" ; do
-    if [[ -L "$link" ]] ; then \rm -f $link ; fi
+    if [[ -L "$link" ]] ; then rm -f $link ; fi
   done
   "$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name" "delete"
 }
 
 create_alias() {
+  rvm_environment_identifier="${rvm_environment_identifier:-""}"
+  alias_name="${alias_name:-""}"
+  rvm_ruby_string="${rvm_ruby_string:-""}"
+
   if alias_conflicts_with_ruby "$alias_name"; then
     # Force it to an empty alias name to trigger the usage.
     alias_name=""
   fi
+
   if [[ -z "$rvm_environment_identifier" ]] || [[ -z "$alias_name" ]] ; then
     "$rvm_scripts_path"/log "error" "usage: 'rvm alias [alias_name] [ruby_string]'"
     result=1
@@ -100,11 +105,14 @@ alias_list() {
   done; unset item
 }
 
-action="$1"
-alias_name="$2"
-rvm_environment_identifier="$3"
-if [[ ! -f "$rvm_config_path/alias" ]] ; then \touch "$rvm_config_path/alias" ; fi
-if printf "$alias_name" | \grep -q "$rvm_gemset_separator" ; then
+args=($*)
+action="${args[0]}"
+alias_name="${args[1]}"
+rvm_environment_identifier="${args[2]}"
+args="$(echo ${args[@]:3}) " # Strip trailing / leading / extra spacing.
+
+if [[ ! -f "$rvm_config_path/alias" ]] ; then touch "$rvm_config_path/alias" ; fi
+if printf "$alias_name" | grep -q "$rvm_gemset_separator" ; then
   gemset_name="${alias_name/*${rvm_gemset_separator}/}"
   alias_name="${alias_name/${rvm_gemset_separator}*/}"
 fi

data/scripts/array

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [[ ! -z "$ZSH_VERSION" ]] ; then __array_start=1 ; else __array_start=0 ; fi
+if [[ -n "${ZSH_VERSION:-""}" ]] ; then __array_start=1 ; else __array_start=0 ; fi
 
 # Usage: contains "a_string" "${an_array[@]}"
 array_contains() {

data/scripts/cd

@@ -2,8 +2,9 @@
 
 # Source a .rvmrc file in a directory after changing to it, if it exists.
 # To disable this fature, set rvm_project_rvmrc=0 in $HOME/.rvmrc
-if [[ "$rvm_project_rvmrc" -ne 0 ]] ; then
-  if [[ -n "$ZSH_VERSION" ]]; then
+rvm_project_rvmrc=${rvm_project_rvmrc:-1}
+if [[ $rvm_project_rvmrc -ne 0 ]] ; then
+  if [[ -n "${ZSH_VERSION:-""}" ]] ; then
     autoload is-at-least
     if is-at-least 4.3.4 >/dev/null 2>&1; then
       # On zsh, use chpwd_functions

data/scripts/cleanup

@@ -13,7 +13,7 @@ cleanup() {
     eval "current_path=\"\$rvm_${cleanup_type}_path\""
     if [[ -n "$current_path" && -d "$current_path" && "$current_path" != "/" ]]; then
       "$rvm_scripts_path"/log "info" "Cleaning up rvm directory '$current_path'"
-      \rm -rf "$current_path"/* >/dev/null 2>&1
+      rm -rf "$current_path"/* >/dev/null 2>&1
     fi
   done; unset cleanup_type current_path
 }

data/scripts/cli

@@ -16,8 +16,17 @@ __rvm_parse_args() {
 
   if echo "$@" | \grep -q 'trace' ; then echo "$@" ; __rvm_version ; fi
 
+  rvm_action="${rvm_action:-""}"
+  export rvm_ruby_string="${rvm_ruby_string:-""}"
+
+  local rvm_parse_break=0
+  local rvm_error_message=""
+
   while [[ $# -gt 0 ]] ; do
-    rvm_token="$1" ; shift
+    rvm_token="$next_token" ; shift
+
+    if [[ $# -gt 0 ]] ; then next_token="$1" ; else next_token="" ; fi
+
     case "$rvm_token" in
       fetch|version|srcdir|reset|debug|reload|update|monitor|notes|implode|seppuku|question|answer|env)
         rvm_action=$rvm_token
@@ -25,17 +34,17 @@ __rvm_parse_args() {
 
       package)
         rvm_action="$rvm_token"
-        if [[ "$1" = "--only-path" ]]; then
+        if [[ "$next_token" = "--only-path" ]]; then
           shift; rvm_only_path_flag=1
         fi
-        rvm_ruby_args="$@"
+        rvm_ruby_args="$*"
         rvm_parse_break=1
       ;;
 
       use)
         rvm_action="$rvm_token"
         rvm_verbose_flag=1
-        if [[ "ruby" = "$1" ]] ; then shift ; fi
+        if [[ "ruby" = "$next_token" ]] ; then shift ; fi
       ;;
 
       install|uninstall)
@@ -56,7 +65,7 @@ __rvm_parse_args() {
         rvm_ruby_string="$rvm_token"
         rvm_ruby_strings="$rvm_token"
         rvm_action="${rvm_action:-use}"
-        if "$rvm_scripts_path"/match "$1" "^[0-9]\.[0-9]" ; then rvm_ruby_version=$1 ; shift ; fi
+        if "$rvm_scripts_path"/match "$next_token" "^[0-9]\.[0-9]" ; then rvm_ruby_version=$next_token ; shift ; fi
       ;;
 
       gemset)
@@ -64,13 +73,15 @@ __rvm_parse_args() {
 
         rvm_ruby_gem_home="$GEM_HOME"
 
-        if [[ "clear" = "$1" ]] ; then
+        if [[ -z "$next_token" ]] ; then
+          rvm_ruby_args="help"
+        elif [[ "clear" = "$next_token" ]] ; then
           __rvm_gemset_clear
           rvm_ruby_args="clear"
-        elif [[ "use" = "$1" ]] ; then
+        elif [[ "use" = "$next_token" ]] ; then
           rvm_use_flag=1
           rvm_ruby_args="$@" ; shift
-          rvm_gemset_name="$1" ; shift
+          rvm_gemset_name="$next_token" ; shift
           if [[ ! -z "$(echo $rvm_gemset_name | \grep $rvm_gemset_separator)" ]] ; then
             rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)'${rvm_gemset_separator}'.*/\1/')
             rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*'${rvm_gemset_separator}'\(.*\)/\1/')
@@ -79,10 +90,10 @@ __rvm_parse_args() {
             fi
             rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator}$rvm_gemset_name"
           fi
-        elif [[ "delete" = "$1" ]] ; then
+        elif [[ "delete" = "$next_token" ]] ; then
           rvm_delete_flag=1
           rvm_ruby_args="$@" ; shift
-          rvm_gemset_name="$1"; shift
+          rvm_gemset_name="$next_token"; shift
           if echo "$rvm_gemset_name" | \grep -q "$rvm_gemset_separator" ; then
             rvm_ruby_string=$(echo "$rvm_gemset_name" | sed 's/\(.*\)'${rvm_gemset_separator}'.*/\1/')
             rvm_gemset_name=$(echo "$rvm_gemset_name" | sed 's/.*'${rvm_gemset_separator}'\(.*\)/\1/')
@@ -92,6 +103,7 @@ __rvm_parse_args() {
             rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator}$rvm_gemset_name"
           fi
         else
+          rvm_gemset_name="${rvm_gemset_name:-""}"
           if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then __rvm_ruby_string ;  fi
           rvm_ruby_args="$@"
         fi
@@ -101,11 +113,11 @@ __rvm_parse_args() {
       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
+        if [[ "system" = "$next_token" ]] ; then rvm_system_flag=1 ; shift ; fi
+        if [[ "user" = "$next_token" ]]   ; then rvm_user_flag=1  ;  shift ; fi
       ;;
 
-      inspect|list|info)
+      inspect|list|info|strings)
         rvm_action="$rvm_token"
         rvm_ruby_args="$@"
         rvm_parse_break=1
@@ -142,15 +154,15 @@ __rvm_parse_args() {
       ;;
 
       do|ruby|rake|gem|rubydo|rakedo|gemdo)
-        if [[ "do" = "$rvm_action" ]] ; then rvm_action="ruby" ; fi
+        if [[ "do" = "${rvm_action:-""}" ]] ; then rvm_action="ruby" ; fi
         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" ]]  ; then
+        if [[ "rake" = "${rvm_action:-""}" || "gem" = "${rvm_action:-""}" || "ruby" = "${rvm_action:-""}" ]] ; then
+          if [[ -z "$next_token" ]] ; then
+            if [[ "gem" = "${rvm_action:-""}" ]]  ; then
               rvm_action="error"
               rvm_error_message="'rvm $rvm_action' must be followed by arguments."
-            elif [[ "ruby" = "$rvm_action" ]] ; then
-              if echo "$rvm_ruby_strings" | \grep -q ',' ; then
+            elif [[ "ruby" = "${rvm_action:-""}" ]] ; then
+              if echo "$rvm_ruby_strings":-""} | \grep -q ',' ; then
                 rvm_action="ruby"
                 rvm_ruby_args=""
               else
@@ -158,11 +170,11 @@ __rvm_parse_args() {
                 rvm_error_message="rvm X,Y,Z '$rvm_action' must be followed by arguments."
               fi
             fi
-          elif [[ "-S" = "$1" ]]  ; then
+          elif [[ "-S" = "$next_token" ]]  ; then
             rvm_action="ruby"
             rvm_ruby_args="$flag $(__rvm_quote_args "$@")"
             rvm_parse_break=1
-          elif [[ "-e" = "$1" ]] ; then
+          elif [[ "-e" = "$next_token" ]] ; then
             rvm_action="ruby"
             rvm_ruby_args="$flag $(__rvm_quote_args "$@")"
             rvm_parse_break=1
@@ -171,16 +183,16 @@ __rvm_parse_args() {
             rvm_parse_break=1
           fi
         else
-          if "$rvm_scripts_path"/match "$1" "^-" ; then
+          if "$rvm_scripts_path"/match "$next_token" "^-" ; then
             unset rvm_ruby_strings
           else
-            if "$rvm_scripts_path"/match "$1" "^[0-9]" ; then
+            if "$rvm_scripts_path"/match "$next_token" "^[0-9]" ; then
               rvm_ruby_strings="${1//,/ }" ; shift
               unset rvm_ruby_interpreter
             else
-              if [[ "ruby rbx jruby macruby ree rubinius maglev mput shyouhei ironruby" =~ $1 ]] ; then
-                rvm_ruby_strings=$1
-                rvm_ruby_interpreter=$1
+              if [[ "ruby rbx jruby macruby ree rubinius maglev mput shyouhei ironruby" =~ $next_token ]] ; then
+                rvm_ruby_strings=$next_token
+                rvm_ruby_interpreter=$next_token
                 shift
               else
                 unset rvm_ruby_interpreter rvm_ruby_strings
@@ -200,10 +212,10 @@ __rvm_parse_args() {
       ;;
 
       -v|--version)
-        if [[ -z "$1" ]] ; then
+        if [[ -z "$next_token" ]] ; then
           rvm_action="version"
         else
-          rvm_ruby_version="$1"
+          rvm_ruby_version="$next_token"
           shift
         fi
       ;;
@@ -213,7 +225,7 @@ __rvm_parse_args() {
       ;;
 
       --ree-options)
-        if [[ ! -z "$1" ]] ; then
+        if [[ ! -z "$next_token" ]] ; then
           export rvm_ree_options="${1//,/ }" ; shift
         else
           rvm_action="error"
@@ -222,26 +234,26 @@ __rvm_parse_args() {
       ;;
 
       --patches|--patch)
-        rvm_patch_names="$1 $rvm_patch_names"; shift
+        rvm_patch_names="$next_token ${rvm_patch_names:-""}"; shift
         rvm_patch_original_pwd="$PWD"
       ;;
 
       --head) rvm_head_flag=1 ;;
 
       --bin)
-        if [[ "update" = "$rvm_action" ]] ; then
+        if [[ "update" = "${rvm_action:-""}" ]] ; then
           rvm_bin_flag=1
         else
-          rvm_bin_path="$1" ; shift
+          rvm_bin_path="$next_token" ; shift
         fi
         ;;
 
       -r|--require)
-        if [[ -z "$1" ]] ; then
+        if [[ -z "$next_token" ]] ; then
           rvm_action="error"
           rvm_error_message="-r|--require *must* be followed by a library name."
         else
-          rvm_ruby_require="$rvm_ruby_require -r$1"
+          rvm_ruby_require="$rvm_ruby_require -r$next_token"
           shift
         fi
       ;;
@@ -253,7 +265,7 @@ __rvm_parse_args() {
 
       -f|--file)
         rvm_action="ruby"
-        rvm_ruby_file="$1"
+        rvm_ruby_file="$next_token"
         shift
       ;;
 
@@ -275,7 +287,7 @@ __rvm_parse_args() {
       ;;
 
       --alias)
-        if [[ -n "$1" ]]; then
+        if [[ -n "$next_token" ]]; then
           rvm_ruby_aliases="$(echo "${rvm_ruby_aliases//,/ } ${1//,/ }" | __rvm_strip)"
           shift
         fi
@@ -288,41 +300,59 @@ __rvm_parse_args() {
 
       wrapper)
         rvm_action="$rvm_token"
-        rvm_ruby_string="$1" ;
-        [[ -n "$1" ]] && shift
-        rvm_wrapper_name="$1"
-        [[ -n "$1" ]] && shift
+        rvm_ruby_string="$next_token" ;
+        [[ -n "$next_token" ]] && shift
+        rvm_wrapper_name="$next_token"
+        [[ -n "$next_token" ]] && shift
         rvm_ruby_args="$@" # list of binaries, or none
         rvm_parse_break=1
       ;;
 
-      -G)                   path_variable="rvm_gems_path"     ; __rvm_set_path_variable "$1"; shift  ;;
-      --source)             path_variable="rvm_src_path"      ; __rvm_set_path_variable "$1"; shift  ;;
-      --archives)           path_variable="rvm_archives_path" ; __rvm_set_path_variable "$1"; shift  ;;
+      -G)                   path_variable="rvm_gems_path"     ; __rvm_set_path_variable "$next_token"; shift  ;;
+      --source)             path_variable="rvm_src_path"      ; __rvm_set_path_variable "$next_token"; shift  ;;
+      --archives)           path_variable="rvm_archives_path" ; __rvm_set_path_variable "$next_token"; shift  ;;
       -h|--help|usage)      rvm_action=help                      ;;
-      --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)
-      --sdk)                rvm_sdk="$1"               ; shift   ;;
-      --archflags)          rvm_archflags="$1"         ; shift   ;;
+      --make)               rvm_ruby_make="$next_token"         ; shift   ;;
+      --make-install)       rvm_ruby_make_install="$next_token" ; shift   ;;
+      --nice)               rvm_niceness="$next_token"          ; shift   ;;
+      -l|--level)           rvm_ruby_patch_level="p$next_token" ; shift   ;;
+      # TODO: handle this below better (if $next_token is null)
+      --sdk)                rvm_sdk="$next_token"               ; shift   ;;
+      --archflags)          rvm_archflags="$next_token"         ; shift   ;;
       --install)            rvm_install_on_use_flag=1            ;;
-      --trace)              rvm_trace_flag=1    ; set -x         ;;
+      --trace)
+          rvm_trace_flag=1
+          if [[ -z "${ZSH_VERSION:-""}" ]] ; then
+            local option="" ;
+            for option in verbose xtrace errexit errtrace noclobber nounset pipefail ; do
+              set -o $option
+            done
+            export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
+          else
+            set -x
+          fi
+        ;;
+      --debug)
+          rvm_debug_flag=1
+          local option="" ;
+          for option in verbose errtrace ; do
+            set -o $option
+          done
+      ;;
       -q|--quiet)           rvm_quiet_flag=1                     ;;
       -s|--silent)          rvm_silent_flag=1                    ;;
-      --proxy)              rvm_proxy="$1"      ; shift          ;;
+      --proxy)              rvm_proxy="$next_token"      ; shift          ;;
       --disable-llvm|--disable-jit) rvm_llvm_flag=0              ;;
       --enable-llvm|--enable-jit)   rvm_llvm_flag=1              ;;
 
       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|--sticky|--create|--gems|--docs)
+      --self|--gem|--rubygems|--reconfigure|--default|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--sticky|--create|--gems|--docs)
         export "rvm_${rvm_token//-/}_flag"=1
       ;;
 
       --dump-environment)
-        export rvm_dump_environment_flag="$1"; shift
+        export rvm_dump_environment_flag="$next_token"; shift
       ;;
 
       --clang)
@@ -332,8 +362,8 @@ __rvm_parse_args() {
       ;;
 
       -j)
-        if [[ ! -z "$1" ]] ; then
-          rvm_make_flags="$rvm_make_flags -j$1"
+        if [[ ! -z "$next_token" ]] ; then
+          rvm_make_flags="$rvm_make_flags -j$next_token"
           shift
         else
           rvm_action="error"
@@ -342,13 +372,13 @@ __rvm_parse_args() {
       ;;
 
       --with-rubies)
-        rvm_ruby_strings="$1"
+        rvm_ruby_strings="$next_token"
         shift
       ;;
 
       -C|--configure)
-        if [[ ! -z "$1" ]] ; then
-          rvm_ruby_configure_flags="$(echo $1 | sed -e 's#,--# --#g')"
+        if [[ ! -z "$next_token" ]] ; then
+          rvm_ruby_configure_flags="$(echo $next_token | sed -e 's#,--# --#g')"
           shift
         else
           rvm_action="error"
@@ -362,11 +392,11 @@ __rvm_parse_args() {
       --disable-*) rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token" ;;
 
       -I|--include)
-        if [[ -z "$1" ]] ; then
+        if [[ -z "$next_token" ]] ; then
           rvm_action="error"
           rvm_error_message="-I|--include *must* be followed by a path."
         else
-          rvm_ruby_load_path="$rvm_ruby_load_path:$1"
+          rvm_ruby_load_path="$rvm_ruby_load_path:$next_token"
           shift
         fi
       ;;
@@ -379,6 +409,7 @@ __rvm_parse_args() {
             if "$rvm_scripts_path/match" "$rvm_token" "^.+${rvm_gemset_separator}.+$" ; then
               rvm_gemset_name="${rvm_token/*${rvm_gemset_separator}/}"
               rvm_ruby_string="${rvm_token/${rvm_gemset_separator}*/}"
+
             elif echo "$rvm_token" | \grep -q '.gems$' ; then
               rvm_file_name="${rvm_token/.gems/}.gems" # Account for possible .gems.gems
               # elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
@@ -386,45 +417,53 @@ __rvm_parse_args() {
               rvm_gemset_name="${rvm_token/.gems/}"
               rvm_file_name="$rvm_gemset_name.gems"
             fi
+
           elif echo "$rvm_token" | \grep -q ',' ; then
             rvm_ruby_strings="$rvm_token"
-            if [[ -z "$rvm_action" ]] ; then
+            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_action="use"
-            rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
+            rvm_action="${rvm_action:-use}"
             rvm_gemset_name="${rvm_token/*${rvm_gemset_separator}/}"
-            rvm_ruby_string="$(__rvm_environment_identifier | awk -F${rvm_gemset_separator} '{print $1}')"
+            rvm_ruby_string="${rvm_ruby_string:-""}"
             rvm_ruby_strings="${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
+
           elif "$rvm_scripts_path/match" "$rvm_token" "^.+${rvm_gemset_separator}.+$" ; then
-            rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
-            rvm_ruby_string="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $1}')"
+            gemset_name="${rvm_token/*${rvm_gemset_separator}/}"
+            rvm_ruby_string="$rvm_token"
             rvm_ruby_strings="$rvm_token"
+
           elif "$rvm_scripts_path/match" "$rvm_token" "^.+\\+.+$" ; then
             rvm_ruby_alias="${rvm_token/*+/}"
             rvm_ruby_string="${rvm_token/+*/}"
             rvm_ruby_strings="$rvm_ruby_string"
+
           elif "$rvm_scripts_path/match" "$rvm_token" "-" ; then
             rvm_ruby_string="$rvm_token"
             rvm_ruby_strings="$rvm_token"
+
           elif "$rvm_scripts_path/match" "$rvm_token" "^[0-9].[0-9]" ; then
             rvm_ruby_string="$rvm_token"
             rvm_ruby_strings="$rvm_token"
             rvm_action="${rvm_action:-use}"
+
           elif "$rvm_scripts_path/match" "$rvm_token" "^ree-" ; then
             rvm_ruby_string="$rvm_token"
             rvm_ruby_strings="$rvm_token"
             rvm_action="${rvm_action:-use}"
+
           elif [[ -L "$rvm_rubies_path/$rvm_token" ]] ; then # Alias
             rvm_ruby_string=$rvm_token
             rvm_ruby_strings="$rvm_token"
             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
-              if [[ -z "$rvm_action" ]] ; then rvm_action="ruby" ; fi
+              if [[ -z "${rvm_action:-""}" ]] ; then rvm_action="ruby" ; fi
             else
               rvm_action="error"
               rvm_error_message="Unrecognized command line argument: '$rvm_token'"
@@ -434,34 +473,47 @@ __rvm_parse_args() {
           rvm_action="error"
           rvm_error_message="Unrecognized command line argument(s): '$rvm_token $@'"
         fi
-        if [[ "error" = "$rvm_action" ]] ; then
+
+        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
+    if [[ -z "${rvm_action:-""}" && -n "${rvm_ruby_string:-""}" ]]  ; then rvm_action="use" ; fi
+
+    if [[ ${rvm_parse_break:-0} -eq 1 || -n "${rvm_error_message:-""}" ]] ; then break ; fi
   done
 
+  # Empty args list.
   while [[ $# -gt 0 ]] ; do shift ; done
 
-  if [[ ! -z "$rvm_error_message" ]] ; then __rvm_pushpop ; return 1 ; fi
+  if [[ -n "${rvm_error_message:-""}" ]] ; then
+    __rvm_pushpop
+    "$rvm_scripts_path"/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
+    return 1
+  fi
+
 }
 
 rvm() {
+  local next_token
+
   __rvm_setup
 
-  case $- in *i*) rvm_interactive=1     ;;
-               *) unset rvm_interactive ;;
-  esac ; export rvm_interactive
+  case $- in *i*) rvm_interactive_flag=1 ;;
+               *) rvm_interactive_flag=0 ;;
+  esac ; export rvm_interactive_flag
 
-  if [[ -z "$ZSH_VERSION" ]] ; then
+  if [[ -z "${ZSH_VERSION:-""}" ]] ; then
     trap '\rm -rf "$rvm_tmp_path/$$" >/dev/null 2>&1' 0 1 2 3 15
   fi
 
   # Check that this is the current version.
   disk_version=$(tail -n 3 < "${rvm_path:-$HOME/.rvm}/lib/VERSION.yml" | sed -e 's/^.*: //g' | \tr "\n" '.' | sed -e 's/\.$//')
-  if [[ "${rvm_version}" != "${disk_version}" ]] && [[ "reload" != "$1" ]]; then
+
+  if [[ $# -gt 0 ]] ; then next_token="$1" ; else next_token="" ; fi
+
+  if [[ "${rvm_version}" != "${disk_version}" ]] && [[ "reload" != "$next_token" ]]; then
     printf "\nA RVM version ${disk_version} is installed yet ${rvm_version} is loaded.\n Please do one of the following:\n  * 'rvm reload'\n  * open a new shell\n  * source your shell init scripts"
     return 1
   fi
@@ -471,7 +523,12 @@ rvm() {
   __rvm_initialize
   __rvm_parse_args "$@"
 
-  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_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd rvm_clang_flag rvm_install_arguments
+  rvm_reload_flag=${rvm_reload_flag:-0}
+  rvm_use_flag=${rvm_reload_flag:-0}
+  rvm_delete_flag=${rvm_delete_flag:-0}
+  rvm_action="${rvm_action:-usage}"
+
+  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_flag 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_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd rvm_clang_flag rvm_install_arguments
   export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_patches_path rvm_patches_path rvm_patchsets_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_ruby_aliases rvm_quiet_flag rvm_silent_flag
 
   result=0
@@ -491,16 +548,13 @@ rvm() {
 
     list)  "$rvm_scripts_path"/list $rvm_ruby_args ; result=$? ;;
     # TODO: Make debug run in the current environment.
-    debug) "$rvm_scripts_path"/info '' debug ; result=$? ;;
-    help)  "$rvm_scripts_path"/help $rvm_ruby_args ; result=$? ;;
-    env)   "$rvm_scripts_path"/env "$rvm_ruby_string" ; result=$?  ;;
+    debug) "$rvm_scripts_path/info" '' debug ; result=$? ;;
+    help)  "$rvm_scripts_path/help" $rvm_ruby_args ; result=$? ;;
+    env)   "$rvm_scripts_path/env" "$rvm_ruby_string" ; result=$?  ;;
     info)
-      if [[ "$1" = "info" ]]; then shift; fi
-      if [[ -z "$rvm_ruby_args" ]] ; then
-        "$rvm_scripts_path/info"
-      else
-        "$rvm_scripts_path/info" $rvm_ruby_args
-      fi
+      if [[ $# -gt 0 ]] ; then next_token="$1" ; else next_token="" ; fi
+      if [[ "$next_token" = "info" ]]; then shift; fi
+      "$rvm_scripts_path/info" $rvm_ruby_args
       result=$?
     ;;
 
@@ -531,7 +585,7 @@ rvm() {
       __rvm_run_script "$rvm_action" ; result=$?
     ;;
 
-    rvmrc) eval "__rvm_rvmrc_tools $rvm_ruby_args" ; result="$?" ;;
+    rvmrc) eval "__rvm_rvmrc_tools $rvm_ruby_args" ; result=$? ;;
 
     gemset)
       #if "$rvm_scripts_path/match" $rvm_ruby_args use ; then
@@ -542,11 +596,11 @@ rvm() {
         fi
       else
         export rvm_ruby_strings
-        "$rvm_scripts_path"/gemsets $rvm_ruby_args
-        unset rvm_ruby_strings
+        "$rvm_scripts_path/gemsets" $rvm_ruby_args ; result=$?
+        rvm_ruby_strings=""
 
         # Clear the gemset.
-        if [[ "$rvm_delete_flag" -eq 1 ]] ; then
+        if [[ $rvm_delete_flag -eq 1 ]] ; then
           gem_prefix="$(echo $GEM_HOME | sed 's/'${rvm_gemset_separator}'.*$//')"
           if [[ "$GEM_HOME" = "${gem_prefix}${rvm_gemset_separator}${rvm_gemset_name}" ]] ; then
             rvm_ruby_gem_home="$gem_prefix"
@@ -565,10 +619,10 @@ rvm() {
       "$rvm_scripts_path"/monitor ; result=$?
     ;;
 
-    notes)       "$rvm_scripts_path"/notes   ; result=$?  ;;
-    reload)      unset rvm_loaded_flag ; rvm_reload_flag=1 ;;
+    notes)       "$rvm_scripts_path/notes"   ; result=$?  ;;
+    reload)      rvm_loaded_flag=0 ; rvm_reload_flag=1    ;;
     tests|specs) rvm_action="rake" ; __rvm_do ; result=$? ;;
-    package)     "$rvm_scripts_path"/package $rvm_ruby_args ; result=$?  ;;
+    package)     "$rvm_scripts_path/package" $rvm_ruby_args ; result=$?  ;;
 
     fetch|install|uninstall|remove)
       if [[ -n "$rvm_ruby_strings" ]]; then
@@ -580,13 +634,12 @@ rvm() {
     ;;
 
     error)
-      "$rvm_scripts_path"/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
       __rvm_pushpop
       result=1
     ;;
 
     *)
-      if [[ ! -z "$rvm_action" ]] ; then
+      if [[ -n "${rvm_action:-""}" ]] ; then
         "$rvm_scripts_path/log" "fail"  "unknown action '$rvm_action'"
       else
         __rvm_usage
@@ -600,10 +653,13 @@ rvm() {
     __rvm_project_rvmrc
   fi
 
-  if [[ ! -z "$rvm_trace_flag" ]] ; then set +x ; unset rvm_trace_flag ; fi
-
   __rvm_teardown
 
+  if [[ $rvm_trace_flag -eq 1 ]] ; then
+    set +x
+    rvm_trace_flag=0
+  fi
+
   return $result
 }