rvm 1.0.14 → 1.0.15

data/binscripts/rvm-prompt

@@ -72,15 +72,19 @@ if [[ -n "$ruby" && -n "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
 
   ruby_string=$(dirname "$ruby" | xargs dirname | xargs basename)
 
-  default_alias="$(rvm alias show default)"
+  if [[ -n "$no_default" ]]; then
 
-  identifier="$(rvm tools identifier)"
+    # Do not display anything if no default flag was provided
+    #   and we are using the default ruby
 
-  # Do not display anything if no default flag was provided
-  #   and we are using the default ruby
-  if [[ -n "$no_default" && "$identifier" = "$default_alias" ]]; then
+    # Only people who explicitely ask for this will have the
+    #   slight performance penalty associated.
 
-    exit 0
+    if [[ "$(rvm tools identifier)" = "$(rvm alias show default)"  ]] ; then
+
+      exit 0
+
+    fi
 
   fi
 

data/config/db

@@ -25,7 +25,7 @@ ruby_1.8.7_patch_level=302
 rubygems_version=1.3.7
 rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
 rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
-rubygems_1.3.7_url=http://rubyforge.org/frs/download.php/70696
+rubygems_1.3.7_url=http://rvm.beginrescueend.com/src/
 rbx_version=1.1.0
 rbx_1.0.0_patch_level=20100514
 rbx_1.0.1_patch_level=20100603
@@ -38,17 +38,17 @@ ree_configure_flags=--dont-install-useful-gems
 ree_1.8.6_patch_level=20090610
 ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677
 ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
-ree_1.8.7_url=http://rubyforge.org/frs/download.php/71096
+ree_1.8.7_url=http://rvm.beginrescueend.com/src/
 ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
 ree_1.8.7_patch_level=2010.02
 jruby_version=1.5.3
 jruby_repo_url=git://github.com/jruby/jruby.git
 jruby_url=http://jruby.org.s3.amazonaws.com/downloads
-macruby_version=0.7
+macruby_version=0.7.1
 macruby_url=http://www.macruby.org/files
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg
-maglev_version=24209
+maglev_version=24407
 maglev_url=http://glass-downloads.gemstone.com/maglev
 maglev_repo_url=git://github.com/MagLev/maglev.git
 shyouhei_repo_url=git://github.com/shyouhei/ruby.git

data/config/known

@@ -36,7 +36,7 @@ ree-1.8.6-head
 ree-1.8.7-head
 
 # MagLev
-maglev[-24209]
+maglev[-24407]
 maglev-head
 
 # Shyouhei head, the default mput
@@ -44,7 +44,7 @@ mput[-head]
 
 # Mac OS X Snow Leopard Only
 macruby-0.6
-macruby-[0.7] # the default macruby
+macruby-[0.7.1] # the default macruby
 macruby-nightly
 macruby-head      # Build from the macruby git repository
 

data/config/md5

@@ -64,6 +64,7 @@ rubygems-1.3.7.tgz=e85cfadd025ff6ab689375adbf344bbe
 MacRuby%200.5.zip=675454a8c7bc19d606d90a726e08427c
 MacRuby%200.6.zip=a80afd3700c88cf95c539fc63b272faf
 MacRuby%200.7.zip=0bb60588c9ec9b1517665743bb05132f
+MacRuby%200.7.1.zip=e8245dcd03c0757dfae7e6fee913947a
 jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
 jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7
 jruby-bin-1.5.0.RC1.tar.gz=47b4ca2a21659d36a2775ade0a2534c4
@@ -81,7 +82,7 @@ zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
 curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
 pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
 ironruby-1.0.zip=7a92888837b3507355ed391dbfc0ab83
-GemStone-24209.Darwin-i386.tar.gz=be17189f4a4a65622d8c3b8261091575
-GemStone-24209.Linux-x86_64.tar.gz=bab53507337aafc0f118b4eb097831e0
-MagLev-24209.Darwin-i386.tar.gz=93fd5b2d31e9a19dc49065ec8755a87f
-MagLev-24209.Linux-x86_64.tar.gz=ecb1c6a94e5b272d7595e6aee673c668
+GemStone-24407.Darwin-i386.tar.gz=2f293e1927b8a1c5a060fe174f7ec614
+GemStone-24407.Linux-x86_64.tar.gz=aa4436623199dba79eb5bc8652316b07
+MagLev-24407.Darwin-i386.tar.gz=4aa0a3c35c63c876c8f786691a20dcb5
+MagLev-24407.Linux-x86_64.tar.gz=ab6928f5a39231efb86253e8b8e00134

data/install

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 set -o errtrace
-set -o errexit
 
 export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
 
@@ -170,6 +169,9 @@ Upgrade Notes
 
   * If you wish to have the 'pretty colors' again, set in ~/.rvmrc:
     export rvm_pretty_print_flag=1
+
+  * If you see the following error message: Unknown alias name: 'default'
+    re-set your default ruby, this is due to a change in how default works.
 "
 }
 
@@ -342,9 +344,9 @@ for file in "${files[@]}" ; do
 
   cp -f "$source_path/binscripts/$file" "${rvm_bin_path:-"$rvm_path/bin"}/"
 
-done
+  chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
 
-chmod +x "${rvm_bin_path:-"$rvm_path/bin"}"/* # TODO: this is quite suboptimal.
+done
 
 #
 # RC Files
@@ -564,7 +566,7 @@ for file in "${files[@]}" ; do
 
 done
 
-printf "\n    Copying manpages into place."
+printf "\n    Copying manpages into place.\n"
 
 files=($(builtin cd "$install_source_path/man" ; \
   find . -maxdepth 1 -mindepth 1 -type f -print))

data/lib/VERSION.yml

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

data/rvm.gemspec

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

@@ -633,9 +633,13 @@ rvm()
 
   __rvm_parse_args "$@"
 
-  rvm_action="${rvm_action:-usage}"
+  result=$?
+
+  if [[ $result -gt 0 ]] ; then
+    return $result
+  fi
 
-  result=0
+  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_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
 

data/scripts/gemsets

@@ -15,7 +15,7 @@ usage()
 
   Action:
 
-    {import,export,create,copy,empty,delete,name,dir,list,gemdir,install,pristine,clear,use,update,unpack,globalcache}
+    {import,export,create,copy,rename,empty,delete,name,dir,list,gemdir,install,pristine,clear,use,update,unpack,globalcache}
 
   Description:
 
@@ -31,7 +31,11 @@ gemset_update()
 
     "$rvm_path/scripts/log" "info" "Running gem update for all rubies and gemsets."
 
-    rvm_ruby_strings="$(builtin cd "${rvm_gems_path:-"$rvm_path/gems"}" ; find . -maxdepth 1 -mindepth 1 -type d -print 2>/dev/null | grep -v '^\(doc\|cache\|@\|system\)' | \tr '\n' ',')"
+    rvm_ruby_strings="$(
+      builtin cd "${rvm_gems_path:-"$rvm_path/gems"}" ;
+      find . -maxdepth 1 -mindepth 1 -type d -print 2>/dev/null \
+        | grep -v '^\(doc\|cache\|@\|system\)' | \tr '\n' ','
+    )"
 
     rvm_ruby_strings="${rvm_ruby_strings/%,}"
 
@@ -76,13 +80,17 @@ gemset_globalcache()
     "$rvm_path/scripts/log" "info" \
       "Removing the global cache (note: this will empty the caches)"
 
-    directories=($(builtin cd "${rvm_gems_path:-"$rvm_path/gems"}" ; find . -maxdepth 1 -mindepth 1 -type d -print))
+    directories=($(
+      builtin cd "${rvm_gems_path:-"$rvm_path/gems"}" ;
+      find . -maxdepth 1 -mindepth 1 -type d -print)
+    )
 
     for directory_name in "${directories[@]//.\/}"; do
 
       current_cache_path="${rvm_gems_path:-"$rvm_path/gems"}/$directory_name/cache"
 
-      if [[ -L "$current_cache_path" && "$(readlink "$current_cache_path")" == "$rvm_gems_cache_path" ]]; then
+      if [[ -L "$current_cache_path" \
+        && "$(readlink "$current_cache_path")" == "$rvm_gems_cache_path" ]]; then
 
         "$rvm_path/scripts/log" "info" \
           "Reverting the gem cache for $directory_name to an empty directory."
@@ -93,7 +101,8 @@ gemset_globalcache()
       fi
     done
 
-    "$rvm_path/scripts/db" "$rvm_path/config/user" "use_gemset_globalcache" "delete"
+    "$rvm_path/scripts/db" "$rvm_path/config/user" \
+      "use_gemset_globalcache" "delete"
 
   elif [[ "$1" == "enable" ]]; then
 
@@ -102,7 +111,10 @@ gemset_globalcache()
 
     mkdir -p "$rvm_gems_cache_path"
 
-    directories=($(builtin cd "${rvm_gems_path:-"$rvm_path/gems"}" ; find . -maxdepth 1 -mindepth 1 -type d -print))
+    directories=($(
+      builtin cd "${rvm_gems_path:-"$rvm_path/gems"}" ;
+      find . -maxdepth 1 -mindepth 1 -type d -print)
+    )
 
     for directory_name in "${directories[@]//.\/}" ; do
 
@@ -110,7 +122,8 @@ gemset_globalcache()
 
       if [[ -d "$current_cache_path" && ! -L "$current_cache_path" ]]; then
 
-        "$rvm_path/scripts/log" "info" "Moving the gem cache for $directory_name to the global cache."
+        "$rvm_path/scripts/log" "info" \
+          "Moving the gem cache for $directory_name to the global cache."
 
         mv "$current_cache_path/"*.gem "$rvm_gems_cache_path/" 2>/dev/null
 
@@ -121,7 +134,8 @@ gemset_globalcache()
 
     done
 
-    "$rvm_path/scripts/db" "$rvm_path/config/user" "use_gemset_globalcache" "true"
+    "$rvm_path/scripts/db" "$rvm_path/config/user" \
+      "use_gemset_globalcache" "true"
 
   else
     printf "
@@ -211,7 +225,10 @@ gemset_list()
 
     if [[ -n "${rvm_ruby_string:-""}" ]] ; then
 
-      ls "${rvm_gems_path:-"$rvm_path/gems"}/" | awk -F"${rvm_gemset_separator:-"@"}" "/${rvm_ruby_string}${rvm_gemset_separator:-"@"}/{print \$2}" 2>/dev/null
+      ls "${rvm_gems_path:-"$rvm_path/gems"}/" \
+        | awk -F"${rvm_gemset_separator:-"@"}" \
+        "/${rvm_ruby_string}${rvm_gemset_separator:-"@"}/{print \$2}" \
+        2>/dev/null
 
     else
       "$rvm_path/scripts/log" "error" \
@@ -249,7 +266,8 @@ gemset_delete()
 
     elif [[ -d "$gemdir" ]] ; then
 
-      "$rvm_path/scripts/log" "warn" "Are you SURE you wish to remove the entire gemset directory '$rvm_gemset_name' ($gemdir)?"
+      "$rvm_path/scripts/log" "warn" \
+        "Are you SURE you wish to remove the entire gemset directory '$rvm_gemset_name' ($gemdir)?"
 
       printf "(anything other than 'yes' will cancel) > "
 
@@ -387,6 +405,59 @@ gemset_copy()
   fi
 }
 
+# Migrate gemsets from ruby X to ruby Y
+gemset_rename()
+{
+  local source_name destination_name source_path destination_path
+
+  source_name="${args[__array_start]:-""}"
+  args[$__array_start]="" ; args=(${args[@]})
+
+  destination_name="${args[__array_start]:-""}"
+  args[$__array_start]="" ; args=(${args[@]})
+
+  if [[ -z "$destination_name" || -z "$source_name" ]] ; then
+    "$rvm_path/scripts/log" "error" \
+      "Source and destination gemsets must be specified: 'rvm gemset rename X Y'"
+    return 1
+  fi
+
+  source_path="$(rvm_silence_logging=1 rvm "@$source_name" gem env gemdir)"
+
+  if [[ -z "$source_path" || ! -d "$source_path" ]]; then
+    "$rvm_path/scripts/log" "error" \
+      "'$source_name' does not exist."
+    return 1
+  fi
+
+  destination_path=${source_path/%$source_name/$destination_name}
+
+  if [[ -d "$source_path" ]] ; then
+
+    if [[ ! -d "$destination_path" ]] ; then
+
+      mv "$source_path" "$destination_path"
+
+    else
+
+      "$rvm_path/scripts/log" "error" \
+        "Gemset $destination_name already exists!"
+
+      return 1
+
+    fi
+
+  else
+
+    "$rvm_path/scripts/log" "error" \
+      "Gems directory does not exist for $source_path ($source_path)"
+
+    return 1
+
+  fi
+}
+
+
 gemset_unpack()
 {
   local gems name directory version versions
@@ -457,7 +528,8 @@ gemset_export()
 
   touch "$rvm_file_name"
 
-  echo "# $rvm_file_name generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > "$rvm_file_name"
+  echo "# $rvm_file_name generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator" \
+    > "$rvm_file_name"
 
   gems=($(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | tr ' ' ';'))
 
@@ -894,6 +966,9 @@ case "$action" in
   copy)
     gemset_copy
     ;;
+  rename)
+    gemset_rename
+    ;;
   empty)
     gemset_empty
     ;;

data/scripts/install

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 set -o errtrace
-set -o errexit
 
 export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
 
@@ -170,6 +169,9 @@ Upgrade Notes
 
   * If you wish to have the 'pretty colors' again, set in ~/.rvmrc:
     export rvm_pretty_print_flag=1
+
+  * If you see the following error message: Unknown alias name: 'default'
+    re-set your default ruby, this is due to a change in how default works.
 "
 }
 
@@ -342,9 +344,9 @@ for file in "${files[@]}" ; do
 
   cp -f "$source_path/binscripts/$file" "${rvm_bin_path:-"$rvm_path/bin"}/"
 
-done
+  chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
 
-chmod +x "${rvm_bin_path:-"$rvm_path/bin"}"/* # TODO: this is quite suboptimal.
+done
 
 #
 # RC Files
@@ -564,7 +566,7 @@ for file in "${files[@]}" ; do
 
 done
 
-printf "\n    Copying manpages into place."
+printf "\n    Copying manpages into place.\n"
 
 files=($(builtin cd "$install_source_path/man" ; \
   find . -maxdepth 1 -mindepth 1 -type f -print))

data/scripts/irbrc.rb

@@ -32,7 +32,7 @@ begin
     File::open(histfile, "w+") { |io| io.puts lines.join("\n") }
   end
 
-rescue
+rescue LoadError
   puts "Readline was unable to be required, if you need completion or history install readline then reinstall the ruby.\nYou may follow 'rvm notes' for dependencies and/or read the docs page http://rvm.beginrescueend.com/packages/readline/ . Be sure you 'rvm remove X ; rvm install X' to re-compile your ruby with readline support after obtaining the readline libraries."
 end
 

data/scripts/notes

@@ -26,13 +26,13 @@ if [[ "Linux" = "$system" ]] ; then
     printf "
 dependencies:
 # For RVM
-  rvm: bash curl git-core
+  rvm: bash curl git
 
 # For JRuby (if you wish to use it) you will need:
   jruby: aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk
 
 # For MRI & ree (if you wish to use it) you will need (depending on what you are installing):
-  ruby: aptitude install build-essential bison openssl libreadline5 libreadline-dev curl git-core zlib1g zlib1g-dev libssl-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev
+  ruby: aptitude install build-essential bison openssl libreadline5 libreadline-dev curl git zlib1g zlib1g-dev libssl-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev
   ruby-head: git subversion autoconf
 
 # For IronRuby (if you wish to use it) you will need:
@@ -109,8 +109,8 @@ elif [[ "Darwin" = "$system"  ]] ; then
 
   printf "
   Notes for ${system} $release
-    # For Snow Leopard be sure to have XCode Tools Version 3.2.1 (1613) or later (there were bugs with the dvd release version).
-    # You should download the latest XCode tools from developer.apple.com. This is necessary since the dvd install for Snow Leopard has bugs.
+    # For Snow Leopard be sure to have Xcode Tools Version 3.2.1 (1613) or later (there were bugs with the dvd release version).
+    # You should download the latest Xcode tools from developer.apple.com. This is necessary since the dvd install for Snow Leopard has bugs.
     # If you intend on installing MacRuby you must install LLVM first.
     # If you intend on installing JRuby you must install the JDK.
     # If you intend on installing IronRuby you must install Mono (version 2.6 or greater is recommended).

data/scripts/package

@@ -164,7 +164,8 @@ openssl()
     fi
     configure_command="./Configure"
 
-    patches="$rvm_path/patches/$package/Makefile.org.patch,$rvm_path/patches/$package/crypto-Makefile.patch"
+    # Anyone know WTF happened to these patches???
+    #patches="$rvm_path/patches/$package/Makefile.org.patch,$rvm_path/patches/$package/crypto-Makefile.patch"
 
     # Don't use -j option for make OpenSSL
     if [[ ! -z "$rvm_make_flags" ]] ; then

data/scripts/rvm

@@ -118,3 +118,6 @@ if [[ $? -gt 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
   unset rvm_prefix_needs_trailing_slash rvm_bin_path rvm_man_path rvm_rc_files rvm_gems_path rvm_gems_cache_path rvm_interactive_flag rvm_gems_path rvm_project_rvmrc_default rvm_gemset_separator
 
 fi
+
+cd .
+

data/scripts/rvm-install

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 set -o errtrace
-set -o errexit
 
 export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
 
@@ -170,6 +169,9 @@ Upgrade Notes
 
   * If you wish to have the 'pretty colors' again, set in ~/.rvmrc:
     export rvm_pretty_print_flag=1
+
+  * If you see the following error message: Unknown alias name: 'default'
+    re-set your default ruby, this is due to a change in how default works.
 "
 }
 
@@ -342,9 +344,9 @@ for file in "${files[@]}" ; do
 
   cp -f "$source_path/binscripts/$file" "${rvm_bin_path:-"$rvm_path/bin"}/"
 
-done
+  chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
 
-chmod +x "${rvm_bin_path:-"$rvm_path/bin"}"/* # TODO: this is quite suboptimal.
+done
 
 #
 # RC Files
@@ -564,7 +566,7 @@ for file in "${files[@]}" ; do
 
 done
 
-printf "\n    Copying manpages into place."
+printf "\n    Copying manpages into place.\n"
 
 files=($(builtin cd "$install_source_path/man" ; \
   find . -maxdepth 1 -mindepth 1 -type f -print))

data/scripts/selector

@@ -425,6 +425,8 @@ __rvm_ruby_string()
   # * rvm_ruby_revision
   # * rvm_ruby_tag
 
+  local ruby_string gemset_name
+
   rvm_expanding_aliases=${rvm_expanding_aliases:-0}
 
   rvm_ruby_version=${rvm_ruby_version:-""}
@@ -435,11 +437,18 @@ __rvm_ruby_string()
   rvm_ruby_revision=${rvm_ruby_revision:-""}
   rvm_ruby_tag=${rvm_ruby_tag:-""}
 
+  if echo "$rvm_ruby_string" | \grep -q "${rvm_gemset_separator:-"@"}" ; then
+    rvm_gemset_name="${rvm_ruby_string/*${rvm_gemset_separator:-"@"}/}"
+    rvm_ruby_string="${rvm_ruby_string/${rvm_gemset_separator:-"@"}*/}"
+  fi
+
   # Alias'd rubies
-  if [[ ${rvm_expanding_aliases:-0} -eq 0 && -n ${rvm_ruby_string:-""} && $rvm_ruby_string != "system" ]]; then
-    if expanded_alias_name="$("$rvm_path/scripts/alias" show "$rvm_ruby_string" 2>/dev/null)" && [[ -n "$expanded_alias_name" ]] ; then
+  if [[ ${rvm_expanding_aliases:-0} -eq 0 && -n ${rvm_ruby_string:-""}
+    && $rvm_ruby_string != "system" ]] ; then
+    if expanded_alias_name="$("$rvm_path/scripts/alias" show "$rvm_ruby_string" 2>/dev/null)" \
+      && [[ -n "$expanded_alias_name" ]] ; then
       rvm_ruby_string="$expanded_alias_name"
-    elif [[ "$rvm_ruby_string" = default ]]; then
+    elif [[ "$rvm_ruby_string" = default ]] ; then
       # Default is not a known value. Instead, we need to therefore set it to system.
       rvm_ruby_string="system"
     fi
@@ -448,14 +457,18 @@ __rvm_ruby_string()
   if echo "$rvm_ruby_string" | \grep -q "${rvm_gemset_separator:-"@"}" ; then
     rvm_gemset_name="${rvm_ruby_string/*${rvm_gemset_separator:-"@"}/}"
     rvm_ruby_string="${rvm_ruby_string/${rvm_gemset_separator:-"@"}*/}"
-    rvm_sticky_flag=1
   fi
 
-  ruby_string=${rvm_ruby_string/${rvm_gemset_separator:-"@"}*/}
+  # Stash the ruby string.
+  ruby_string=${rvm_ruby_string:-""}
+  gemset_name=${rvm_gemset_name:-""}
 
   __rvm_unset_ruby_variables
 
-  rvm_ruby_string=${rvm_ruby_string:-""}
+  if [[ ! -z "$gemset_name" ]] ; then
+    rvm_gemset_name="$gemset_name"
+    rvm_sticky_flag=1 # <- not sold on this.
+  fi
 
   strings=($(echo ${ruby_string//-/ }))
 
@@ -778,7 +791,8 @@ __rvm_gemset_use()
     fi
 
     if [[ ${rvm_interactive_flag:-0} -gt 0 && ${rvm_verbose_flag:-1} -ne 0 ]] ; then
-      "$rvm_path/scripts/log" "info" "Now using gemset '${rvm_gemset_name:-default}'"
+      "$rvm_path/scripts/log" "info" \
+        "Now using gemset '${rvm_gemset_name:-default}'"
     fi
 
     rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"

data/scripts/update

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 set -o errtrace
-set -o errexit
 
 export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
 
@@ -170,6 +169,9 @@ Upgrade Notes
 
   * If you wish to have the 'pretty colors' again, set in ~/.rvmrc:
     export rvm_pretty_print_flag=1
+
+  * If you see the following error message: Unknown alias name: 'default'
+    re-set your default ruby, this is due to a change in how default works.
 "
 }
 
@@ -342,9 +344,9 @@ for file in "${files[@]}" ; do
 
   cp -f "$source_path/binscripts/$file" "${rvm_bin_path:-"$rvm_path/bin"}/"
 
-done
+  chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
 
-chmod +x "${rvm_bin_path:-"$rvm_path/bin"}"/* # TODO: this is quite suboptimal.
+done
 
 #
 # RC Files
@@ -564,7 +566,7 @@ for file in "${files[@]}" ; do
 
 done
 
-printf "\n    Copying manpages into place."
+printf "\n    Copying manpages into place.\n"
 
 files=($(builtin cd "$install_source_path/man" ; \
   find . -maxdepth 1 -mindepth 1 -type f -print))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 1
   - 0
-  - 14
-  version: 1.0.14
+  - 15
+  version: 1.0.15
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -04:00
+date: 2010-10-19 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []