rvm 0.1.18 → 0.1.19

data/binscripts/rvm

@@ -2,17 +2,28 @@
 
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+if [[ -z "$rvm_prefix" ]] ; then unset rvm_prefix ; fi
 if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
 
+if [[ -z "$rvm_prefix" ]] ; then 
+  if [[ "root" = "$(whoami)" ]] ; then
+    rvm_prefix="/usr/local" 
+  else
+    rvm_prefix="$HOME"
+  fi
+fi
+
 if [[ -z "$rvm_path" ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_path="/usr/local/rvm"
+    rvm_path="$rvm_prefix/rvm"
   else
     if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
       rvm_path="$HOME/.rvm"
-    elif [[ -d "/usr/local/rvm" ]] && [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
-      rvm_path="${rvm_path:-"/usr/local/rvm"}"
+    elif [[ -d "$rvm_prefix/rvm" ]] && [[ -s "$rvm_prefix/rvm/scripts/rvm" ]] ; then
+      rvm_path="$rvm_prefix/rvm"
+    else
+      rvm_path="$HOME/.rvm"
     fi
   fi
 fi

data/config/db

@@ -29,7 +29,7 @@ macruby_version=0.5
 macruby_url=http://www.macruby.org/files
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://macruby.icoretech.org/latest/macruby_nightly-latest.pkg
-maglev_version=22891
+maglev_version=22907
 maglev_url=http://glass-downloads.gemstone.com/maglev
 maglev_repo_url=git://github.com/MagLev/maglev.git
 rubinius_repo_url=git://github.com/evanphx/rubinius.git

data/config/md5

@@ -43,6 +43,10 @@ MagLev-22891.Darwin-i386.tar.gz=d8d3a8aaff1473422d6a30ecd2b2e9ff
 GemStone-22891.Darwin-i386.tar.gz=84080bda40c640aac9f19f5ea48403bf
 MagLev-22891.Linux-x86_64.tar.gz=f91f1bec1f3defb49323a70ec25504ef
 GemStone-22891.Linux-x86_64.tar.gz=5fd0d341a0eb586c9f804976cc290810
+GemStone-22907.Darwin-i386.tar.gz=c55d586da20dc4dd65da2e7f731f1d74
+GemStone-22907.Linux-x86_64.tar.gz=47c2d4527e3ea04715808048669d69ce
+MagLev-22907.Darwin-i386.tar.gz=8b7b351581611d076c7c9c1f90a04160
+MagLev-22907.Linux-x86_64.tar.gz=9f88d6bf8f607f5fdc1c476f7a6ab851
 MacRuby%200.5.zip=675454a8c7bc19d606d90a726e08427c
 jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
 jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7

data/examples/rvmrc

@@ -10,42 +10,42 @@
 
 # rvm Path
 #   This is where rvm installs and manages everything in by default.
-#rvm_path="$HOME/.rvm"
+#export rvm_path="$HOME/.rvm"
 
 # Archives Path
 #   This is where all tarballs/zipfiles/packagefiles are downladed to
-#rvm_archives_path="${rvm_path}/archives"
+#export rvm_archives_path="${rvm_path}/archives"
 
 # Source Path
 #   This is where rvm extracts to for compiling & installing.
-#rvm_source_path="${rvm_path}/src"
+#export rvm_source_path="${rvm_path}/src"
 
 # Log Path
 #   This is where rvm logs all of it's actions to
 #   (not including the 'do' actions)
-#rvm_log_path="${rvm_path}/log"
+#export rvm_log_path="${rvm_path}/log"
 
 # Bin Path
 #   This is where rvm places all of it's executable/wrapper scripts.
-#rvm_bin_path="${$rvm_path}/bin"
+#export rvm_bin_path="${$rvm_path}/bin"
 
 # Gem Path
 #   This is where rvm installs all gems to for each ruby
 #   interpreter/version%gemset
-#rvm_gem_path="$rvm_path/.gem"
+#export rvm_gems_path="$rvm_path/gems"
 
 # Hooks Path
 #   This is where rvm rubs custom hook files from.
-#rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
+#export rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 
 # Temp Path
 #   This is where rvm stores all of its temporary files.
-#rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
+#export rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 
 # Install On Use Flag
 # Install rubies when used if are not installed.
-#ruby_install_on_use=1
+#export ruby_install_on_use=1
 
 # Make Flags, I have 8 cpu's so I might use 7 make threads:
-#rvm_make_flags="-j 7"
+#export rvm_make_flags="-j7"
 

data/install

@@ -35,17 +35,17 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-__rvm_load_rvmrc
-
-if [[ -z "$rvm_path" ]] ; then
-  unset rvm_path
+if [[ -z "$rvm_prefix" ]] ; then
+  __rvm_load_rvmrc
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_path="/usr/local/rvm"
+    rvm_prefix="/usr/local/"
   else
-    rvm_path="$HOME/.rvm"
+    rvm_prefix="$HOME/."
   fi
 fi
 
+if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
+
 source scripts/initialize
 __rvm_initialize
 
@@ -69,7 +69,7 @@ rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
-rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
+rvm_symlink_path="${rvm_symlink_path:-$rvm_prefix/bin}"
 
 mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path $rvm_symlink_path $HOME/.gem/cache
 
@@ -92,6 +92,11 @@ if [[ ! -s "$rvm_config_path/user" ]] ; then
   echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
+scripts="monitor match log install color db fetch log set libraries"
+for script_name in $(echo $scripts) ; do
+  chmod +x $rvm_scripts_path/$script_name
+done
+
 #
 # Bin Scripts
 #
@@ -167,6 +172,7 @@ echo -e "\nThank you for using rvm. I hope that it makes your work easier and mo
 echo -e "If you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
 echo -e "My irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
 echo -e "If I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
+echo -e "Be sure to get head often as rvm development happens fast, you can do this by typing 'rvm update --head'."
 echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne"
 echo -e "\n********************************************************************************"
@@ -176,13 +182,14 @@ if [[ "root" != "$(whoami)" ]] ; then
   echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
   echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
   echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-  echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must split your .bashrc"
+  echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must remove it and split your .bashrc"
   echo -e "\n   Put everything *except the return code line(s)* into your .bash_profile, and everything above that code in your .bashrc."
+  echo -e "\n   Be *sure* to REMOVE the '&& return' statement line."
   echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
   echo -e "\n4) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
 fi
 
-if grep '&& return' ~/.bashrc ; then
+if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
   echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc. Please remove it and refactor your profiles to be correct. If you have questions about this please visit #rvm on irc.freenode.net.\n\n"
 fi
 

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 18
+:patch: 19

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.18"
+  s.version = "0.1.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-02-23}
+  s.date = %q{2010-02-27}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -41,14 +41,13 @@ Gem::Specification.new do |s|
      "scripts/color",
      "scripts/db",
      "scripts/fetch",
-     "scripts/gems",
+     "scripts/gemsets",
      "scripts/hash",
      "scripts/hook",
      "scripts/initialize",
      "scripts/install",
      "scripts/irbrc",
      "scripts/irbrc.rb",
-     "scripts/libraries",
      "scripts/log",
      "scripts/maglev",
      "scripts/manage",
@@ -56,9 +55,11 @@ Gem::Specification.new do |s|
      "scripts/md5",
      "scripts/monitor",
      "scripts/notes",
+     "scripts/package",
      "scripts/rvm",
      "scripts/rvm-install",
      "scripts/selector",
+     "scripts/set",
      "scripts/symlink",
      "scripts/update",
      "scripts/utility",
@@ -79,7 +80,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rvm}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Ruby Version Manager (rvm)}
 
   if s.respond_to? :specification_version then

data/scripts/cli

@@ -8,10 +8,16 @@ __rvm_parse_args() {
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      fetch|version|srcdir|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|monitor|notes|mono)
+      fetch|version|srcdir|reset|debug|reload|implode|seppuku|update|monitor|notes)
         rvm_action=$rvm_token
       ;;
 
+      package)
+        rvm_action="$rvm_token"
+        export rvm_ruby_args="$@"
+        rvm_parse_break=1
+      ;;
+
       use)
         rvm_action=$rvm_token
         export rvm_verbose_flag=1
@@ -34,24 +40,18 @@ __rvm_parse_args() {
         export rvm_remove_flag=1
       ;;
 
-      system|default)
-        rvm_action=${rvm_action:-use}
-        rvm_ruby_interpreter="$rvm_token"
-        rvm_ruby_string="$rvm_token"
-      ;;
-
       # Can likely remove this due to the *) case
       jruby|ree|macruby|rbx|rubinius|mput|shyouhei|ironruby|default|maglev|all)
-        rvm_ruby_interpreter="$rvm_token"
-        rvm_ruby_string="$rvm_token"
+        export rvm_ruby_interpreter="$rvm_token"
+        export rvm_ruby_string="$rvm_token"
         rvm_action="${rvm_action:-use}"
         if $rvm_scripts_path/match "$1" "^[0-9]\.[0-9]" ; then rvm_ruby_version=$1 ; shift ; fi
       ;;
 
-      gems|gemset)
-        rvm_action="gems"
+      gemset)
+        rvm_action=$rvm_token
         if [[ "clear" = "$1" ]] ; then
-          unset rvm_gem_set_name ; shift
+          unset rvm_gemset_name ; shift
           export rvm_ruby_gem_home="$(echo $GEM_HOME | sed 's/%.*$//')"
           export GEM_HOME="$rvm_ruby_gem_home"
           export BUNDLE_PATH="$rvm_ruby_gem_home"
@@ -61,15 +61,15 @@ __rvm_parse_args() {
         elif [[ "delete" = "$1" ]] || [[ "use" = "$1" ]] ; then
           export rvm_${1}_flag=1
           export rvm_ruby_args="$*" ; shift
-          rvm_gem_set_name="$1"; shift
-          rvm_ruby_string=$(echo $rvm_gem_set_name | sed 's/\(.*\)%.*/\1/')
-          rvm_gem_set_name=$(echo $rvm_gem_set_name | sed 's/.*%\(.*\)/\1/')
-          if [[ "$rvm_ruby_string" != "$rvm_gem_set_name" ]] ; then export rvm_ruby_string ; fi
-          if [[ ! -z "$rvm_gem_set_name" ]] ; then export rvm_gem_set_name ; fi
+          rvm_gemset_name="$1"; shift
+          export rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)%.*/\1/')
+          export rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*%\(.*\)/\1/')
+          if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then export rvm_ruby_string ; fi
+          if [[ ! -z "$rvm_gemset_name" ]] ; then export rvm_gemset_name ; fi
         else
           if [[ -z "$1" ]] ; then
             rvm_action="error"
-            rvm_error_message="'gems' must be followed by a gems(et) action, see http://rvm.beginrescueend.com/gemsets/#managing for details."
+            rvm_error_message="'gems' must be followed by a gemset action, see http://rvm.beginrescueend.com/gemsets/ for details."
           else
             export rvm_ruby_args="$*" ; export rvm_${1}_flag=1 ; shift
           fi
@@ -103,20 +103,23 @@ __rvm_parse_args() {
 
       do|ruby|rake|gem|rubydo|rakedo|gemdo)
         if [[ "do" = "$rvm_action" ]] ; then rvm_action="ruby" ; fi
-        rvm_action=$(echo $rvm_token | sed 's#do##g')
+        export 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" ]] || [[ "ruby" = "$rvm_action" ]] ; then
               rvm_action="error"
               rvm_error_message="the '$rvm_action' actions must be followed by arguments."
             fi
-          elif [[ "-S" = "$1" ]] || [[ "-e" = "$1" ]] ; then
-            rvm_action="ruby"
-            flag="$1" ; shift
-            rvm_ruby_args="$flag '$@'"
+          elif [[ "-S" = "$1" ]]  ; then
+            export rvm_action="ruby"
+            export rvm_ruby_args="$flag $@"
+            rvm_parse_break=1
+          elif [[ "-e" = "$1" ]] ; then
+            export rvm_action="ruby"
+            export rvm_ruby_args="$flag '$@'"
             rvm_parse_break=1
           else
-            rvm_ruby_args="$*"
+            export rvm_ruby_args="$*"
             rvm_parse_break=1
           fi
         else
@@ -187,7 +190,7 @@ __rvm_parse_args() {
       ;;
 
       --head)
-        if [[ -z "$rvm_ruby_string" ]] ; then rvm_ruby_string="head"; else rvm_ruby_string="${rvm_ruby_string}-head" ; fi
+        if [[ -z "$rvm_ruby_string" ]] ; then export rvm_ruby_string="head"; else export rvm_ruby_string="${rvm_ruby_string}-head" ; fi
         rvm_ruby_revision="head"
         export rvm_head_flag=1
         rvm_action="${rvm_action:-use}"
@@ -259,12 +262,13 @@ __rvm_parse_args() {
         shift
       ;;
 
-      default|system)
-        rvm_action="use"
-        rvm_ruby_interpreter="$rvm_token"
-        rvm_ruby_string="$rvm_token"
+      system|default)
+        rvm_action=${rvm_action:-use}
+        export rvm_ruby_interpreter="$rvm_token"
+        export rvm_ruby_string="$rvm_token"
       ;;
 
+
       -h|--help|usage|help) rvm_action=help                     ;;
       -G|--gems)            rvm_gems_path="$1"         ; shift  ;;
       --source)             rvm_src_path="$1"          ; shift  ;;
@@ -274,11 +278,10 @@ __rvm_parse_args() {
       --nice)               rvm_niceness="$1"          ; shift  ;;
       -l|--level)           rvm_ruby_patch_level="p$1" ; shift  ;;
       # TODO: handle this below better (if $1 is null)
-      -m|--gem-set)         rvm_gem_set_name="$1"      ; shift  ;;
+      -m|--gemset)          rvm_gemset_name="$1"       ; shift  ;;
       --sdk)                rvm_sdk="$1"               ; shift  ;;
       --archflags)          rvm_archflags="$1"         ; shift  ;;
       --symlink)            rvm_symlink_name="$1"      ; shift  ;;
-      tests|specs)          rvm_action="tests"                  ;;
       --install)            export rvm_install_on_use_flag=1    ;;
       --trace)              export rvm_trace_flag=1    ; set -x ;;
       --proxy)              export rvm_proxy="$1"      ; shift  ;;
@@ -301,37 +304,37 @@ __rvm_parse_args() {
 
       *)
         if [[ ! -z "$rvm_token" ]] ; then
-          if [[ "gems" = "$rvm_action" ]] ; then
+          if [[ "gemset" = "$rvm_action" ]] ; then
             if $rvm_scripts_path/match "$rvm_token" "^.+%.+$" ; then
-              rvm_gem_set_name="$(echo "$rvm_token" | awk -F'%' '{print $2}')"
-              rvm_ruby_string="$(echo "$rvm_token" | awk -F'%' '{print $1}')"
+              export rvm_gemset_name="$(echo "$rvm_token" | awk -F'%' '{print $2}')"
+              export rvm_ruby_string="$(echo "$rvm_token" | awk -F'%' '{print $1}')"
             elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
-              rvm_file_name="$(echo "$rvm_token" | sed 's#\.gems##g').gems"
+              export rvm_file_name="$(echo "$rvm_token" | sed 's#\.gems##g').gems"
               # elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
             else
-              rvm_gem_set_name="$(echo "$rvm_token" | sed 's#\.gems##g')"
-              rvm_file_name="$rvm_gem_set_name.gems"
+              export rvm_gemset_name="$(echo "$rvm_token" | sed 's#\.gems##g')"
+              export rvm_file_name="$rvm_gemset_name.gems"
             fi
           elif [[ ! -z "$(echo "$rvm_token" | awk '/,/')" ]] ; then
-            rvm_ruby_version="$rvm_token"
+            export rvm_ruby_version="$rvm_token"
             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" "^.+%.+$" ; then
-            rvm_gem_set_name="$(echo "$rvm_token" | awk -F'%' '{print $2}')"
-            rvm_ruby_string="$(echo "$rvm_token" | awk -F'%' '{print $1}')"
+            export rvm_gemset_name="$(echo "$rvm_token" | awk -F'%' '{print $2}')"
+            export rvm_ruby_string="$(echo "$rvm_token" | awk -F'%' '{print $1}')"
           elif $rvm_scripts_path/match "$rvm_token" "-" ; then
-            rvm_ruby_string="$rvm_token"
+            export rvm_ruby_string="$rvm_token"
           elif $rvm_scripts_path/match "$rvm_token" "^[0-9].[0-9]" ; then
-            rvm_ruby_string="$rvm_token"
-            rvm_action="${rvm_action:-use}"
+            export rvm_ruby_string="$rvm_token"
+            export rvm_action="${rvm_action:-use}"
           elif $rvm_scripts_path/match "$rvm_token" "^ree-" ; then
-            rvm_ruby_string="$rvm_token"
-            rvm_action="${rvm_action:-use}"
+            export rvm_ruby_string="$rvm_token"
+            export 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
+              export rvm_ruby_args=$rvm_token
+              export rvm_ruby_file=$rvm_token
               if [[ -z "$rvm_action" ]] ; then
                 rvm_action="ruby"
               fi
@@ -347,7 +350,6 @@ __rvm_parse_args() {
         if [[ "error" = "$rvm_action" ]] ; then
           break;
         fi
-
     esac
 
     if [[ -z "$rvm_action" ]] && [[ ! -z "$rvm_ruby_string" ]]  ; then rvm_action="use" ; fi
@@ -381,31 +383,39 @@ rvm() {
 
   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=$? ;;
-    implode)       __rvm_implode             ; result=$? ;;
-    update)        __rvm_update              ; result=$? ;;
-    reboot)        __rvm_reboot              ; result=$? ;;
-    usage|help)    __rvm_usage               ; result=$? ;;
-    benchmark)     __rvm_benchmark           ; result=$? ;;
-    inspect)       __rvm_inspect             ; result=$? ;;
-    ruby|gem|rake) __rvm_do                  ; result=$? ;;
-    gemdir)        $rvm_scripts_path/gems gemdir ; result=$?  ;;
-    gems)
+    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|help)      __rvm_usage            ; result=$? ;;
+    benchmark)       __rvm_benchmark        ; result=$? ;;
+    inspect)         __rvm_inspect          ; result=$? ;;
+    implode|seppuku) __rvm_implode          ; result=$? ;;
+
+    gemdir)
+      $rvm_scripts_path/gemsets gemdir
+      result=$?
+    ;;
+
+    ruby|gem|rake)
+      $rvm_scripts_path/set $rvm_action $rvm_ruby_args
+      result=$?
+    ;;
+    gemset)
       if [[ "$rvm_use_flag" -eq 1 ]] ; then
-        __rvm_gems_select
-        result=$? 
+        __rvm_gemset_select
+        result=$?
         if [[ $result -eq 0 ]] ; then
-          __rvm_gems_use
+          __rvm_gemset_use
         fi
       else
-        $rvm_scripts_path/gems $rvm_ruby_args
+        $rvm_scripts_path/gemsets $rvm_ruby_args
       fi
       result=$?
     ;;
@@ -416,6 +426,7 @@ rvm() {
     ;;
     notes)         $rvm_scripts_path/notes   ; result=$?  ;;
     reload)        unset rvm_loaded_flag ; rvm_reload_flag=1                      ;;
+
     fetch|install|uninstall|remove)
       if [[ ! -z "$rvm_ruby_string" ]] ; then
         $rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_string"
@@ -428,12 +439,11 @@ rvm() {
     ;;
     tests|specs)   rvm_action="rake" ; __rvm_do ; result=$? ;;
 
-    iconv|openssl|ncurses|zlib|readline|curl|mono)
-      __rvm_${rvm_action}_install
+    package)
+      $rvm_scripts_path/package $rvm_ruby_args
       result=$?
     ;;
 
-
     error)
       $rvm_scripts_path/log "fail" "$rvm_error_message ( see: 'rvm usage' )"
       __rvm_pushpop