rvm 0.1.24 → 0.1.26

data/README

@@ -65,6 +65,7 @@ Flags
   --summary     - Used with rubydo to print out a summary of the commands run.
   --jit         - Used with rubinius install to build with JIT
   --latest      - with gemset --dump skips version strings for latest gem.
+  --gems        - with uninstall/remove removes gems with the interpreter.
   --reconfigure - Force ./configure on install even if Makefile already exists.
 
 

data/binscripts/rvm-prompt

@@ -10,6 +10,7 @@ add(){
   fi
 }
 
+rvm_gemset_separator=${rvm_gemset_separator:-"+"}
 if [[ ! -z "$(which ruby 2>/dev/null | awk '/rvm/{print}')" ]] ; then
   unset format
   while [[ $# -gt 0 ]] ; do
@@ -52,8 +53,8 @@ if [[ ! -z "$(which ruby 2>/dev/null | awk '/rvm/{print}')" ]] ; then
   fi
 
   if [[ ! -z "$gemset_flag" ]] ; then
-    gemset="$(gem env gemdir | awk -F% '{print $2}')"
-    if [[ ! -z "$gemset" ]] ; then gemset="%$gemset" ; fi
+    gemset="$(echo $GEM_HOME | awk -F${rvm_gemset_separator} '{print $2}')"
+    if [[ ! -z "$gemset" ]] ; then gemset="${rvm_gemset_separator}$gemset" ; fi
   fi
 
   if [[ ! -z "$unicode_flag" ]] ; then
@@ -68,22 +69,28 @@ if [[ ! -z "$(which ruby 2>/dev/null | awk '/rvm/{print}')" ]] ; then
       system)   unicode="➆" ;;
       ruby)
         case "$version" in
-          1.8.6)  unicode="❻"  ;; 
-          1.8.7)  unicode="❼"  ;; 
-          1.9.1)  unicode="❶"  ;; 
+          1.8.6)  unicode="❻"  ;;
+          1.8.7)  unicode="❼"  ;;
+          1.9.1)  unicode="❶"  ;;
           1.9.2)  unicode="❷"  ;;
           *)      unicode="♢"  ;;
         esac ;;
       *) unicode="♢" ;;
-    esac 
+    esac
+
+    if [[ ! -z "$(echo $ruby_string | awk '/-head/')" ]] ; then
+      unicode="${unicode}〠"
+    fi
     # TODO: Architecture
     # TODO: gemset
     echo $unicode
   else
     command="prompt=\"$format\""
     eval "$command"
-    echo "$prompt" | sed 's#-\s*$##' | sed 's#-%#%#'
+    echo "$prompt" | sed 's#-\s*$##' | sed 's#-'${rvm_gemset_separator}'#'${rvm_gemset_separator}'#'
   fi
+else
+  echo "system"
 fi
 
 exit 0

data/binscripts/rvm-update-head

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
+if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+rvm_path="${rvm_path:-$HOME/.rvm}"
+mkdir -p $rvm_path/src/
+cd $rvm_path/src
+
+rm -rf ./rvm/ && git clone --depth 1 git://github.com/wayneeseguin/rvm.git
+cd rvm
+dos2unix scripts/* >/dev/null 2>&1
+bash scripts/install

data/binscripts/rvm-update-latest

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
+if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+rvm_path="${rvm_path:-$HOME/.rvm}"
+mkdir -p $rvm_path/src/
+cd $rvm_path/src
+
+stable_version=$(curl -B http://rvm.beginrescueend.com/releases/stable-version.txt 2>/dev/null)
+
+echo "rvm-${stable_version}"
+
+curl -L "http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz" -o "rvm-${stable_version}.tar.gz"
+
+tar zxf "rvm-${stable_version}.tar.gz"
+
+cd "rvm-${stable_version}"
+
+dos2unix scripts/* >/dev/null 2>&1
+
+bash scripts/install

data/config/db

@@ -8,8 +8,9 @@ rubygems_version=1.3.6
 rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
 rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
 rbx_version=1.0.0
-rbx_patch_level=rc3
-rbx_url=http://asset.rubini.us/rubinius-1.0.0-rc3-20100216.tar.gz
+rbx_patch_level=rc4
+rbx_1.0.0_rc3_url=http://asset.rubini.us/rubinius-1.0.0-rc3-20100216.tar.gz
+rbx_1.0.0_rc4_url=http://asset.rubini.us/rubinius-1.0.0-rc4-20100331.tar.gz
 ree_version=1.8.7
 ree_1.8.6_patch_level=20090610
 ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677
@@ -29,7 +30,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=23082
+maglev_version=23101
 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

@@ -1,4 +1,5 @@
 rubinius-1.0.0-rc1-20091125.tar.gz=c1cf037f05caf1bc962c09e220b435f4
+rubinius-1.0.0-rc4-20100331.tar.gz=c631131cc9542c548b4fc3791d8aa6b2
 ruby-1.8.5-p115.tar.gz=20ca6cc87eb077296806412feaac0356
 ruby-1.8.5-p231.tar.gz=e900cf225d55414bffe878f00a85807c
 ruby-1.8.6-p286.tar.gz=797ea136fe43e4286c9362ee4516674e
@@ -68,3 +69,7 @@ GemStone-23082.Darwin-i386.tar.gz=aa5f1768e5bad2bb687913c575f9cff6
 GemStone-23082.Linux-x86_64.tar.gz=7b7fd0df5d1deacf7aa12ccc9a94a33f
 MagLev-23082.Darwin-i386.tar.gz=d9027e7b7c8220573b1d3d588712ffc4
 MagLev-23082.Linux-x86_64.tar.gz=d63c4c94a2eaf19b051182e974413fef
+GemStone-23101.Darwin-i386.tar.gz=09b2c6fbb17b5571d31f2539779a2c24
+GemStone-23101.Linux-x86_64.tar.gz=9710555efbeb3563c607f09db1d33090
+MagLev-23101.Darwin-i386.tar.gz=281c9615cb2ef94f720b67fb893f1e26
+MagLev-23101.Linux-x86_64.tar.gz=3294165bd510129fcf591920573c3af1

data/examples/rvmrc

@@ -27,7 +27,7 @@
 
 # Bin Path
 #   This is where rvm places all of it's executable/wrapper scripts.
-#export 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

data/install

@@ -13,9 +13,9 @@ source scripts/utility
 usage() {
   echo -e "
   Usage:
-    ${0} <options>
+    ${0} [options]
 
-  Options:
+  options:
     --auto    : Automatically update shell profile files.
     --prefix  : Installation prefix directory.
     --help    : Display help/usage (this) message
@@ -23,6 +23,15 @@ usage() {
   "
 }
 
+spinner_counter=0
+spinner() {
+  array=('/' '-' '\\' '|' '/' '-' '\\' '|')
+  index=$((($spinner_counter % 8)))
+  echo -e -n "\r${array[$index]}"
+  let "spinner_counter=spinner_counter+1"
+  which perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
+}
+
 if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
 
 while [[ $# -gt 0 ]] ; do
@@ -47,18 +56,25 @@ fi
 if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
+if grep -q 'scripts/rvm' $HOME/.bash* || grep -q 'scripts/rvm' $HOME/.zsh*; then
+  if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
+    export upgrade_flag=1
+  else
+    export upgrade_flag=0
+  fi
+else
+  export upgrade_flag=0
+fi
+
 __rvm_initialize
 
 #
-# Setup
+# Setup & Configuration
 #
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
 cwd=$(pwd)
 source_path="${source_path:-$cwd}"
-
-# State what is required to use rvm
-echo -e "\nInstalling rvm to $rvm_path/ ..."
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
@@ -71,9 +87,25 @@ rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_symlink_path="${rvm_symlink_path:-$rvm_prefix/bin}"
 
+export rvm_gemset_separator="@" # TODO: Remove this after a while.
+
+echo -e "\n$(tput setaf 2)RVM$(tput sgr0) - shell scripts which allow management of multiple ruby interpreters and environments."
+echo -e "\n    $(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
+echo -e "\n    $(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm (#rvm on irc.freenode.net)"
+
+echo -e "\n********************************************************************************"
+if [[ "$upgrade_flag" -eq 1 ]] ;then
+  echo -e -n "  Upgrading the RVM installation in $rvm_path/"
+else
+  echo -e -n "  Installing rvm to $rvm_path/"
+fi
+
+spinner
+
 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
 
 for file in README LICENCE ; do
+  spinner
   cp -f "$source_path/$file" "$rvm_path/"
 done
 
@@ -81,19 +113,22 @@ done
 # Scripts
 #
 for dir_name in config scripts examples lib hooks ; do
+  spinner
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
     cp -Rf "$source_path/$dir_name" "$rvm_path"
   fi
 done ; unset dir_name
 
+spinner
 if [[ ! -s "$rvm_config_path/user" ]] ; then
   mkdir -p "$rvm_config_path/"
   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 package"
-for script_name in $(echo $scripts) ; do
+scripts=("monitor" "match" "log" "install" "color" "db" "fetch" "log" "set" "package")
+for script_name in $scripts ; do
+  spinner
   chmod +x $rvm_scripts_path/$script_name
 done
 
@@ -102,14 +137,17 @@ done
 #
 # Cleanse and purge...
 for file in rvm-prompt rvm rvmsudo ; do
+  spinner && perl -e 'sleep 0.2'
   rm -f "$rvm_bin_path/$file"
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
+spinner
 chmod +x $rvm_bin_path/*
 
 #
 # RC Files
 #
+spinner
 if [[ ! -z "$rvm_auto_flag" ]] ; then
   echo -e "Checking rc files... ($rvm_rc_files)"
   if [[ "$rvm_loaded_flag" != "1" ]] ; then
@@ -134,11 +172,13 @@ fi
 #
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 mkdir -p "$rvm_rubies_path/"
+spinner
 for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
   if [[ -d "$ruby" ]] ; then
     mv "$ruby" "$rvm_rubies_path/"
     new_path="$rvm_rubies_path/$(basename $ruby)"
     for file in gem rake ; do
+      spinner
       if [[ -s "$new_path/bin/$file" ]] ; then
         sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
         rm -f "$new_path/bin/$file.orig"
@@ -148,7 +188,46 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
   fi
 done
 #
-# End of migration.
+# End of rubies migration.
+#
+
+#
+# Migrate old gemset directories to new gemset pattern.
+#
+spinner
+echo -e -n "\r*" # Stop spinner.
+
+for gemset in $rvm_path/gems/*\%* ; do
+  new_path=${gemset/\%/${rvm_gemset_separator}}
+  if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
+    echo -e "    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    mv $gemset $new_path
+  fi
+done
+
+for gemset in $rvm_path/gems/*\+* ; do
+  new_path=${gemset/\+/${rvm_gemset_separator}}
+  if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
+    echo -e "    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    mv $gemset $new_path
+  fi
+done
+for gemset in $rvm_path/gems/*\@ ; do
+  new_path=$(echo $gemset | sed -e 's#\@$##')
+  if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
+    echo -e "    Fixing: $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    mv $gemset $new_path
+  fi
+done
+
+# Upgrade any default file.
+if [[ -s $rvm_config_path/default ]] && grep -q '\%' $rvm_config_path/default ; then
+  sed -e "s#\%#${rvm_gemset_separator}#g" $rvm_config_path/default > $rvm_config_path/default.new
+  mv $rvm_config_path/default.new $rvm_config_path/default
+fi
+
+#
+# End of gemset migration.
 #
 
 if [[ "root" = "$(whoami)" ]] ; then
@@ -160,11 +239,11 @@ if [[ "root" = "$(whoami)" ]] ; then
   chmod +x $rvm_symlink_path/rvmsudo
 fi
 
-echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-./scripts/notes
+if [[ "$upgrade_flag" -eq 0 ]] ; then
+  echo -e "\n********************************************************************************"
+  ./scripts/notes
+fi
 
-echo -e "$(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
-echo -e "\n$(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm "
 echo -e "\n********************************************************************************"
 name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
 echo -e "\n${name:-"$(whoami)"},\n"
@@ -177,20 +256,28 @@ echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne"
 echo -e "\n********************************************************************************"
 
-if [[ "root" != "$(whoami)" ]] ; then
-  echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
-  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 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 [[ -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"
+if [[ "$upgrade_flag" -eq 1 ]] ; then
+  echo -e "\n$(tput setaf 6)**** NOTICE *************************************************************************************"
+  echo -e "*  Gemset separator has changed, it is now @ and will remain unless any rubies error using it.  *"
+  echo -e "*  If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X'   *"
+  echo -e "*************************************************************************************************$(tput sgr0)\n"
+  echo -e "Upgrade of RVM in $rvm_path/ is complete.\n"
+else
+  if [[ "root" != "$(whoami)" ]] ; then
+    echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
+    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 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 [[ -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"
+  fi
+  echo -e "Installation of RVM to $rvm_path/ is complete.\n\n"
 fi
 
 exit 0

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 24
+:patch: 26

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.24"
+  s.version = "0.1.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-03-21}
+  s.date = %q{2010-04-05}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -22,6 +22,8 @@ Gem::Specification.new do |s|
      "README",
      "binscripts/rvm",
      "binscripts/rvm-prompt",
+     "binscripts/rvm-update-head",
+     "binscripts/rvm-update-latest",
      "binscripts/rvmsudo",
      "config/db",
      "config/md5",
@@ -65,7 +67,6 @@ Gem::Specification.new do |s|
      "scripts/utility",
      "scripts/version"
   ]
-  s.has_rdoc = false
   s.homepage = %q{http://github.com/wayneeseguin/rvm}
   s.post_install_message = %q{********************************************************************************
 

data/scripts/cd

@@ -2,13 +2,13 @@
 
 # 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" != 0 ]] ; then
+if [[ "$rvm_project_rvmrc" -ne 0 ]] ; then
   cd() {
     builtin cd "$@"
     local cwd ; cwd=$(pwd)
     while : ; do
       if [[ -z "$cwd" ]] || [[ "$HOME" = "$cwd" ]] || [[ "/" = "$cwd" ]] ; then
-        if [[ "$rvm_project_rvmrc_default" = 1 ]] ; then
+        if [[ "$rvm_project_rvmrc_default" -eq 1 ]] ; then
           rvm default 1>/dev/null 2>&1
         fi
         break

data/scripts/cli

@@ -3,7 +3,7 @@
 __rvm_usage() { cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less} ; }
 
 __rvm_parse_args() {
-  if echo "$*" | grep -q 'trace' ; then echo "$*" ; __rvm_version ; fi
+  if echo "$@" | grep -q 'trace' ; then echo "$@" ; __rvm_version ; fi
 
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
@@ -54,22 +54,22 @@ __rvm_parse_args() {
         export rvm_ruby_gem_home="$GEM_HOME"
 
         if [[ "clear" = "$1" ]] ; then
-          unset rvm_gemset_name ; shift
+          __rvm_gemset_clear
           rvm_ruby_args="clear"
         elif [[ "use" = "$1" ]] ; then
           rvm_use_flag=1
           rvm_ruby_args="$@" ; shift
           export rvm_use_flag rvm_ruby_args
           rvm_gemset_name="$1"; shift
-          if [[ ! -z "$(echo $rvm_gemset_name | grep '%')" ]] ; then
-            rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)%.*/\1/')
-            rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*%\(.*\)/\1/')
+          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/')
             if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then
-              export rvm_ruby_string="$rvm_ruby_string%$rvm_gemset_name"
+              export rvm_ruby_string="$rvm_ruby_string${rvm_gemset_separator}$rvm_gemset_name"
             else
               unset rvm_ruby_string
             fi
-            export rvm_ruby_gem_home="$rvm_ruby_gem_home%$rvm_gemset_name"
+            export rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator}$rvm_gemset_name"
           fi
           if [[ ! -z "$rvm_gemset_name" ]] ; then export rvm_gemset_name ; fi
         elif [[ "delete" = "$1" ]] ; then
@@ -77,15 +77,15 @@ __rvm_parse_args() {
           rvm_ruby_args="$@" ; shift
           rvm_gemset_name="$1"; shift
           export rvm_delete_flag rvm_ruby_args rvm_gemset_name
-          if [[ ! -z "$(echo $rvm_gemset_name | grep '%')" ]] ; then
-            rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)%.*/\1/')
-            rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*%\(.*\)/\1/')
+          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/')
             if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then
-              export rvm_ruby_string="$rvm_ruby_string%$rvm_gemset_name"
+              export rvm_ruby_string="$rvm_ruby_string${rvm_gemset_separator}$rvm_gemset_name"
             else
               unset rvm_ruby_string
             fi
-            export rvm_ruby_gem_home="$rvm_ruby_gem_home%$rvm_gemset_name"
+            export rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator}$rvm_gemset_name"
           fi
           if [[ ! -z "$rvm_gemset_name" ]] ; then export rvm_gemset_name ; fi
         else
@@ -206,31 +206,7 @@ __rvm_parse_args() {
         rvm_action="${rvm_action:-use}"
       ;;
 
-      --head)
-        #if [[ -z "$rvm_ruby_string" ]] ; then export rvm_ruby_string="head"; else export rvm_ruby_string="${rvm_ruby_string}-head" ; fi
-        #rvm_action="${rvm_action:-use}"
-        #rvm_ruby_revision="head"
-        export rvm_head_flag=1
-      ;;
-
-      #
-      # Legacy items, replaced with ruby strings.
-      #
-      #-t|--tag)
-      #  rvm_ruby_tag="$1";
-      #  rvm_action="${rvm_action:-use}"
-      #  shift
-      #;;
-      #--rev|--revision)
-      #  rvm_ruby_revision="$1";
-      #  rvm_action="${rvm_action:-use}"
-      #  shift
-      #;;
-      #-b|--branch)
-      #  rvm_ruby_branch="$1";
-      #  rvm_action="${rvm_action:-use}"
-      #  shift
-      #;;
+      --head) export rvm_head_flag=1 ;;
 
       --bin)
         if [[ "update" = "$rvm_action" ]] ; then
@@ -292,7 +268,6 @@ __rvm_parse_args() {
         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  ;;
@@ -310,27 +285,20 @@ __rvm_parse_args() {
       --proxy)              export rvm_proxy="$1"      ; shift  ;;
       --disable-llvm|--disable-jit) export rvm_llvm_flag=0      ;;
       --enable-llvm|--enable-jit)   export 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|--passenger|--editor|--sticky|--create|--rvmrc)
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--passenger|--editor|--sticky|--create|--rvmrc|--gems)
         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"
-      ;;
-
-      --)
-        rvm_ruby_args="$*"
-        rvm_parse_break=1
-      ;;
-
+      --) rvm_ruby_args="$*" ; rvm_parse_break=1                ;;
       *)
         if [[ ! -z "$rvm_token" ]] ; then
           if [[ "gemset" = "$rvm_action" ]] ; then
-            if $rvm_scripts_path/match "$rvm_token" "^.+%.+$" ; then
-              export rvm_gemset_name="$(echo "$rvm_token" | awk -F'%' '{print $2}')"
-              export rvm_ruby_string="$(echo "$rvm_token" | awk -F'%' '{print $1}')"
+            if $rvm_scripts_path/match "$rvm_token" "^.+${rvm_gemset_separator}.+$" ; then
+              export rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
+              export rvm_ruby_string="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $1}')"
             elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
               export rvm_file_name="$(echo "$rvm_token" | sed 's#\.gems##g').gems"
               # elif [[ ! -z "$(echo "$rvm_token" | awk '/\.gems$/')" ]] ; then
@@ -343,9 +311,9 @@ __rvm_parse_args() {
             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
-            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" "^.+${rvm_gemset_separator}.+$" ; then
+            export rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
+            export rvm_ruby_string="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $1}')"
           elif $rvm_scripts_path/match "$rvm_token" "-" ; then
             export rvm_ruby_string="$rvm_token"
           elif $rvm_scripts_path/match "$rvm_token" "^[0-9].[0-9]" ; then
@@ -442,12 +410,12 @@ rvm() {
 
         # Clear the gemset.
         if [[ "$rvm_delete_flag" -eq 1 ]] ; then
-          gem_prefix="$(echo $GEM_HOME | sed 's/%.*$//')"
-          if [[ "$GEM_HOME" = "$gem_prefix%$rvm_gemset_name" ]] ; 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"
             GEM_HOME="$rvm_ruby_gem_home"
             BUNDLE_PATH="$rvm_ruby_gem_home"
-            GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home%global/bin"
+            GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home${rvm_gemset_separator}global/bin"
             export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
           fi ; unset gem_prefix
         fi