rvm 0.1.35 → 0.1.36

data/README

@@ -15,6 +15,7 @@ Flags
   --jit         - Used with rubinius install to build with JIT
   --latest      - with gemset --dump skips version strings for latest gem.
   --gems        - with uninstall/remove removes gems with the interpreter.
+  --docs        - with install, attempt to generate ri after installation.
   --reconfigure - Force ./configure on install even if Makefile already exists.
 
 

data/config/db

@@ -1,7 +1,7 @@
 niceness=0
 interpreter=ruby
 ruby_version=1.8.7
-ruby_patchlevel=249
+ruby_patchlevel=174
 ruby_configure=--enable-shared
 ruby_repo_url=http://svn.ruby-lang.org/repos/ruby
 ruby_1.0_url=ftp://ftp.ruby-lang.org/pub/ruby/1.0
@@ -15,10 +15,10 @@ ruby_1.8_url=ftp://ftp.ruby-lang.org/pub/ruby/1.8
 ruby_1.9_url=ftp://ftp.ruby-lang.org/pub/ruby/1.9
 ruby_2.0_url=ftp://ftp.ruby-lang.org/pub/ruby/2.0
 ruby_1.9.1_patch_level=378
-ruby_1.9.2_patch_level=preview1
+ruby_1.9.2_patch_level=preview3
 ruby_1.8.5_patch_level=231
 ruby_1.8.6_patch_level=399
-ruby_1.8.7_patch_level=249
+ruby_1.8.7_patch_level=174
 rubygems_version=1.3.7
 rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
 rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365

data/config/known

@@ -1,11 +1,11 @@
 (ruby-)1.8.6(-p399)
 (ruby-)1.8.6-head
-(ruby-)1.8.7(-p249)
+(ruby-)1.8.7(-p174)
 (ruby-)1.8.7-head
 (ruby-)1.9.1(-p243)
 (ruby-)1.9.1(-p376)
 (ruby-)1.9.1-head
-(ruby-)1.9.2-preview1
+(ruby-)1.9.2-preview3
 (ruby-)1.9.2-head
 ruby-head
 

data/config/md5

@@ -20,6 +20,7 @@ ruby-1.9.1-p376.tar.gz=ebb20550a11e7f1a2fbd6fdec2a3e0a3
 ruby-1.9.1-p376.tar.gz=ebb20550a11e7f1a2fbd6fdec2a3e0a3
 ruby-1.9.1-p378.tar.gz=9fc5941bda150ac0a33b299e1e53654c
 ruby-1.9.2-preview1.tar.gz=e2b8cdbf300f53472be09699a5837fd1
+ruby-1.9.2-preview3.tar.gz=209e59f3495a5503fa948c2732f1d705
 ruby-enterprise-1.8.6-20090610.tar.gz=0bf66ee626918464a6eccdd83c99d63a
 ruby-enterprise-1.8.7-2009.10.tar.gz=3727eef7b6b1b2f31db7d091328d966e
 ruby-enterprise-1.8.7-20090928.tar.gz=ae00018ce89d95419dfde370fcd485ac

data/help/ruby

@@ -13,7 +13,7 @@ Given:
      ruby-1.8.7-p174 [x86_64]
      ruby-1.9.1-head [x86_64]
   => ruby-1.9.1-p243 [x86_64]
-     ruby-1.9.2-preview1 [x86_64]
+     ruby-1.9.2-preview3 [x86_64]
 
   jruby:
 
@@ -70,9 +70,9 @@ We can run the ruby program 'test.rb' against all versions of ruby installed by
     patchlevel: 243, release_date: 2009-07-16, ruby_version: 1.9.1, ruby_platform: i386-darwin10.0.0
 
 
-    ruby-1.9.2-preview1: ruby 1.9.2dev (2009-07-18 trunk 24186) [i386-darwin10.0.0]
+    ruby-1.9.2-preview3: ruby 1.9.2dev (2010-05-31 revision 28117) [x86_64-darwin10.3.0]
 
-    patchlevel: -1, release_date: 2009-07-18, ruby_version: 1.9.2, ruby_platform: i386-darwin10.0.0
+    patchlevel: -1, release_date: 2010-05-31, ruby_version: 1.9.2, ruby_platform: x86_64-darwin10.3.0
 
     ree-1.8.7-20090928: ruby 1.8.7 (2009-06-12 patchlevel 174) [i686-darwin10.0.0], MBARI 0x6770, Ruby Enterprise Edition 20090928
 

data/install

@@ -38,7 +38,7 @@ while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
   case "$token" in
     --auto)    rvm_auto_flag=1          ;;
-    --prefix)  prefix_path="$1" ; shift ;;
+    --prefix)  rvm_prefix="$1" ; shift ;;
     --version) rvm_path="$(pwd)" ; __rvm_version ; unset rvm_path ; exit ;;
     --help|*)  usage                    ;;
   esac
@@ -258,7 +258,8 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n$(tput setaf 6)Upgrade Notes\n"
   printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
   printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
-  printf "\n  * Do not forget that 'rvm notes' tells you OS dependency packages for installing rubies."
+  printf "\n  * 'rvm notes' tells you OS dependency packages for installing rubies."
+  printf "\n  * 1.8.7 default patchlevel is p174, override ~/.rvm/config/db in ~/.rvm/config/user"
   printf "\n$(tput sgr0)\n"
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 35
+:patch: 36

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.35"
+  s.version = "0.1.36"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-05-29}
+  s.date = %q{2010-05-31}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/cli

@@ -326,7 +326,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|--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|--docs)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
         if [[ "--debug" = "$rvm_token" ]] ; then rvm_debug_flag ; fi
       ;;
@@ -449,7 +449,7 @@ rvm() {
       fi
       result=$?
     ;;
-    docs)            $rvm_scripts_path/docs  ; result=$? ;;
+    docs)            $rvm_scripts_path/docs  $rvm_ruby_args ; result=$? ;;
     alias)           $rvm_scripts_path/alias $rvm_ruby_args ; result=$? ;;
     help)            $rvm_scripts_path/help  $rvm_ruby_args ; result=$? ;;
 
@@ -547,7 +547,11 @@ rvm() {
       result=1
   esac
 
-  if [[ ! -z "$rvm_reload_flag" ]] ; then source "$rvm_scripts_path/rvm" ; fi
+  if [[ ! -z "$rvm_reload_flag" ]] ; then
+    source "$rvm_scripts_path/rvm"
+    # Note: Not using builtin on purpose. Done so we can trigger a reload the rvmrc.
+    cd .
+  fi
 
   if [[ ! -z "$rvm_trace_flag" ]] ; then set +x ; unset rvm_trace_flag ; fi
 

data/scripts/docs

@@ -5,24 +5,32 @@ 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
 
-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_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_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
+# Ensure we have the doc directories.
+if [[ ! -d "$rvm_docs_path" ]] ; then
+  mkdir -p "$rvm_docs_path/rdoc" "$rvm_docs_path/yard"
+fi
+
+usage() {
+  printf "Usage: 'rvm docs {open,generate,generate-ri,generate-rdoc}'\n"
+  exit 1
+}
 
 open_docs() {
-  if [[ -s "$rvm_docs_path/$rvm_ruby_string/$rvm_docs_type/index.html" ]] ; then
+  if [[ -s "$rvm_docs_path/$rvm_docs_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
+      open $rvm_docs_path/$rvm_docs_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
+      xdg-open $rvm_docs_path/$rvm_docs_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
@@ -31,26 +39,34 @@ open_docs() {
   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
+generate_ri() {
+  # Generate ri docs
+  __rvm_pushpop "$rvm_src_path/$rvm_docs_ruby_string/"
+  $rvm_scripts_path/log "info" "Generating ri 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_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_pushpop
+}
+
+generate_rdoc() {
+  __rvm_pushpop "$rvm_src_path/$rvm_docs_ruby_string/"
+  rm -rf "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/"
+  $rvm_scripts_path/log "info" "Generating rdoc 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_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
   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 -o $rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type > /dev/null 2>> $rvm_log_path/$rvm_docs_ruby_string/docs.error.log
   fi
-  rdoc -a --ri-site 2>> $rvm_log_path/$rvm_ruby_string/docs.error.log
+  __rvm_pushpop
 }
 
-if [[ "open" = "$action" ]] ; then
-  open_docs
-elif [[ "generate" = "$action" ]] ; then
-  generate_docs
-else
-  $rvm_scripts_path/log "error" ""
-  exit 1
-fi
+case "$1" in
+  open)          open_docs ;;
+  generate)      generate_ri; generate_rdoc ;;
+  generate-ri)   generate_ri ;;
+  generate-rdoc) generate_rdoc ;;
+  *)             usage ;;
+esac
 
 exit $result

data/scripts/install

@@ -38,7 +38,7 @@ while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
   case "$token" in
     --auto)    rvm_auto_flag=1          ;;
-    --prefix)  prefix_path="$1" ; shift ;;
+    --prefix)  rvm_prefix="$1" ; shift ;;
     --version) rvm_path="$(pwd)" ; __rvm_version ; unset rvm_path ; exit ;;
     --help|*)  usage                    ;;
   esac
@@ -258,7 +258,8 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n$(tput setaf 6)Upgrade Notes\n"
   printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
   printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
-  printf "\n  * Do not forget that 'rvm notes' tells you OS dependency packages for installing rubies."
+  printf "\n  * 'rvm notes' tells you OS dependency packages for installing rubies."
+  printf "\n  * 1.8.7 default patchlevel is p174, override ~/.rvm/config/db in ~/.rvm/config/user"
   printf "\n$(tput sgr0)\n"
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else

data/scripts/log

@@ -8,20 +8,20 @@ message=$1
 
 if [[ -z "$rvm_interactive" ]] || [[ -z "$TERM" ]] || [[ "unknown" = "$TERM" ]] ; then
   case "$level" in
-    debug) shift ; printf "\n$level: $message"     ;;
-    info)  shift ; printf "\n$level: $message"     ;;
-    warn)  shift ; printf "\n$level: $message"     ;;
-    error) shift ; printf "\n$level: $message" >&2 ;;
-    fail)  shift ; printf "\n$level: $message" >&2 ;;
+    debug) shift ; printf "\n$level: $message\n"     ;;
+    info)  shift ; printf "\n$level: $message\n"     ;;
+    warn)  shift ; printf "\n$level: $message\n"     ;;
+    error) shift ; printf "\n$level: $message\n" >&2 ;;
+    fail)  shift ; printf "\n$level: $message\n" >&2 ;;
     *) printf "$message"
   esac
 else
   case "$level" in
-    debug) shift ; printf "\n$(tput setaf 5)$message$(tput sgr0)"     ;;
-    info)  shift ; printf "\n$(tput setaf 2)$message$(tput sgr0)"     ;;
-    warn)  shift ; printf "\n$(tput setaf 3)$message$(tput sgr0)"     ;;
-    error) shift ; printf "\n$(tput setaf 1)$message$(tput sgr0)" >&2 ;;
-    fail)  shift ; printf "\n$(tput setaf 1)$message$(tput sgr0)" >&2 ;;
+    debug) shift ; printf "\n$(tput setaf 5)$level$(tput sgr0): $message\n"     ;;
+    info)  shift ; printf "\n$(tput setaf 2)$level$(tput sgr0): $message\n"     ;;
+    warn)  shift ; printf "\n$(tput setaf 3)$level$(tput sgr0): $message\n"     ;;
+    error) shift ; printf "\n$(tput setaf 1)$level$(tput sgr0): $message\n" >&2 ;;
+    fail)  shift ; printf "\n$(tput setaf 1)$level$(tput sgr0): $message\n" >&2 ;;
     *) printf "$message"
   esac
 fi

data/scripts/manage

@@ -11,6 +11,16 @@ trap "rm -rf ${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
 
+# Checks for bison, returns zero iff it is found
+__rvm_check_for_bison() {
+  if [[ "$rvm_head_flag" -gt 0 ]]; then
+    if ! command -v bison >/dev/null ; then
+      $rvm_scripts_path/log "fail" "bison is not available in your path. Please ensure it exists before compiling from head."
+      return 1
+    fi
+  fi
+}
+
 __rvm_install_source() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
@@ -670,6 +680,9 @@ RubyWrapper
     ;;
 
     ruby)
+      __rvm_check_for_bison
+      result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+
       if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
       __rvm_install_source $*
     ;;
@@ -898,6 +911,15 @@ __rvm_post_install() {
 
   __rvm_irbrc
   __rvm_load_gemsets
+
+  __rvm_generate_default_docs
+}
+
+__rvm_generate_default_docs() {
+  if [[ "$rvm_docs_flag" = "1" && "$rvm_ruby_interpreter" != "macruby" ]]; then
+    $rvm_scripts_path/log "info" "Attempting to generate ri docs..."
+    (source $rvm_scripts_path/rvm; rvm use "$rvm_ruby_string"; rvm docs generate-ri) > ~/rvm-install-docs 2>&1
+  fi
 }
 
 __rvm_load_gemsets() {
@@ -1063,21 +1085,11 @@ __rvm_manage_rubies() {
   rvm_ruby_gem_home=$(echo $rvm_ruby_gem_home | awk -F${rvm_gemset_separator} '{print $1}')
   rvm_ruby_string=$(echo $rvm_ruby_string | awk -F${rvm_gemset_separator} '{print $1}')
 
-  # TODO: Extract the common functionality out of the if below
-  #if [[ ! -z "$rvm_ruby_string" ]] ; then
-  #  unset rvm_ruby_interpreter rvm_ruby_version
-  #  eval "__rvm_${rvm_action}_ruby"
-  #  __rvm_unset_ruby_variables
-  #elif [[ ! -z "$rvm_ruby_version" ]] ;then
   if [[ ! -z "$rubies_string" ]] ;then
     for rvm_ruby_string in $(echo $rubies_string | tr ',' ' ') ; do
       eval "__rvm_${rvm_action}_ruby"
       __rvm_unset_ruby_variables
     done
-  #elif [[ ! -z "$rvm_ruby_interpreter" ]] ; then
-  #  unset rvm_ruby_string rvm_ruby_version
-  #  eval "__rvm_${rvm_action}_ruby"
-  #  __rvm_unset_ruby_variables
   else # all
     if [[ "$rvm_action" != "install" ]] ; then
       while read -r bin_line

data/scripts/rvm-install

@@ -38,7 +38,7 @@ while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
   case "$token" in
     --auto)    rvm_auto_flag=1          ;;
-    --prefix)  prefix_path="$1" ; shift ;;
+    --prefix)  rvm_prefix="$1" ; shift ;;
     --version) rvm_path="$(pwd)" ; __rvm_version ; unset rvm_path ; exit ;;
     --help|*)  usage                    ;;
   esac
@@ -258,7 +258,8 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n$(tput setaf 6)Upgrade Notes\n"
   printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
   printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
-  printf "\n  * Do not forget that 'rvm notes' tells you OS dependency packages for installing rubies."
+  printf "\n  * 'rvm notes' tells you OS dependency packages for installing rubies."
+  printf "\n  * 1.8.7 default patchlevel is p174, override ~/.rvm/config/db in ~/.rvm/config/user"
   printf "\n$(tput sgr0)\n"
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else

data/scripts/selector

@@ -255,7 +255,6 @@ __rvm_use() {
 
     if [[ ! -z "$rvm_verbose_flag" ]] ; then
       $rvm_scripts_path/log "info" "Now using system ruby."
-      printf "\n"
     fi
 
     export rvm_ruby_string="system"
@@ -287,7 +286,6 @@ __rvm_use() {
 
     if [[ ! -z "$rvm_verbose_flag" ]] ; then
       $rvm_scripts_path/log "info" "Using $(basename $GEM_HOME | tr '-' ' ' | sed 's/'${rvm_gemset_separator}'/ with gemset /')"
-      printf "\n"
     fi
 
     new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"

data/scripts/set

@@ -50,9 +50,6 @@ __rvm_ruby_do() {
       fi
     fi
     rvm_command="$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path $args"
-  elif [[ "gem" = "$(basename $binary)" ]] && $rvm_scripts_path/match "$args" '^install' ; then
-    #$rvm_scripts_path/gem install $args
-    rvm_command="$rvm_scripts_path/gemsets $rvm_ruby_mode $args $rvm_gem_options"
   else
     rvm_command="$binary $rvm_ruby_mode $args"
   fi

data/scripts/update

@@ -38,7 +38,7 @@ while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
   case "$token" in
     --auto)    rvm_auto_flag=1          ;;
-    --prefix)  prefix_path="$1" ; shift ;;
+    --prefix)  rvm_prefix="$1" ; shift ;;
     --version) rvm_path="$(pwd)" ; __rvm_version ; unset rvm_path ; exit ;;
     --help|*)  usage                    ;;
   esac
@@ -258,7 +258,8 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n$(tput setaf 6)Upgrade Notes\n"
   printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
   printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
-  printf "\n  * Do not forget that 'rvm notes' tells you OS dependency packages for installing rubies."
+  printf "\n  * 'rvm notes' tells you OS dependency packages for installing rubies."
+  printf "\n  * 1.8.7 default patchlevel is p174, override ~/.rvm/config/db in ~/.rvm/config/user"
   printf "\n$(tput sgr0)\n"
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else

data/scripts/utility

@@ -115,7 +115,7 @@ __rvm_cleanup_variables() {
 
   if [[ "$rvm_sticky_flag" = "1" ]] ; then export rvm_gemset_name ; else unset rvm_gemset_name  ; fi
 
-  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_ruby_patch rvm_sticky_flagrvm_rvmrc_flag rvm_gems_flag rvm_only_path_flag
+  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_ruby_patch rvm_sticky_flagrvm_rvmrc_flag rvm_gems_flag rvm_only_path_flag rvm_docs_flag
 }
 
 # Unset ruby-specific variables
@@ -356,10 +356,12 @@ __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 "$(command -v ruby | awk /$(basename $rvm_rubies_path)/)" ]] ; then
-      rvm_state=system
-    else
-      rvm_state="$(dirname "$(command -v ruby)" | xargs dirname | xargs basename)"
+    rvm_state="$(__rvm_environment_identifier)"
+    rvm_state="${rvm_state:-"system"}"
+    if [[ -n "$1" ]]; then
+      rvm_ruby_string="$1"
+      __rvm_select
+      __rvm_use
     fi
   else
     rvm_ruby_string="$rvm_state"
@@ -549,7 +551,13 @@ __rvm_mono_env() {
 }
 
 __rvm_environment_identifier() {
-  echo "$GEM_HOME" | xargs basename
+  ruby_string="$(command -v ruby)"
+  if [ -n "$ruby_string" ] && echo "$ruby_string" | grep -q -F "$rvm_rubies_path"; then
+    echo "$GEM_HOME" | xargs basename
+  else
+    echo "system"
+  fi
+  unset ruby_string
 }
 
 __rvm_ensure_has_enviroment_files() {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 93
+  hash: 83
   prerelease: false
   segments: 
   - 0
   - 1
-  - 35
-  version: 0.1.35
+  - 36
+  version: 0.1.36
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-29 00:00:00 -04:00
+date: 2010-05-31 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []