rvm 0.1.39 → 0.1.40

data/scripts/rubygems

@@ -1,17 +1,13 @@
 #!/usr/bin/env bash
 
-source $rvm_scripts_path/initialize
-source $rvm_scripts_path/utility
-source $rvm_scripts_path/selector
+source "$rvm_scripts_path/base"
 
 result=0
 
-__rvm_select
-
-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
+__rvm_become
 
 rubygems_setup() {
+  __rvm_warn_on_rubyopt
   unset RUBYOPT
   if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.9/')" ]] || [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^mput/')" ]] ; then
     install=0

data/scripts/rvm-install

@@ -23,6 +23,13 @@ usage() {
   "
 }
 
+check_rubyopt_conditions() {
+  if [[ -n "$RUBYOPT" ]]; then
+    printf "\n\nWARNING: You have RUBYOPT set in your current environment. This may interfere with normal rvm"
+    printf "\n operation. If errors show up, please try unsetting RUBYOPT first.\n"
+  fi
+}
+
 spinner_counter=0
 spinner() {
   array=('/' '-' '\\' '|' '/' '-' '\\' '|')
@@ -282,12 +289,14 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   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
     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"
@@ -309,6 +318,7 @@ else
     printf "\nEven if you use zsh you should still adjust the .bashrc as above."
     printf "\nIf you have any questions about this please visit #rvm on irc.freenode.net.\n"
   fi
+  check_rubyopt_conditions
   printf "\nInstallation of RVM to $rvm_path/ is complete.\n\n"
 fi
 

data/scripts/selector

@@ -192,7 +192,7 @@ __rvm_select() {
 
   __rvm_gemset_select
 
-  if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ "system" != "$rvm_ruby_interpreter" ]]  && [[ "default" != "$rvm_ruby_interpreter" ]] ; then
+  if [[ -n "$rvm_ruby_interpreter" && "system" != "$rvm_ruby_interpreter" && "default" != "$rvm_ruby_interpreter" ]] ; then
     if [[ ! -z "$rvm_ruby_version" ]] ; then
       rvm_release_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $1 }')
       rvm_major_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $2 }')

data/scripts/set

@@ -1,12 +1,6 @@
 #!/usr/bin/env bash
 
-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
+source "$rvm_scripts_path/base"
 
 if [[ -z "$1" ]] ; then
   $rvm_scripts_path/log "error" "Action must be specified."
@@ -21,13 +15,14 @@ __rvm_attempt_single_exec() {
   if [[ "$action" != "exec" ]] || $rvm_scripts_path/match "$rvm_ruby_strings" ' '; then
     return 1
   fi
+  __rvm_become "$rvm_ruby_strings"
   eval "exec $args"
 }
 
 # Perform an action using one of a selected ruby's specified binaries.
 __rvm_ruby_do() {
   # Return on invalid rubies.
-  __rvm_become || return 1
+  __rvm_become "$current_set_ruby" || return 1
   if [[ "$action" = "exec" ]]; then
     # Exec is a special case.
     rvm_command="$args"
@@ -73,7 +68,12 @@ __rvm_ruby_do() {
     eval "$rvm_command" >> ./log/$rvm_ruby_string/$action.log 2>> ./log/$rvm_ruby_string/$action.error.log
   else
     if [[ "$rvm_verbose_flag" != "0" ]] ; then
-      $rvm_scripts_path/log "info" "$rvm_ruby_string: $(ruby -v $rvm_ruby_mode | tr "\n" ' ')\n"
+      current_env="$(__rvm_environment_identifier)"
+      if [[ "$current_env" != "$current_set_ruby" ]]; then
+        current_env="$current_set_ruby ($current_env)"
+      fi
+      $rvm_scripts_path/log "info" "$current_env: $(ruby -v $rvm_ruby_mode | tr "\n" ' ')\n"
+      unset current_env
     fi
     eval "$rvm_command"
   fi
@@ -165,9 +165,9 @@ rvm_ruby_strings="$(echo "$rvm_ruby_strings" | tr ',' ' ')"
 # Check for a single ruby && exec if present.
 __rvm_attempt_single_exec
 
-for rvm_ruby_string in ${rvm_ruby_strings} ; do
+for current_set_ruby in ${rvm_ruby_strings} ; do
   __rvm_ruby_do
-done
+done; unset current_set_ruby
 
 if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
 if [[ ! -z "$rvm_yaml_flag" ]]    ; then __rvm_yaml    ; fi

data/scripts/update

@@ -23,6 +23,13 @@ usage() {
   "
 }
 
+check_rubyopt_conditions() {
+  if [[ -n "$RUBYOPT" ]]; then
+    printf "\n\nWARNING: You have RUBYOPT set in your current environment. This may interfere with normal rvm"
+    printf "\n operation. If errors show up, please try unsetting RUBYOPT first.\n"
+  fi
+}
+
 spinner_counter=0
 spinner() {
   array=('/' '-' '\\' '|' '/' '-' '\\' '|')
@@ -282,12 +289,14 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   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
     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"
@@ -309,6 +318,7 @@ else
     printf "\nEven if you use zsh you should still adjust the .bashrc as above."
     printf "\nIf you have any questions about this please visit #rvm on irc.freenode.net.\n"
   fi
+  check_rubyopt_conditions
   printf "\nInstallation of RVM to $rvm_path/ is complete.\n\n"
 fi
 

data/scripts/utility

@@ -63,6 +63,15 @@ __rvm_quote_args() {
   echo "$quoted_string" | sed -e 's/^ *//g' -e 's/ *$//g'
 }
 
+__rvm_warn_on_rubyopt() {
+  if [[ -n "$RUBYOPT" ]]; then
+    $rvm_scripts_path/log "warn" "Please note: You have the RUBYOPT environment variable set and this may interfere with normal rvm operations. We sugges unsetting it."
+    return 1
+  else
+    return 0
+  fi
+}
+
 __rvm_strings() {
   unset results
   for rvm_ruby_string in $(echo $rvm_ruby_args) ; do
@@ -169,6 +178,57 @@ __rvm_with_env() {
   unset rvm_env_args rvm_env_command
 }
 
+# Returns the first 1.8.7-compatible (partly) ruby for use
+# with things like rbx etc which require a ruby be installed.
+__rvm_18_compat_ruby() {
+  rubies=""
+  for ruby_name in $(\ls $rvm_rubies_path); do
+    if [[ ! -L "$rvm_rubies_path/$ruby_name" ]] && $rvm_scripts_path/match "$ruby_name" '^(ruby-1.8.[[:digit:]]|rbx|ree)-'; then
+      rubies="$rubies $ruby_name"
+    fi
+  done; unset ruby_name
+  echo "$rubies" | sed 's/^ //' | tr ' ' '\n' | sort | tail -n1
+  unset rubies
+}
+
+__rvm_ensure_has_18_compat_ruby() {
+  if [[ -z "$(__rvm_18_compat_ruby)" ]]; then
+    # TODO: install currently doesn't return the correct status.
+    original_ruby="$(__rvm_environment_identifier)"
+    local compat_result=0
+    if ! $rvm_bin_path/rvm install 1.8.7; then
+      $rvm_scripts_path/log "fatal" "To proceed rvm requires a 1.8-compatible ruby is installed. We attempted to install 1.8.7 automatically but it failed."
+      $rvm_scripts_path/log "fatal" "Please install it manually (or a compatible alternative) to proceed."
+      compat_result=1
+    fi
+    __rvm_unset_ruby_variables
+    __rvm_become "$original_ruby"
+    unset original_ruby
+    return $compat_result
+  fi
+}
+
+__rvm_inherit_trace_flag() {
+  if [[ -n "$rvm_trace_flag" ]]; then
+    set -x
+    export rvm_trace_flag
+  fi
+}
+
+# Cleans up temp folders for a given prefix,
+# typically the current process id.
+__rvm_cleanup_temp_for() {
+  [[ -z "$1" ]] && return 1
+  if [[ -d "$rvm_tmp_path/" ]]; then
+    rm -rf "$rvm_tmp_path/$1"* >/dev/null 2>&1
+  fi
+  exit
+}
+
+__rvm_cleanup_temp_on_exit() {
+  trap "__rvm_cleanup_temp_for '$$'" 0 1 2 3 15
+}
+
 __rvm_set_rvmrc() {
   if [[ "$HOME" != "$(pwd)" ]] ; then
     if [[ "$rvm_verbose_flag" -eq 1 ]] ; then flags="use " ; fi
@@ -246,16 +306,16 @@ __rvm_reset() {
   PATH="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
   PATH="$rvm_bin_path:$PATH" ; export PATH
 
-  for variable in RUBY_VERSION GEM_HOME BUNDLE_PATH MY_RUBY_HOME ; do unset $variable ; done
-
   for flag in default passenger editor ; do rm -f "$rvm_bin_path"/${flag}_* ; done
+  unset flag
 
   for file in system default ; do
-    if [[ -f "$rvm_path/$file" ]] ; then rm -f $rvm_path/$file ; fi
-    if [[ -f "$rvm_config_path/$file" ]] ; then rm -f $rvm_config_path/$file ; fi
-  done
-  rvm_ruby_interpreter="system"
-  __rvm_select
+    rm -f "$rvm_path/$file" "$rvm_config_path/$file" "$rvm_environments_path/$file"
+  done; unset file
+
+  # Go back to a clean state.
+  __rvm_become "system"
+  __rvm_unset_ruby_variables
 
   for system_config in system_ruby system_gem_path system_user_gem_path ; do
     $rvm_scripts_path/db "$rvm_config_path/user" "$system_config" "delete"
@@ -316,7 +376,7 @@ __rvm_initialize() {
 # Update rubygems or binscripts based on CLI selection.
 __rvm_update() {
   __rvm_pushpop $rvm_path
-  if [[ "head" = "$rvm_ruby_revision" ]] || [[ ! -z "$rvm_self_flag" ]] || [[ "update" = "$rvm_action" ]] || [[ ! -z "$rvm_update_flag" ]] ; then
+  if [[ "$rvm_head_flag" == "1" ]] || [[ ! -z "$rvm_self_flag" ]] || [[ "update" = "$rvm_action" ]] || [[ ! -z "$rvm_update_flag" ]] ; then
     __rvm_version
     __rvm_update_rvm
   fi
@@ -333,18 +393,18 @@ __rvm_update_rvm() {
   mkdir -p "$rvm_src_path"
   __rvm_pushpop "$rvm_src_path"
 
-  if [[ "head" = "$rvm_ruby_revision" ]] || [[ -z "$system_ruby" ]] ; then
+  if [[ "$rvm_head_flag" == "1" ]] ; then
     if [[ -d "$rvm_src_path/rvm/.git" ]] ; then
       builtin cd $rvm_src_path/rvm/ && git pull origin master && ./scripts/install
     else
-      builtin cd $rvm_src_path && git clone git://github.com/wayneeseguin/rvm.git && builtin cd rvm/ && ./install
+      builtin cd $rvm_src_path && git clone http://github.com/wayneeseguin/rvm.git && builtin cd rvm/ && ./scripts/install
     fi
   else
     stable_version=$(curl -s http://rvm.beginrescueend.com/releases/stable-version.txt)
 
     __rvm_run "fetch" "$rvm_scripts_path/fetch 'http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz'" "fetching rvm-${stable_version}.tar.gz"
 
-    __rvm_run "extract" "cat $rvm_archives_path/rvm-${stable_version}.tar.gz | gunzip | tar xf - -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
+    __rvm_run "extract" "cat $rvm_archives_path/rvm-${stable_version}.tar.gz | gunzip | tar xf - -C $rvm_src_path" "Extracting rvm-${stable_version}.tar.gz ..."
 
     __rvm_run "install" "builtin cd $rvm_src_path/rvm-${stable_version}/ ; ./install" "Installing rvm-${stable_version}..."
   fi
@@ -534,6 +594,14 @@ __rvm_gemset_select() {
 
   # Ensure that the ruby gem home exists.
   mkdir -p "$rvm_ruby_gem_home"
+  if [[ -n "$rvm_ruby_gem_home" ]] && echo "$rvm_ruby_gem_home" | grep -q 'rvm'; then
+    if __rvm_using_gemset_globalcache && [[ ! -L "$rvm_ruby_gem_home/cache" ]]; then
+      mv "$rvm_ruby_gem_home/cache/"*.gem "$rvm_gems_cache_path/" 2>/dev/null
+      rm -rf "$rvm_ruby_gem_home/cache"
+      ln -nfs "$rvm_gems_cache_path" "$rvm_ruby_gem_home/cache"
+    fi
+  fi
+
   export rvm_ruby_gem_path rvm_ruby_gem_home
 }
 
@@ -640,6 +708,18 @@ __rvm_ensure_has_enviroment_files() {
   fi
 }
 
+__rvm_using_gemset_globalcache() {
+  $rvm_scripts_path/db "$rvm_config_path/user" "use_gemset_globalcache" | grep -q '^true$'
+}
+
+__rvm_current_gemcache_dir() {
+  if __rvm_using_gemset_globalcache; then
+    echo "$rvm_gems_cache_path"
+  else
+    echo "${rvm_ruby_gem_home:-"$GEM_HOME"}/cache"
+  fi
+}
+
 __rvm_Answer_to_the_Ultimate_Question_of_Life_the_Universe_and_Everything() {
   for index in {1..750} ; do perl -e 'sleep 0.2'; echo -n '.' ; done ; printf "%d" 0x2A ; echo
 }

data/scripts/wrapper

@@ -4,13 +4,7 @@ default_flag="$rvm_default_flag"
 # Prevent it from recursing.
 unset rvm_default_flag rvm_wrapper_name
 
-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
+source "$rvm_scripts_path/base"
 
 full_binary_name() {
   echo "$binary_name" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 85
+  hash: 75
   prerelease: false
   segments: 
   - 0
   - 1
-  - 39
-  version: 0.1.39
+  - 40
+  version: 0.1.40
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 -04:00
+date: 2010-06-22 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -79,7 +79,9 @@ files:
 - scripts/alias
 - scripts/aliases
 - scripts/array
+- scripts/base
 - scripts/cd
+- scripts/cleanup
 - scripts/cli
 - scripts/color
 - scripts/completion