rvm 0.0.36 → 0.0.37

data/rvm.gemspec

@@ -0,0 +1,54 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rvm}
+  s.version = "0.0.37"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Wayne E. Seguin"]
+  s.date = %q{2009-09-09}
+  s.default_executable = %q{rvm-install}
+  s.description = %q{Manages Ruby interpreter installations and switching between them.}
+  s.email = %q{wayneeseguin@gmail.com}
+  s.executables = ["rvm-install"]
+  s.extra_rdoc_files = [
+    "README"
+  ]
+  s.files = [
+    "INSTALL",
+     "LICENCE",
+     "README",
+     "config/db",
+     "examples/rvmrc",
+     "lib/rvm.rb",
+     "rvm.gemspec",
+     "scripts/rvm",
+     "scripts/rvm-aliases",
+     "scripts/rvm-cli",
+     "scripts/rvm-functions",
+     "scripts/rvm-install",
+     "scripts/rvm-prompt",
+     "scripts/rvm-ruby-installer",
+     "scripts/rvm-selector",
+     "scripts/rvm-utility"
+  ]
+  s.homepage = %q{http://github.com/wayneeseguin/rvm}
+  s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{dynamicreports}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Ruby Version Manager (rvm)}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/scripts/rvm

@@ -14,4 +14,5 @@ source $rvm_path/scripts/rvm-selector
 source $rvm_path/scripts/rvm-ruby-installer # TODO: Script not function.
 source $rvm_path/scripts/rvm-cli
 
-if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi
+if [ -f ~/.rvm/default ] ; then source ~/.rvm/default ; fi
+

data/scripts/rvm-aliases

@@ -0,0 +1,4 @@
+alias rubydo="rvm rubydo"
+alias multiruby="rvm rubydo"
+alias gemdo="rvm gemdo"
+alias rakedo="rvm rakedo"

data/scripts/rvm-cli

@@ -7,6 +7,7 @@ function __rvm_parse-args {
       install|uninstall|path|info|setup|version|srcdir|list|symlinks|reset|debug|reload|usage|help|implode|update)
         rvm_action=$rvm_token
       ;;
+
       use)
         rvm_action=$rvm_token
         if [ "$1" = "default" ] ; then
@@ -70,6 +71,7 @@ function __rvm_parse-args {
                          rvm_ruby_version="$rvm_token"
                          rvm_action="${rvm_action:-use}"
       ;;
+
       1.2.0|1.3.1)
                          rvm_ruby_interpreter="jruby"
                          rvm_ruby_version="$rvm_token"
@@ -111,6 +113,7 @@ function __rvm_parse-args {
           break;
         fi
       ;;
+
       --re-configure)    rvm_re_configure=1                ;;
       -M|--make)         rvm_ruby_make="$1"        ; shift ;;
       -I|--make-install) rvm_ruby_make_install="$1"; shift ;;
@@ -121,16 +124,31 @@ function __rvm_parse-args {
                          rvm_ruby_args="$@"
                          rvm_parse_break=1
       ;;
+
       -h|--help)         rvm_action=help           ; shift ;;
       -d|--default)      rvm_set_default=1                 ;;
       --head)            rvm_ruby_rev="head"               ;;
       --trace|--debug)   rvm_debug=1                       ;;
       --force)           rvm_force=1                       ;;
-      --set-prompt)      rvm_set_prompt=1                  ;;
          --all)          rvm_all=1                 ; shift ;;
       -m|--gem-set)      rvm_gem_set_name="$1"     ; shift ;;
          --rm-gem-set)   rvm_gem_set_name_rm="$1"  ; shift ;;
-         --jit)          rvm_rubinius_jit="RBX_LLVM=1"     ;;
+         --dump)         rvm_dump=1                ; shift ;;
+         --load)
+         rvm_load=1
+         if [ ! -z "$1" ] ; then
+           rvm_load_file="$1"
+           shift
+         else
+            rvm_action="error"
+            rvm_error_message="--load must be followed by the .gemset file to load."
+            break;
+         fi
+         shift
+      ;;
+
+      --latest)         rvm_latest=1              ; shift ;;
+      --jit)            rvm_rubinius_jit="RBX_LLVM=1"     ;;
 
       default|system)
         rvm_action="use"
@@ -158,15 +176,15 @@ function rvm {
   __rvm_parse-args $@
 
   case "$rvm_action" in
-    install)   __rvm_install-ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
-    uninstall) __rvm_uninstall    $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
-    use)       __rvm_use          $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
-    list)      __rvm_list                                                                       ;;
-    gemdir)    __rvm_gem-dir      $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
-    srcdir)    __rvm_src-dir      $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
-    gemdup)    __rvm_gem-dup      $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
-    symlinks)  __rvm_symlinks                                                                   ;;
-    version)   __rvm_version                                                                    ;;
+    install)   __rvm_install-ruby ;;
+    uninstall) __rvm_uninstall    ;;
+    use)       __rvm_use          ;;
+    gemdir)    __rvm_gem-dir      ;;
+    srcdir)    __rvm_src-dir      ;;
+    gemdup)    __rvm_gem-dup      ;;
+    list)      __rvm_list         ;;
+    symlinks)  __rvm_symlinks     ;;
+    version)   __rvm_version      ;;
     rubydo|rakedo|gemdo)
       if [ ! -z "$rvm_ruby_version" ] ; then
         rvm_ruby_versions=$(echo $rvm_ruby_version | tr ',' ' ')

data/scripts/rvm-functions

@@ -0,0 +1,11 @@
+# http://rvm.beginrescueend.com/gems/
+# Thanks for the awesome idea batasrki
+function gemdir {
+  if [ -z "$1" ] ; then
+    echo "gemdir expects a parameter, which should be a valid rvm Ruby selector"
+  else
+    rvm use $1
+    cd `rvm gemdir`
+    pwd
+  fi
+}

data/scripts/rvm-install

@@ -14,7 +14,7 @@ if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 rvm_dir=~/.rvm
 
-echo -e "Installing rvm source to ~/.rvm/scripts/rvm..."
+echo -e "\nInstalling rvm source to ~/.rvm/scripts/rvm..."
 for dir in src scripts bin log archives config gems examples ; do
   mkdir -p $rvm_dir/$dir
 done
@@ -60,11 +60,13 @@ if [ $? -gt 0 ] ; then
       touch ~/.bash_profile
       if [ -z "`grep '\.rvm/scripts/rvm' ~/.bash_profile`" ] ; then
         echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.bash_profile."
+        echo -e "\n" >> ~/.bash_profile
         echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bash_profile
       fi
       touch ~/.bashrc
       if [ -z "`grep '\.rvm/scripts/rvm' ~/.bashrc`" ] ; then
         echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.bashrc."
+        echo -e "\n" >> ~/.bashrc
         echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bashrc
       fi
 
@@ -75,6 +77,7 @@ if [ $? -gt 0 ] ; then
       touch ~/.zshrc
       if [ -z "`grep '\.rvm/scripts/rvm' ~/.zshrc`" ] ; then
         echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.zshrc."
+        echo -e "\n" >> ~/.zshrc
         echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.zshrc
       fi
     fi
@@ -91,6 +94,15 @@ for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
       actual_file="$file"
     fi
     sed -i.orig 's/rvm\/bin\/rvm/rvm\/scripts\/rvm/g' $actual_file
+
+    if [ -f ~/.profile ] ; then
+      grep '.profile' $actual_file > /dev/null
+      if [ $? -gt 0 ] ; then
+        profile=~/.profile
+        echo -e "\n" >> $actual_file
+        echo "source $profile" >> $actual_file
+      fi
+    fi
   fi
 done
 
@@ -113,36 +125,45 @@ if [ "$system" = "Linux" ] ; then
   rvm_pacman_binary=`which pacman 2> /dev/null`
   rvm_yum_binary=`which yum 2> /dev/null`
 
-  echo -e "\033[0;33m <w> \033[0mFor jRuby & ree (if you wish to use it) you will need:"
   if [ ! -z "$rvm_apt_get_binary" ] ; then
-    echo -e "\033[0;32m <i> \033[0msudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk libreadline5-dev libssl-dev "
+    echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
+    echo -e "\033[0;32m <i> \033[0msudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
+    echo -e "\033[0;33m <w> \033[0mFor ree (if you wish to use it) you will need:"
+    echo -e "\033[0;32m <i> \033[0msudo apt-get install libreadline5-dev libssl-dev "
 
   elif [ ! -z "$rvm_emerge_binary" ] ; then
+    echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
     echo -e "\033[0;32m <i> \033[0msudo emerge dev-java/sun-jdk dev-java/sun-jre-bin"
 
   elif [ ! -z "$rvm_pacman_binary" ] ; then
+    echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
     echo -e "\033[0;32m <i> \033[0msudo pacman -Sy jdk jre"
 
   elif [ ! -z "$rvm_yum_binary" ] ; then
+    echo -e "\033[0;33m <w> \033[0mFor ree (if you wish to use it) you will need:"
     echo -e "\033[0;32m <i> \033[0myum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
 
   else
+    echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
     echo -e "\033[0;32m <i> \033[0mThe SUN java runtime environment and development kit."
   fi
 elif [ "$sytem" = "Darwin" ] ; then
+  echo -e "\033[0;32m <i> \033[0mBe sure that you have XCode Tools installed in order to use rvm."
   echo -e "\033[0;32m <i> \033[0mIf you intend on installing MacRuby you must install LLVM first."
 fi
 
 echo -e "$info There have been a great many updates since previous releases, please:"
 echo -e "$info   * remove sourcing of ~/.rvm/current from your shell profiles."
-echo -e "$info   * note that ruby gems are now all installed into ~/.rvm/gems"
+echo -e "$info   * CLOSE THIS SHELL AND OPEN A NEW ONE FOR rvm."
 
 echo -e "\n$info  Please visit the website for much more information: http://rvm.beginrescueend.com/\n"
 echo '    w⦿‿⦿t! '
 echo -e "\n        ~ Wayne"
 
 source $rvm_dir/scripts/rvm
+
 rvm symlinks
 echo
 rvm -v
+echo
 

data/scripts/rvm-prompt

@@ -0,0 +1,5 @@
+#!/bin/bash
+if [ ! -z "$(echo `which ruby` | grep 'rvm')" ] ; then
+  echo "[$(which ruby | xargs dirname | xargs dirname | xargs basename | tr '-' ':')]"
+fi
+

data/scripts/rvm-ruby-installer

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-#
-# Installer
-#
-
 function __rvm_install-source {
 
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
@@ -238,7 +234,9 @@ function __rvm_install-ruby {
       ;;
 
     rbx|rubinius)
-      __rvm_reset # Requires 1.8 to install due to parsetree. TOOD: Check for 1.8 + parse-tree
+      # TODO: check if system is 1.8.X otherwise use rvm's 1.8.X and check for parsetree, install if missing
+      unset GEM_HOME MY_RUBY_HOME IRBRC
+      PATH="$rvm_default_path" ; export PATH
       rvm_ruby_repo_url=$rvm_rubinius_repo_url
       rvm_ruby_configure=""
       rvm_ruby_make="rake"
@@ -278,7 +276,12 @@ function __rvm_install-ruby {
           __rvm_log "info" "\tDownloading $rvm_package_file, this may take a while depending on your connection..."
           __rvm_fetch $rvm_url
           __rvm_log "info" "\tExtracting $rvm_package_file..."
-          __rvm_run "extract" unzip -q $rvm_archives_path/$rvm_package_file.zip -d $rvm_source_path
+          rvm_unzip=`which unzip`
+          if [ $? -ne 0 ] ; then
+            __rvm_log "error" "\t'unzip' was not found in your PATH. jRuby official release comes as a .zip file, hence 'unzip' is required to extract it. Please install 'unzip' and try again."
+          else
+            __rvm_run "extract" unzip -q $rvm_archives_path/$rvm_package_file.zip -d $rvm_source_path
+          fi
           cd $rvm_ruby_src_path
         fi
       fi

data/scripts/rvm-selector

@@ -32,6 +32,7 @@ function __rvm_select {
     rbx|rubinius)
       rvm_ruby_version="head"
       unset rvm_ruby_patch_level
+      rvm_ruby_interpreter="rubinius"
       rvm_ruby_repo_url=`__rvm_db "rubinius_repo_url"`
       rvm_ruby_configure=""
       rvm_ruby_make="build"
@@ -89,7 +90,7 @@ function __rvm_select {
     fi
   fi
 
-  if [ ! -z "$rvm_ruby_interpreter" -a ! -z "$rvm_ruby_version" ] ; then
+  if [ ! -z "$rvm_ruby_interpreter" -a ! -z "$rvm_ruby_version" -a "$rvm_ruby_interpreter" != "system" ] ; then
     rvm_major_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $2 }')
     rvm_minor_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $3 }')
 
@@ -102,6 +103,51 @@ function __rvm_select {
       else
         rvm_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
       fi
+
+      if [ ! -z "$rvm_load" ] ; then
+        # TODO: Load a .gemset file.
+        echo "Loading $rvm_load_file file... (not :)"
+        cat $rvm_load_file | $(
+          while read line ; do # for line in `cat $rvm_load_file` ; do
+            if [ -z "`echo $line | sed 's/ //g' | grep '^#'`" ] ; then # Skip comment lines
+              gem=`echo $line | awk -F';' '{print $1}'`
+              prefix=`echo $line | awk -F';' '{print $2}'`
+              if [ -z "$vars" ] ; then
+                GEM_HOME="$rvm_gem_home" gem install --no-rdoc --no-ri -q $gem
+              else
+                eval "GEM_HOME='$rvm_gem_home' $prefix gem install --no-rdoc --no-ri -q $gem"
+              fi
+              unset gem prefix
+            fi
+          done
+        )
+      fi
+
+      if [ ! -z "$rvm_dump" ] ; then
+        if [ -z "$rvm_gem_set_name" ] ; then
+          file_name="default"
+        else
+          file_name="$rvm_gem_set_name"
+        fi
+
+        echo "# $rvm_gem_set_name.gemset generated gem dump file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_gem_set_name.gemset
+
+        gems="`gem list | sed 's/[\(|\)]//g' | sed 's/, /,/g' | tr ' ' ';'`"
+        for gem in $gems ; do
+          name=`echo $gem | awk -F';' '{print $1}'`
+          if [ -z "$rvm_gem_latest" ] ; then
+            versions=`echo $gem | awk -F';' '{print $2}' | sed 's/,/ /g'`
+            for version in $versions ; do
+              echo "$name -v$version" >> $file_name.gemset
+            done
+            unset version
+          else
+            echo "$name" >> $file_name.gemset
+          fi
+          unset name
+        done
+        unset file_name gems versions
+      fi
     fi
     mkdir -p $rvm_gem_home
 
@@ -131,12 +177,27 @@ function __rvm_use {
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
   if [ -z "$rvm_ruby_interpreter" ] ; then rvm_ruby_interpreter="default" ; fi
 
-  if [ "$rvm_ruby_interpreter" = "default" -o "$rvm_ruby_interpreter" = "system" ] ; then
+  if [ "$rvm_ruby_interpreter" = "default" ] ; then
+
+    if [ -s $rvm_path/default ] ; then
+      source $rvm_path/default
+    else
+      __rvm_log "error" "no default rvm specified, defaulting to pre-rvm sytem."
+      unset GEM_HOME MY_RUBY_HOME IRBRC
+      PATH="$rvm_default_path" ; export PATH
+      if [ -s $rvm_path/system ] ; then
+        source $rvm_path/system
+      fi
+    fi
+
+  elif [ "$rvm_ruby_interpreter" = "system" ] ; then
+
     unset GEM_HOME MY_RUBY_HOME IRBRC
     PATH="$rvm_default_path" ; export PATH
-    if [ "$rvm_ruby_interpreter" = "default" -a -s $rvm_path/current ] ; then
-      source $rvm_path/current
+    if [ -s $rvm_path/system ] ; then
+      source $rvm_path/system
     fi
+
   else
     GEM_HOME=$rvm_gem_home ; export GEM_HOME
     MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME
@@ -174,26 +235,22 @@ Config
     fi
     PATH="$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:$rvm_default_path" ; export PATH
 
-    rvm_prompt="$rvm_ruby_package_name" ; export rvm_prompt
-    if [ ! -z "$rvm_set_prompt" -a ! -z "$PS1" ] ; then
-      PS1="\033[0;32m${rvm_prompt}\033[0m:: ${rvm_default_ps1}" ; export PS1
-    fi
-
     if [ ! -z "$rvm_set_default" ] ; then
       RUBY_VERSION="$($MY_RUBY_HOME/bin/ruby -v | sed 's/^\(.*\) (.*$/\1/')"
       export GEM_HOME MY_RUBY_HOME RUBY_VERSION
 
-      echo "PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:\$PATH ; export PATH" > $rvm_path/current
+      echo "PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:\$PATH ; export PATH" > $rvm_path/default
 
-      for variable in rvm_prompt RUBY_VERSION GEM_HOME MY_RUBY_HOME IRBRC ; do
+      for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME IRBRC ; do
         eval "export $variable"
         eval value=\$${variable}
         if [ ! -z "$variable" ] ; then
-          echo "${variable}='$value' ; export ${variable}" >> $rvm_path/current
+          echo "${variable}='$value' ; export ${variable}" >> $rvm_path/default
         else
-          echo "unset ${variable}" >> $rvm_path/current
+          echo "unset ${variable}" >> $rvm_path/default
         fi
       done
+      unset rvm_set_default
     fi
   fi
 }

data/scripts/rvm-utility

@@ -4,8 +4,8 @@ function __rvm_meta {
   rvm_meta_author="Wayne E. Seguin"
   rvm_meta_author_email="wayneeseguin@gmail.com"
   rvm_meta_website="http://rvm.beginrescueend.com/"
-  rvm_meta_version="0.0.36"
-  rvm_meta_updated="2009.09.06"
+  rvm_meta_version="0.0.37"
+  rvm_meta_updated="2009.09.09"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -37,6 +37,7 @@ function __rvm_usage {
     reset     - Remove default and current settings, exit the shell.
                 (If you experience odd behavior try this first)
     rubydo    - Used with -f to run a ruby file against specified or all rubies
+    gemdo     - Used with -f to execute a command using selected ruby's 'gem'
     debug     - Emit environment & configuration information for *current* ruby
 
     reload    - Reload rvm source itself (useful after changing rvm source)
@@ -118,6 +119,7 @@ binaries:
   ruby:         "`which ruby`"
   irb:          "`which irb`"
   gem:          "`which gem`"
+  rake:         "`which rake`"
 
 environment:
   GEM_HOME:     "$GEM_HOME"
@@ -127,15 +129,19 @@ Info
 }
 
 function __rvm_debug {
+
   __rvm_log "info" "PATH:$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}')"
+
   for file in .bash_profile .bashrc .zshrc ; do
     if [ -s $file ] ; then
       __rvm_log "debug" "~/$file:\n$(grep rvm ~/$file)\n"
     fi
   done
-  if [ -s $rvm_path/current ] ; then
-    __rvm_log "debug" "$rvm_path/current:\n$($rvm_path/current)\n"
+
+  if [ -s $rvm_path/default ] ; then
+    __rvm_log "debug" "$rvm_path/default:\n$($rvm_path/default)\n"
   fi
+
   if [ -e $rvm_path/bin/rvm ] ; then
     __rvm_log "debug" "rvm script in bin:\n$(ls -laht $rvm_path/bin/rvm)"
   fi
@@ -178,7 +184,7 @@ function __rvm_run {
 }
 
 function __rvm_cleanup-variables {
-  unset rvm_selected rvm_action rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_irbrc_file rvm_ruby_irbrc rvm_source_path rvm_path rvm_debug rvm_prefix_path rvm_ruby_package_name rvm_gem_path rvm_command rvm_error_message rvm_ruby_home rvm_ruby_binary rvm_gem_set_name rvm_delete_flag rvm_ruby_tag rvm_ruby_rev rvm_url rvm_ruby_make rvm_ruby_make_install rvm_config_path rvm_bin_path rvm_force rvm_set_prompt rvm_all rvm_re_configure
+  unset rvm_selected rvm_action rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_irbrc_file rvm_ruby_irbrc rvm_source_path rvm_path rvm_debug rvm_prefix_path rvm_ruby_package_name rvm_gem_path rvm_command rvm_error_message rvm_ruby_home rvm_ruby_binary rvm_gem_set_name rvm_delete_flag rvm_ruby_tag rvm_ruby_rev rvm_url rvm_ruby_make rvm_ruby_make_install rvm_config_path rvm_bin_path rvm_force rvm_all rvm_re_configure
 }
 
 # TODO: root user loadng of /etc/rvmrc
@@ -191,6 +197,7 @@ function __rvm_bin_scripts {
 
 ruby_wrapper=$(cat <<-RubyWrapper
 #!/bin/bash
+puts "rvm installed ruby binaries should *not* be run as the root user (yet): http://rvm.beginrescueend.com/faq/" if (`whoami`.strip == "root")
 GEM_HOME=$rvm_gem_home ; export GEM_HOME
 MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME
 PATH=$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH ; export PATH
@@ -205,7 +212,6 @@ RubyWrapper
 
 }
 
-
 function __rvm_fetch {
 
   pushd $rvm_archives_path > /dev/null
@@ -217,15 +223,15 @@ function __rvm_fetch {
 
 function __rvm_load-defaults {
 
-  if [ ! -s $rvm_path/default ] ; then
-    for variable in rvm_prompt RUBY_VERSION GEM_HOME MY_RUBY_HOME PATH ; do
+  if [ ! -s $rvm_path/system ] ; then
+    for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME PATH ; do
       eval value=\$${variable}
       if [ -z "$value" ] ; then
-        echo "unset ${variable}" >> $rvm_path/default
+        echo "unset ${variable}" >> $rvm_path/system
       else
         eval "export $variable"
         eval value=\$${variable}
-        echo "${variable}='$value' ; export ${variable}" >> $rvm_path/default
+        echo "${variable}='$value' ; export ${variable}" >> $rvm_path/system
       fi
     done
   fi
@@ -271,9 +277,11 @@ function __rvm_load-defaults {
 function __rvm_reset {
 
   PATH="$rvm_path/bin:$rvm_default_path" ; export PATH
-  for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME rvm_prompt ; do unset $variable ; done
+  for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME ; do unset $variable ; done
+  if [ -f $rvm_path/system ] ; then rm -f $rvm_path/system ; fi
   rm -f $rvm_path/default*
-  rm -f $rvm_path/current
+  # TODO: Remove this after a few releases:
+  rm -f $rvm_path/current*
 
   __rvm_select "system"
 
@@ -322,7 +330,7 @@ function __rvm_src-dir {
 
 }
 
-# clones from source implementation/version to current
+# clones from source implementation/version to default
 function __rvm_gem-dup {
 
   if [ "$1" = "default" ] ; then
@@ -404,10 +412,46 @@ function __rvm_list {
     echo "rbx head --jit"
     echo "ree 20090610"
   else
-    echo -e "\nruby:\n$(/bin/ls -l $rvm_path/ | awk '/ ruby-[1-2].*/ { print " - " $NF  }')\n"
-    echo -e "jruby:\n$(/bin/ls -l $rvm_path/ | awk '/jruby-.*/ { print " - " $NF }')\n"
-    echo -e "ree:\n$(/bin/ls $rvm_path/ | awk '/ruby-enterprise-.*/ { print " - " $NF }')\n"
-    echo -e "system:\n - ($($rvm_default_system_ruby -v))\n"
+    current=`which ruby | xargs dirname | xargs dirname | xargs basename`
+    echo -e "\nruby:\n"
+    for version in `/bin/ls -l $rvm_path/ | awk '/ ruby-[1-2].*/ { print $NF  }'` ; do
+      if [ "$current" = "$version" ] ; then
+        echo -e "=> $version"
+        selected="1"
+      else
+        echo -e "   $version"
+      fi
+    done
+    unset version
+
+    echo -e "\njruby:\n"
+    for version in `/bin/ls -l $rvm_path/ | awk '/jruby-.*/ { print $NF }'` ; do
+      if [ "$current" = "$version" ] ; then
+        echo -e "=> $version"
+        selected="1"
+      else
+        echo -e "   $version"
+      fi
+    done
+    unset version
+
+    echo -e "\nree:\n"
+    for version in `/bin/ls $rvm_path/ | awk '/ruby-enterprise-.*/ { print $NF }'` ; do
+      if [ "$current" = "$version" ] ; then
+        echo -e "=> $version"
+        selected="1"
+      else
+        echo -e "   $version"
+      fi
+    done
+
+    echo -e "\nsystem:\n"
+    if [ "$selected" = "1" ] ; then
+      echo -e "   $($rvm_default_system_ruby -v)\n"
+    else
+      echo -e "=> $($rvm_default_system_ruby -v)\n"
+    fi
+    unset current version selected
   fi
 
 }
@@ -418,9 +462,9 @@ function __rvm_initialize {
   if [ $? -ne 0 ] ; then
     rvm_fetch=`which wget`
     if [ $? -ne 0 ] ; then
-      rvm_fetch="wget -q -c "
-    else
       __rvm_log "fail" "rvm expects either curl or wget, neither seem to be in your path :("
+    else
+      rvm_fetch="wget -q -c "
     fi
   else
     rvm_fetch="$rvm_fetch -O -L -s --create-dirs -C - "
@@ -463,4 +507,3 @@ function __rvm_initialize {
   mkdir -p $rvm_source_path $rvm_bin_path $rvm_archives_path
 }
 
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-08 00:00:00 -04:00
+date: 2009-09-09 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -28,9 +28,13 @@ files:
 - config/db
 - examples/rvmrc
 - lib/rvm.rb
+- rvm.gemspec
 - scripts/rvm
+- scripts/rvm-aliases
 - scripts/rvm-cli
+- scripts/rvm-functions
 - scripts/rvm-install
+- scripts/rvm-prompt
 - scripts/rvm-ruby-installer
 - scripts/rvm-selector
 - scripts/rvm-utility