rvm 1.0.7 → 1.0.8

data/scripts/docs

@@ -1,18 +1,25 @@
 #!/usr/bin/env bash
 rvm_base_except="selector"
+
 source "$rvm_path/scripts/base"
 
 rvm_docs_ruby_string="$(__rvm_environment_identifier | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}')"
+
 if [[ "$rvm_docs_ruby_string" = "system" || -z "$rvm_docs_ruby_string" ]]; then
+
   "$rvm_path/scripts/log" "error" "Currently 'rvm docs ...' does not work with non-rvm rubies."
+
   exit 1
+
 fi
 
 rvm_docs_type="${rvm_docs_type:-rdoc}"
 
 # Ensure we have the doc directories.
-if [[ ! -d "$rvm_docs_path" ]] ; then
-  \mkdir -p "$rvm_docs_path/rdoc" "$rvm_docs_path/yard"
+if [[ ! -d "${rvm_docs_path:-"$rvm_path/docs"}" ]] ; then
+
+  mkdir -p "${rvm_docs_path:-"$rvm_path/docs"}/rdoc" "${rvm_docs_path:-"$rvm_path/docs"}/yard"
+
 fi
 
 usage() {
@@ -27,39 +34,60 @@ usage() {
 }
 
 open_docs() {
-  if [[ -s "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/index.html" ]] ; then
+  if [[ -s "${rvm_docs_path:-"$rvm_path/docs"}/$rvm_docs_ruby_string/$rvm_docs_type/index.html" ]] ; then
+
     if command -v open >/dev/null ; then
-      open "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/index.html"
+
+      open "${rvm_docs_path:-"$rvm_path/docs"}/$rvm_docs_ruby_string/$rvm_docs_type/index.html"
+
     elif command -v xdg-open >/dev/null ; then
-      xdg-open "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/index.html"
+
+      xdg-open "${rvm_docs_path:-"$rvm_path/docs"}/$rvm_docs_ruby_string/$rvm_docs_type/index.html"
+
     else
+
       "$rvm_path/scripts"/log "error" "Neither open nor xdg-open were found, in order to open the docs one of these two are required. \n(OR you can let me know how else to open the html in your browser from comand line on your OS :) )"
+
     fi
+
   else
+
     "$rvm_path/scripts"/log "error" "$rvm_docs_type docs are missing, perhaps run 'rvm docs generate' first?"
+
   fi
 }
 
 generate_ri() {
   # Generate ri docs
   (
-    builtin cd "$rvm_src_path/$rvm_docs_ruby_string/"
+    builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_docs_ruby_string/"
+
     "$rvm_path/scripts/log" "info" "Generating ri documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
-    "$rvm_path/scripts/log" "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )"
-    rdoc -a --ri --ri-site > /dev/null 2>> $rvm_log_path/$rvm_docs_ruby_string/docs.error.log
+
+    "$rvm_path/scripts/log" "info" "( Errors will be logged to ${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.error.log )"
+
+    rdoc -a --ri --ri-site > /dev/null 2>> ${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.error.log
   )
 }
 
 generate_rdoc() {
   (
-    builtin cd "$rvm_src_path/$rvm_docs_ruby_string/"
-    \rm -rf "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/"
+    builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_docs_ruby_string/"
+
+    \rm -rf "${rvm_docs_path:-"$rvm_path/docs"}/$rvm_docs_ruby_string/$rvm_docs_type/"
+
     "$rvm_path/scripts/log" "info" "Generating rdoc documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
-    "$rvm_path/scripts/log" "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )"
+
+    "$rvm_path/scripts/log" "info" "( Errors will be logged to ${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.error.log )"
+
     if gem list | \grep -q ^hanna ; then
-      hanna -o "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type" --inline-source --line-numbers --fmt=html > /dev/null 2>> "$rvm_log_path/$rvm_docs_ruby_string/docs.error.log"
+
+      hanna -o "${rvm_docs_path:-"$rvm_path/docs"}/$rvm_docs_ruby_string/$rvm_docs_type" --inline-source --line-numbers --fmt=html > /dev/null 2>> "${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.error.log"
+
     else
-      rdoc -a -o "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type" > /dev/null 2>> "$rvm_log_path/$rvm_docs_ruby_string/docs.error.log"
+
+      rdoc -a -o "${rvm_docs_path:-"$rvm_path/docs"}/$rvm_docs_ruby_string/$rvm_docs_type" > /dev/null 2>> "${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.error.log"
+
     fi
   )
 }

data/scripts/env

@@ -25,7 +25,7 @@ __rvm_become "$environment_name"
 
 if [[ "$?" = 0 ]]; then
   __rvm_use
-  environment_file_path="$rvm_environments_path/$(__rvm_environment_identifier)"
+  environment_file_path="$rvm_path/environments/$(__rvm_environment_identifier)"
   # Echo the path or environment file.
   if [[ -n "$rvm_path_flag" ]]; then
     echo "$environment_file_path"

data/scripts/environment-convertor

@@ -32,7 +32,7 @@ convert_exports_to_fish() {
 }
 
 contents_of_environment_file() {
-  cat "$rvm_environments_path/$(__rvm_environment_identifier)"
+  cat "$rvm_path/environments/$(__rvm_environment_identifier)"
 }
 
 convert_to_shell() {

data/scripts/fetch

@@ -1,118 +1,230 @@
 #!/usr/bin/env bash
 
 rvm_base_except="selector"
+
 source "$rvm_path/scripts/base"
+
 result=0
 
 # Set it to cleanup the download on interruption.
 trap 'cleanup_download' 1 2 3 15
 
 cleanup_download() {
-  [[ -f "$archive" ]] && rm -rf "$archive"
+
+  [[ -f "$archive" ]] && rm -f "$archive"
+
 }
 
 record_md5() {
+
   if [[ "Darwin" = "$(uname)" ]] || [[ "FreeBSD" = "$(uname)" ]]; then
+
     archive_md5="$(/sbin/md5 -q "${archive}")"
+
   else
+
     archive_md5="$(md5sum "${archive}" | awk '{print $1}')"
+
   fi
-  "$rvm_path/scripts/db" "$rvm_config_path/md5" "$archive" "$archive_md5"
+
+  "$rvm_path/scripts/db" "$rvm_path/config/md5" "$archive" "$archive_md5"
+
 }
 
-builtin cd "$rvm_archives_path"
+builtin cd "${rvm_archives_path:-"$rvm_path/archives"}"
 
 # args=($*) # Reserved for future use
 
-if [[ -z "$1" ]] ; then "$rvm_path/scripts/log" "fail" "BUG: $0 called without an argument :/" ; exit 1 ; fi
+if [[ -z "$1" ]] ; then
+
+  "$rvm_path/scripts/log" "fail" \
+    "BUG: $0 called without an argument :/"
+
+  exit 1
+fi
 
 url="$1"; download=1 ; package_name="$2"
 
 if ! command -v curl > /dev/null ; then
-  "$rvm_path/scripts/log" "fail" "rvm requires curl. curl was not found in your active path."
+
+  "$rvm_path/scripts/log" "fail" \
+    "rvm requires curl. curl was not found in your active path."
+
   exit 1
+
 elif [[ ! -z ${rvm_proxy} ]] ; then
+
   fetch_command="curl -x${rvm_proxy} -L --create-dirs -C - " # -s for silent
+
 else
+
   fetch_command="curl -L --create-dirs -C - " # -s for silent
+
 fi
 
 if [[ ! -z "$package_name" ]] ; then
+
   fetch_command="${fetch_command} -o ${package_name} "
+
   archive="$package_name"
+
 else
+
   fetch_command="${fetch_command} -O "
+
   archive=$(basename "$url")
+
 fi
 
-if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_path/scripts/log" "debug" "Fetching $archive" ; fi
+if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
+
+  "$rvm_path/scripts/log" "debug" \
+    "Fetching $archive"
+
+fi
 
 # Check first if we have the correct archive
-archive_md5="$($rvm_path/scripts/db "$rvm_config_path/md5" "$archive" | head -n1)"
-if [[ -e "$archive" ]] && [[ ! -z "$archive_md5" ]] ; then
-  if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_path/scripts/log" "debug" "Found archive and its md5, testing correctness" ; fi
-  if ! "$rvm_path/scripts"/md5 "${rvm_archives_path}/${archive}" "$archive_md5" ; then
-    if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_path/scripts/log" "debug" "Archive is bad, downloading" ; fi
+archive_md5="$($rvm_path/scripts/db "$rvm_path/config/md5" "$archive" | head -n1)"
+
+if [[ -e "$archive" && ! -z "$archive_md5" ]] ; then
+
+  if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
+
+    "$rvm_path/scripts/log" "debug" \
+    "Found archive and its md5, testing correctness"
+
+  fi
+
+  if ! "$rvm_path/scripts"/md5 "${rvm_archives_path:-"$rvm_path/archives"}/${archive}" "$archive_md5" ; then
+
+    if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
+      "$rvm_path/scripts/log" "debug" \
+        "Archive md5 did not match, downloading"
+    fi
+
     download=1
+
   else
-    if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_path/scripts/log" "debug" "Archive is good, not downloading" ; fi
+
+    if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
+
+      "$rvm_path/scripts/log" "debug" \
+        "Archive md5 matched, not downloading"
+
+    fi
+
     download=0
+
     result=0
-  fi ; unset archive_md5
+
+  fi
+
 else
-  if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_path/scripts/log" "debug" "No archive or no MD5, downloading" ; fi
+
+  if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
+
+    "$rvm_path/scripts/log" "debug" \
+      "No archive or no MD5, downloading"
+
+  fi
+
   download=1
+
 fi
 
 # try to convert the ftp url to a http url
-http_url="$(echo $url | sed -e 's/ftp:/http:/' -e 's/git:/http:/')"
+http_url="$(echo "$url" | sed -e 's/ftp:/http:/' -e 's/git:/http:/')"
 
 if [[ $download -gt 0 ]] ; then
+
   rm -f $archive
-  eval $fetch_command "$url"
-  result=$?
+
+  eval $fetch_command "$url" ; result=$?
+
   if [[ $result -gt 0 ]] ; then
+
     retry=0
+
     try_http=0
+
     if [[ $result -eq 78 ]] ; then
-      "$rvm_path/scripts/log" "error" "The requested url does not exist: '$url'"
+
+      "$rvm_path/scripts/log" "error" \
+        "The requested url does not exist: '$url'"
+
       try_http=1
+
     elif [[ $result -eq 18 ]] ; then
-      "$rvm_path/scripts/log" "error" "Partial file. Only a part of the file was transferred. Removing partial and re-trying."
+
+      "$rvm_path/scripts/log" "error" \
+        "Partial file. Only a part of the file was transferred. Removing partial and re-trying."
+
       rm -f "$archive"
+
       retry=1
+
     elif [[ $result -eq 33 ]] ; then
-      if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_path/scripts/log" "debug" "Server does not support 'range' command, removing '$archive'" ; fi
+
+      if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
+
+        "$rvm_path/scripts/log" "debug" \
+        "Server does not support 'range' command, removing '$archive'"
+
+      fi
+
       rm -f "$archive"
+
       retry=1
+
     else
-      "$rvm_path/scripts/log" "error" "There was an error, please check $rvm_ruby_log_path/*.error.log. Next we'll try to fetch via http."
+
+      "$rvm_path/scripts/log" "error" \
+        "There was an error, please check ${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/*.error.log. Next we'll try to fetch via http."
+
       try_http=1
+
     fi
 
     if [[ $retry -eq 1 ]] ; then
-      eval $fetch_command "$url"
-      result=$?
+
+      eval $fetch_command "$url" ; result=$?
+
       if [[ $result -gt 0 ]] ; then
-        "$rvm_path/scripts/log" "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
+
+        "$rvm_path/scripts/log" "error" \
+          "There was an error, please check ${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/*.error.log"
+
       else
+
         record_md5
+
       fi
+
     fi
 
     if [[ $try_http -eq 1 ]] ; then
-      eval $fetch_command "$http_url"
-      result=$?
+
+      eval $fetch_command "$http_url" ; result=$?
+
       if [[ $result -gt 0 ]] ; then
-        "$rvm_path/scripts/log" "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
+
+        "$rvm_path/scripts/log" "error" \
+          "There was an error, please check ${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/*.error.log"
+
       else
+
         record_md5
+
       fi
+
     fi
 
   else
+
     record_md5
+
   fi
+
 fi
 
 exit $result

data/scripts/gemsets

@@ -14,7 +14,7 @@ usage() {
 
   Action:
 
-    {import,export,create,copy,empty,delete,name,dir,list,gemdir,install,pristine,clear,use,update,globalcache}
+    {import,export,create,copy,empty,delete,name,dir,list,gemdir,install,pristine,clear,use,update,unpack,globalcache}
 
   Description:
 
@@ -27,7 +27,7 @@ gemset_update() {
   if [[ -z "$rvm_ruby_strings" ]]; then
     "$rvm_path/scripts/log" "info" "Running gem update for all rubies and gemsets."
 
-    rvm_ruby_strings="$(builtin cd "$rvm_gems_path" ; 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/%,}"
     rvm_ruby_strings="${rvm_ruby_strings//.\/}"
   else
@@ -62,11 +62,11 @@ gemset_globalcache() {
 
     "$rvm_path/scripts/log" "info" "Removing the global cache (note: this will empty the caches)"
 
-    directories=($(builtin cd "$rvm_gems_path" ; 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/$directory_name/cache"
+      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
 
@@ -78,7 +78,7 @@ gemset_globalcache() {
       fi
     done
 
-    "$rvm_path/scripts/db" "$rvm_config_path/user" "use_gemset_globalcache" "delete"
+    "$rvm_path/scripts/db" "$rvm_path/config/user" "use_gemset_globalcache" "delete"
 
   elif [[ "$1" == "enable" ]]; then
 
@@ -86,11 +86,11 @@ gemset_globalcache() {
 
     mkdir -p "$rvm_gems_cache_path"
 
-    directories=($(builtin cd "$rvm_gems_path" ; 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/$directory_name/cache"
+      current_cache_path="${rvm_gems_path:-"$rvm_path/gems"}/$directory_name/cache"
 
       if [[ -d "$current_cache_path" && ! -L "$current_cache_path" ]]; then
 
@@ -105,7 +105,7 @@ gemset_globalcache() {
 
     done
 
-    "$rvm_path/scripts/db" "$rvm_config_path/user" "use_gemset_globalcache" "true"
+    "$rvm_path/scripts/db" "$rvm_path/config/user" "use_gemset_globalcache" "true"
 
   else
     printf "
@@ -175,13 +175,13 @@ gemset_list() {
   if [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] ; then __rvm_select ; fi
 
   "$rvm_path/scripts/log" "info" \
-    "\ngemsets for $rvm_ruby_string (found in $rvm_gems_path/$rvm_ruby_string)"
+    "\ngemsets for $rvm_ruby_string (found in ${rvm_gems_path:-"$rvm_path/gems"}/$rvm_ruby_string)"
 
-  if [[ -n "${rvm_gems_path:-""}" ]] ; then
+  if [[ -d "${rvm_gems_path:-"$rvm_path/gems"}" ]] ; then
 
     if [[ -n "${rvm_ruby_string:-""}" ]] ; then
 
-      ls "${rvm_gems_path}/" | 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" \
@@ -191,7 +191,7 @@ gemset_list() {
 
   else
     "$rvm_path/scripts/log" "error" \
-      "\$rvm_gems_path is not set!"
+      "${rvm_gems_path:-"$rvm_path/gems"} does not exist!"
     return 1
   fi
   printf "\n"
@@ -205,7 +205,7 @@ gemset_delete() {
 
   if [[ -n "$rvm_gemset_name" ]] ; then
 
-    gemdir="$rvm_gems_path/$rvm_ruby_string${rvm_gemset_separator:-"@"}$rvm_gemset_name"
+    gemdir="${rvm_gems_path:-"$rvm_path/gems"}/$rvm_ruby_string${rvm_gemset_separator:-"@"}$rvm_gemset_name"
 
     if [[ -d "$gemdir" && "$gemdir" != '/' && ${rvm_force_flag:-0} -gt 0 ]] ; then
 
@@ -345,6 +345,49 @@ gemset_copy() {
   fi
 }
 
+gemset_unpack() {
+
+  local gems name directory version versions
+
+  directory="${args[$__array_start]}"
+
+  if [[ -z "$directory" ]] ; then
+    directory="vendor/gems"
+  fi
+
+  if [[ -n "$rvm_ruby_gem_home" ]] ; then
+    export GEM_HOME="$rvm_ruby_gem_home"
+    export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin"
+    export BUNDLE_PATH="$rvm_ruby_gem_home"
+  fi
+
+  "$rvm_path/scripts/log" "info" \
+    "Unpacking current environments gemset to ${directory}\n"
+
+  unset -f gem
+
+  gems=($(command gem list | sed 's#[\(|\)]##g' | sed -e 's#, #,#g' -e 's/ /;/g'))
+
+  for gem in ${gems[@]} ; do
+
+    name="${gem/;*/}"
+
+    versions="${gem/*;/}" ; versions=(${versions//,/ })
+
+    for version in "${versions[@]}" ; do
+
+      ( command gem unpack "$name" -v"$version" --target "$directory" )&
+
+    done
+
+  done ; wait
+
+  "$rvm_path/scripts/log" "info" \
+    "Unpacking into ${directory} complete\n"
+
+  return 0
+}
+
 gemset_export() {
   local gems name file_name version versions
 
@@ -352,7 +395,7 @@ gemset_export() {
 
   if [[ -n "$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${rvm_gemset_separator:-"@"}global/bin"
+    export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin"
     export BUNDLE_PATH="$rvm_ruby_gem_home"
   fi
 
@@ -399,7 +442,7 @@ gemset_import() {
 
   if [[ -n "${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${rvm_gemset_separator:-"@"}global/bin"
+    export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin"
     export BUNDLE_PATH="$rvm_ruby_gem_home"
   fi
 
@@ -494,7 +537,8 @@ __rvm_parse_gems_args() {
 # Install a gem
 gem_install() {
 
-  local gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string gem_action
+  local result gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string gem_action
+
   result=0
 
   # First we parse the gem args to pick apart the pieces.
@@ -544,11 +588,11 @@ gem_install() {
       else
         if [[ -s "$(__rvm_current_gemcache_dir)/$(basename $gem_file_name)" ]] ; then
 
-          mkdir -p "$rvm_tmp_path/$$/"
+          mkdir -p "${rvm_tmp_path:-"$rvm_path/tmp"}/$$/"
 
-          mv "$(__rvm_current_gemcache_dir)/$gem_file_name" "$rvm_tmp_path/$$/$gem_file_name"
+          mv "$(__rvm_current_gemcache_dir)/$gem_file_name" "${rvm_tmp_path:-"$rvm_path/tmp"}/$$/$gem_file_name"
 
-          gem="$rvm_tmp_path/$$/$gem_file_name -f -l"
+          gem="${rvm_tmp_path:-"$rvm_path/tmp"}/$$/$gem_file_name -f -l"
         else
           gem="$cache_file"
         fi
@@ -562,9 +606,9 @@ gem_install() {
     # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line.
     if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
 
-    if [[ -n "$rvm_ruby_gem_home" && "$rvm_ruby_gem_home" != "$rvm_gems_path" ]] ; then
+    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/bin:$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator:-"@"}global/bin' BUNDLE_PATH='${rvm_ruby_gem_home}' ${gem_prefix} command 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_ruby_global_gems_path/bin' BUNDLE_PATH='${rvm_ruby_gem_home}' ${gem_prefix} command gem install $gems_args $rvm_gem_options $gem_postfix $vars"
 
     else
 
@@ -655,7 +699,7 @@ gemset_prune() {
 }
 
 gemset_pristine() {
-  if command -v gem > /dev/null ; then
+  if ( unset -f gem ; command -v gem > /dev/null ) ; then
 
     gem pristine --all
 
@@ -673,7 +717,8 @@ gemset_pristine() {
 # Loads the default gemsets for the current interpreter and gemset.
 gemset_initial() {
 
-  "$rvm_path/scripts/log" "info" "Importing initial gemsets for $(__rvm_environment_identifier)."
+  "$rvm_path/scripts/log" "info" \
+    "Importing initial gemsets for $(__rvm_environment_identifier)."
 
   mkdir -p "$rvm_path/gemsets/${rvm_ruby_string//-//}" 2>/dev/null
 
@@ -799,6 +844,9 @@ case "$action" in
   update)
     gemset_update
     ;;
+  unpack)
+    gemset_unpack
+    ;;
   globalcache)
     gemset_globalcache "$2"
     ;;