rvm 0.1.32 → 0.1.33

data/scripts/alias

@@ -0,0 +1,103 @@
+#!/usr/bin/env bash
+
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+
+trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
+
+source $rvm_scripts_path/initialize
+source $rvm_scripts_path/utility
+source $rvm_scripts_path/selector
+
+show_alias() {
+  if [[ -z "$alias_name" ]]; then
+    $rvm_scripts_path/log "error" "usage: 'rvm alias show [alias_name]'"
+    result=1
+    return
+  fi
+  expanded_alias_name="$($rvm_scripts_path/db "$rvm_config_path/alias" "$alias_name")"
+  if [[ -z "$expanded_alias_name" ]]; then
+    $rvm_scripts_path/log "error" "Unknown alias name: '$alias_name'"
+    result=1
+  else
+    result=0
+    echo "$expanded_alias_name"
+  fi
+  unset expanded_alias_name
+}
+
+delete_alias() {
+  echo "Deleting alias: $alias_name"
+  for link in "$rvm_rubies_path/$alias_name" ; do
+    if [[ -L "$link" ]] ; then rm -f $link ; fi
+  done
+  $rvm_scripts_path/db "$rvm_config_path/alias" "$alias_name" "delete"
+}
+
+create_alias() {
+  if [[ -z "$rvm_environment_identifier" ]] || [[ -z "$alias_name" ]] ; then
+    $rvm_scripts_path/log "error" "usage: 'rvm alias [alias_name] [ruby_string]'"
+    result=1
+  else
+    if [[ -z "$rvm_alias" ]] ; then
+      rvm_ruby_string="$rvm_environment_identifier"
+      rvm_expanding_aliases=1
+      __rvm_ruby_string >& /dev/null
+      unset rvm_expanding_aliases
+      if [[ -z "$rvm_ruby_string" ]]; then
+        $rvm_scripts_path/log "error" "unknown ruby string specified"
+        result=1
+        return
+      fi
+      final_environment_identifier="$(__rvm_environment_identifier)"
+      $rvm_scripts_path/log "info" "Creating alias $alias_name for $final_environment_identifier."
+      ln -nfs "$rvm_rubies_path/$rvm_ruby_string" "$rvm_rubies_path/$alias_name"
+      $rvm_scripts_path/log "info" "Recording alias $alias_name for $final_environment_identifier."
+      $rvm_scripts_path/db "$rvm_config_path/alias" "$alias_name" "$final_environment_identifier"
+    else
+      if [[ -d "$rvm_rubies_path/$alias_name" ]] ; then
+        $rvm_scripts_path/log "error" "$rvm_rubies_path/$alias_name is taken and is *not* able to be an alias name."
+        result=1
+      else
+        $rvm_scripts_path/log "error" "$rvm_rubies_path/$alias_name is already aliased."
+        result=1
+      fi
+    fi
+  fi
+}
+
+alias_list() {
+  for item in $rvm_rubies_path/* ; do
+    if [[ -L "$item" ]] ; then
+      echo "$(basename $item) => $($rvm_scripts_path/db "$rvm_config_path/alias" "$(basename "$item")")"
+    fi
+  done
+}
+
+action="$1"
+alias_name="$2"
+rvm_environment_identifier="$3"
+if [[ ! -f "$rvm_config_path/alias" ]] ; then touch "$rvm_config_path/alias" ; fi
+if [[ ! -z "$alias_name" ]] ; then
+  rvm_alias="$($rvm_scripts_path/db "$rvm_config_path/alias" "$alias_name")"
+fi
+
+# CLI API:
+#   rvm alias create [alias_name] [ruby]
+#   rvm alias delete [alias_name]
+#   rvm alias show [alias_name]
+#   rvm alias list
+if [[ "$action" = "delete" ]] ; then
+  delete_alias
+elif [[ "$action" = "create" ]] ; then
+  create_alias
+elif [[ "$action" = "list" ]] ; then
+  alias_list
+elif [[ "$action" = "show" ]]; then
+  show_alias
+else
+  $rvm_scripts_path/log "error" "usage: 'rvm alias [action] [arguments]"
+fi
+
+unset action alias_name rvm_ruby_string rvm_environment_identifier final_environment_identifier
+
+exit $result

data/scripts/cli

@@ -14,6 +14,9 @@ __rvm_parse_args() {
 
       package)
         rvm_action="$rvm_token"
+        if [[ "$1" = "--only-path" ]]; then
+          shift; rvm_only_path_flag=1
+        fi
         rvm_ruby_args="$@"
         rvm_parse_break=1
       ;;
@@ -24,6 +27,10 @@ __rvm_parse_args() {
         if [[ "ruby" = "$1" ]] ; then shift ; fi
       ;;
 
+      env)
+        rvm_action=$rvm_token
+      ;;
+
       inspect)
         rvm_action=$rvm_token
         rvm_ruby_args="$@"
@@ -82,27 +89,23 @@ __rvm_parse_args() {
             rvm_ruby_gem_home="$rvm_ruby_gem_home${rvm_gemset_separator}$rvm_gemset_name"
           fi
         else
-          if [[ -z "$1" ]] ; then
-            rvm_action="error"
-            rvm_error_message="'gemset' must be followed by a gemset action, see http://rvm.beginrescueend.com/gemsets/ for details."
-          else
-            if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then __rvm_ruby_string ;  fi
-            rvm_ruby_args="$@"
-          fi
+          if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then __rvm_ruby_string ;  fi
+          rvm_ruby_args="$@"
         fi
         rvm_parse_break=1
       ;;
 
-      gemdir)
+      gemdir|gempath|gemhome)
         rvm_action=$rvm_token
         rvm_gemdir_flag=1
         if [[ "system" = "$1" ]] ; then rvm_system_flag=1 ; shift ; fi
         if [[ "user" = "$1"  ]]   ; then rvm_user_flag=1  ;  shift ; fi
       ;;
 
-      list|info|docs|alias)
+      list|info|alias|docs)
         rvm_action="$rvm_token"
         rvm_ruby_args="$@"
+        if [[ "$rvm_token" = "info" ]] && [[ -z "$rvm_ruby_args" ]] ; then rvm_ruby_args="$rvm_ruby_string" ; fi
         rvm_parse_break=1
       ;;
 
@@ -198,7 +201,7 @@ __rvm_parse_args() {
 
       # For use with --patch
       --patch-name) rvm_ruby_patch_name="$1" ; shift ;;
-      -h|--patch)
+      --patch)
         if [[ -z "$rvm_ruby_patch" ]] ; then
           rvm_ruby_patch="$1"
         else
@@ -279,6 +282,24 @@ __rvm_parse_args() {
         rvm_ruby_args="$@"
         rvm_parse_break=1
       ;;
+
+      --passenger|--editor)
+        rvm_wrapper_name="${rvm_token/--/}"
+      ;;
+
+      --symlink)
+        $rvm_scripts_path/log "warn" "--symlink has been removed, please see 'rvm wrapper'."
+        shift
+      ;;
+
+      wrapper)
+        rvm_action="$rvm_token"
+        rvm_ruby_string="$1" ; shift
+        rvm_wrapper_name="$1" ; shift
+        rvm_ruby_args="$@" # list of binaries, or none
+        rvm_parse_break=1
+      ;;
+
       -h|--help|usage)      rvm_action=help                     ;;
       -G|--gems)            rvm_gems_path="$1"         ; shift  ;;
       --source)             rvm_src_path="$1"          ; shift  ;;
@@ -290,7 +311,6 @@ __rvm_parse_args() {
       # TODO: handle this below better (if $1 is null)
       --sdk)                rvm_sdk="$1"               ; shift  ;;
       --archflags)          rvm_archflags="$1"         ; shift  ;;
-      --symlink)            rvm_symlink_name="$1"      ; shift  ;;
       --install)            rvm_install_on_use_flag=1    ;;
       --trace)              rvm_trace_flag=1    ; set -x ;;
       --proxy)              rvm_proxy="$1"      ; shift  ;;
@@ -304,7 +324,7 @@ __rvm_parse_args() {
 
       reboot|damnit|wtf|argh|BOOM|boom|wth) $rvm_action="reboot" ;;
 
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--passenger|--editor|--sticky|--create|--rvmrc|--gems)
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--sticky|--create|--rvmrc|--gems)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
         if [[ "--debug" = "$rvm_token" ]] ; then rvm_debug_flag ; fi
       ;;
@@ -325,6 +345,7 @@ __rvm_parse_args() {
             fi
           elif [[ ! -z "$(echo "$rvm_token" | awk '/,/')" ]] ; then
             rvm_ruby_version="$rvm_token"
+            rvm_ruby_strings="$rvm_token" # Migrating to this from rvm_ruby_version
             if [[ -z "$rvm_action" ]] ; then
               rvm_action="ruby" # Not sure if we really want to do this but we'll try it out.
             fi
@@ -382,27 +403,23 @@ rvm() {
   # Check that this is the current version.
   disk_version=$(cat "${rvm_path:-$HOME/.rvm}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')
   if [[ "${rvm_version}" != "${disk_version}" ]] && [[ "reload" != "$1" ]]; then
-    echo -e "A newer version of rvm has been installed ($disk_version) than is loaded ($rvm_version), please do one of the following:\n  * 'rvm reload'\n  * open a new shell\n  * source your shell init scripts"
+    printf "\nA newer version of rvm has been installed ($disk_version) than is loaded ($rvm_version), please do one of the following:\n  * 'rvm reload'\n  * open a new shell\n  * source your shell init scripts"
     return 1
   fi
 
   __rvm_cleanup_variables
   __rvm_load_rvmrc
   __rvm_initialize
-  __rvm_load_defaults
   __rvm_parse_args "$@"
 
-  export BUNDLE_PATH GEM_HOME GEM_PATH rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_ruby_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_patch rvm_ruby_patch_name rvm_ruby_string rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag
-  export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_symlink_path
+  export BUNDLE_PATH GEM_HOME GEM_PATH rvm_ruby_string rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_ruby_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_patch rvm_ruby_patch_name rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag
+  export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator
 
   result=0
   case "$rvm_action" in
     use)             __rvm_use               ; result=$? ;;
     srcdir)          __rvm_source_dir        ; result=$? ;;
-    list)            __rvm_list              ; result=$? ;;
     strings)         __rvm_strings           ; result=$? ;;
-    info)            __rvm_info              ; result=$? ;;
-    debug)           __rvm_debug             ; result=$? ;;
     version)         __rvm_version           ; result=$? ;;
     reset)           __rvm_reset             ; result=$? ;;
     update)          __rvm_update            ; result=$? ;;
@@ -411,19 +428,43 @@ rvm() {
     benchmark)       __rvm_benchmark         ; result=$? ;;
     inspect)         __rvm_inspect           ; result=$? ;;
     implode|seppuku) __rvm_implode           ; result=$? ;;
+
+    list)            $rvm_scripts_path/list $rvm_ruby_args ; result=$? ;;
+    # TODO: Make debug run in the current environment.
+    debug)           $rvm_scripts_path/info '' debug ; result=$? ;;
+    info)
+      if [[ -z "$rvm_ruby_args" ]] ; then
+        . $rvm_scripts_path/info
+      else
+        $rvm_scripts_path/info $rvm_ruby_args
+      fi
+      result=$?
+    ;;
     docs)            $rvm_scripts_path/docs  ; result=$? ;;
-    alias)           $rvm_scripts_path/alias ; result=$? ;;
-    help)            $rvm_scripts_path/help $rvm_ruby_args ; result=$? ;;
+    alias)           $rvm_scripts_path/alias $rvm_ruby_args ; result=$? ;;
+    help)            $rvm_scripts_path/help  $rvm_ruby_args ; result=$? ;;
 
     answer) __rvm_Answer_to_the_Ultimate_Question_of_Life_the_Universe_and_Everything ; result=42 ;;
     question) __rvm_ultimate_question ; result=42 ;;
 
-    gemdir)
-      $rvm_scripts_path/gemsets gemdir
+    env)
+      $rvm_scripts_path/env "$rvm_ruby_string"
+      result=$?
+    ;;
+
+    wrapper)
+      $rvm_scripts_path/wrapper "$rvm_ruby_string" "$rvm_wrapper_name" $rvm_ruby_args
+      result=$?
+      unset rvm_wrapper_name
+    ;;
+
+    gemdir|gemhome|gempath)
+      $rvm_scripts_path/gemsets $rvm_action
       result=$?
     ;;
 
     ruby|gem|rake)
+      unset rvm_ruby_string
       $rvm_scripts_path/set $rvm_action $rvm_ruby_args
       result=$?
     ;;

data/scripts/db

@@ -1,5 +1,12 @@
 #!/usr/bin/env bash
 
+usage() {
+  printf "\nUsage:\n" >&2
+  printf "\n  $rvm_scripts_path/db database_file {{key}} {{value}} # set" >&2
+  printf "\n  $rvm_scripts_path/db database_file {{key}} # get" >&2
+  printf "\n  $rvm_scripts_path/db database_file {{key}} unset # unset\n\n" >&2
+}
+
 if [[ -f "$1" ]] ; then
   database_file="$1" ; shift
   if [[ ! -f "$database_file" ]] ; then
@@ -7,13 +14,13 @@ if [[ -f "$1" ]] ; then
     touch $database_file
   fi
 else
-  echo "Database file $1 does not exist." >&2
+  printf "\n\nDatabase file $1 does not exist.\n\n" >&2
   exit 1
 fi
 
 key="$1" ; shift
 if [[ -z "$key" ]] ; then
-  echo "usage: $0 database key [value]" >&2
+  usage
   exit 1
 else
   value="$*"

data/scripts/docs

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+
+trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
+
+source $rvm_scripts_path/initialize
+
+rvm_ruby_string="$(basename $GEM_HOME 2>/dev/null | awk -F'@' '{print $1}')"
+if [[ -z "$rvm_ruby_string" ]] && echo $GEM_HOME | grep -v 'rvm/' > /dev/null 2>&1 ; then
+  $rvm_scripts_path/log "error" "Currently 'rvm docs ...' does not work with non-rvm rubies."
+  exit 1
+fi
+
+rvm_docs_type="${rvm_docs_type:-rdoc}"
+action="$(echo $rvm_ruby_args | awk '{print $1}')"
+
+if [[ ! -d "$rvm_docs_path" ]] ; then mkdir -p "$rvm_docs_path/rdoc" "$rvm_docs_path/yard" ; fi
+
+open_docs() {
+  if [[ -s "$rvm_docs_path/$rvm_ruby_string/$rvm_docs_type/index.html" ]] ; then
+    if command -v open >/dev/null ; then
+      open $rvm_docs_path/$rvm_ruby_string/$rvm_docs_type/index.html
+    elif command -v xdg-open >/dev/null ; then
+      xdg-open $rvm_docs_path/$rvm_ruby_string/$rvm_docs_type/index.html
+    else
+      $rvm_scripts_path/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_scripts_path/log "error" "$rvm_docs_type docs are missing, perhaps run 'rvm docs generate' first?"
+  fi
+}
+
+generate_docs() {
+  builtin cd "$rvm_src_path/$rvm_ruby_string/"
+  rm -rf $rvm_docs_path/$rvm_ruby_string/$rvm_docs_type/
+  $rvm_scripts_path/log "info" "Generating documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
+  $rvm_scripts_path/log "info" "( Errors will be logged to $rvm_log_path/$rvm_ruby_string/docs.error.log )"
+  if gem list | grep ^hanna >/dev/null 2>&1 ; then
+    hanna -o $rvm_docs_path/$rvm_ruby_string/$rvm_docs_type --inline-source --line-numbers --fmt=html 2>> $rvm_log_path/$rvm_ruby_string/docs.error.log
+    hanna --ri --ri-site -o $rvm_docs_path/$rvm_ruby_string/$rvm_docs_type --inline-source --line-numbers --fmt=html 2>> $rvm_log_path/$rvm_ruby_string/docs.error.log
+  else
+    rdoc -a -o $rvm_docs_path/$rvm_ruby_string/$rvm_docs_type 2>> $rvm_log_path/$rvm_ruby_string/docs.error.log
+    rdoc -a --ri --ri-site -o $rvm_docs_path/$rvm_ruby_string/$rvm_docs_type 2>> $rvm_log_path/$rvm_ruby_string/docs.error.log
+  fi
+}
+
+if [[ "open" = "$action" ]] ; then
+  open_docs
+elif [[ "generate" = "$action" ]] ; then
+  generate_docs
+else
+  $rvm_scripts_path/log "error" ""
+  exit 1
+fi
+
+exit $result

data/scripts/env

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+# Recursive loops, oh my!
+unset rvm_default_flag
+
+source $rvm_scripts_path/initialize
+source $rvm_scripts_path/utility
+source $rvm_scripts_path/selector
+
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+
+trap "if [[ -d $rvm_tmp_path/ ]] && [[ -s $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
+
+usage() {
+  printf "Usage: rvm env [ruby_string] [--path]\n"
+}
+
+environment_name="$1"
+
+if [[ -z "$environment_name" ]]; then
+  usage ; exit 1
+fi
+
+rvm_ruby_string="${environment_name}" ;
+
+# Ensure the string is valid before printing an env.
+{ __rvm_ruby_string && __rvm_select && __rvm_use; }> /dev/null 2>&1
+
+if [[ "$?" = 0 ]]; then
+  __rvm_use
+  environment_file_path="$rvm_environments_path/$(__rvm_environment_identifier)"
+  # Echo the path or environment file.
+  if [[ -n "$rvm_path_flag" ]]; then
+    echo "$environment_file_path"
+  else
+    cat "$environment_file_path"
+  fi
+  unset environment_file_path
+  result=0
+else
+  result=1
+fi
+
+unset rvm_ruby_string environment_name
+__rvm_unset_ruby_variables
+
+exit $result
+

data/scripts/fetch

@@ -42,7 +42,7 @@ if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Fetching $
 archive_md5="$($rvm_scripts_path/db "$rvm_config_path/md5" "$archive")"
 if [[ -e "$archive" ]] && [[ ! -z "$archive_md5" ]] ; then
   if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Found archive and its md5, testing correctness" ; fi
-  if [[ $($rvm_scripts_path/md5 $archive $archive_md5) -gt 0 ]] ; then
+  if ! $rvm_scripts_path/md5 "${rvm_archives_path}/${archive}" "$archive_md5" ; then
     if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Archive is bad, downloading" ; fi
     download=1
   else

data/scripts/gemsets

@@ -11,7 +11,7 @@ if [[ ! -d "$rvm_ruby_gem_home" ]] && command -v gem > /dev/null 2>&1; then rvm_
 trap "if [[ -d $rvm_tmp_path/ ]] && [[ -s $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
 
 __rvm_gemset_name() {
-   __rvm_gemset_gemdir |  awk -F${rvm_gemset_separator} '{print $2}'
+   __rvm_gemset_dir |  awk -F${rvm_gemset_separator} '{print $2}'
 }
 
 __rvm_gemset_dir() {
@@ -35,9 +35,7 @@ __rvm_gemset_list() {
 
   if [[ ! -z "$rvm_gems_path" ]] ; then
     if [[ ! -z $rvm_ruby_string ]] ; then
-      for gemdir in $rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}* ; do
-        echo "$gemdir" | awk -F${rvm_gemset_separator} '{print $2}'
-      done
+      \ls ${rvm_gems_path}/ | awk -F"${rvm_gemset_separator}" "/${rvm_ruby_string}${rvm_gemset_separator}/{print \$2}" 2>/dev/null
     else
       $rvm_scripts_path/log "error" "\$rvm_ruby_string is not set!"
     fi
@@ -73,13 +71,13 @@ __rvm_gemset_empty() {
   if [[ -z "$rvm_ruby_gem_home" ]] ; then __rvm_select ; fi
   gemdir="$rvm_ruby_gem_home"
   if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
-    cd $gemdir && rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
+    builtin cd $gemdir && rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
   elif [[ -d "$gemdir" ]] ; then
     $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gemset for gemset '$(basename $gemdir)' ($gemdir)?"
     echo -n "(anything other than 'yes' will cancel) > "
     read response
     if [[ "yes" = "$response" ]] ; then
-      cd $gemdir && rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
+      builtin cd $gemdir && rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
     else
       $rvm_scripts_path/log "info" "Not doing anything, phew... close call that one eh?"
     fi
@@ -102,11 +100,13 @@ __rvm_gemset_copy() {
   destination_path="$(rvm $destination_ruby gem env gemdir | tail -n 1)"
   if [[ -d "$source_path" ]] ; then
     if [[ ! -d "$destination_path" ]] ; then mkdir -p $destination_path ; fi
-    $rvm_scripts_path/log "info" "Copying gemset from $source_ruby to $destination_ruby" ;
+    $rvm_scripts_path/log "info" "Copying gemset from $source_ruby to $destination_ruby"
     for dir in bin doc gems specifications ; do
       mkdir -p "$destination_path/$dir"
       cp -Rf "$source_path/$dir" "$destination_path/"
     done
+    $rvm_scripts_path/log "info" "Making gemset for $destination_ruby pristine."
+    $(rvm $destination_ruby ; gem pristine --all)
   else
     $rvm_scripts_path/log "error" "Gems directory does not exist for $source_path ($source_path)"
     return 1
@@ -295,17 +295,17 @@ __rvm_gem_install() {
 }
 
 # Output the user's current gem directory.
-__rvm_gemset_gemdir() {
+__rvm_gemset_info() {
   if [[ "$rvm_user_flag" -eq 1 ]] ; then
     echo $(rvm system ; gem env | grep "\- $HOME" | awk '{print $NF}')
   elif [[ "$rvm_system_flag" -eq 1 ]] ; then
-    echo $(rvm system ; gem env gemdir system)
+    echo $(rvm system ; gem env $action system)
   elif [[ ! -z "$rvm_ruby_string" ]] ; then
-    echo $(rvm "$rvm_ruby_string" ; gem env gemdir)
+    echo $(rvm "$rvm_ruby_string" ; gem env $action)
   elif [[ ! -z "$GEM_HOME" ]] ; then
     echo "$GEM_HOME"
   else
-    gem env gemdir
+    gem env $action
   fi
 }
 
@@ -342,8 +342,8 @@ elif [[ "dir" = "$action" ]] ; then
   __rvm_gemset_dir
 elif [[ "list" = "$action" ]] ; then
   __rvm_gemset_list
-elif [[ "gemdir" = "$action" ]] ; then
-  __rvm_gemset_gemdir
+elif [[ "gemdir" = "$action" ]] || [[ "gempath" = "$action" ]] || [[ "gemhome" = "$action" ]] || [[ "home" = "$action" ]] || [[ "path" = "$action" ]] || [[ "version" = "$action" ]] ; then
+  __rvm_gemset_info
 elif [[ "install" = "$action" ]] ; then
   __rvm_gem_install $*
 elif [[ "pristine" = "$action" ]] ; then
@@ -352,7 +352,7 @@ elif [[ "clear" = "$action" ]] ; then
   $rvm_scripts_path/log "info" "gemset cleared."
   exit 0
 else
-  $rvm_scripts_path/log "error" "Unrecognized gemset action '$action'.\n\nValid gems actions are: {create,use,import,export,copy,delete,empty,name,list,gemdir,install}"
+  $rvm_scripts_path/log "error" "Unrecognized gemset action '$action'.\n\nValid gems actions are: {import,export,create,copy,empty,delete,name,dir,list,gemdir,install,pristine,clear}"
 fi
 
 exit $?