rvm 1.0.4 → 1.0.5

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 4
+:patch: 5

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   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-06}
+  s.date = %q{2010-09-07}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -108,6 +108,7 @@ Gem::Specification.new do |s|
      "scripts/color",
      "scripts/completion",
      "scripts/db",
+     "scripts/default",
      "scripts/disk-usage",
      "scripts/docs",
      "scripts/env",

data/scripts/alias

@@ -4,6 +4,23 @@ unset rvm_default_flag rvm_wrapper_name
 
 source "$rvm_scripts_path"/base
 
+usage() {
+  printf "
+
+  Usage:
+
+    rvm alias [action] [arguments]
+
+  Examples:
+
+    rvm alias create [alias_name] [ruby]
+    rvm alias delete [alias_name]
+    rvm alias show [alias_name]
+    rvm alias list
+
+"
+}
+
 alias_conflicts_with_ruby() {
   # If default exists, we should return true.
   [[ "$1" == "default" && ! -L "$rvm_rubies_path/default" ]] && return 1
@@ -15,44 +32,48 @@ alias_conflicts_with_ruby() {
     __rvm_ruby_string > /dev/null 2>&1
     echo "$?"
   )"
+
   if [[ "0" == "$alias_check_result" ]]; then
-    "$rvm_scripts_path"/log "error" "You are attempted to create an alias called '$1', which is recognized as a rvm ruby."
+    "$rvm_scripts_path"/log "error" "\nYou have attempted to create an alias called '$1', which is recognized as a rvm ruby.\n"
     return 0
   fi
+
   return 1
+
   unset alias_check_result
 }
 
-show_alias() {
+alias_show() {
   if [[ -z "$alias_name" ]]; then
-    "$rvm_scripts_path"/log "error" "usage: 'rvm alias show [alias_name]'"
+    "$rvm_scripts_path"/log "error" "\nusage: 'rvm alias show [alias_name]'\n"
     result=1
     return
   fi
   expanded_alias_name="$("$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name")"
   if [[ -z "$expanded_alias_name" ]]; then
-    "$rvm_scripts_path"/log "error" "Unknown alias name: '$alias_name'"
+    "$rvm_scripts_path"/log "error" "\nUnknown alias name: '$alias_name'\n"
     result=1
   else
     result=0
     if [[ -n "$gemset_name" ]] ; then
-      printf "${expanded_alias_name}${rvm_gemset_separator}${gemset_name}"
+      printf "${expanded_alias_name}${rvm_gemset_separator}${gemset_name}\n"
     else
-      printf "$expanded_alias_name"
+      printf "$expanded_alias_name\n"
     fi
   fi
   unset expanded_alias_name
 }
 
-delete_alias() {
+alias_delete() {
   echo "Deleting alias: $alias_name"
+
   for link in "$rvm_rubies_path/$alias_name" ; do
     if [[ -L "$link" ]] ; then rm -f $link ; fi
   done
   "$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name" "delete"
 }
 
-create_alias() {
+alias_create() {
   rvm_environment_identifier="${rvm_environment_identifier:-""}"
   alias_name="${alias_name:-""}"
   rvm_ruby_string="${rvm_ruby_string:-""}"
@@ -63,7 +84,7 @@ create_alias() {
   fi
 
   if [[ -z "$rvm_environment_identifier" ]] || [[ -z "$alias_name" ]] ; then
-    "$rvm_scripts_path"/log "error" "usage: 'rvm alias [alias_name] [ruby_string]'"
+    "$rvm_scripts_path"/log "error" "\nusage: 'rvm alias [alias_name] [ruby_string]'\n"
     result=1
   else
     if [[ -z "$rvm_alias" ]] ; then
@@ -76,7 +97,7 @@ create_alias() {
         rvm_ruby_string="$rvm_environment_identifier"
       fi
       if [[ -z "$rvm_ruby_string" ]]; then
-        "$rvm_scripts_path"/log "error" "unknown ruby string specified"
+        "$rvm_scripts_path"/log "error" "\nUnknown ruby string '$rvm_ruby_string' specified\n"
         result=1
         return
       fi
@@ -87,10 +108,10 @@ create_alias() {
       "$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name" "$final_environment_identifier"
     else
       if [[ -d "$rvm_rubies_path/$alias_name" ]] ; then
-        "$rvm_scripts_path"/log "error" "$rvm_rubies_path/$alias_name is taken and is *not* able to be an alias name."
+        "$rvm_scripts_path"/log "error" "\n$rvm_rubies_path/$alias_name is taken and is *not* able to be an alias name.\n"
         result=1
       else
-        "$rvm_scripts_path"/log "error" "$rvm_rubies_path/$alias_name is already aliased."
+        "$rvm_scripts_path"/log "error" "\n$rvm_rubies_path/$alias_name is already aliased.\n"
         result=1
       fi
     fi
@@ -106,37 +127,38 @@ alias_list() {
 }
 
 args=($*)
-action="${args[0]}"
-alias_name="${args[1]}"
-rvm_environment_identifier="${args[2]}"
+action="${args[0]:-""}"
+alias_name="${args[1]:-""}"
+rvm_environment_identifier="${args[2]:-""}"
 args="$(echo ${args[@]:3}) " # Strip trailing / leading / extra spacing.
+result=0
 
 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}*/}"
+else
+  gemset_name=""
 fi
+
 if [[ ! -z "$alias_name" ]] ; then
   rvm_alias="$("$rvm_scripts_path"/db "$rvm_config_path/alias" "$alias_name")"
 fi
 
-# CLI API:
-#   rvm alias create [alias_name] [ruby]
-#   rvm alias delete [alias_name]
-#   rvm alias show [alias_name]
-#   rvm alias list
 if [[ "$action" = "delete" ]] ; then
-  delete_alias
+  alias_delete
 elif [[ "$action" = "create" ]] ; then
-  create_alias
+  alias_create
 elif [[ "$action" = "list" ]] ; then
   alias_list
 elif [[ "$action" = "show" ]]; then
-  show_alias
+  alias_show
+elif [[ "$action" = "help" ]]; then
+  usage
 else
-  "$rvm_scripts_path"/log "error" "usage: 'rvm alias [action] [arguments]"
+  usage
+  exit 1
 fi
 
-unset action alias_name rvm_ruby_string rvm_environment_identifier final_environment_identifier
-
-exit $result
+exit $?

data/scripts/base

@@ -1,14 +1,29 @@
+#!/usr/bin/env bash
+
 # Base is a collection general files + commonely included
 # setup functions.
 
 # Load the general scripts.
 # Use rvm_base_except="" to override the except.
-for script_name in initialize utility selector; do
-  if echo "$rvm_base_except" | \grep -vq "$script_name" ; then
+for script_name in initialize utility selector ; do
+  if echo "${rvm_base_except:-""}" | \grep -vq "$script_name" ; then
     source "$rvm_scripts_path"/$script_name
   fi
-done; unset script_name rvm_base_except
+done ; unset script_name rvm_base_except
+
+  #for option in errexit noclobber nounset ; do
+  #  set -o $option
+  #done
+
+  #if [[ -z "${ZSH_VERSION:-""}" ]] ; then
+  #  set -o errtrace
+  #  set -o pipefail
+  #fi
+
+if [[ ${rvm_trace_flag:-0} -gt 0 ]]; then
+  export rvm_trace_flag=1
+  set -o xtrace
+fi
 
-# Setup hooks etc.
-__rvm_inherit_trace_flag
-__rvm_cleanup_temp_on_exit
+# Cleanup tmp on exit.
+trap "__rvm_cleanup_temp_for '$$'" 0 1 2 3 15

data/scripts/cli

@@ -22,10 +22,9 @@ __rvm_parse_args() {
   local rvm_parse_break=0
   local rvm_error_message=""
 
-  while [[ $# -gt 0 ]] ; do
-    rvm_token="$next_token" ; shift
-
-    if [[ $# -gt 0 ]] ; then next_token="$1" ; else next_token="" ; fi
+  while [[ -n "$next_token" ]] ; do
+    rvm_token="$next_token"
+    if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
 
     case "$rvm_token" in
       fetch|version|srcdir|reset|debug|reload|update|monitor|notes|implode|seppuku|question|answer|env)
@@ -37,14 +36,16 @@ __rvm_parse_args() {
         if [[ "$next_token" = "--only-path" ]]; then
           shift; rvm_only_path_flag=1
         fi
-        rvm_ruby_args="$*"
+        rvm_ruby_args="$next_token $*"
         rvm_parse_break=1
       ;;
 
       use)
         rvm_action="$rvm_token"
         rvm_verbose_flag=1
-        if [[ "ruby" = "$next_token" ]] ; then shift ; fi
+        if [[ "ruby" = "$next_token" ]] ; then
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+        fi
       ;;
 
       install|uninstall)
@@ -65,7 +66,14 @@ __rvm_parse_args() {
         rvm_ruby_string="$rvm_token"
         rvm_ruby_strings="$rvm_token"
         rvm_action="${rvm_action:-use}"
-        if "$rvm_scripts_path"/match "$next_token" "^[0-9]\.[0-9]" ; then rvm_ruby_version=$next_token ; shift ; fi
+        if "$rvm_scripts_path"/match "$next_token" "^[0-9]\.[0-9]" ; then
+          rvm_ruby_version=$next_token
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+        fi
+      ;;
+
+      default)
+
       ;;
 
       gemset)
@@ -82,11 +90,11 @@ __rvm_parse_args() {
 
         elif [[ "use" = "$next_token" ]] ; then
           rvm_use_flag=1
-          rvm_ruby_args="$@"
+          rvm_ruby_args="$next_token $@"
           rvm_gemset_name="$next_token"
-          shift # Clear next_token
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
 
-          if [[ $# -gt 0 ]] ; then rvm_gemset_name="$1" ; else rvm_gemset_name="" ; fi
+          if [[ -n "$next_token" ]] ; then rvm_gemset_name="$next_token" ; else rvm_gemset_name="" ; fi
 
           if echo $rvm_gemset_name | \grep -q $rvm_gemset_separator ; then
             rvm_ruby_string=$(echo $rvm_gemset_name | sed -e 's/\(.*\)'${rvm_gemset_separator}'.*/\1/')
@@ -101,8 +109,11 @@ __rvm_parse_args() {
 
         elif [[ "delete" = "$next_token" ]] ; then
           rvm_delete_flag=1
-          rvm_ruby_args="$@" ; shift
-          rvm_gemset_name="$next_token"; shift
+          rvm_ruby_args="$next_token $@"
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+          rvm_gemset_name="$next_token"
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+
           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/')
@@ -115,51 +126,60 @@ __rvm_parse_args() {
         else
           rvm_gemset_name="${rvm_gemset_name:-""}"
           if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then __rvm_ruby_string ;  fi
-          rvm_ruby_args="$@"
+          rvm_ruby_args="$next_token $@"
         fi
+
         rvm_parse_break=1
       ;;
 
       gemdir|gempath|gemhome)
         rvm_action=$rvm_token
         rvm_gemdir_flag=1
-        if [[ "system" = "$next_token" ]] ; then rvm_system_flag=1 ; shift ; fi
-        if [[ "user" = "$next_token" ]]   ; then rvm_user_flag=1  ;  shift ; fi
+
+        if [[ "system" = "$next_token" ]] ; then
+          rvm_system_flag=1
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+        fi
+
+        if [[ "user" = "$next_token" ]] ; then
+          rvm_user_flag=1
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+        fi
       ;;
 
       inspect|list|info|strings)
         rvm_action="$rvm_token"
-        rvm_ruby_args="$@"
+        rvm_ruby_args="$next_token $@"
         rvm_parse_break=1
       ;;
 
       -S)
         rvm_action="ruby"
-        rvm_ruby_args="$rvm_token $(__rvm_quote_args "$@")"
+        rvm_ruby_args="$rvm_token $next_token $(__rvm_quote_args "$@")"
         rvm_parse_break=1
       ;;
 
       -e)
         rvm_action="ruby"
-        rvm_ruby_args="$rvm_token $(__rvm_quote_args "$@")"
+        rvm_ruby_args="$rvm_token $next_token $(__rvm_quote_args "$@")"
         rvm_parse_break=1
       ;;
 
       docs|alias|rubygems|exec|cleanup|tools|disk-usage|snapshot|repair|migrate|upgrade)
         rvm_action="$rvm_token"
-        rvm_ruby_args="$(__rvm_quote_args "$@")"
+        rvm_ruby_args="$next_token $(__rvm_quote_args "$@")"
         rvm_parse_break=1
       ;;
 
       load-rvmrc)
         rvm_action="rvmrc"
-        rvm_ruby_args="'load' $(__rvm_quote_args "$@")"
+        rvm_ruby_args="'load' $next_token $(__rvm_quote_args "$@")"
         rvm_parse_break=1
       ;;
 
       rvmrc)
         rvm_action="rvmrc"
-        rvm_ruby_args="$(__rvm_quote_args "$@")"
+        rvm_ruby_args="$next_token $(__rvm_quote_args "$@")"
         rvm_parse_break=1
       ;;
 
@@ -187,16 +207,16 @@ __rvm_parse_args() {
 
           elif [[ "-S" = "$next_token" ]]  ; then
             rvm_action="ruby"
-            rvm_ruby_args="$flag $(__rvm_quote_args "$@")"
+            rvm_ruby_args="$flag $next_token $(__rvm_quote_args "$@")"
             rvm_parse_break=1
 
           elif [[ "-e" = "$next_token" ]] ; then
             rvm_action="ruby"
-            rvm_ruby_args="$flag $(__rvm_quote_args "$@")"
+            rvm_ruby_args="$flag $next_token $(__rvm_quote_args "$@")"
             rvm_parse_break=1
 
           else
-            rvm_ruby_args="$(__rvm_quote_args "$@")"
+            rvm_ruby_args="$next_token $@"
             rvm_parse_break=1
           fi
         else
@@ -205,14 +225,15 @@ __rvm_parse_args() {
 
           else
             if "$rvm_scripts_path"/match "$next_token" "^[0-9]" ; then
-              rvm_ruby_strings="${1//,/ }" ; shift
+              rvm_ruby_strings="${1//,/ }"
+              if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
               unset rvm_ruby_interpreter
 
             else
               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
+                if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
               else
                 unset rvm_ruby_interpreter rvm_ruby_strings
               fi
@@ -227,7 +248,7 @@ __rvm_parse_args() {
 
       specs|tests)
         rvm_action="rake"
-        rvm_ruby_args="$(echo $rvm_token | sed -e 's/s$//')"
+        rvm_ruby_args="$(echo "$rvm_token" | sed -e 's/s$//')"
       ;;
 
       -v|--version)
@@ -235,7 +256,7 @@ __rvm_parse_args() {
           rvm_action="version"
         else
           rvm_ruby_version="$next_token"
-          shift
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
         fi
       ;;
 
@@ -245,7 +266,9 @@ __rvm_parse_args() {
 
       --ree-options)
         if [[ ! -z "$next_token" ]] ; then
-          export rvm_ree_options="${1//,/ }" ; shift
+          export rvm_ree_options="${1//,/ }"
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+
         else
           rvm_action="error"
           rvm_error_message="--ree-options *must* be followed by... well... options."
@@ -253,7 +276,8 @@ __rvm_parse_args() {
       ;;
 
       --patches|--patch)
-        rvm_patch_names="$next_token ${rvm_patch_names:-""}"; shift
+        rvm_patch_names="$next_token ${rvm_patch_names:-""}"
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
         rvm_patch_original_pwd="$PWD"
       ;;
 
@@ -263,7 +287,8 @@ __rvm_parse_args() {
         if [[ "update" = "${rvm_action:-""}" ]] ; then
           rvm_bin_flag=1
         else
-          rvm_bin_path="$next_token" ; shift
+          rvm_bin_path="$next_token"
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
         fi
         ;;
 
@@ -273,7 +298,7 @@ __rvm_parse_args() {
           rvm_error_message="-r|--require *must* be followed by a library name."
         else
           rvm_ruby_require="$rvm_ruby_require -r$next_token"
-          shift
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
         fi
       ;;
 
@@ -285,7 +310,7 @@ __rvm_parse_args() {
       -f|--file)
         rvm_action="ruby"
         rvm_ruby_file="$next_token"
-        shift
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
       ;;
 
       system|default)
@@ -297,7 +322,7 @@ __rvm_parse_args() {
 
       help)
         rvm_action="$rvm_token"
-        rvm_ruby_args="$@"
+        rvm_ruby_args="$next_token $@"
         rvm_parse_break=1
       ;;
 
@@ -308,59 +333,110 @@ __rvm_parse_args() {
       --alias)
         if [[ -n "$next_token" ]]; then
           rvm_ruby_aliases="$(echo "${rvm_ruby_aliases//,/ } ${1//,/ }" | __rvm_strip)"
-          shift
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
         fi
       ;;
 
       --symlink)
         "$rvm_scripts_path/log" "warn" "--symlink has been removed, please see 'rvm wrapper'."
-        shift
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
       ;;
 
       wrapper)
         rvm_action="$rvm_token"
         rvm_ruby_string="$next_token" ;
-        [[ -n "$next_token" ]] && shift
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
         rvm_wrapper_name="$next_token"
-        [[ -n "$next_token" ]] && shift
-        rvm_ruby_args="$@" # list of binaries, or none
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+        rvm_ruby_args="$next_token $@" # list of binaries, or none
         rvm_parse_break=1
       ;;
 
-      -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="$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)
+      -G)
+        path_variable="rvm_gems_path"
+        __rvm_set_path_variable "$next_token"
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+      ;;
+
+      --source)
+        path_variable="rvm_src_path"
+        __rvm_set_path_variable "$next_token"
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+      ;;
+
+      --archives)
+        path_variable="rvm_archives_path"
+        __rvm_set_path_variable "$next_token"
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+      ;;
+
+      -h|--help|usage)
+        rvm_action=help
+      ;;
+
+      --make)
+        rvm_ruby_make="$next_token"
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+      ;;
+      --make-install)
+        rvm_ruby_make_install="$next_token" ; shift
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+      ;;
+
+      --nice)
+        rvm_niceness="$next_token"
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+      ;;
+
+      -l|--level)
+        rvm_ruby_patch_level="p$next_token"
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+      ;;
+
+      --sdk)
+        rvm_sdk="$next_token"
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+      ;;
+
+      --archflags)
+        rvm_archflags="$next_token"
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+      ;;
+
+      --install)
+        rvm_install_on_use_flag=1
+      ;;
+
+      --trace|--debug)
+        local option=""
+        rvm_debug_flag=1
+
+        for option in verbose errexit noclobber nounset ; do
+          set -o $option
+        done
+        if [[ -z "${ZSH_VERSION:-""}" ]] ; then
+          set -o errtrace
+          set -o pipefail
+        fi
+
+        if [[ "$rvm_token" = "--trace" ]] ; then
           rvm_trace_flag=1
+          set -o xtrace
           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
+            export PS4='+${BASH_SOURCE} : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() : }'
           fi
-        ;;
-      --debug)
-          rvm_debug_flag=1
-          local option="" ;
-          for option in verbose errtrace ; do
-            set -o $option
-          done
+        fi
       ;;
+
       -q|--quiet)           rvm_quiet_flag=1                     ;;
+
       -s|--silent)          rvm_silent_flag=1                    ;;
-      --proxy)              rvm_proxy="$next_token"      ; shift          ;;
+
+      --proxy)
+        rvm_proxy="$next_token"
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+      ;;
+
       --disable-llvm|--disable-jit) rvm_llvm_flag=0              ;;
       --enable-llvm|--enable-jit)   rvm_llvm_flag=1              ;;
 
@@ -371,7 +447,8 @@ __rvm_parse_args() {
       ;;
 
       --dump-environment)
-        export rvm_dump_environment_flag="$next_token"; shift
+        export rvm_dump_environment_flag="$next_token"
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
       ;;
 
       --clang)
@@ -383,7 +460,8 @@ __rvm_parse_args() {
       -j)
         if [[ ! -z "$next_token" ]] ; then
           rvm_make_flags="$rvm_make_flags -j$next_token"
-          shift
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+
         else
           rvm_action="error"
           rvm_error_message="-j *must* be followed by an integer (normally the # of CPU's in your machine)."
@@ -392,13 +470,15 @@ __rvm_parse_args() {
 
       --with-rubies)
         rvm_ruby_strings="$next_token"
-        shift
+        if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+
       ;;
 
       -C|--configure)
         if [[ ! -z "$next_token" ]] ; then
           rvm_ruby_configure_flags="$(echo $next_token | sed -e 's#,--# --#g')"
-          shift
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+
         else
           rvm_action="error"
           rvm_error_message="--configure *must* be followed by configure flags."
@@ -416,11 +496,11 @@ __rvm_parse_args() {
           rvm_error_message="-I|--include *must* be followed by a path."
         else
           rvm_ruby_load_path="$rvm_ruby_load_path:$next_token"
-          shift
+          if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
         fi
       ;;
 
-      --) rvm_ruby_args="$*" ; rvm_parse_break=1                ;;
+      --) rvm_ruby_args="$next_token $*" ; rvm_parse_break=1                ;;
 
       *)
         if [[ -n "$rvm_token" ]] ; then
@@ -480,8 +560,8 @@ __rvm_parse_args() {
 
           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
+              rvm_ruby_args="$rvm_token"
+              rvm_ruby_file="$rvm_token"
               if [[ -z "${rvm_action:-""}" ]] ; then rvm_action="ruby" ; fi
             else
               rvm_action="error"
@@ -493,9 +573,7 @@ __rvm_parse_args() {
           rvm_error_message="Unrecognized command line argument(s): '$rvm_token $@'"
         fi
 
-        if [[ "error" = "${rvm_action:-""}" ]] ; then
-          break;
-        fi
+        if [[ "error" = "${rvm_action:-""}" ]] ; then break ; fi
     esac
 
     if [[ -z "${rvm_action:-""}" && -n "${rvm_ruby_string:-""}" ]]  ; then rvm_action="use" ; fi
@@ -507,11 +585,9 @@ __rvm_parse_args() {
   while [[ $# -gt 0 ]] ; do shift ; done
 
   if [[ -n "${rvm_error_message:-""}" ]] ; then
-    __rvm_pushpop
     "$rvm_scripts_path"/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
     return 1
   fi
-
 }
 
 rvm() {
@@ -530,7 +606,7 @@ rvm() {
   # 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 [[ $# -gt 0 ]] ; then next_token="$1" ; else next_token="" ; fi
+  if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; 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"
@@ -567,7 +643,7 @@ rvm() {
     help)  "$rvm_scripts_path/help" $rvm_ruby_args ; result=$? ;;
     env)   "$rvm_scripts_path/env" "$rvm_ruby_string" ; result=$?  ;;
     info)
-      if [[ $# -gt 0 ]] ; then next_token="$1" ; else next_token="" ; fi
+      if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
       if [[ "$next_token" = "info" ]]; then shift; fi
       "$rvm_scripts_path/info" $rvm_ruby_args
       result=$?
@@ -589,7 +665,7 @@ rvm() {
       old_rvm_ruby_string=$rvm_ruby_string
       unset rvm_ruby_string
       export rvm_ruby_strings
-      "$rvm_scripts_path/set" "$rvm_action" "$rvm_ruby_args"
+      "$rvm_scripts_path/set" "$rvm_action" $rvm_ruby_args
       result=$?
       # Restore the state pre-sets.
       [[ -n "$old_rvm_ruby_string" ]] && rvm_ruby_string=$old_rvm_ruby_string
@@ -652,7 +728,6 @@ rvm() {
     ;;
 
     error)
-      __rvm_pushpop
       result=1
     ;;