scripts/cli in rvm-0.0.88 vs scripts/cli in rvm-0.0.89

@@ -15,28 +15,34 @@
   if [[ ! -z "$(echo "$*" | awk '/trace/')" ]] ; then echo "$*" ; fi
 
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      fetch|install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline|monitor|notes)
+      fetch|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline|monitor|notes)
         rvm_action=$rvm_token
       ;;
 
       use)
         rvm_action=$rvm_token
-        rvm_verbose_flag=1
+        export rvm_verbose_flag=1
         if [[ "ruby" = "$1" ]] ; then shift ; fi
       ;;
 
       inspect)
         rvm_action=$rvm_token
         rvm_ruby_args=$*
         rvm_parse_break=1
       ;;
 
+      install|uninstall)
+        export ${rvm_token}_flag=1
+        rvm_action=$rvm_token
+      ;;
+
       rm|remove)
         rvm_action="remove"
+        export rvm_remove_flag=1
       ;;
 
       system|default)
         rvm_action=${rvm_action:-use}
         rvm_ruby_interpreter="$rvm_token"
@@ -51,27 +57,27 @@
       ;;
 
       gems|gemset)
         rvm_action="gems"
         if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "delete" = "$1" ]] ; then
-          eval "rvm_${1}_flag=1" ; shift
+          export rvm_${1}_flag=1 ; shift
         elif [[ "dump" = "$1" ]] || [[ "$1" = "load" ]] ; then
-          eval "rvm_${1}_flag=1" ; shift
+          export rvm_${1}_flag=1 ; shift
         else
-          rvm_use_flag=1 # Default is to use the (named) gem set.
+          export rvm_use_flag=1 # Default is to use the (named) gem set.
         fi
       ;;
 
       gemdir)
         rvm_action=$rvm_token
-        if [[ "system" = "$1" ]] ; then rvm_system_flag=1 ; shift ; fi
-        if [[ "user" = "$1"  ]]   ; then rvm_user_flag=1  ;  shift ; fi
+        if [[ "system" = "$1" ]] ; then export rvm_system_flag=1 ; shift ; fi
+        if [[ "user" = "$1"  ]]   ; then export rvm_user_flag=1  ;  shift ; fi
       ;;
 
       --load|load|dump|clear)
         rvm_action="gems"
-        eval "rvm_${rvm_token}_flag=1"
+        export rvm_${rvm_token}_flag=1
       ;;
 
       -S|-e)
         rvm_action="ruby"
         rvm_ruby_args="$rvm_token $@"
@@ -165,11 +171,11 @@
       ;;
 
       --head)
         if [[ -z "$rvm_ruby_string" ]] ; then rvm_ruby_string="head"; else rvm_ruby_string="${rvm_ruby_string}-head" ; fi
         rvm_ruby_revision="head"
-        rvm_head_flag=1
+        export rvm_head_flag=1
         rvm_action="${rvm_action:-use}"
       ;;
 
       --rev|--revision)
         rvm_ruby_revision="$1";
@@ -183,11 +189,11 @@
         shift
       ;;
 
       --bin)
         if [[ "update" = "$rvm_action" ]] ; then
-          rvm_bin_flag=1
+          export rvm_bin_flag=1
         else
           rvm_bin_path="$1" ; shift
         fi
         ;;
 
@@ -241,11 +247,11 @@
         rvm_action="use"
         rvm_ruby_interpreter="system"
         rvm_ruby_string="$rvm_token"
       ;;
 
-      --install)            rvm_install_on_use_flag=1           ;;
+      --install)            export rvm_install_on_use_flag=1           ;;
       -h|--help|usage|help) rvm_action=help                     ;;
       -G|--gems)            rvm_gem_path="$1"          ; shift  ;;
       --source)             rvm_src_path="$1"          ; shift  ;;
       --archives)           rvm_archives_path="$1"     ; shift  ;;
       --make)               rvm_ruby_make="$1"         ; shift  ;;
@@ -259,11 +265,11 @@
 
       tests|specs)          rvm_action="tests"                  ;;
       --trace)              export rvm_trace_flag=1    ; set -x ;;
 
       --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose)
-        eval "rvm_$(echo $rvm_token | sed 's#-##g')_flag=1"
+        export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
         if [[ "--debug" = "$rvm_token" ]] ; then export rvm_debug_flag ; fi
       ;;
 
       reboot|flush|asdf|damnit|wtf|argh|work|workdamnit|BOOM|boom|wth)
         $rvm_action="reboot"
@@ -364,18 +370,18 @@
     update)        __rvm_update              ; result=$?  ;;
     reboot)        __rvm_reboot              ; result=$?  ;;
     usage|help)    __rvm_usage               ; result=$?  ;;
     benchmark)     __rvm_benchmark           ; result=$?  ;;
     inspect)       __rvm_inspect             ; result=$?  ;;
-    gems)          __rvm_gems                ; result=$?  ;;
+    gems)          $rvm_scripts_path/gems ${rvm_ruby_file:-$rvm_ruby_args} ; result=$?  ;;
     ruby|gem|rake) __rvm_do                  ; result=$?  ;;
     monitor)
       export rvm_ruby_version rvm_ruby_string
       $rvm_scripts_path/monitor ; result=$?
     ;;
     notes)         $rvm_scripts_path/notes   ; result=$?  ;;
-    reload) rvm_reload_flag=1                             ;;
+    reload)        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"
@@ -392,10 +398,10 @@
     ;;
 
     info|debug)
       __rvm_version
       __rvm_info
-      if [[ "debug" = "$rvm_action" ]] ; then rvm_debug_flag=1 ; __rvm_debug ; fi
+      if [[ "debug" = "$rvm_action" ]] ; then export rvm_debug_flag=1 ; __rvm_debug ; fi
     ;;
 
     error)
       $rvm_scripts_path/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
       __rvm_pushpop