rvm 0.1.27 → 0.1.29

data/scripts/package

@@ -4,8 +4,20 @@
 # ruby dependency packages:
 #
 
+for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
+  if [[ -f "$rvmrc" ]] ; then
+    if grep -q '^\s*rvm .*$' $rvmrc ; then
+      $rvm_scripts_path/log "error" "$rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
+      return 1
+    else
+      source "$rvmrc"
+    fi
+  fi
+done
+
 source $rvm_scripts_path/initialize
 source $rvm_scripts_path/utility
+__rvm_load_rvmrc
 
 trap "rm -f $rvm_tmp_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
 if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
@@ -37,7 +49,7 @@ install_package() {
 
   builtin cd "$rvm_src_path/$package-$version"
 
-  __rvm_run "$package/configure" "${configure:-"./configure --prefix=$rvm_usr_path"} $configure_flags" "Configuring $package in $rvm_src_path/$package-$version."
+  __rvm_run "$package/configure" "${configure:-"./configure --prefix=${prefix_path:-"$rvm_usr_path"}"} $configure_flags" "Configuring $package in $rvm_src_path/$package-$version."
 
   unset configure_flags
 
@@ -79,20 +91,27 @@ openssl() {
   else
     export openssl_os="os/compiler darwin-i386-cc"
   fi
-  package="openssl" ; version="0.9.8k" ; archive_format="tar.gz"
+  package="openssl" ; version="0.9.8n" ; archive_format="tar.gz"
   package_url="http://www.openssl.org/source"
   configure="./config --prefix=$rvm_usr_path zlib no-asm no-krb5 shared"
   install_package
 }
 
 zlib() {
-  package="zlib" ; version="1.2.4" ; archive_format="tar.gz"
+  package="zlib" ; version="1.2.5" ; archive_format="tar.gz"
   package_url="http://www.zlib.net"
   install_package
 }
 
-ncurses() {
+autoconf() {
+  package_url="ftp.gnu.org/gnu/autoconf"
+  package="autoconf" ; version="2.65" ; archive_format="tar.gz"
+
+  prefix_path="${rvm_symlink_path:-"${rvm_path:-"$HOME/.rvm"}/bin"}"
+  install_package
+}
 
+ncurses() {
   package_url="http://ftp.gnu.org/pub/gnu/ncurses"
   package="ncurses" ; version="5.7" ; archive_format="tar.gz"
   configure_flags="--with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs"
@@ -111,6 +130,16 @@ gettext() {
   install_package
 }
 
+libxml2() {
+  package_url="ftp://xmlsoft.org/libxml2/"
+  package="libxml2" ; version="2.7.3" ; archive_format="tar.gz"
+  if [[ "Darwin" = "$(uname)" ]] ; then
+    configure="./configure --prefix=${rvm_usr_path} --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
+  fi
+  install_package
+  unset prefix_path
+}
+
 glib() {
   package="glib" ; version="2.23.1" ; archive_format="tar.gz"
   package_url="http://ftp.gnome.org/pub/gnome/sources/glib/2.23"
@@ -146,7 +175,7 @@ llvm() {
 }
 
 if [[ ! -z "$library" ]] ; then
-  if [[ " readline iconv curl openssl zlib ncurses pkgconfig gettext glib mono llvm " =~ "$library" ]] ; then
+  if [[ " readline iconv curl openssl zlib autoconf ncurses pkgconfig gettext glib mono llvm libxml2 " =~ "$library" ]] ; then
     ${library}
   else
     $rvm_scripts_path/log "error" "Package '${library}' is unknown."

data/scripts/rvm

@@ -9,8 +9,16 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
 
   mkdir -p $HOME/.gem/cache
 
-  if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-  if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+  for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
+    if [[ -f "$rvmrc" ]] ; then
+      if grep -q '^\s*rvm .*$' $rvmrc ; then
+        echo -e "Error: $rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
+        return 1
+      else
+        source "$rvmrc"
+      fi
+    fi
+  done
 
   if [[ -z "$rvm_prefix" ]] ; then
     if [[ "root" = "$(whoami)" ]] ; then

data/scripts/rvm-install

@@ -29,7 +29,7 @@ spinner() {
   index=$((($spinner_counter % 8)))
   echo -e -n "\r${array[$index]}"
   let "spinner_counter=spinner_counter+1"
-  which perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
+  command -v perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
 }
 
 if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
@@ -56,6 +56,7 @@ fi
 if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
+
 if grep -q 'scripts/rvm' $HOME/.bash* || grep -q 'scripts/rvm' $HOME/.zsh*; then
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
     export upgrade_flag=1
@@ -102,7 +103,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 $rvm_symlink_path $HOME/.gem/cache
+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
 
 for file in README LICENCE ; do
   spinner
@@ -112,7 +113,7 @@ done
 #
 # Scripts
 #
-for dir_name in config scripts examples lib hooks ; do
+for dir_name in config scripts examples lib hooks help ; do
   spinner
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -265,17 +266,28 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
 else
   if [[ "root" != "$(whoami)" ]] ; then
     echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
-    echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
+    echo -e "\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:"
     echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
     echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-    echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must remove it and split your .bashrc"
-    echo -e "\n   Put everything *except the return code line(s)* into your .bash_profile, and everything above that code in your .bashrc."
-    echo -e "\n   Be *sure* to REMOVE the '&& return' statement line."
+    echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
+    echo -e "\n   if [[ ! -z "$PS1" ]] ; then"
+    echo -e "\n     ... original content that was below the && return line ..."
+    echo -e "\n   fi # <= be sure to close the if."
+    echo -e "\n   #EOF .bashrc"
+    echo -e "\n   Be absolutely *sure* to REMOVE the '&& return'."
     echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
-    echo -e "\n4) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+    echo -e "\n   placing all non-interactive items in the .bashrc"
+    echo -e "\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
-    echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc. Please remove it and refactor your profiles to be correct. If you have questions about this please visit #rvm on irc.freenode.net.\n"
+    echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc.
+       This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:
+       if [[ ! -z "$PS1" ]] ; then
+         ... original content that was below the && return line ...
+       fi # <= be sure to close the if.
+       #EOF .bashrc
+
+    If you have any questions about this please visit #rvm on irc.freenode.net.\n"
   fi
   echo -e "Installation of RVM to $rvm_path/ is complete.\n\n"
 fi

data/scripts/selector

@@ -31,7 +31,7 @@ __rvm_select() {
         else
           __rvm_db "macruby_version" "rvm_ruby_version"
           __rvm_db "macruby_url" "rvm_url"
-          rvm_ruby_package_name="MacRuby%200.5.zip"
+          rvm_ruby_package_name="MacRuby%20${rvm_ruby_version}.zip"
           rvm_ruby_package_file="$rvm_ruby_package_name"
           rvm_url="$rvm_url/$rvm_ruby_package_name"
         fi
@@ -68,12 +68,14 @@ __rvm_select() {
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
         rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
       else
-        rvm_archive_extension="zip"
+        rvm_archive_extension="tar.gz"
         rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
+        jruby_url="$(__rvm_db "jruby_url")"
         rvm_ruby_package_file="${rvm_ruby_interpreter}-bin-${rvm_ruby_version}"
         rvm_ruby_package_name="${rvm_ruby_interpreter}-${rvm_ruby_version}"
         rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
-        rvm_url="http://jruby.org.s3.amazonaws.com/downloads/${rvm_ruby_version}/${rvm_ruby_package_file}.tar.gz"
+        rvm_url="${jruby_url}/${rvm_ruby_version}/${rvm_ruby_package_file}.tar.gz"
+        unset jruby_url
       fi
       alias jruby_ng="jruby --ng"
       alias jruby_ng_server="jruby --ng-server"
@@ -104,20 +106,20 @@ __rvm_select() {
     ironruby)
       unset rvm_ruby_patch_level
       if [[ "$rvm_head_flag" -eq 1 ]] ; then
-        export rvm_ruby_version="head"
-        export rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
-        export rvm_ruby_package_name="${rvm_ruby_string}"
-        export rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
-        export rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
+        rvm_ruby_version="head"
+        rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
+        rvm_ruby_package_name="${rvm_ruby_string}"
+        rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
+        rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
       else
-        export rvm_archive_extension="tar.gz"
-        export rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ironruby_version")"}
-        export rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
-        sha1=$(curl -s http://github.com/api/v2/yaml/repos/show/ironruby/ironruby/tags | awk '/'${rvm_ruby_version}'/{print $NF}')
-        export rvm_ruby_package_file="ironruby-ironruby-${sha1:0:7}.${rvm_archive_extension}"
-        export rvm_ruby_package_name="ironruby-ironruby-${sha1:0:7}"
-        export rvm_url="$(__rvm_db "ironruby_url")v${rvm_ruby_version}"
+        rvm_archive_extension="zip"
+        rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ironruby_version")"}
+        rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
+        rvm_ruby_package_name="${rvm_ruby_interpreter}-${rvm_ruby_version}"
+        rvm_ruby_package_file="${rvm_ruby_interpreter}-${rvm_ruby_version}.${rvm_archive_extension}"
+        rvm_url="$(__rvm_db "ironruby_${rvm_ruby_version}_url")${rvm_ruby_package_file}"
       fi
+      export rvm_ruby_version rvm_ruby_string rvm_ruby_package_name rvm_ruby_repo_url rvm_url rvm_archive_extension
     ;;
 
     ree)
@@ -164,8 +166,8 @@ __rvm_select() {
     ;;
 
     current)
-      ruby_binary="$(which binary 2>/dev/null)"
-      if $rvm_scripts_path/match "$ruby_binary" "rvm" ; then
+      ruby_binary="$(command -v ruby)"
+      if [[ $? -eq 0 ]] && $rvm_scripts_path/match "$ruby_binary" "rvm" ; then
         rvm_ruby_string="$(dirname "$ruby_binary" | xargs dirname | xargs basename)"
       else
         rvm_ruby_interpreter="system"
@@ -373,6 +375,12 @@ __rvm_ruby_string() {
 
   __rvm_unset_ruby_variables
 
+  # Alias'd rubies
+  if [[ -z "$alias_name" ]] ; then
+    value="$($rvm_scripts_path/db "$rvm_config_path/alias" "$ruby_string" 2>/dev/null)"
+    if [[ ! -z "$value" ]] ; then ruby_string="$value" ; fi
+  fi
+
   for string in $(echo $ruby_string | tr '-' ' ') ; do
     if [[ "head" = "$string" ]] ; then
       rvm_ruby_revision="head"

data/scripts/set

@@ -22,15 +22,13 @@ __rvm_ruby_do() {
 
   binary="$(echo $action | sed 's#do$##')"
   if [[ -x "$rvm_ruby_home/bin/$binary" ]] ; then
-    rm -f "$rvm_path/gems/cache"
-    ln -nfs "$HOME/.gem/cache" "$rvm_path/gems/cache"
     binary="$rvm_ruby_home/bin/$binary"
   elif [[ -x "$rvm_ruby_global_gems_path/bin/$binary" ]] ; then
     binary="$rvm_ruby_global_gems_path/bin/$binary"
   elif [[ -x "$rvm_ruby_gem_home/bin/$binary" ]] ; then
     binary="$rvm_ruby_gem_home/bin/$binary"
-  elif [[ "system" = "$rvm_ruby_string" ]] && [[ -x "$(which $binary)" ]] ; then
-    binary="$(basename $(which $binary 2>/dev/null) 2>/dev/null)"
+  elif [[ "system" = "$rvm_ruby_string" ]] && [[ -x "$(command -v $binary)" ]] ; then
+    binary="$(basename $(command -v $binary) 2>/dev/null)"
   else
     $rvm_scripts_path/log "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
     __rvm_unset_ruby_variables
@@ -42,7 +40,7 @@ __rvm_ruby_do() {
     rvm_ruby_mode="--$(echo $rvm_ruby_mode | sed 's/^m//')"
   fi
 
-  load_path="$(dirname $(which $binary 2>/dev/null) 2>/dev/null):$rvm_ruby_load_path"
+  load_path="$(dirname $(command -v $binary) 2>/dev/null):$rvm_ruby_load_path"
   # TODO: the else case below should be run if $args =~ /\.rb$/
   if [[ "ruby" = "$(basename $binary)" ]] && [[ "$rvm_benchmark_flag" -ne 1 ]] ; then
     if $rvm_scripts_path/match "$args" "\.rb$" ; then
@@ -64,7 +62,9 @@ __rvm_ruby_do() {
     touch ./log/$rvm_ruby_string/$action.log ./log/$rvm_ruby_string/$action.error.log
     eval "$rvm_command" >> ./log/$rvm_ruby_string/$action.log 2>> ./log/$rvm_ruby_string/$action.error.log
   else
-    $rvm_scripts_path/log "info" "$rvm_ruby_string: $($rvm_ruby_home/bin/ruby -v $rvm_ruby_mode | tr "\n" ' ')"
+    if [[ "$rvm_verbose_flag" != "0" ]] ; then
+      $rvm_scripts_path/log "info" "$rvm_ruby_string: $($rvm_ruby_home/bin/ruby -v $rvm_ruby_mode | tr "\n" ' ')"
+    fi
     eval "$rvm_command"
   fi
   result=$?
@@ -146,7 +146,7 @@ __rvm_json() {
 
 # Loop over a set or all rvm installed rubies to perform some action.
 # Record the results and report based on CLI selections.
-#__rvm_do() {
+
 rubies=() ; successes=() ; errors=() ; statuses=()
 # TODO: Extract the common functionality out of the if below
 if [[ ! -z "$rvm_ruby_string" ]] ; then
@@ -175,5 +175,3 @@ if [[ ! -z "$rvm_json_flag" ]]    ; then __rvm_json    ; fi
 $rvm_scripts_path/hook "after_do"
 
 exit ${#errors[*]}
-#}
-

data/scripts/update

@@ -29,7 +29,7 @@ spinner() {
   index=$((($spinner_counter % 8)))
   echo -e -n "\r${array[$index]}"
   let "spinner_counter=spinner_counter+1"
-  which perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
+  command -v perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
 }
 
 if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
@@ -56,6 +56,7 @@ fi
 if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
+
 if grep -q 'scripts/rvm' $HOME/.bash* || grep -q 'scripts/rvm' $HOME/.zsh*; then
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
     export upgrade_flag=1
@@ -102,7 +103,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 $rvm_symlink_path $HOME/.gem/cache
+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
 
 for file in README LICENCE ; do
   spinner
@@ -112,7 +113,7 @@ done
 #
 # Scripts
 #
-for dir_name in config scripts examples lib hooks ; do
+for dir_name in config scripts examples lib hooks help ; do
   spinner
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -265,17 +266,28 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
 else
   if [[ "root" != "$(whoami)" ]] ; then
     echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
-    echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
+    echo -e "\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:"
     echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
     echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-    echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must remove it and split your .bashrc"
-    echo -e "\n   Put everything *except the return code line(s)* into your .bash_profile, and everything above that code in your .bashrc."
-    echo -e "\n   Be *sure* to REMOVE the '&& return' statement line."
+    echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
+    echo -e "\n   if [[ ! -z "$PS1" ]] ; then"
+    echo -e "\n     ... original content that was below the && return line ..."
+    echo -e "\n   fi # <= be sure to close the if."
+    echo -e "\n   #EOF .bashrc"
+    echo -e "\n   Be absolutely *sure* to REMOVE the '&& return'."
     echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
-    echo -e "\n4) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+    echo -e "\n   placing all non-interactive items in the .bashrc"
+    echo -e "\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
-    echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc. Please remove it and refactor your profiles to be correct. If you have questions about this please visit #rvm on irc.freenode.net.\n"
+    echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc.
+       This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:
+       if [[ ! -z "$PS1" ]] ; then
+         ... original content that was below the && return line ...
+       fi # <= be sure to close the if.
+       #EOF .bashrc
+
+    If you have any questions about this please visit #rvm on irc.freenode.net.\n"
   fi
   echo -e "Installation of RVM to $rvm_path/ is complete.\n\n"
 fi

data/scripts/utility

@@ -26,64 +26,56 @@ is_a_function() { type $1 | head -n 1 | grep -q "function" ; }
 
 # Ouput rvm environment information.
 __rvm_info() {
-
   if [[ ! -z "$rvm_ruby_args" ]] ; then
-    echo $(rvm_ruby_string="$rvm_ruby_args"; __rvm_select ; __rvm_use ; __rvm_environment_info)
-    echo -e $info ; unset info
+    cat < <(rvm_ruby_string="$rvm_ruby_args"; __rvm_select ; __rvm_use ; __rvm_environment_info; echo -e "$environment_info")
   else
     __rvm_environment_info
+    echo -e "$environment_info"
   fi
-
 }
 
 __rvm_environment_info() {
-  if [[ ! -z "$(/usr/bin/which ruby 2>/dev/null)" ]] ; then full_version=$(ruby -v) ; fi
-  echo -e "system:\n  uname:        \"$(uname -a)\""
-
-  if [[ ! -z "$ZSH_VERSION" ]] ; then echo -e "  shell:         \"zsh\"\n  version:     \"$ZSH_VERSION\"" ; fi
-  if [[ ! -z "$BASH_VERSION" ]] ; then echo -e "  shell:        \"bash\"\n  version:      \"$BASH_VERSION\"" ; fi
-
-  cat <<Ruby
-
-ruby:
-  interpreter:  "$(echo $full_version | awk '{print $1}')"
-  version:      "$(echo $full_version | awk '{print $2}')"
-  date:         "$(echo $full_version | sed 's/^.*(\([0-9]\{4\}\(-[0-9][0-9]\)\{2\}\).*$/\1/')"
-  platform:     "$(echo $full_version | sed 's/^.*\[//' | sed 's/\].*$//')"
-  patchlevel:   "$(echo $full_version | sed 's/^.*(//' | sed 's/).*$//')"
-  full_version: "$full_version"
-
-Ruby
-
-  cat <<Homes
-homes:
-  gem:          "${GEM_HOME:-'not set'}"
-  ruby:         "${MY_RUBY_HOME:-'not set'}"
-Homes
-
-  cat <<Binaries
-binaries:
-  ruby:         "$(which ruby 2>/dev/null)"
-  irb:          "$(which irb 2>/dev/null)"
-  gem:          "$(which gem 2>/dev/null)"
-  rake:         "$(which rake 2>/dev/null)"
-Binaries
+  environment_info="" ; full_version=""
+  ruby=$(command -v ruby)
+  if [[ $? -eq 0 ]] && [[ -x "$ruby" ]] ; then full_version="$($ruby -v)" ; fi
 
-  cat <<Environment
-
-environment:
-  GEM_HOME:     "$GEM_HOME"
-  GEM_PATH:     "$GEM_PATH"
-  BUNDLE_PATH:  "$BUNDLE_PATH"
-  MY_RUBY_HOME: "$MY_RUBY_HOME"
-  IRBRC:        "$IRBRC"
-Environment
-
-  gemset="$(echo $GEM_HOME | awk -F${rvm_gemset_separator:-'@'} '{print $2}')"
-  echo -e "  gemset:       \"$gemset\"\n"
-
-  if [[ ! -z "$MAGLEV_HOME" ]] ; then info="$info\n  MAGLEV_HOME: \"$MAGLEV_HOME\"" ; fi
+  environment_info="$environment_info\nsystem:\n  uname:        \"$(uname -a)\""
 
+  if [[ ! -z "$ZSH_VERSION" ]]  ; then
+    environment_info="$environment_info\n  shell:        \"zsh\"\n  version:     \"$ZSH_VERSION\""
+  fi
+  if [[ ! -z "$BASH_VERSION" ]] ; then
+    environment_info="$environment_info\n  shell:        \"bash\"\n  version:      \"$BASH_VERSION\""
+  fi
+  environment_info="$environment_info\n\nrvm:"
+  environment_info="$environment_info\n  type:         \"$(head -n 1 < <(type rvm))\""
+  environment_info="$environment_info\n  version:      \"$(__rvm_version | tr "\n" ' ' | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')\""
+  environment_info="$environment_info\n\nruby:"
+  environment_info="$environment_info\n  interpreter:  \"$(echo "${full_version}" | awk '{print $1}')\""
+  environment_info="$environment_info\n  version:      \"$(echo "${full_version}" | awk '{print $2}')\""
+  environment_info="$environment_info\n  date:         \"$(echo "${full_version}" | sed 's/^.*(\([0-9]\{4\}\(-[0-9][0-9]\)\{2\}\).*$/\1/')\""
+  environment_info="$environment_info\n  platform:     \"$(echo "${full_version}" | sed 's/^.*\[//' | sed 's/\].*$//')\""
+  environment_info="$environment_info\n  patchlevel:   \"$(echo "${full_version}" | sed 's/^.*(//' | sed 's/).*$//')\""
+  environment_info="$environment_info\n  full_version: \"${full_version}\""
+  environment_info="$environment_info\n\nhomes:"
+  environment_info="$environment_info\n  gem:          \"${GEM_HOME:-'not set'}\""
+  environment_info="$environment_info\n  ruby:         \"${MY_RUBY_HOME:-'not set'}\""
+  environment_info="$environment_info\n\nbinaries:"
+  environment_info="$environment_info\n  ruby:         \"$(command -v ruby)\""
+  environment_info="$environment_info\n  irb:          \"$(command -v irb)\""
+  environment_info="$environment_info\n  gem:          \"$(command -v gem)\""
+  environment_info="$environment_info\n  rake:         \"$(command -v rake)\""
+  environment_info="$environment_info\n\nenvironment:"
+  environment_info="$environment_info\n  GEM_HOME:     \"$GEM_HOME\""
+  environment_info="$environment_info\n  GEM_PATH:     \"$GEM_PATH\""
+  environment_info="$environment_info\n  BUNDLE_PATH:  \"$BUNDLE_PATH\""
+  environment_info="$environment_info\n  MY_RUBY_HOME: \"$MY_RUBY_HOME\""
+  environment_info="$environment_info\n  IRBRC:        \"$IRBRC\""
+  environment_info="$environment_info\n  RUBYOPT:      \"$RUBYOPT\""
+  environment_info="$environment_info\n  gemset:       \"$(echo $GEM_HOME | awk -F${rvm_gemset_separator:-'@'} '{print $2}')\"\n"
+  if [[ ! -z "$MAGLEV_HOME" ]] ; then
+    environment_info="$environment_info\n  MAGLEV_HOME: \"$MAGLEV_HOME\""
+  fi
   unset full_version
 }
 
@@ -119,7 +111,7 @@ __rvm_debug() {
 
   for file_name in $(echo $debug_files); do
     if [[ -f "$file_name" ]] && [[ -s "$file_name" ]] ; then
-      $rvm_scripts_path/log "debug" "$file_name (filtered):\n$(cat $file_name | awk '!/assword|_key/')\n"
+      $rvm_scripts_path/log "debug" "$file_name \(filtered\):\n$(cat $file_name | awk '!/assword|_key/')\n"
     fi
   done
 
@@ -134,7 +126,6 @@ __rvm_strings() {
       return 1
     else
       results="$results $(__rvm_select ; echo $rvm_ruby_string)"
-      unset rvm_ruby_string
     fi
   done
   echo $results
@@ -199,7 +190,7 @@ __rvm_cleanup_variables() {
 
 # Unset ruby-specific variables
 __rvm_unset_ruby_variables() {
-  unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_gem_path
+  unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_gem_path rvm_ruby_name rvm_ruby_alias
 }
 
 __rvm_set_rvmrc() {
@@ -220,8 +211,16 @@ __rvm_set_rvmrc() {
 
 }
 __rvm_load_rvmrc() {
-  if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-  if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+  for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
+    if [[ -f "$rvmrc" ]] ; then
+      if grep -q '^\s*rvm .*$' $rvmrc ; then
+        $rvm_scripts_path/log "error" "$rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
+        return 1
+      else
+        source "$rvmrc"
+      fi
+    fi
+  done
 }
 
 # Wrap the specified ruby code file in a Benchmark.bmbm block and execute it.
@@ -291,14 +290,13 @@ __rvm_load_defaults() {
 
   __rvm_db "system_ruby" "rvm_system_ruby"
   if [[ ! -z "$rvm_system_ruby" ]] ; then
-    rvm_system_ruby=$(which ruby 2>/dev/null)
+    rvm_system_ruby=$(command -v ruby)
     if [[ $? -ne 0 ]] ; then
       $rvm_scripts_path/log "info" "System ruby not found, no system default will be stored."
     else
       $rvm_scripts_path/db "$rvm_config_path/user" "system_ruby" "$rvm_system_ruby"
-
       # Now store system system & user gem paths
-      if [[ ! -z "$(which gem 2>/dev/null)" ]] ; then
+      if [[ ! -z "$(command -v gem)" ]] ; then
         __rvm_db "system_user_gem_path" "rvm_system_user_gem_path"
         if [[ -z "$rvm_system_user_gem_path" ]] ; then
           rvm_system_user_gem_path=$( rvm system ; gem env gemdir user; )
@@ -425,7 +423,7 @@ __rvm_list_known() {
   echo -e "jruby-1.2.0\njruby-1.3.1\njruby(-1.4.0) # the default\njruby-head"
   echo -e "rbx(-prc1) # default\nrbx-head"
   echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
-  echo -e "maglev(-23191)\nmaglev-head"
+  echo -e "maglev(-23400)\nmaglev-head"
   echo -e "mput(-head) # shyouhei head, the default mput"
   echo -e "ironruby-0.9.3\nironruby-1.0-rc2\nironruby-head"
   if [[ "Darwin" = "$(uname)" ]] ; then
@@ -435,7 +433,7 @@ __rvm_list_known() {
 
 __rvm_list_rubies() {
   echo
-  ruby=$(which ruby 2>/dev/null) ; current_ruby=""
+  ruby=$(command -v ruby) ; current_ruby=""
   if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo $ruby | awk '/rvm/')" ]] ; then
     current_ruby="$(echo $ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
   fi
@@ -462,18 +460,18 @@ __rvm_list_rubies() {
     fi ; unset version
   fi
 
-  system_ruby="$(rvm system ; which ruby 2>/dev/null)"
-  if [[ ! -z "$system_ruby" ]] && [[ -x "$system_ruby" ]]; then
+  system_ruby="$(rvm system ; command -v ruby)"
+  if [[ ! -z "$system_ruby" ]] && [[ -x "$system_ruby" ]] ; then
     echo -e "\nSystem Ruby\n"
     system_version=$($system_ruby -v)
-    string="[ $(file $system_ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+    binary=$(ls -l "$system_ruby" | awk '{print $NF}') # Account for symbolic links.
+    string="[ $(file $binary | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+
     if [[ ! -z "$system_ruby" ]] && [[ "$current_ruby" = "$system_version" ]] ; then echo -n "=> " ; else echo -n "   " ; fi
     echo -e "$(tput setaf 2)system$(tput sgr0) $string"
-  else
-    $rvm_scripts_path/log "info" "No system ruby found."
   fi
 
-  unset current_ruby version selected system_ruby system_version string
+  unset current_ruby version selected system_ruby system_version string binary
   echo
 }
 
@@ -532,7 +530,7 @@ __rvm_update_rvm() {
 }
 
 __rvm_reboot() {
-  $rvm_scripts_path/log "warn" "Do you wish to reset rvm? ('yes', or 'no')"
+  $rvm_scripts_path/log "warn" "Do you wish to reboot rvm? ('yes', or 'no')"
   read response
   if [[ "yes" = "$response" ]] ; then
     builtin cd $rvm_path
@@ -571,10 +569,10 @@ __rvm_pushpop() {
 # Meant for use before and after an operation that might reset the currently selected ruby.
 __rvm_state() {
   if [[ -z "$rvm_state" ]] ; then
-    if [[ -z "$(which ruby 2>/dev/null | awk /$(basename $rvm_rubies_path)/)" ]] ; then
+    if [[ -z "$(command -v ruby | awk /$(basename $rvm_rubies_path)/)" ]] ; then
       rvm_state=system
     else
-      rvm_state="$(dirname "$(which ruby 2>/dev/null)" | xargs dirname | xargs basename)"
+      rvm_state="$(dirname "$(command -v ruby)" | xargs dirname | xargs basename)"
     fi
   else
     rvm_ruby_string="$rvm_state"
@@ -587,7 +585,7 @@ __rvm_state() {
 # Output an inspection of selected 'binary' scripts, based on CLI selection.
 __rvm_inspect() {
   for binary in $rvm_ruby_args ; do
-    actual_file="$(which $binary 2>/dev/null)"
+    actual_file="$(command -v $binary)"
     $rvm_scripts_path/log "info" "$actual_file:"
     if [[ ! -z "$rvm_shebang_flag" ]] ; then cat $actual_file | head -n 1    ; fi
     if [[ ! -z "$rvm_env_flag" ]]     ; then cat $actual_file | awk '/ENV/'  ; fi
@@ -638,7 +636,7 @@ __rvm_make_flags() {
 # Select a gemset based on CLI set options and environment.
 # This only sets 'rvm_ruby_gem_home'
 __rvm_gemset_select() {
-  which gem > /dev/null 2>&1
+  command -v gem > /dev/null
   if [[ $? -gt 0 ]] ; then return 0 ; fi # Stop if no 'gem' command is available.
 
   rvm_ruby_global_gems_path="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}global"
@@ -664,7 +662,7 @@ __rvm_gemset_select() {
     else
       if [[ ! -z "$rvm_ruby_string" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
         rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
-      elif [[ -z "$GEM_HOME" ]]  && [[ ! -z "$(which gem 2>/dev/null)" ]] ; then
+      elif [[ -z "$GEM_HOME" ]]  && [[ ! -z "$(command -v gem)" ]] ; then
         rvm_ruby_gem_home=$(gem env gemdir)
       elif [[ ! -z "$GEM_HOME" ]] ; then
         rvm_ruby_gem_home="$GEM_HOME"
@@ -674,8 +672,20 @@ __rvm_gemset_select() {
     fi
     if [[ -z "$rvm_gemset_name" ]] ; then unset rvm_gemset_name ; fi
   else
-    if [[ -z "$rvm_ruby_gem_home" ]] || [[ ! -z "$(echo $rvm_ruby_gem_home | grep ${rvm_gemset_separator})" ]] ; then
-      rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
+    gemset=$(echo "$rvm_ruby_gem_home" | awk -F'@' '{print $NF}')
+    if [[ -z "$rvm_ruby_string" ]] && [[ ! -z "${GEM_HOME/@*/}" ]] ; then
+      rvm_ruby_string=$(basename ${GEM_HOME/@*/})
+    fi
+
+    if [[ ! -z "$rvm_ruby_string" ]] ; then
+      if [[ -z "$rvm_ruby_gem_home" ]] || [[ ! -z "$gemset" ]] ; then
+        rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
+      elif [[ ! -z "$gemset" ]] && [[ "$rvm_gemset_name" != "$gemset" ]] ; then
+        rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
+      fi ; unset gemset
+    else
+      $rvm_scripts_path/log "error" "Gemsets can not be used with non rvm controlled rubies (currently)."
+      return 1
     fi
   fi
 
@@ -766,3 +776,15 @@ __rvm_mono_env() {
   export PKG_CONFIG_PATH="$rvm_usr_path/lib/pkgconfig:$PKG_CONFIG_PATH"
   PATH="$rvm_usr_path/bin:$PATH"
 }
+
+__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
+}
+
+__rvm_ultimate_question() {
+  echo "I do not know the Ultimate Question, "
+  echo "however I can help you build a more "
+  echo "powerful Ruby which can compute the "
+  echo "Ultimate Question."
+}
+