rvm 1.0.22 → 1.0.23

data/binscripts/rvmsudo

@@ -7,10 +7,6 @@ esac
 
 prefix="PATH='$PATH'"
 
-if [[ -n "${BUNDLE_PATH:-""}" ]] ; then
-  prefix="BUNDLE_PATH='$BUNDLE_PATH' $prefix"
-fi
-
 if [[ -n "${GEM_HOME:-""}" ]] ; then
   prefix="GEM_HOME='$GEM_HOME' $prefix"
 fi

data/config/db

@@ -30,6 +30,7 @@ rbx_version=head
 rbx_1.0.0_patch_level=20100514
 rbx_1.0.1_patch_level=20100603
 rbx_1.1.0_patch_level=20100923
+rbx_1.1.1_patch_level=20101116
 rbx_url=http://asset.rubini.us
 rubinius_repo_url=git://github.com/evanphx/rubinius.git
 http://rubini.us/download/latest

data/config/known

@@ -27,8 +27,9 @@ jruby-head
 
 # Rubinius
 rbx-1.0.1
-rbx[-1.1.0]
-rbx-head
+rbx-1.1.0
+rbx-1.1.1
+rbx[-head]
 
 # Ruby Enterprise Edition
 ree-1.8.6

data/config/md5

@@ -135,3 +135,4 @@ rubygems-1.3.6.tgz=789ca8e9ad1d4d3fe5f0534fcc038a0d
 rubygems-1.3.7.tgz=e85cfadd025ff6ab689375adbf344bbe
 zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
 zlib-1.2.5.tar.gz=c735eab2d659a96e5a594c9e8541ad63
+rubinius-1.1.1-20101116.tar.gz=b39f618eeba37c3aff215da8bca55fd7

data/examples/rvmrc

@@ -45,3 +45,5 @@
 # Make Flags, I have 8 cpu's so I might use 7 make threads:
 #export rvm_make_flags="-j7"
 
+# Automatically trust project .rvmrc files
+#  export rvm_trust_rvmrcs_flag=1

data/help/info

@@ -34,7 +34,6 @@ Example:
     environment:
       GEM_HOME:     "/Users/wayne/.rvm/gems/ruby-1.9.2-head"
       GEM_PATH:     "/Users/wayne/.rvm/gems/ruby-1.9.2-head:/Users/wayne/.rvm/gems/ruby-1.9.2-head@global"
-      BUNDLE_PATH:  "/Users/wayne/.rvm/gems/ruby-1.9.2-head"
       MY_RUBY_HOME: "/Users/wayne/.rvm/rubies/ruby-1.9.2-head"
       IRBRC:        "/Users/wayne/.rvm/rubies/ruby-1.9.2-head/.irbrc"
       RUBYOPT:      ""
@@ -55,7 +54,6 @@ Example:
     environment:
       GEM_HOME:     "/Users/wayne/.rvm/gems/ruby-1.8.7-p249"
       GEM_PATH:     "/Users/wayne/.rvm/gems/ruby-1.8.7-p249:/Users/wayne/.rvm/gems/ruby-1.8.7-p249@global"
-      BUNDLE_PATH:  "/Users/wayne/.rvm/gems/ruby-1.8.7-p249"
       MY_RUBY_HOME: "/Users/wayne/.rvm/rubies/ruby-1.8.7-p249"
       IRBRC:        "/Users/wayne/.rvm/rubies/ruby-1.8.7-p249/.irbrc"
       RUBYOPT:      ""

data/install

@@ -161,6 +161,8 @@ upgrade_notes()
 
 Upgrade Notes
 
+  * rvm_trust_rvmrcs has been changed to rvm_trust_rvmrcs_flag for consistency
+
   * Ruby package dependency list for your OS is given by:
     rvm notes
 

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 22
+:patch: 23

data/lib/rvm/environment/tools.rb

@@ -11,7 +11,7 @@ module RVM
       path_identifier = rvm(:tools, "path-identifier", path.to_s)
       if path_identifier.exit_status == 2
         error_message = "The rvmrc located in '#{path}' could not be loaded, likely due to trust mechanisms."
-        error_message << " Please run 'rvm rvmrc {trust,untrust} \"#{path}\"' to continue, or set rvm_trust_rvmrcs to 1."
+        error_message << " Please run 'rvm rvmrc {trust,untrust} \"#{path}\"' to continue, or set rvm_trust_rvmrcs_flag to 1."
         raise ErrorLoadingRVMRC, error_message
       end
       return normalize(path_identifier.stdout)

data/lib/rvm/environment/utility.rb

@@ -162,7 +162,6 @@ module RVM
       if compatible_with_current?(result)
         ENV['GEM_HOME']    = result[:GEM_HOME]
         ENV['GEM_PATH']    = result[:GEM_PATH]
-        ENV['BUNDLE_PATH'] = result[:BUNDLE_PATH]
         Gem.clear_paths if defined?(Gem)
       else
         raise IncompatibleRubyError.new(result, "The given ruby environment requires #{ruby_string(result)} (versus #{self.class.current_ruby_string})")

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.22"
+  s.version = "1.0.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-11-16}
+  s.date = %q{2010-11-17}
   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/base

@@ -42,7 +42,7 @@ else
   __array_start=0
 fi
 
-export BUNDLE_PATH GEM_HOME GEM_PATH rvm_action rvm_alias_expanded rvm_archflags rvm_archive_extension rvm_bin_flag rvm_bin_path rvm_clang_flag rvm_configure_flags rvm_debug_flag rvm_default_flag rvm_delete_flag rvm_docs_type rvm_dump_environment_flag rvm_error_message rvm_expanding_aliases rvm_file_name rvm_gemdir_flag rvm_gemset_name rvm_gemstone_package_file rvm_gemstone_url rvm_head_flag rvm_hook rvm_install_arguments rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_loaded_flag rvm_make_flags rvm_niceness rvm_nightly_flag rvm_only_path_flag rvm_parse_break rvm_patch_names rvm_patch_original_pwd rvm_pretty_print_flag rvm_prior_cc rvm_proxy rvm_quiet_flag rvm_ree_options rvm_reload_flag rvm_remove_flag rvm_ruby_alias rvm_ruby_aliases rvm_ruby_args rvm_ruby_binary rvm_ruby_bits rvm_ruby_configure rvm_ruby_file rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_global_gems_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_load_path rvm_ruby_major_version rvm_ruby_make rvm_ruby_make_install rvm_ruby_minor_version rvm_ruby_mode rvm_ruby_name rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_patch rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_require rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_sha rvm_ruby_string rvm_ruby_strings rvm_ruby_tag rvm_ruby_url rvm_ruby_user_tag rvm_ruby_version rvm_script_name rvm_sdk rvm_silent_flag rvm_sticky_flag rvm_system_flag rvm_token rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_wrapper_name
+export GEM_HOME GEM_PATH rvm_action rvm_alias_expanded rvm_archflags rvm_archive_extension rvm_bin_flag rvm_bin_path rvm_clang_flag rvm_configure_flags rvm_debug_flag rvm_default_flag rvm_delete_flag rvm_docs_type rvm_dump_environment_flag rvm_error_message rvm_expanding_aliases rvm_file_name rvm_gemdir_flag rvm_gemset_name rvm_gemstone_package_file rvm_gemstone_url rvm_head_flag rvm_hook rvm_install_arguments rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_loaded_flag rvm_make_flags rvm_niceness rvm_nightly_flag rvm_only_path_flag rvm_parse_break rvm_patch_names rvm_patch_original_pwd rvm_pretty_print_flag rvm_prior_cc rvm_proxy rvm_quiet_flag rvm_ree_options rvm_reload_flag rvm_remove_flag rvm_ruby_alias rvm_ruby_aliases rvm_ruby_args rvm_ruby_binary rvm_ruby_bits rvm_ruby_configure rvm_ruby_file rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_global_gems_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_load_path rvm_ruby_major_version rvm_ruby_make rvm_ruby_make_install rvm_ruby_minor_version rvm_ruby_mode rvm_ruby_name rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_patch rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_require rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_sha rvm_ruby_string rvm_ruby_strings rvm_ruby_tag rvm_ruby_url rvm_ruby_user_tag rvm_ruby_version rvm_script_name rvm_sdk rvm_silent_flag rvm_sticky_flag rvm_system_flag rvm_token rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_wrapper_name
 
 
 # Cleanup tmp on exit.

data/scripts/cd

@@ -48,7 +48,7 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
     # This functionality is opt-in by setting rvm_cd_complete_flag=1 in ~/.rvmrc
     # Generic bash cd completion seems to work great for most, so this is only
     # for those that have some issues with that.
-    if [[ ${rvm_cd_complete_flag} = 1 ]] ; then
+    if [[ ${rvm_cd_complete_flag:-0} = 1 ]] ; then
 
       # If $CDPATH is set, bash should tab-complete based on directories in those paths,
       # but with the cd function above, the built-in tab-complete ignores $CDPATH. This

data/scripts/cli

@@ -653,7 +653,7 @@ rvm()
 
   rvm_action="${rvm_action:-usage}"
 
-  export BUNDLE_PATH GEM_HOME GEM_PATH rvm_action rvm_archflags rvm_bin_flag rvm_bin_path rvm_clang_flag rvm_configure_flags rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_dump_environment_flag rvm_error_message rvm_file_name rvm_gemdir_flag rvm_gemset_name rvm_head_flag rvm_install_arguments rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_loaded_flag rvm_make_flags rvm_niceness rvm_only_path_flag rvm_parse_break rvm_patch_names rvm_patch_original_pwd rvm_pretty_print_flag rvm_prior_cc rvm_proxy rvm_quiet_flag rvm_ree_options rvm_reload_flag rvm_remove_flag rvm_ruby_alias rvm_ruby_aliases rvm_ruby_args rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_load_path rvm_ruby_make rvm_ruby_make_install rvm_ruby_patch_level rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_require rvm_ruby_string rvm_ruby_strings rvm_ruby_version rvm_script_name rvm_sdk rvm_silent_flag rvm_system_flag rvm_token rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_wrapper_name
+  export GEM_HOME GEM_PATH rvm_action rvm_archflags rvm_bin_flag rvm_bin_path rvm_clang_flag rvm_configure_flags rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_dump_environment_flag rvm_error_message rvm_file_name rvm_gemdir_flag rvm_gemset_name rvm_head_flag rvm_install_arguments rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_loaded_flag rvm_make_flags rvm_niceness rvm_only_path_flag rvm_parse_break rvm_patch_names rvm_patch_original_pwd rvm_pretty_print_flag rvm_prior_cc rvm_proxy rvm_quiet_flag rvm_ree_options rvm_reload_flag rvm_remove_flag rvm_ruby_alias rvm_ruby_aliases rvm_ruby_args rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_load_path rvm_ruby_make rvm_ruby_make_install rvm_ruby_patch_level rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_require rvm_ruby_string rvm_ruby_strings rvm_ruby_version rvm_script_name rvm_sdk rvm_silent_flag rvm_system_flag rvm_token rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_wrapper_name
 
   case "$rvm_action" in
     use)             __rvm_use        ;;
@@ -728,9 +728,8 @@ rvm()
           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:$rvm_ruby_gem_home${rvm_gemset_separator:-"@"}global"
-            export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
+            export rvm_ruby_gem_home GEM_HOME GEM_PATH
           fi
           unset gem_prefix
         fi

data/scripts/gemsets

@@ -471,7 +471,6 @@ gemset_unpack()
   if [[ -n "$rvm_ruby_gem_home" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
     export GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
-    export BUNDLE_PATH="$rvm_ruby_gem_home"
   fi
 
   "$rvm_path/scripts/log" "info" \
@@ -510,7 +509,6 @@ gemset_export()
   if [[ -n "$rvm_ruby_gem_home" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
     export GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
-    export BUNDLE_PATH="$rvm_ruby_gem_home"
   fi
 
   if [[ -z "$rvm_file_name" ]] ; then
@@ -560,7 +558,6 @@ gemset_import()
   if [[ -n "${rvm_ruby_gem_home:-""}" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
     export GEM_PATH="$rvm_ruby_gem_home"
-    export BUNDLE_PATH="$rvm_ruby_gem_home"
   else
     rvm_ruby_gem_home=${GEM_HOME:-$(gem env gemdir)}
   fi
@@ -738,7 +735,7 @@ gem_install()
 
     if [[ -n "$rvm_ruby_gem_home" && "$rvm_ruby_gem_home" != "${rvm_gems_path:-"$rvm_path/gems"}" ]] ; then
 
-      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' BUNDLE_PATH='${rvm_ruby_gem_home}' $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' $gem_prefix gem install $gems_args $rvm_gem_options $gem_postfix $vars"
 
     else
 

data/scripts/info

@@ -82,7 +82,6 @@ info_environment()
     PATH:         \"${PATH:-""}\"
     GEM_HOME:     \"${GEM_HOME:-""}\"
     GEM_PATH:     \"${GEM_PATH:-""}\"
-    BUNDLE_PATH:  \"${BUNDLE_PATH:-""}\"
     MY_RUBY_HOME: \"${MY_RUBY_HOME:-""}\"
     IRBRC:        \"${IRBRC:-""}\"
     RUBYOPT:      \"${RUBYOPT:-""}\"

data/scripts/install

@@ -161,6 +161,8 @@ upgrade_notes()
 
 Upgrade Notes
 
+  * rvm_trust_rvmrcs has been changed to rvm_trust_rvmrcs_flag for consistency
+
   * Ruby package dependency list for your OS is given by:
     rvm notes
 

data/scripts/manage

@@ -262,7 +262,6 @@ __rvm_install_source()
 
   export GEM_HOME="$rvm_ruby_gem_home"
   export GEM_PATH="$rvm_ruby_gem_path"
-  export BUNDLE_PATH="$rvm_ruby_gem_home"
 
   __rvm_rubygems_setup
   result=$?
@@ -325,7 +324,7 @@ __rvm_install_ruby()
           fi
 
         elif [[ "nightly" = "$rvm_ruby_version" ]] ; then
-          macruby_path="/Library/Frameworks/MacRuby.framework/Versions/0.6/usr/bin"
+          macruby_path="/Library/Frameworks/MacRuby.framework/Versions/0.8/usr/bin"
           # TODO: Separated nightly from head.
 
           "$rvm_path/scripts/log" "info" "Retrieving the latest nightly macruby build..."
@@ -341,7 +340,7 @@ __rvm_install_ruby()
           fi
 
           mv "${rvm_archives_path:-"$rvm_path/archives"}/macruby_nightly-latest.pkg" \
-            "$rvm_archives_path/macruby_nightly.pkg"
+            "${rvm_archives_path:-"$rvm_path/archives"}/macruby_nightly.pkg"
 
           __rvm_run "macruby/extract" \
             "sudo /usr/sbin/installer -pkg '${rvm_archives_path:-"$rvm_path/archives"}/macruby_nightly.pkg' -target '/'"
@@ -540,7 +539,7 @@ RubyWrapper
       # TODO: use 'rvm gems load' here:
       unset CFLAGS LDFLAGS ARCHFLAGS # Important.
 
-      unset BUNDLE_PATH GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
+      unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
 
       __rvm_remove_rvm_from_path
 
@@ -1048,7 +1047,7 @@ RubyWrapper
 
       if [[ ${rvm_make_flags_flag:-0} -eq 1 ]] ; then __rvm_make_flags ; fi
 
-      unset BUNDLE_PATH GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
+      unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
 
       __rvm_remove_rvm_from_path
 
@@ -1151,7 +1150,6 @@ RubyWrapper
 
       export GEM_HOME="$rvm_ruby_gem_home"
       export GEM_PATH="$rvm_ruby_gem_path"
-      export BUNDLE_PATH="$rvm_ruby_gem_home"
 
       __rvm_rubygems_setup
 
@@ -1853,15 +1851,15 @@ __rvm_rubygems_setup()
 
     for dir in $rvm_ruby_global_gems_path $rvm_ruby_gem_home ; do
 
-      export GEM_HOME="$dir" ; export GEM_PATH="$dir" ; export BUNDLE_PATH="$dir"
+      export GEM_HOME="$dir" ; export GEM_PATH="$dir"
 
       __rvm_run "rubygems.update" \
         "$rvm_ruby_home/bin/gem update --system" "$rvm_ruby_string - updating #rubygems for $dir"
 
     done
 
-    GEM_HOME="$home" ; GEM_PATH="$path" ; BUNDLE_PATH="$home"
-    export GEM_HOME GEM_PATH BUNDLE_PATH
+    GEM_HOME="$home" ; GEM_PATH="$path"
+    export GEM_HOME GEM_PATH
 
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
 
@@ -1940,7 +1938,7 @@ __rvm_rubygems_setup()
     builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name"
 
     __rvm_run "rubygems.install" \
-      "GEM_PATH='$rvm_ruby_gem_path:$rvm_ruby_global_gems_path' GEM_HOME='$rvm_ruby_gem_home' BUNDLE_PATH='$rvm_ruby_gem_home' $rvm_ruby_home/bin/ruby ${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name/setup.rb"
+      "GEM_PATH='$rvm_ruby_gem_path:$rvm_ruby_global_gems_path' GEM_HOME='$rvm_ruby_gem_home' $rvm_ruby_home/bin/ruby ${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name/setup.rb"
     result=$?
 
     if [[ $result -gt 0 ]] ; then
@@ -2004,11 +2002,11 @@ __rvm_inject_gem_env()
 
     if [[ -n "$(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_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:' + ENV['PATH']\nENV['BUNDLE_PATH']=ENV['BUNDLE_PATH'] || '$rvm_ruby_gem_home'\n"
+      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_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:' + ENV['PATH']\n"
 
     elif [[ -n "$(head -n 1 "$actual_file" | awk '/bash/')" ]] ; then
 
-      string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_home:$rvm_ruby_global_gems_path'}\nPATH=$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:\$PATH\nBUNDLE_PATH=\${BUNDLE_PATH:-'$rvm_ruby_gem_home'}\n"
+      string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_home:$rvm_ruby_global_gems_path'}\nPATH=$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:\$PATH\n"
 
     fi
 

data/scripts/rvm-install

@@ -161,6 +161,8 @@ upgrade_notes()
 
 Upgrade Notes
 
+  * rvm_trust_rvmrcs has been changed to rvm_trust_rvmrcs_flag for consistency
+
   * Ruby package dependency list for your OS is given by:
     rvm notes
 

data/scripts/selector

@@ -4,7 +4,7 @@
 __rvm_select()
 {
   # Set Variable Defaults
-  export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
+  export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
 
   if [[ -z "${rvm_ruby_string:-""}" ]] ; then
     [[ -n "${rvm_ruby_interpreter:-""}" ]] && rvm_ruby_string="$rvm_ruby_interpreter"
@@ -267,7 +267,7 @@ __rvm_use()
 
   if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
 
-    unset GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
+    unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
 
     new_path="$(__rvm_remove_rvm_from_path ; printf "$PATH"):${rvm_bin_path:-"$rvm_path/bin"}"
 
@@ -309,12 +309,11 @@ __rvm_use()
   else
     GEM_HOME="$rvm_ruby_gem_home"
     GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_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 BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
+    export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
 
     IRBRC=${IRBRC:-""} ; if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi
 
@@ -380,7 +379,7 @@ __rvm_use()
 
       else
         RUBY_VERSION="$("$rvm_ruby_home/bin/ruby" -v | sed 's#^\(.*\) (.*$#\1#')"
-        export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
+        export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
         "$rvm_path/scripts/alias" delete default &> /dev/null
         "$rvm_path/scripts/alias" create default "$environment_id" >& /dev/null
         \ln -nfs "$rvm_path/environments/$environment_id" "$rvm_path/environments/default"
@@ -847,10 +846,9 @@ __rvm_gemset_use()
     rvm_ruby_global_gems_path="${rvm_ruby_gem_home%%${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}global"
 
     GEM_HOME="$rvm_ruby_gem_home"
-    BUNDLE_PATH="$rvm_ruby_gem_home"
     GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
 
-    export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
+    export rvm_ruby_gem_home GEM_HOME GEM_PATH
 
     __rvm_use # Now ensure the selection takes effect for the environment.
   fi
@@ -868,11 +866,9 @@ __rvm_gemset_clear()
 
   GEM_HOME=$rvm_ruby_gem_home
 
-  BUNDLE_PATH="$rvm_ruby_gem_home"
-
   GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
 
-  export rvm_ruby_gem_home rvm_ruby_global_gems_path GEM_HOME BUNDLE_PATH GEM_PATH
+  export rvm_ruby_gem_home rvm_ruby_global_gems_path GEM_HOME GEM_PATH
 
   __rvm_use # Now ensure the selection takes effect for the environment.
 }

data/scripts/update

@@ -161,6 +161,8 @@ upgrade_notes()
 
 Upgrade Notes
 
+  * rvm_trust_rvmrcs has been changed to rvm_trust_rvmrcs_flag for consistency
+
   * Ruby package dependency list for your OS is given by:
     rvm notes
 

data/scripts/utility

@@ -1030,7 +1030,7 @@ __rvm_ensure_has_environment_files()
     printf "export PATH=\"${rvm_ruby_gem_home}/bin:${rvm_ruby_global_gems_path}/bin:${rvm_ruby_home}/bin:${rvm_bin_path:-"$rvm_path/bin"}:\$PATH\"\n" \
       > "$file_name"
 
-    for variable in rvm_path RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH \
+    for variable in rvm_path RUBY_VERSION GEM_HOME GEM_PATH \
       MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gemset_name MAGLEV_HOME ; do
 
       eval "export $variable"
@@ -1223,7 +1223,7 @@ __rvm_rvmrc_tools()
       fi
     ;;
     load)
-      rvm_rvmrc_cwd="" rvm_trust_rvmrcs=1  \
+      rvm_rvmrc_cwd="" rvm_trust_rvmrcs_flag=1  \
         __rvm_project_rvmrc "$(dirname "$rvmrc_path")"
     ;;
     *)
@@ -1237,7 +1237,7 @@ __rvm_rvmrc_tools()
 __rvm_check_rvmrc_trustworthiness()
 {
   # Trust when they have the flag... of doom!
-  [[ -z "$1" || "$rvm_trust_rvmrcs" = "1" ]] && return 0
+  [[ -z "$1" || "$rvm_trust_rvmrcs_flag" = "1" ]] && return 0
   value="$(__rvm_rvmrc_stored_trust "$1")"
   if [[ -z "$value" ]] ; then
     __rvm_ask_to_trust "$1"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 1
   - 0
-  - 22
-  version: 1.0.22
+  - 23
+  version: 1.0.23
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -05:00
+date: 2010-11-17 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []