scripts/cli in rvm-0.0.54 vs scripts/cli in rvm-0.0.55

@@ -3,11 +3,11 @@
 function __rvm_meta {
   rvm_meta_author="Wayne E. Seguin"
   rvm_meta_author_email="[e-mail]"
   rvm_meta_website="http://rvm.beginrescueend.com/"
   rvm_meta_version="`cat $rvm_path/lib/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`"
-  rvm_meta_updated="2009.10.01"
+  rvm_meta_updated="2009.10.05"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
 
 function __rvm_usage {
@@ -129,17 +129,20 @@
       system|default)
         rvm_action=${rvm_action:-use}
         rvm_ruby_interpreter="$rvm_token"
       ;;
 
+      # TODO: if $1 is a $version string nab it and shift
       jruby|ree|macruby|rbx|rubinius|default|all)
         rvm_ruby_interpreter="$rvm_token"
         rvm_action="${rvm_action:-use}"
+        if [ ! -z "$(echo $1 | awk '/^[0-9]/')" ] ; then
+          rvm_ruby_version=$1 ; shift
+        fi
       ;;
 
       gemset)
-          set +x
         rvm_action=$rvm_token
         if [ "$1" = "delete" ] ; then
           rvm_delete_flag=1
           shift
           if [ -z "$1" -a -z "$rvm_gem_set_name" ] ; then
@@ -148,11 +151,10 @@
           else
             rvm_gem_set_name="$1"
             shift
           fi
         fi
-        set -x
       ;;
 
       gemdir)
         rvm_action=$rvm_token
         if [ "$1" = "system" ] ; then rvm_ruby_interpreter="system" ; shift ; fi
@@ -356,10 +358,14 @@
       -h|--help|usage|help) rvm_action=help         ; shift ;;
       -m|--gem-set)         rvm_gem_set_name="$1"     ; shift ;;
          --rm-gem-set)      rvm_gem_set_name_rm="$1"  ; shift ;;
       tests|specs)          rvm_action="tests"                ;;
 
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--trace|--delete)
+      --trace)
+        eval "rvm_$(echo $rvm_token | sed 's/-//g')_flag=1"
+        set -x
+      ;;
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete)
         eval "rvm_$(echo $rvm_token | sed 's/-//g')_flag=1"
       ;;
 
       reboot|flush|asdf|damnit|wtf|argh|work|workdamnit|BOOM|boom|wth)
         $rvm_action="reboot"