rvm 0.1.33 → 0.1.34

data/config/known

@@ -0,0 +1,44 @@
+(ruby-)1.8.6(-p399)
+(ruby-)1.8.6-head
+(ruby-)1.8.7(-p249)
+(ruby-)1.8.7-head
+(ruby-)1.9.1(-p243)
+(ruby-)1.9.1(-p376)
+(ruby-)1.9.1-head
+(ruby-)1.9.2-preview1
+(ruby-)1.9.2-head
+ruby-head
+
+# Jruby
+jruby-1.2.0
+jruby-1.3.1
+jruby-1.4.0
+jruby(-1.5.0) # the default
+jruby-head
+
+# Rubinius
+rbx(-1.0.0) # default
+rbx-head
+
+# Ruby Enterprise Edition
+ree-1.8.6
+ree(-1.8.7) # the default
+ree-1.8.6-head
+ree-1.8.7-head
+
+# MagLev
+maglev(-23530)
+maglev-head
+
+# Shyouhei head, the default mput
+mput(-head)
+
+# Mac OS X Snow Leopard Only
+macruby(-nightly) # the default macruby
+macruby-head      # Build from the macruby git repository
+
+# Not working yet
+ironruby-0.9.3
+ironruby-1.0-rc2
+ironruby-head
+

data/contrib/gemset_snapshot

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+echo "Snapshotting the current environment gem list into snapshot.gems"
+file_name="snapshot.gems"
+echo '# system snapshot gemset file' > snapshot.gems
+for gem in $(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | tr ' ' ';') ; do
+  name="$(echo $gem | awk -F';' '{print $1}')"
+  versions="$(echo $gem | awk -F';' '{print $2}' | sed 's#,# #g')"
+  for version in $versions ; do
+    echo "$name -v$version" >> $file_name
+  done ; unset version versions
+done ; unset file_name
+
+exit $?

data/install

@@ -265,7 +265,7 @@ else
   if [[ "root" != "$(whoami)" ]] ; then
     printf "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
     printf "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
-    printf "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+    printf "\n     [[ -s \$HOME/scripts/rvm ]] && source \$HOME/scripts/rvm"
     printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
     printf "\n   This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
     printf "\n   if [[ ! -z "$PS1" ]] ; then"
@@ -273,8 +273,8 @@ else
     printf "\n   fi # <= be sure to close the if."
     printf "\n   #EOF .bashrc"
     printf "\n   Be absolutely *sure* to REMOVE the '&& return'."
-    printf "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
-    printf "\n   placing all non-interactive items in the .bashrc"
+    printf "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the bottom of your .bash_profile."
+    printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
     printf "\n3) 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

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 33
+:patch: 34

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.33"
+  s.version = "0.1.34"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-05-27}
+  s.date = %q{2010-05-29}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -26,7 +26,9 @@ Gem::Specification.new do |s|
      "binscripts/rvm-update-latest",
      "binscripts/rvmsudo",
      "config/db",
+     "config/known",
      "config/md5",
+     "contrib/gemset_snapshot",
      "examples/rvmrc",
      "gemsets/default.gems",
      "gemsets/global.gems",

data/scripts/cli

@@ -105,7 +105,6 @@ __rvm_parse_args() {
       list|info|alias|docs)
         rvm_action="$rvm_token"
         rvm_ruby_args="$@"
-        if [[ "$rvm_token" = "info" ]] && [[ -z "$rvm_ruby_args" ]] ; then rvm_ruby_args="$rvm_ruby_string" ; fi
         rvm_parse_break=1
       ;;
 
@@ -394,6 +393,8 @@ __rvm_parse_args() {
 }
 
 rvm() {
+  __rvm_setup
+
   if [[ ! -z "$PS1" ]] ; then export rvm_interactive=1 ; else unset rvm_interactive ; fi
 
   if [[ -z "$ZSH_VERSION" ]] ; then
@@ -433,8 +434,9 @@ rvm() {
     # TODO: Make debug run in the current environment.
     debug)           $rvm_scripts_path/info '' debug ; result=$? ;;
     info)
+      if [[ "$1" == "info" ]]; then shift; fi
       if [[ -z "$rvm_ruby_args" ]] ; then
-        . $rvm_scripts_path/info
+        $rvm_scripts_path/info
       else
         $rvm_scripts_path/info $rvm_ruby_args
       fi
@@ -464,8 +466,11 @@ rvm() {
     ;;
 
     ruby|gem|rake)
+      old_rvm_ruby_string=$rvm_ruby_string
       unset rvm_ruby_string
       $rvm_scripts_path/set $rvm_action $rvm_ruby_args
+      [[ -n "$old_rvm_ruby_string" ]] && rvm_ruby_string=$old_rvm_ruby_string
+      unset old_rvm_ruby_string
       result=$?
     ;;
 
@@ -537,6 +542,8 @@ rvm() {
 
   if [[ ! -z "$rvm_trace_flag" ]] ; then set +x ; unset rvm_trace_flag ; fi
 
+  __rvm_teardown
+
   return $result
 }
 

data/scripts/docs

@@ -38,11 +38,10 @@ generate_docs() {
   $rvm_scripts_path/log "info" "( Errors will be logged to $rvm_log_path/$rvm_ruby_string/docs.error.log )"
   if gem list | grep ^hanna >/dev/null 2>&1 ; then
     hanna -o $rvm_docs_path/$rvm_ruby_string/$rvm_docs_type --inline-source --line-numbers --fmt=html 2>> $rvm_log_path/$rvm_ruby_string/docs.error.log
-    hanna --ri --ri-site -o $rvm_docs_path/$rvm_ruby_string/$rvm_docs_type --inline-source --line-numbers --fmt=html 2>> $rvm_log_path/$rvm_ruby_string/docs.error.log
   else
     rdoc -a -o $rvm_docs_path/$rvm_ruby_string/$rvm_docs_type 2>> $rvm_log_path/$rvm_ruby_string/docs.error.log
-    rdoc -a --ri --ri-site -o $rvm_docs_path/$rvm_ruby_string/$rvm_docs_type 2>> $rvm_log_path/$rvm_ruby_string/docs.error.log
   fi
+  rdoc -a --ri-site 2>> $rvm_log_path/$rvm_ruby_string/docs.error.log
 }
 
 if [[ "open" = "$action" ]] ; then

data/scripts/gemsets

@@ -23,7 +23,6 @@ __rvm_gemset_create() {
   for gemset in $(echo $gems_args) ; do
     gem_home="${rvm_ruby_gem_prefix}${rvm_gemset_separator}${gems_args/ /}"
     mkdir -p $gem_home
-    ln -nfs "$HOME/.gem/cache" "$gem_home/cache"
     $rvm_scripts_path/log "info" "Gemset '$gemset' created."
   done ; unset gem_home
 }
@@ -55,7 +54,8 @@ __rvm_gemset_delete() {
       echo -n "(anything other than 'yes' will cancel) > "
       read response
       if [[ "yes" = "$response" ]] ; then
-        rm -f $gemdir/cache && rm -rf $gemdir
+        rm -f $gemdir/cache 2>/dev/null
+        rm -rf $gemdir
       else
         $rvm_scripts_path/log "info" "Not doing anything, phew... close call that one eh?"
       fi
@@ -237,10 +237,10 @@ __rvm_gem_install() {
   else
     if [[ -s "$gem" ]] ; then
       cache_file="$gem"
-    elif [[ -s "$rvm_gems_path/cache/${gem_file_name}" ]] ; then
-      cache_file="$rvm_gems_path/cache/${gem_file_name}"
+    elif [[ -s "$rvm_ruby_gem_home/cache/${gem_file_name}" ]] ; then
+      cache_file="$rvm_ruby_gem_home/cache/${gem_file_name}"
     else
-      cache_file="${cache_file:-$(\ls ${rvm_gems_path}/cache/${gem_file_name} 2> /dev/null | sort | head -n1)}"
+      cache_file="${cache_file:-$(\ls ${rvm_ruby_gem_home}/cache/${gem_file_name} 2> /dev/null | sort | head -n1)}"
     fi
 
     if [[ ! -s "$cache_file" ]] ; then
@@ -259,9 +259,9 @@ __rvm_gem_install() {
         unset gem # already installed, not forcing reinstall.
         $rvm_scripts_path/log "info" "$gem_name $gem_version exists, skipping (--force to re-install)"
       else
-        if [[ -s "$rvm_gems_path/cache/$(basename $gem_file_name)" ]] ; then
+        if [[ -s "$rvm_ruby_gem_home/cache/$(basename $gem_file_name)" ]] ; then
           mkdir -p "$rvm_tmp_path/$$/"
-          mv "$rvm_gems_path/cache/$gem_file_name" "$rvm_tmp_path/$$/$gem_file_name"
+          mv "$rvm_ruby_gem_home/cache/$gem_file_name" "$rvm_tmp_path/$$/$gem_file_name"
           gem="$rvm_tmp_path/$$/$gem_file_name -f -l"
         else
           gem="$cache_file"

data/scripts/info

@@ -67,7 +67,7 @@ info_environment() {
   rvm_info="$rvm_info\n    MY_RUBY_HOME: \"$MY_RUBY_HOME\""
   rvm_info="$rvm_info\n    IRBRC:        \"$IRBRC\""
   rvm_info="$rvm_info\n    RUBYOPT:      \"$RUBYOPT\""
-  rvm_info="$rvm_info\n    gemset:       \"$(printf $GEM_HOME | awk -F${rvm_gemset_separator:-'@'} '{print $2}')\"\n"
+  rvm_info="$rvm_info\n    gemset:       \"$(printf "$GEM_HOME" | awk -F${rvm_gemset_separator:-'@'} '{print $2}')\"\n"
   if [[ ! -z "$MAGLEV_HOME" ]] ; then
     rvm_info="$rvm_info\n  MAGLEV_HOME: \"$MAGLEV_HOME\""
   fi
@@ -131,12 +131,12 @@ fi
 if [[ -z "$sections" ]] ; then sections="$all_sections" ; fi
 
 if [[ -z "$ruby_strings" ]] ; then
-  printf "${rvm_ruby_string}:\n"
+  printf "$(echo "$GEM_HOME" | xargs basename):\n"
   info_sections
 else
   for ruby_string in $(printf $ruby_strings | tr ',' ' ') ; do
     rvm_ruby_string="${ruby_string}" ;  __rvm_select ; __rvm_use
-    printf "${rvm_ruby_string}:\n"
+    printf "$(__rvm_environment_identifier):\n"
     info_sections
   done
 fi

data/scripts/install

@@ -265,7 +265,7 @@ else
   if [[ "root" != "$(whoami)" ]] ; then
     printf "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
     printf "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
-    printf "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+    printf "\n     [[ -s \$HOME/scripts/rvm ]] && source \$HOME/scripts/rvm"
     printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
     printf "\n   This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
     printf "\n   if [[ ! -z "$PS1" ]] ; then"
@@ -273,8 +273,8 @@ else
     printf "\n   fi # <= be sure to close the if."
     printf "\n   #EOF .bashrc"
     printf "\n   Be absolutely *sure* to REMOVE the '&& return'."
-    printf "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
-    printf "\n   placing all non-interactive items in the .bashrc"
+    printf "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the bottom of your .bash_profile."
+    printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
     printf "\n3) 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

data/scripts/list

@@ -4,11 +4,11 @@ if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
 # Query for valid rvm ruby strings
 # This is meant to be used with scripting.
-__rvm_list_strings() {
+list_strings() {
   echo $(\ls $rvm_rubies_path)
 }
 
-__rvm_list_default() {
+list_default() {
   strings="$(echo $rvm_ruby_args | awk '{print $2}')"
   if [[ "$strings" = "string" ]] ; then
     $rvm_scripts_path/alias show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename
@@ -24,26 +24,24 @@ __rvm_list_default() {
   fi
 }
 
-__rvm_list_known() {
+list_ruby_svn_tags() {
   while read -r tag
   do
     prefix="$(echo ${tag/\//} | sed 's#^v1_##' | awk -F'_' '{print "(ruby-)1."$1"."$2}' | sed 's#p$##')"
     echo "${prefix}-t${tag/\//}"
     unset prefix tag
   done < <(svn list http://svn.ruby-lang.org/repos/ruby/tags/ | awk '/^v1_[8|9]/')
-  printf "\n(ruby-)1.8.6(-p399)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p249)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1(-p376)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1\n(ruby-)1.9.2-head\nruby-head\n"
-  printf "\njruby-1.2.0\njruby-1.3.1\njruby-1.4.0\njruby(-1.5.0) # the default\njruby-head"
-  printf "\nrbx(-1.0.0) # default\nrbx-head"
-  printf "\nree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
-  printf "\nmaglev(-23530)\nmaglev-head"
-  printf "\nmput(-head) # shyouhei head, the default mput"
-  printf "\nironruby-0.9.3\nironruby-1.0-rc2\nironruby-head"
-  if [[ "Darwin" = "$(uname)" ]] ; then
-    printf "\nmacruby(-nightly) # the default macruby\nmacruby-head # Build from the macruby git repository"
+}
+
+list_known() {
+  if [[ -z "$rvm_interactive" ]] || [[ -z "$TERM" ]] || [[ "unknown" = "$TERM" ]] ; then
+    cat "$rvm_config_path/known"
+  else
+    cat "$rvm_config_path/known" | ${PAGER:-less}
   fi
 }
 
-__rvm_list_rubies() {
+list_rubies() {
   echo
   ruby=$(command -v ruby) ; current_ruby=""
   if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo $ruby | awk '/rvm/')" ]] ; then
@@ -88,13 +86,15 @@ __rvm_list_rubies() {
 action="$(echo "$1" | awk '{print $1}')"
 
 if [[ "known" = "$action" ]] ; then
-  __rvm_list_known
+  list_known
 elif [[ "default" = "$action" ]] ; then
-  __rvm_list_default
+  list_default
 elif [[ -z "$action" ]] || [[ "rubies" = "$action" ]] ; then
-  __rvm_list_rubies
+  list_rubies
 elif [[ "strings" = "$action" ]] ; then
-  __rvm_list_strings
+  list_strings
+elif [[ "ruby_svn_tags" = "$action" ]] ; then
+  list_ruby_svn_tags
 else # help
   printf "\nUsage:  rvm list {known,default,rubies,strings}"
 fi

data/scripts/log

@@ -8,20 +8,20 @@ message=$1
 
 if [[ -z "$rvm_interactive" ]] || [[ -z "$TERM" ]] || [[ "unknown" = "$TERM" ]] ; then
   case "$level" in
-    debug) shift ; printf "\n<d>$message </d>\n"     ;;
-    info)  shift ; printf "\n<i>$message </i>\n"     ;;
-    warn)  shift ; printf "\n<w>$message </w>\n"     ;;
-    error) shift ; printf "\n<e>$message </e>\n" >&2 ;;
-    fail)  shift ; printf "\n<f>$message </f>\n" >&2 ;;
+    debug) shift ; printf "\n$level: $message"     ;;
+    info)  shift ; printf "\n$level: $message"     ;;
+    warn)  shift ; printf "\n$level: $message"     ;;
+    error) shift ; printf "\n$level: $message" >&2 ;;
+    fail)  shift ; printf "\n$level: $message" >&2 ;;
     *) printf "$message"
   esac
 else
   case "$level" in
-    debug) shift ; printf "\n$(tput setaf 5)$message$(tput sgr0)\n"     ;;
-    info)  shift ; printf "\n$(tput setaf 2)$message$(tput sgr0)\n"     ;;
-    warn)  shift ; printf "\n$(tput setaf 3)$message$(tput sgr0)\n"     ;;
-    error) shift ; printf "\n$(tput setaf 1)$message$(tput sgr0)\n" >&2 ;;
-    fail)  shift ; printf "\n$(tput setaf 1)$message$(tput sgr0)\n" >&2 ;;
+    debug) shift ; printf "\n$(tput setaf 5)$message$(tput sgr0)"     ;;
+    info)  shift ; printf "\n$(tput setaf 2)$message$(tput sgr0)"     ;;
+    warn)  shift ; printf "\n$(tput setaf 3)$message$(tput sgr0)"     ;;
+    error) shift ; printf "\n$(tput setaf 1)$message$(tput sgr0)" >&2 ;;
+    fail)  shift ; printf "\n$(tput setaf 1)$message$(tput sgr0)" >&2 ;;
     *) printf "$message"
   esac
 fi

data/scripts/manage

@@ -267,7 +267,7 @@ RubyWrapper
       PATH=$rvm_bin_path:$PATH ; export PATH
 
       if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.0/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
-        $rvm_scripts_path/log "info" "Downloading $rvm_ruby_file, this may take a while depending on your connection..."
+        $rvm_scripts_path/log "info" "Downloading $rvm_ruby_package_file, this may take a while depending on your connection..."
         $rvm_scripts_path/fetch "$rvm_url"
         result=$? ; if [[ "$result" -gt 0 ]] ; then
           $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result

data/scripts/rvm

@@ -7,8 +7,6 @@
 if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   unset rvm_reload_flag
 
-  mkdir -p $HOME/.gem/cache
-
   for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
     if [[ -f "$rvmrc" ]] ; then
       if grep -q '^\s*rvm .*$' $rvmrc ; then
@@ -72,7 +70,7 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
 
     alias rvm-restart="source '${rvm_path}/scripts/rvm'"
 
-    if command -v ruby >/dev/null 2>&1 && command -v ruby | grep -v rvm >/dev/null ; then
+    if ! command -v ruby >/dev/null 2>&1 || command -v ruby | grep -v rvm >/dev/null ; then
      [[ -s "$rvm_environments_path/default" ]] && source "$rvm_environments_path/default"
     fi
   else

data/scripts/rvm-install

@@ -265,7 +265,7 @@ else
   if [[ "root" != "$(whoami)" ]] ; then
     printf "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
     printf "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
-    printf "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+    printf "\n     [[ -s \$HOME/scripts/rvm ]] && source \$HOME/scripts/rvm"
     printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
     printf "\n   This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
     printf "\n   if [[ ! -z "$PS1" ]] ; then"
@@ -273,8 +273,8 @@ else
     printf "\n   fi # <= be sure to close the if."
     printf "\n   #EOF .bashrc"
     printf "\n   Be absolutely *sure* to REMOVE the '&& return'."
-    printf "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
-    printf "\n   placing all non-interactive items in the .bashrc"
+    printf "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the bottom of your .bash_profile."
+    printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
     printf "\n3) 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

data/scripts/update

@@ -265,7 +265,7 @@ else
   if [[ "root" != "$(whoami)" ]] ; then
     printf "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
     printf "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
-    printf "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+    printf "\n     [[ -s \$HOME/scripts/rvm ]] && source \$HOME/scripts/rvm"
     printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
     printf "\n   This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
     printf "\n   if [[ ! -z "$PS1" ]] ; then"
@@ -273,8 +273,8 @@ else
     printf "\n   fi # <= be sure to close the if."
     printf "\n   #EOF .bashrc"
     printf "\n   Be absolutely *sure* to REMOVE the '&& return'."
-    printf "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
-    printf "\n   placing all non-interactive items in the .bashrc"
+    printf "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the bottom of your .bash_profile."
+    printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
     printf "\n3) 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

data/scripts/utility

@@ -1,7 +1,27 @@
 #!/usr/bin/env bash
 
-# ZSH has 1 based array indexing, bash has 0 based.
-if [[ ! -z "$ZSH_VERSION" ]] ; then __shell_array_start=1 ; else __shell_array_start=0 ; fi
+__rvm_setup() {
+  # ZSH has 1 based array indexing, bash has 0 based.
+  if [[ ! -z "$ZSH_VERSION" ]] ; then
+    __shell_array_start=1
+    # Set clobber for zsh users, for compatibility with bash's append operator ( >> file ) behavior
+    setopt | grep -qs '^noclobber$'
+    rvm_zsh_clobber=$?
+    setopt clobber
+  else
+    __shell_array_start=0
+  fi ; export __shell_array_start
+}
+
+__rvm_teardown() {
+  if [[ ! -z "$ZSH_VERSION" ]] ; then
+    if [[ "$rvm_zsh_clobber" -eq 0 ]] ; then
+      setopt noclobber
+    fi ; unset rvm_zsh_clobber
+  else
+    :
+  fi
+}
 
 # Query the rvm key-value database for a specific key
 # Allow overrides from user specifications in $rvm_config_path/user
@@ -469,25 +489,9 @@ __rvm_gemset_select() {
 
   rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
 
-  # Careful not to nuke system gems cache.
-  if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ ! -z "$(echo $rvm_ruby_gem_home | awk '/rvm/')" ]] ; then
-    # Ensure that the ruby gem home exists.
-    mkdir -p "$rvm_ruby_gem_home"
-
-    # If there is a cache *directory* already,
-    # move all the gems to the global cache directory and remove it.
-    if [[ -d "$rvm_ruby_gem_home/cache" ]] && [[ ! -L "$rvm_ruby_gem_home/cache" ]] ; then
-      if [[ ! -z "$(\ls -A "$rvm_ruby_gem_home"/cache/)" ]] ; then
-        mv "$rvm_ruby_gem_home"/cache/* "$HOME"/.gem/cache/
-      fi
-      rmdir "$rvm_ruby_gem_home"/cache
-    fi
-
-    # If the ruby's gems cache directory is not a symlink to the global cache, symlink it
-    if [[ ! -L "$rvm_ruby_gem_home/cache" ]] ; then
-      ln -nfs "$HOME/.gem/cache" "$rvm_ruby_gem_home/cache"
-    fi
-  fi ; export rvm_ruby_gem_path rvm_ruby_gem_home
+  # Ensure that the ruby gem home exists.
+  mkdir -p "$rvm_ruby_gem_home"
+  export rvm_ruby_gem_path rvm_ruby_gem_home
 }
 
 # Use a gemset specified by 'rvm_ruby_gem_home'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 95
   prerelease: false
   segments: 
   - 0
   - 1
-  - 33
-  version: 0.1.33
+  - 34
+  version: 0.1.34
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -04:00
+date: 2010-05-29 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -36,7 +36,9 @@ files:
 - binscripts/rvm-update-latest
 - binscripts/rvmsudo
 - config/db
+- config/known
 - config/md5
+- contrib/gemset_snapshot
 - examples/rvmrc
 - gemsets/default.gems
 - gemsets/global.gems