rvm 0.1.13 → 0.1.14

data/binscripts/rvmsudo

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 prefix="PATH='$PATH'"
+if [[ ! -z "$BUNDLE_PATH" ]] ; then prefix="BUNDLE_PATH='$BUNDLE_PATH' $prefix" ; fi
 if [[ ! -z "$GEM_HOME" ]] ; then prefix="GEM_HOME='$GEM_HOME' $prefix" ; fi
 if [[ ! -z "$GEM_PATH" ]] ; then prefix="GEM_PATH='$GEM_PATH' $prefix" ; fi
 

data/install

@@ -73,7 +73,7 @@ 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}"
 
-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 $rvm_gems_path/cache $rvm_gems_path/doc
+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
   cp -f "$source_path/$file" "$rvm_path/"
@@ -179,7 +179,7 @@ if [[ "root" != "$(whoami)" ]] ; then
   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   Put everything below and above that line into your .bash_profile, and delete that line and below from .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   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

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 13
+:patch: 14

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   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-12}
+  s.date = %q{2010-02-13}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/cli

@@ -56,12 +56,13 @@ __rvm_parse_args() {
           unset rvm_gem_set_name ; shift
           export rvm_ruby_gem_home="$(echo $GEM_HOME | sed 's/%.*$//')"
           export GEM_HOME="$rvm_ruby_gem_home"
-          export GEM_PATH="$rvm_ruby_gem_path"
+          export BUNDLE_PATH="$rvm_ruby_gem_home"
+          export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home%global/bin"
           rvm_ruby_args="clear"
           rvm_parse_break=1
         elif [[ "delete" = "$1" ]] ; then
-          export rvm_delete_flag=1 ; shift
-          rvm_ruby_args="$*"
+          export rvm_delete_flag=1
+          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/')
@@ -280,7 +281,7 @@ __rvm_parse_args() {
       --disable-llvm|--disable-jit) export rvm_llvm_flag=0      ;;
       --enable-llvm|--enable-jit)   export rvm_llvm_flag=1      ;;
 
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--load|--passenger|--editor)
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--load|--rvmrc|--passenger|--editor)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
         if [[ "--debug" = "$rvm_token" ]] ; then export rvm_debug_flag ; fi
       ;;

data/scripts/fetch

@@ -48,6 +48,7 @@ else
 fi
 
 if [[ $download -gt 0 ]] ; then
+  rm -f $archive
   eval $fetch_command "$1"
   result=$?
   if [[ $result -gt 0 ]] ; then

data/scripts/gems

@@ -47,7 +47,7 @@ __rvm_gems_delete() {
     if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
         rm -rf  "$gemdir"
     elif [[ -d "$gemdir" ]] ; then
-      $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the entire gemset '$rvm_gem_set_name' ($gemdir)?"
+      $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the entire gemset directory '$rvm_gem_set_name' ($gemdir)?"
       echo -n "(anything other than 'yes' will cancel) > "
       read response
       if [[ "yes" = "$response" ]] ; then
@@ -92,6 +92,7 @@ __rvm_gems_dump() {
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
     export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_gems_path/$rvm_ruby_string%global/bin"
+    export BUNDLE_PATH="$rvm_ruby_gem_home"
   fi
 
   if [[ -z "$rvm_file_name" ]] ; then
@@ -124,6 +125,7 @@ __rvm_gems_load() {
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
     export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_gems_path/$rvm_ruby_string%global/bin"
+    export BUNDLE_PATH="$rvm_ruby_gem_home"
   fi
 
   if [[ ! -z "$(echo "$gems_args" | awk '/\.gem.*$/')" ]] ; then
@@ -244,7 +246,7 @@ __rvm_gem_install() {
     if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
 
     if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ "$rvm_ruby_gem_home" != "$rvm_gems_path" ]] ; then
-      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home/bin:$rvm_gems_path/$rvm_ruby_string%global/bin' $gem_prefix gem install $gems_args $rvm_gem_options $gem_postfix $vars"
+      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home/bin:$rvm_gems_path/$rvm_ruby_string%global/bin' BUNDLE_PATH='$rvm_ruby_gem_home' $gem_prefix gem install $gems_args $rvm_gem_options $gem_postfix $vars"
     else
       command="$gem_prefix gem install $gems_args $rvm_gem_options -q $gem $gem_postfix $vars"
     fi

data/scripts/install

@@ -73,7 +73,7 @@ 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}"
 
-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 $rvm_gems_path/cache $rvm_gems_path/doc
+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
   cp -f "$source_path/$file" "$rvm_path/"
@@ -179,7 +179,7 @@ if [[ "root" != "$(whoami)" ]] ; then
   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   Put everything below and above that line into your .bash_profile, and delete that line and below from .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   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

data/scripts/manage

@@ -42,12 +42,15 @@ __rvm_install_source() {
 
   if [[ "1.8.5" = "$rvm_ruby_version" ]] ; then
     # How to install ruby 1.8.5... "sneaky sneaky, sir"
-    if [[ ! -d "$HOME/.rvm/src/ruby-1.8.7-p248/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p248 > /dev/null ; fi
-    if [[ ! -d "$HOME/.rvm/src/ruby-1.8.6-p383/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p383 > /dev/null ; fi
-    cp ~/.rvm/src/ruby-1.8.7-p248/ext/openssl/extconf.rb ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
-    cp ~/.rvm/src/ruby-1.8.7-p248/ext/openssl/openssl_missing.* ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
-    cp ~/.rvm/src/ruby-1.8.7-p248/ext/openssl/ossl_hmac.c ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
-    cp ~/.rvm/src/ruby-1.8.6-p383/ext/readline/* ~/.rvm/src/ruby-1.8.5-p231/ext/readline/
+    src_dir="ruby-1.8.7-p$(__rvm_db "ruby_1.8.7_patch_level")"
+    if [[ ! -d "$HOME/.rvm/src/$src_dir/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p248 > /dev/null ; fi
+    cp ~/.rvm/src/$src_dir/ext/openssl/extconf.rb ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+    cp ~/.rvm/src/$src_dir/ext/openssl/openssl_missing.* ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+    cp ~/.rvm/src/$src_dir/ext/openssl/ossl_hmac.c ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
+    src_dir="ruby-1.8.6-p$(__rvm_db "ruby_1.8.6_patch_level")"
+    if [[ ! -d "$HOME/.rvm/src/$src_dir/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p383 > /dev/null ; fi
+    cp ~/.rvm/src/$src_dir/ext/readline/* ~/.rvm/src/ruby-1.8.5-p231/ext/readline/
+    unset src_dir
   fi
 
   if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
@@ -90,8 +93,9 @@ __rvm_install_source() {
 
   $rvm_scripts_path/log "info" "Installation of $rvm_ruby_string is complete."
 
-  GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
-  GEM_PATH="$rvm_ruby_gem_path" ; export GEM_PATH
+  export GEM_HOME="$rvm_ruby_gem_home"
+  export GEM_PATH="$rvm_ruby_gem_path"
+  export BUNDLE_PATH="$rvm_ruby_gem_home"
 
   __rvm_rubygems_setup
   __rvm_bin_script
@@ -151,12 +155,12 @@ __rvm_install_ruby() {
         for binary_name in $(echo $binaries); do
           # if [[ $binary_name != "gem" ]] ; then prefix="-S" ; fi
           ruby_wrapper=$(cat <<RubyWrapper
-#!/bin/bash
+#!/usr/bin/env bash
 
-GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
-GEM_PATH="$rvm_ruby_gem_path" ; export GEM_PATH
-MY_RUBY_HOME="$rvm_ruby_home" ; export MY_RUBY_HOME
-PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:\$PATH" ; export PATH
+export GEM_HOME="$rvm_ruby_gem_home"
+export GEM_PATH="$rvm_ruby_gem_path"
+export MY_RUBY_HOME="$rvm_ruby_home"
+export PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:\$PATH"
 
 exec $macruby_path/mac$binary_name $prefix "\$@"
 RubyWrapper
@@ -254,7 +258,7 @@ RubyWrapper
       __rvm_unset_ruby_variables ; rvm_ruby_string="$original_string" ; __rvm_select
       unset original_string
 
-      unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
+      unset BUNDLE_PATH GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
 
@@ -327,10 +331,11 @@ RubyWrapper
         ruby_wrapper=$(cat <<RubyWrapper
 #!/usr/bin/env bash
 
-GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
-GEM_PATH="$rvm_ruby_gem_path" ; export GEM_PATH
-MY_RUBY_HOME="$rvm_ruby_home" ; export MY_RUBY_HOME
-PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:\$PATH" ; export PATH
+export GEM_HOME="$rvm_ruby_gem_home"
+export GEM_PATH="$rvm_ruby_gem_path"
+export BUNDLE_PATH="$rvm_ruby_gem_home"
+export MY_RUBY_HOME="$rvm_ruby_home"
+export PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:\$PATH"
 
 exec $rvm_ruby_home/bin/rbx $prefix$binary_name "\$@"
 RubyWrapper
@@ -547,10 +552,11 @@ RubyWrapper
         ruby_wrapper=$(cat <<RubyWrapper
 #!/bin/bash
 
-GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
-GEM_PATH="$rvm_ruby_gem_path" ; export GEM_PATH
-MY_RUBY_HOME="$rvm_ruby_home" ; export MY_RUBY_HOME
-PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:\$PATH" ; export PATH
+export GEM_HOME="$rvm_ruby_gem_home"
+export GEM_PATH="$rvm_ruby_gem_path"
+export BUNDLE_PATH="$rvm_ruby_gem_home"
+export MY_RUBY_HOME="$rvm_ruby_home"
+export PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:\$PATH"
 
 exec mono $rvm_ruby_home/bin/ir.exe $binary_path "\$@"
 RubyWrapper
@@ -570,7 +576,7 @@ RubyWrapper
 
     mput|shyouhei)
       if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
-      unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
+      unset BUNDLE_PATH GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
 
@@ -626,8 +632,9 @@ RubyWrapper
 
       $rvm_scripts_path/log "info" "Installation of $rvm_ruby_string is complete."
 
-      GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
-      GEM_PATH="$rvm_ruby_gem_path" ; export GEM_PATH
+      export GEM_HOME="$rvm_ruby_gem_home"
+      export GEM_PATH="$rvm_ruby_gem_path"
+      export BUNDLE_PATH="$rvm_ruby_gem_home"
 
       __rvm_rubygems_setup
       __rvm_bin_script
@@ -823,10 +830,12 @@ __rvm_post_install() {
   $rvm_scripts_path/log "info" "Installing gems for $rvm_ruby_string."
 
   for rvm_gem_name in rake ; do
-    home="$GEM_HOME" ; export GEM_HOME="$rvm_ruby_global_gems_path"
-    path="$GEM_PATH" ; export GEM_PATH="$rvm_ruby_global_gems_path"
+    home="$GEM_HOME" ; path="$GEM_PATH" # Save
+    export GEM_HOME="$rvm_ruby_global_gems_path"
+    export GEM_PATH="$rvm_ruby_global_gems_path"
+    export BUNDLE_PATH="$rvm_ruby_global_gems_path"
     __rvm_run "gems.install" "$rvm_ruby_home/bin/gem install $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name"
-    export GEM_HOME="$home" ; export GEM_PATH="$path" ; unset home path
+    export GEM_HOME="$home" ; export GEM_PATH="$path" ; export BUNDLE_PATH="$home" ; unset home path
   done ; unset rvm_gem_name
 
   $rvm_scripts_path/log "info" "Installation of gems for $rvm_ruby_string is complete."
@@ -848,10 +857,12 @@ __rvm_rubygems_setup() {
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
     cp $rvm_ruby_src_path/bin/gem $rvm_ruby_home/bin/gem
-    home="$GEM_HOME" ; export GEM_HOME="$rvm_ruby_global_gems_path"
-    path="$GEM_PATH" ; export GEM_PATH="$rvm_ruby_global_gems_path"
+    home="$GEM_HOME" ; path="$GEM_PATH" # Save
+    export GEM_HOME="$rvm_ruby_global_gems_path"
+    export GEM_PATH="$rvm_ruby_global_gems_path"
+    export BUNDLE_PATH="$rvm_ruby_global_gems_path"
     __rvm_run "rubygems.update" "$rvm_ruby_home/bin/gem update --system" "Updating rubygems for $rvm_ruby_string"
-    export GEM_HOME="$home" ; export GEM_PATH="$path" ; unset home path
+    export GEM_HOME="$home" ; export GEM_PATH="$path" ; export BUNDLE_PATH="$home" unset home path
 
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
@@ -881,7 +892,7 @@ __rvm_rubygems_setup() {
 
     builtin cd "$rvm_src_path/$rvm_gem_package_name"
 
-    __rvm_run "rubygems.install" "GEM_PATH=$rvm_ruby_gem_path GEM_HOME=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby $rvm_src_path/$rvm_gem_package_name/setup.rb" "Installing rubygems for $rvm_ruby_home/bin/ruby"
+    __rvm_run "rubygems.install" "GEM_PATH=$rvm_ruby_gem_path GEM_HOME=$rvm_ruby_gem_home BUNDLE_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby $rvm_src_path/$rvm_gem_package_name/setup.rb" "Installing rubygems for $rvm_ruby_home/bin/ruby"
     result=$?
     if [[ $result -eq 0 ]] ; then
       $rvm_scripts_path/log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
@@ -922,9 +933,9 @@ __rvm_inject_gem_env() {
   __rvm_actual_file $1
   if [[ -f "$actual_file" ]] ; then
     if [[ ! -z "$(head -n 1 $actual_file | awk '/[j]*ruby/')" ]] ; then
-      string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_ruby_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_ruby_gem_path'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:' + ENV['PATH']"
+      string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_ruby_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_ruby_gem_path'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:' + ENV['PATH']\nENV['BUNDLE_PATH']=ENV['BUNDLE_PATH'] || '$rvm_ruby_gem_home'\n"
     elif [[ ! -z "$(head -n 1 $actual_file | awk '/bash/')" ]] ; then
-      string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_path'}\nPATH=$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH"
+      string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_path'}\nPATH=$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH\nBUNDLE_PATH=\${BUNDLE_PATH:-'$rvm_ruby_gem_home'}\n"
     fi
     if [[ ! -z "$string" ]] ; then
       awk "NR==2 {print \"$string\"} {print}" "$actual_file" > "$actual_file.new"

data/scripts/notes

@@ -45,8 +45,10 @@ if [[ "Linux" = "$system" ]] ; then
     echo -e "\n       $ pacman -Sy mono"
 
   elif [[ ! -z "$rvm_yum_binary" ]] ; then
-    echo -e "    $item For ree (if you wish to use it) you will need:"
-    echo -e "\n       $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
+    echo -e "    $item For MRI/ree (if you wish to use it) you will need:"
+    echo -e "\n       $ yum install -y gcc-c++ patch readline readline-devel iconv-devel"
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "\n       $ yum install -y java"
 
   else
     echo -e "    $item For JRuby (if you wish to use it) you will need:"

data/scripts/rvm

@@ -7,6 +7,8 @@
 if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   unset rvm_reload_flag
 
+  mkdir -p $HOME/.gem/cache
+
   if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
   if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 

data/scripts/rvm-install

@@ -73,7 +73,7 @@ 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}"
 
-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 $rvm_gems_path/cache $rvm_gems_path/doc
+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
   cp -f "$source_path/$file" "$rvm_path/"
@@ -179,7 +179,7 @@ if [[ "root" != "$(whoami)" ]] ; then
   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   Put everything below and above that line into your .bash_profile, and delete that line and below from .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   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

data/scripts/selector

@@ -238,13 +238,13 @@ __rvm_use() {
     else
       rvm_ruby_interpreter="system"
       $rvm_scripts_path/log "warn" "no default rvm specified, defaulting to pre-rvm system."
-      unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
+      unset GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
       if [[ -s $rvm_config_path/system ]] ; then source $rvm_config_path/system ; fi
     fi
 
   elif [[ "system" = "$rvm_ruby_interpreter" ]] ; then
 
-    unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
+    unset GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
     new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
     new_path="$rvm_bin_path:$new_path"
     if [[ -s $rvm_config_path/system ]] ; then
@@ -271,11 +271,12 @@ __rvm_use() {
   else
     GEM_HOME="$rvm_ruby_gem_home"
     GEM_PATH="$rvm_ruby_gem_path"
+    BUNDLE_PATH="$rvm_ruby_gem_home"
     MY_RUBY_HOME="$rvm_ruby_home"
     RUBY_VERSION="$rvm_ruby_string"
     IRBRC="$rvm_ruby_irbrc"
 
-    export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
+    export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
 
     if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi
 
@@ -312,11 +313,11 @@ __rvm_use() {
       rm -f $rvm_bin_path/default*
     else
       RUBY_VERSION="$($rvm_ruby_home/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
-      export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
+      export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
 
       echo "export PATH=\"$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_bin_path:\$PATH\"" > $rvm_config_path/default
 
-      for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name MAGLEV_HOME ; do
+      for variable in RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name MAGLEV_HOME ; do
         eval "export $variable"
         eval value=\$${variable}
         if [[ ! -z "$value" ]] ; then
@@ -334,6 +335,7 @@ __rvm_use() {
   if [[ ! -z "$rvm_symlink_name" ]]   ; then $rvm_scripts_path/symlink "$rvm_symlink_name" ; unset rvm_symlink_name   ; fi
   if [[ ! -z "$rvm_editor_flag" ]]    ; then $rvm_scripts_path/symlink "editor"            ; unset rvm_editor_flag    ; fi
   if [[ ! -z "$rvm_passenger_flag" ]] ; then $rvm_scripts_path/symlink "passenger"         ; unset rvm_passenger_flag ; fi
+  if [[ ! -z "$rvm_rvmrc_flag" ]]     ; then __rvm_set_rvmrc ; fi
   # Export ruby string and gem set name for extrnal scripts to take advantage of them.
   if [[ ! -z "$rvm_ruby_string" ]]    ; then export rvm_ruby_string  ; fi
   if [[ ! -z "$rvm_gem_set_name" ]]   ; then export rvm_gem_set_name ; fi

data/scripts/update

@@ -73,7 +73,7 @@ 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}"
 
-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 $rvm_gems_path/cache $rvm_gems_path/doc
+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
   cp -f "$source_path/$file" "$rvm_path/"
@@ -179,7 +179,7 @@ if [[ "root" != "$(whoami)" ]] ; then
   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   Put everything below and above that line into your .bash_profile, and delete that line and below from .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   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

data/scripts/utility

@@ -53,8 +53,10 @@ binaries:
 environment:
   GEM_HOME:     "$GEM_HOME"
   GEM_PATH:     "$GEM_PATH"
+  BUNDLE_PATH:  "$BUNDLE_PATH"
   MY_RUBY_HOME: "$MY_RUBY_HOME"
   IRBRC:        "$IRBRC"
+
 Info
 if [[ ! -z "$MAGLEV_HOME" ]] ; then echo -e "  MAGLEV_HOME: \"$MAGLEV_HOME\"" ; fi
 
@@ -158,6 +160,16 @@ __rvm_unset_ruby_variables() {
   unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_gem_path
 }
 
+__rvm_set_rvmrc() {
+  if [[ "$HOME" != "$(pwd)" ]] ; then
+    if [[ -s .rvmrc ]] ; then
+      mv .rvmrc .rvmrc.$(date +%m.%d.%Y-%H:%M:%S)
+    fi
+    echo "rvm use $(basename $rvm_ruby_gem_home)" > .rvmrc
+  else
+    echo -e "Not setting a project specific rvmrc file, currently in the HOME directory."
+  fi
+}
 __rvm_load_rvmrc() {
   if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
   if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
@@ -177,14 +189,17 @@ __rvm_bin_scripts() {
 # Write the bin/ wrapper script for currently selected ruby.
 # TODO: Adjust binscript to be able to handle all rubies not just the standard interpreteres.
 __rvm_bin_script() {
+
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
+
 ruby_wrapper=$(cat <<RubyWrapper
-#!/bin/bash
+#!/usr/bin/env bash
 
-GEM_HOME=$rvm_ruby_gem_home ; export GEM_HOME
-GEM_PATH=$rvm_ruby_gem_path ; export GEM_PATH
-MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME
-PATH=$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_bin_path:\$PATH ; export PATH
+export GEM_HOME="$rvm_ruby_gem_home"
+export GEM_PATH="$rvm_ruby_gem_path"
+export BUNDLE_PATH="$rvm_ruby_gem_home"
+export MY_RUBY_HOME="$rvm_ruby_home"
+export PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_bin_path:\$PATH"
 
 exec "$rvm_ruby_binary" "\$@"
 RubyWrapper
@@ -198,7 +213,7 @@ RubyWrapper
 # Load default ruby, if default is not set load system ruby.
 __rvm_load_defaults() {
   if [[ ! -s "$rvm_config_path/system" ]] ; then
-    for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME ; do
+    for variable in RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME ; do
       eval value=\$${variable}
       if [[ -z "$value" ]] ; then
         echo "unset ${variable}" >> $rvm_config_path/system
@@ -241,7 +256,7 @@ __rvm_reset() {
   PATH="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
   PATH="$rvm_bin_path:$PATH" ; export PATH
 
-  for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME ; do unset $variable ; done
+  for variable in RUBY_VERSION GEM_HOME BUNDLE_PATH MY_RUBY_HOME ; do unset $variable ; done
 
   for flag in default passenger editor ; do rm -f "$rvm_bin_path"/${flag}_* ; done
 
@@ -748,11 +763,20 @@ __rvm_gems_select() {
 
   rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
 
-  # TODO: Remove next line after a few releases.
-  mkdir -p $rvm_gems_path/cache $rvm_gems_path/doc
+  # TODO: Remove next section after a several releases.
+  # Migrate original rvm global gem cache directory to $HOME/.gem/cache
+  if [[ -d "$rvm_path/gems/cache" ]] && [[ ! -L "$rvm_path/gems/cache" ]] ; then
+    if [[ ! -z "$(ls -A "$rvm_path"/gems/cache/)" ]] ; then
+      mv $rvm_path/gems/cache/* $HOME/.gem/cache/
+    fi
+    rmdir $rvm_path/gems/cache
+  fi
+  rm -f "$rvm_path/gems/cache"
+  ln -nfs "$HOME/.gem/cache" "$rvm_path/gems/cache"
+  # /TODO
+
   # Careful not to nuke system gems cache.
   if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ ! -z "$(echo $rvm_ruby_gem_home | awk '/rvm/')" ]] ; then
-    # Global gems cache
     # Ensure that the ruby gem home exists.
     mkdir -p "$rvm_ruby_gem_home"
 
@@ -760,15 +784,14 @@ __rvm_gems_select() {
     # 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/* "$rvm_gems_path"/cache/
+        mv "$rvm_ruby_gem_home"/cache/* "$HOME"/.gem/cache/
       fi
-      rm -rf "$rvm_ruby_gem_home/cache"
+      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 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 "$rvm_gems_path/cache" "$rvm_ruby_gem_home/cache"
+      ln -nfs "$HOME/.gem/cache" "$rvm_ruby_gem_home/cache"
     fi
   fi ; export rvm_ruby_gem_path rvm_ruby_gem_home
 }
@@ -786,8 +809,9 @@ __rvm_gems_use() {
       $rvm_scripts_path/log "info" "gems(et) : ${rvm_gem_set_name:-default}"
     fi
 
-    GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
-    GEM_PATH="$rvm_ruby_gem_path" ; export GEM_PATH
+    export GEM_HOME="$rvm_ruby_gem_home"
+    export GEM_PATH="$rvm_ruby_gem_path"
+    export BUNDLE_PATH="$rvm_ruby_gem_home"
     __rvm_use
   fi
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 -05:00
+date: 2010-02-13 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []