rvm 0.1.41 → 0.1.42

data/scripts/cd

@@ -3,36 +3,21 @@
 # Source a .rvmrc file in a directory after changing to it, if it exists.
 # To disable this fature, set rvm_project_rvmrc=0 in $HOME/.rvmrc
 if [[ "$rvm_project_rvmrc" -ne 0 ]] ; then
-  cd() {
-    builtin cd "$@"
-    local cwd ; cwd=$(pwd)
-    while : ; do
-      if [[ -z "$cwd" ]] || [[ "$HOME" = "$cwd" ]] || [[ "/" = "$cwd" ]] ; then
-        if [[ ! -z "$rvm_rvmrc_cwd" ]] ; then
-          if [[ -z "$rvm_previous_environment" ]] ; then
-            rvm default 1>/dev/null 2>&1
-          else
-            rvm "$rvm_previous_environment"  1>/dev/null 2>&1
-          fi 
-          unset rvm_rvmrc_cwd rvm_previous_environment
-        fi
-        break
-      else
-        if [[ -f "$cwd/.rvmrc" ]] ; then
-          if [[ "$rvm_rvmrc_cwd" != "$cwd" ]] ; then
-            if [[ -z "$rvm_previous_environment" ]] ; then
-              rvm_previous_environment="$(__rvm_environment_identifier)"
-            fi
-            rvm_rvmrc_cwd="$cwd"
-            source "$cwd/.rvmrc"
-            cwd=$(dirname "$cwd")
-          fi
-          break
-        else
-          cwd=$(dirname "$cwd")
-        fi
-      fi
-    done
-    
-  }
+  if [[ -n "$ZSH_VERSION" ]]; then
+    autoload is-at-least
+    if is-at-least 4.3.4 >/dev/null 2>&1; then
+      # On zsh, use chpwd_functions
+      chpwd_functions=( "${chpwd_functions[@]}" __rvm_project_rvmrc )
+    else
+      cd() {
+        builtin cd "$@"
+        __rvm_project_rvmrc
+      }
+    fi
+  else
+    cd() {
+      builtin cd "$@"
+      __rvm_project_rvmrc
+    }
+  fi
 fi

data/scripts/cli

@@ -22,7 +22,7 @@ __rvm_parse_args() {
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      fetch|version|srcdir|reset|debug|reload|update|monitor|notes|implode|seppuku|question|answer)
+      fetch|version|srcdir|reset|debug|reload|update|monitor|notes|implode|seppuku|question|answer|env)
         rvm_action=$rvm_token
       ;;
 
@@ -41,10 +41,6 @@ __rvm_parse_args() {
         if [[ "ruby" = "$1" ]] ; then shift ; fi
       ;;
 
-      env)
-        rvm_action=$rvm_token
-      ;;
-
       install|uninstall)
         export ${rvm_token}_flag=1
         rvm_action=$rvm_token
@@ -119,22 +115,29 @@ __rvm_parse_args() {
 
       -S)
         rvm_action="ruby"
-        rvm_ruby_args="$rvm_token $@"
+        rvm_ruby_args="$rvm_token $(__rvm_quote_args "$@")"
         rvm_parse_break=1
       ;;
 
       -e)
         rvm_action="ruby"
-        rvm_ruby_args="$rvm_token \"$@\""
+        rvm_ruby_args="$rvm_token $(__rvm_quote_args "$@")"
         rvm_parse_break=1
       ;;
 
-      exec|cleanup)
+      exec|cleanup|tools|disk-usage)
         rvm_action="$rvm_token"
         rvm_ruby_args="$(__rvm_quote_args "$@")"
         rvm_parse_break=1
       ;;
 
+      load-rvmrc)
+        rvm_action="$rvm_token"
+        rvm_ruby_args="$1"
+        rvm_parse_break=1
+      ;;
+
+
       do|ruby|rake|gem|rubydo|rakedo|gemdo)
         if [[ "do" = "$rvm_action" ]] ; then rvm_action="ruby" ; fi
         rvm_action=$(echo $rvm_token | sed 's#do##g')
@@ -154,14 +157,14 @@ __rvm_parse_args() {
             fi
           elif [[ "-S" = "$1" ]]  ; then
             rvm_action="ruby"
-            rvm_ruby_args="$flag $@"
+            rvm_ruby_args="$flag $(__rvm_quote_args "$@")"
             rvm_parse_break=1
           elif [[ "-e" = "$1" ]] ; then
             rvm_action="ruby"
-            rvm_ruby_args="$flag '$@'"
+            rvm_ruby_args="$flag $(__rvm_quote_args "$@")"
             rvm_parse_break=1
           else
-            rvm_ruby_args="$*"
+            rvm_ruby_args="$(__rvm_quote_args "$@")"
             rvm_parse_break=1
           fi
         else
@@ -318,6 +321,12 @@ __rvm_parse_args() {
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
       ;;
 
+      --clang)
+        export rvm_clang_flag=1
+        export rvm_prior_cc="$CC"
+        export CC="clang"
+      ;;
+
       -j)
         if [[ ! -z "$1" ]] ; then
           rvm_make_flags="$rvm_make_flags -j$1"
@@ -382,6 +391,11 @@ __rvm_parse_args() {
             if [[ -z "$rvm_action" ]] ; then
               rvm_action="ruby" # Not sure if we really want to do this but we'll try it out.
             fi
+          elif $rvm_scripts_path/match "$rvm_token" "^${rvm_gemset_separator}" ; then
+            rvm_action="use"
+            rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
+            rvm_ruby_string="$(__rvm_environment_identifier | awk -F${rvm_gemset_separator} '{print $1}')"
+            rvm_ruby_strings="${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
           elif $rvm_scripts_path/match "$rvm_token" "^.+${rvm_gemset_separator}.+$" ; then
             rvm_gemset_name="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $2}')"
             rvm_ruby_string="$(echo "$rvm_token" | awk -F${rvm_gemset_separator} '{print $1}')"
@@ -452,7 +466,7 @@ rvm() {
   __rvm_initialize
   __rvm_parse_args "$@"
 
-  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_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd
+  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_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd rvm_clang_flag
   export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_patches_path rvm_patches_path rvm_patchsets_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
@@ -521,6 +535,22 @@ rvm() {
       result=$?
     ;;
 
+    tools)
+      eval "$rvm_scripts_path/tools $rvm_ruby_args"
+      result=$?
+    ;;
+
+    disk-usage)
+      eval "$rvm_scripts_path/disk-usage $rvm_ruby_args"
+      result=$?
+    ;;
+
+
+    load-rvmrc)
+      __rvm_project_rvmrc "$rvm_ruby_args"
+      result=$?
+    ;;
+
     gemset)
       #if $rvm_scripts_path/match $rvm_ruby_args use ; then
       if [[ "$rvm_use_flag" -eq 1 ]] ; then
@@ -553,13 +583,13 @@ rvm() {
       $rvm_scripts_path/monitor ; result=$?
     ;;
     notes)         $rvm_scripts_path/notes   ; result=$?  ;;
-    reload)        unset rvm_loaded_flag ; rvm_reload_flag=1                      ;;
+    reload)        unset rvm_loaded_flag ; rvm_reload_flag=1 ;;
 
     fetch|install|uninstall|remove)
-      if [[ ! -z "$rvm_ruby_string" ]] ; then
-        $rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_string"
-      elif $rvm_scripts_path/match "$rvm_ruby_strings" "," ; then
+      if [[ -n "$rvm_ruby_strings" ]] && $rvm_scripts_path/match "$rvm_ruby_strings" "," ; then
         $rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_strings"
+      elif [[ -n "$rvm_ruby_string" ]]; then
+        $rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_string"
       else
         $rvm_scripts_path/manage "$rvm_action"
       fi

data/scripts/completion

@@ -38,7 +38,7 @@ _rvm_commands ()
   local cur=${COMP_WORDS[COMP_CWORD]}
 
   COMMANDS='\
-        version use reload impload update reset info debug\
+        version use reload implode update reset info debug\
         install uninstall remove\
         ruby gem rake tests specs monitor gemset\
         gemdir srcdir fetch list package notes'

data/scripts/disk-usage

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+#!/usr/bin/env bash
+rvm_base_except="selector"
+source "$rvm_scripts_path/base"
+
+usage() {
+  printf "Usage: 'rvm disk-usage {all,archives,repos,sources,logs,packages}'\n"
+  printf "       Lists the space rvm uses for a given item.\n"
+  exit 1
+}
+
+disk_usage_for_directory() {
+  du -hs "$1" | awk '{print $1}'
+}
+
+disk_usage() {
+  eval "local current_path=\"\$rvm_${2}_path\""
+  if [[ -n "$current_path" && -d "$current_path" && "$current_path" != "/" ]]; then
+    echo "$1 Usage: $(disk_usage_for_directory "$current_path")"
+  fi
+  unset current_path
+}
+
+all_disk_usage() {
+  archives_disk_usage
+  repos_disk_usage
+  sources_disk_usage
+  logs_disk_usage
+  packages_disk_usage
+  total_disk_usage
+}
+
+total_disk_usage() {
+  echo "Total Disk Usage: $(disk_usage_for_directory "$rvm_path")"
+}
+
+archives_disk_usage() { disk_usage "Downloaded Archives" "archives"; }
+repos_disk_usage()    { disk_usage "Repositories" "repo"; }
+sources_disk_usage()  { disk_usage "Extracted Source Code" "src"; }
+logs_disk_usage()     { disk_usage "Log Files" "log"; }
+packages_disk_usage() { disk_usage "Packages" "usr"; }
+
+
+# Exit when there is no argument.
+[[ -z "$1" ]] && usage
+
+case "$1" in
+  all|archives|repos|sources|logs|total|packages) eval "$1_disk_usage" ;;
+  *)        usage ;;
+esac
+

data/scripts/fetch

@@ -3,6 +3,13 @@
 rvm_base_except="selector"
 source "$rvm_scripts_path/base"
 
+# Set it to cleanup the download on interruption.
+trap 'cleanup_download' 1 2 3 15
+
+cleanup_download() {
+  [[ -f "$archive" ]] && rm -rf "$archive"
+}
+
 record_md5() {
   if [[ "Darwin" = "$(uname)" ]] || [[ "FreeBSD" = "$(uname)" ]]; then
     archive_md5="$(/sbin/md5 -q "${archive}")"
@@ -38,7 +45,7 @@ fi
 if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Fetching $archive" ; fi
 
 # Check first if we have the correct archive
-archive_md5="$($rvm_scripts_path/db "$rvm_config_path/md5" "$archive")"
+archive_md5="$($rvm_scripts_path/db "$rvm_config_path/md5" "$archive" | head -n1)"
 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 "${rvm_archives_path}/${archive}" "$archive_md5" ; then
@@ -87,5 +94,4 @@ if [[ $download -gt 0 ]] ; then
     record_md5
   fi
 fi
-
 exit $result

data/scripts/gemsets

@@ -26,7 +26,18 @@ gemset_update() {
 }
 
 gemset_globalcache() {
-  if [[ "$1" == "disable" ]]; then
+  if [[ "$1" == "enabled" ]]; then
+    __rvm_using_gemset_globalcache
+    local globalcache_enabled="$?"
+    local gc_status="Unknown"
+    if [[ "$globalcache_enabled" == "0" ]]; then
+      gc_status="Enabled"
+    else
+      gc_status="Disabled"
+    fi
+    $rvm_scripts_path/log "info" "Gemset global cache is currently: $gc_status"
+    return "$globalcache_enabled"
+  elif [[ "$1" == "disable" ]]; then
     $rvm_scripts_path/log "info" "Removing the global cache (note: this will empty the caches)"
     for directory_name in $(\ls "$rvm_gems_path"); do
       current_cache_path="$rvm_gems_path/$directory_name/cache"
@@ -68,8 +79,8 @@ gemset_dir() {
 gemset_create() {
   rvm_ruby_gem_prefix=$(echo $rvm_ruby_gem_home | sed 's/'${rvm_gemset_separator}'.*$//')
   for gemset in $(echo $gems_args) ; do
-    gem_home="${rvm_ruby_gem_prefix}${rvm_gemset_separator}${gems_args/ /}"
-    mkdir -p $gem_home
+    gem_home="${rvm_ruby_gem_prefix}${rvm_gemset_separator}${gemset}"
+    mkdir -p "$gem_home"
     # When the globalcache is enabled, we need to ensure we setup the cache directory correctly.
     if __rvm_using_gemset_globalcache; then
       if [[ -d "$gem_home/cache" && ! -L "$gem_home/cache" ]]; then
@@ -462,7 +473,7 @@ elif [[ "prune" = "$action" ]] ; then
 elif [[ "update" = "$action" ]]; then
   gemset_update
 elif [[ "globalcache" = "$action" ]]; then
-  gemset_globalcache $2
+  gemset_globalcache "$2"
 elif [[ "clear" = "$action" ]] ; then
   $rvm_scripts_path/log "info" "gemset cleared."
   exit 0

data/scripts/initialize

@@ -1,17 +1,17 @@
 #!/usr/bin/env bash
 
-if [[ "root" = "$(whoami)" ]] ; then
+if [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME/"* ]] || [[ "root" = "$(whoami)" ]] ; then
   rvm_rc_files="${rvm_rc_files:-"/etc/profile /etc/zshenv"}"
 else
   rvm_rc_files="${rvm_rc_files:-"$HOME/.bash_profile $HOME/.bashrc $HOME/.zshenv"}"
 fi
 
-if [[ ! -z "$rvm_archflags" ]] ; then rvm_make_flags_flag=1 ; fi
+[[ -n "$rvm_archflags" ]] && rvm_make_flags_flag=1
 
 rvm_project_rvmrc="${rvm_project_rvmrc:-1}"
 rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-0}"
 
-if [[ "root" = "$(whoami)" ]] ; then
+if [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME/"* ]] || [[ "root" = "$(whoami)" ]] ; then
   rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
   rvm_man_path="${rvm_man_path:-"/usr/local/share/man"}"
 else

data/scripts/install

@@ -44,19 +44,19 @@ if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ;
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
   case "$token" in
-    --auto)    rvm_auto_flag=1          ;;
+    --auto)    rvm_auto_flag=1 ;;
     --prefix)  rvm_prefix="$1" ; shift ;;
     --version) rvm_path="$(pwd)" ; __rvm_version ; unset rvm_path ; exit ;;
-    --help|*)  usage                    ;;
+    --help|*)  usage ;;
   esac
 done
 
 if [[ -z "$rvm_prefix" ]] ; then
   __rvm_load_rvmrc
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_prefix="/usr/local/"
+    rvm_prefix="${rvm_prefix:-"/usr/local/"}"
   else
-    rvm_prefix="$HOME/."
+    rvm_prefix="${rvm_prefix:-"$HOME/."}"
   fi
 fi
 
@@ -87,7 +87,7 @@ rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 
-if [[ "root" = "$(whoami)" ]] ; then
+if [[ -z "$rvm_prefix" ]] && [[ "root" = "$(whoami)" ]] ; then
   rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
 else
   rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
@@ -114,7 +114,7 @@ fi
 
 spinner
 
-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
+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_patches_path $rvm_tmp_path
 
 for file in README LICENCE ; do
   spinner
@@ -139,7 +139,7 @@ if [[ ! -s "$rvm_config_path/user" ]] ; then
 fi
 
 scripts=("monitor" "match" "log" "install" "color" "db" "fetch" "log" "set" "package")
-for script_name in $scripts ; do
+for script_name in "${scripts[@]}" ; do
   spinner
   chmod +x $rvm_scripts_path/$script_name
 done
@@ -148,7 +148,7 @@ done
 # Bin Scripts
 #
 # Cleanse and purge...
-for file in rvm-prompt rvm rvmsudo ; do
+for file in rvm-prompt rvm rvmsudo rvm-shell ; do
   spinner && perl -e 'sleep 0.2'
   rm -f "$rvm_bin_path/$file"
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
@@ -160,7 +160,7 @@ chmod +x $rvm_bin_path/*
 # RC Files
 #
 spinner
-if [[ ! -z "$rvm_auto_flag" ]] ; then
+if [[ -n "$rvm_auto_flag" ]] ; then
   printf "Checking rc files... ($rvm_rc_files)"
   if [[ "$rvm_loaded_flag" != "1" ]] ; then
     for rcfile in $(echo $rvm_rc_files) ; do
@@ -274,16 +274,16 @@ fi
 # End of gemset migration.
 #
 
-if [[ "root" = "$(whoami)" ]] ; then
-  printf "\n    Symlinking rvm to $rvm_bin_path/rvm ..."
-  mkdir -p $rvm_bin_path
-  chmod +x $rvm_bin_path/rvm
-  chmod +x $rvm_bin_path/rvmsudo
-  printf "\n    Copying manpages into place."
-  for man_file in $(\ls "$install_source_path/man"); do
-    cp -f "$install_source_path/man/$man_file" "$rvm_man_path/$man_file"
-  done
-fi
+printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
+mkdir -p $rvm_bin_path
+for file in rvm rvmsudo rvm-shell ; do
+  [[ -s "$rvm_bin_path/$file" ]] && chmod +x "$rvm_bin_path/$file"
+done; unset file
+printf "\n    Copying manpages into place."
+for man_file in $(\ls "$install_source_path/man"); do
+  rm -rf "$rvm_man_path/$man_file"
+  cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
+done
 
 if [[ "$upgrade_flag" -eq 0 ]] ; then
   ./scripts/notes
@@ -303,20 +303,19 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n$(tput setaf 6)Upgrade Notes\n"
   printf "\n  * 'rvm notes' tells you OS dependency packages for installing rubies."
   printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
-  printf "\n  * 1.8.7 default patchlevel is p174, override ~/.rvm/config/db in ~/.rvm/config/user"
   printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
   printf "\n$(tput sgr0)\n"
   check_rubyopt_conditions
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else
-  if [[ "root" != "$(whoami)" ]] ; then
+  if [[ -z "$rvm_prefix" ]] && [[ "root" != "$(whoami)" ]] ; then
     printf "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
     printf "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
     printf "\n     [[ -s \$HOME/.rvm/scripts/rvm ]] && source \$HOME/.rvm/scripts/rvm"
     printf "\n   Please note that this must only occur once - so, you only need to add it the first time you install rvm."
     printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-    printf "\n   This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
-    printf "\n   if [[ ! -z "$PS1" ]] ; then"
+    printf "\n   This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:"
+    printf "\n   if [[ -n "\$PS1" ]] ; then"
     printf "\n     ... original content that was below the && return line ..."
     printf "\n   fi # <= be sure to close the if."
     printf "\n   #EOF .bashrc"
@@ -325,7 +324,7 @@ else
     printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
     printf "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
   fi
-  if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
+  if [[ -s $HOME/.bashrc ]] && grep -q '&& return' $HOME/.bashrc ; then
     printf "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc."
     printf "\n   This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:"
     printf "\n   if [[ -n "\$PS1" ]] ; then"