rvm 0.0.40 → 0.0.41

data/config/db

@@ -13,8 +13,8 @@ ree_interpreter=ruby-enterprise
 ree_version=1.8.6
 ree_patch_level=20090610
 macruby_version=2009-09-04
-ruby_1.9.1_patch_level=p243
+ruby_1.9.1_patch_level=243
 ruby_1.9.2_patch_level=preview1
-ruby_1.8.5_patch_level=p115
-ruby_1.8.6_patch_level=p383
-ruby_1.8.7_patch_level=p174
+ruby_1.8.5_patch_level=115
+ruby_1.8.6_patch_level=383
+ruby_1.8.7_patch_level=174

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.40"
+  s.version = "0.0.41"
 
   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-15}
+  s.date = %q{2009-09-16}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/rvm-cli

@@ -5,7 +5,7 @@ function __rvm_meta {
   rvm_meta_author_email="wayneeseguin@gmail.com"
   rvm_meta_website="http://rvm.beginrescueend.com/"
   rvm_meta_version="`cat $rvm_path/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`"
-  rvm_meta_updated="2009.09.15"
+  rvm_meta_updated="2009.09.16"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -20,7 +20,7 @@ function __rvm_usage {
 
   Usage:
 
-    rvm Action [Implementation] [Options]
+    rvm Action [Implementation] [Options] [Flags]
 
   Action:
 
@@ -43,6 +43,8 @@ function __rvm_usage {
     reload    - Reload rvm source itself (useful after changing rvm source)
     implode   - Removes all ruby installations it manages, everything in ~/.rvm
     update    - Upgrades rvm to the latest version.
+    tests     - run 'rake test' across selected ruby versions
+    specs     - run 'rake spec' across selected ruby versions
 
   Implementation:
 
@@ -55,41 +57,43 @@ function __rvm_usage {
 
   Options:
 
-    -v|--version    - Ruby Package Version, defaults to 'latest'
-    -l|--level      - Patch level for the specified Ruby version
-    -p|--prefix     - Package and source directory prefix, with trailing slash!
-                      Default is a users home directory and /usr/local/ for root
-    -a|--archives   - Directory to place downladed files into (~/.rvm/archives/)
-    -n|--nice       - Specify a process niceness (for slow computers, default 0)
-    -m|--gem-set    - Named gem set for switching between different gem sets
-    --rm-gem-set    - Removes a named gemset.
-
-    -l|--level      - Specify a patch level to use
-    -t|--tag        -
-    -r|--rev        - Specify the repository revision # to use or 'head' for
-
-    -P|--prefix     - Sets the prefix path for installs to be installed to
-       --bin        - Specify path for binaries to be placed
-       --source     - Specify src directory to use
-       --archive    - Specify archive directory to use (tabralls / zips)
-    -G|--gems       - Specify root gem path to use
-    -C|--configure  - Specify custom configure options, comma separated
-                      default: --enable-shared=true
-    --re-configure  - Force installer to re-run configure if already run
-    -M|--make       - Specify a custom make command
-    -I|--make-install - "     a custom make install command
-
-    -f|--file       - Specify a ruby file to run with 'rubydo' command
+    -v|--version    - Emit rvm version loaded for current shell
     -h|--help       - Emit this output and exit
-    -d|--default    - Set the default Ruby to a specified version
-    -m|--gem-set    - Use a named gem set instead of the default set.
+    -l|--level      - patch level to use with rvm use / install
+       --tag        - subersion tag to use
+       --rev        - repository revision # to use or 'head' for
+
+       --prefix     - path for all rvm files (~/.rvm/), with trailing slash!
+       --bin        - path for binaries to be placed (~/.rvm/bin/)
+       --source     - src directory to use (~/.rvm/src/)
+       --archives   - directory for downladed files (~/.rvm/archives/)
     -S|--script     - Specify a script file to attempt to load and run (rubydo)
-    --all           - Used with 'rvm list' to list "most" installable versions.
+    -G|--gems       - root gem path to use
+    -C|--configure  - custom configure options, comma separated
+                      default: --enable-shared=true
+    --reconfigure   - Force installer to re-run configure if already run
+    --make          - custom make command
+    --make-install  - custom make install command
+    --nice          - process niceness (for slow computers, default 0)
+    -m|--gem-set    - use a named gem set, instead of the default set.
     --rm-gem-set    - Remove a named gem set
-    --jit           - Enable JIT for the Rubinius build
-    --force         - Force install, removes old install & source directories.
-    --set-prompt    - Set prompt to have the selected ruby prepended.
-    --debug|--trace - Toggle debug mode on for very verbose output.
+
+  Flags
+
+    --self        - with update, updates rvm itself
+    --rubygems    - with update, updates rubygems for selected ruby
+    --default     - with ruby select, sets a default ruby for new shells.
+    --debug       - Toggle debug mode on for very verbose output.
+    --force       - Force install, removes old install & source before install.
+    --all         - Used with 'rvm list' to display "most" available versions.
+    --dump        - Used with gemset to dump the current ruby's gemset.
+    --load        - Used with gemset to load a specified gemset file
+    --summary     - Used with rubydo to print out a summary of the commands run.
+    --jit         - Used with rubinius install to build with JIT
+    --latest      - with gemset --dump skips version strings for latest gem.
+    --reconfigure -
+    --spec        -
+    --test        -
 
   Resources:
 
@@ -166,45 +170,49 @@ function __rvm_parse-args {
       ;;
 
       1.8|1.8.0|1.8.1|1.8.2|1.8.3|1.8.4|1.8.5|1.8.6|1.8.7|1.9|1.9.1|1.9.2)
-                         rvm_ruby_interpreter="ruby"
-                         rvm_ruby_version="$rvm_token"
-                         rvm_action="${rvm_action:-use}"
+        rvm_ruby_interpreter="ruby"
+        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"
-                         rvm_action="${rvm_action:-use}"
+        rvm_ruby_interpreter="jruby"
+        rvm_ruby_version="$rvm_token"
+        rvm_action="${rvm_action:-use}"
       ;;
 
       -v|--version)
-                         if [ -z "$1" ] ; then
-                           rvm_action="version"
-                         else
-                           rvm_ruby_version="$1"
-                           shift
-                         fi
+        if [ -z "$1" ] ; then
+          rvm_action="version"
+        else
+          rvm_ruby_version="$1"
+          shift
+        fi
+      ;;
+
+      -t|--tag)
+        rvm_ruby_tag="$1";
+        rvm_action="${rvm_action:-use}"
+        shift
       ;;
 
-      -t|--tag)          rvm_ruby_tag="$1";
-                         rvm_action="${rvm_action:-use}"
-                         shift                             ;;
       --head)
-                         rvm_ruby_rev="head"
-                         rvm_action="${rvm_action:-use}"
+        rvm_ruby_rev="head"
+        rvm_action="${rvm_action:-use}"
       ;;
-      --rev|--revision)  rvm_ruby_rev="$1";
-                         rvm_action="${rvm_action:-use}"
-                         shift                             ;;
-      -b|--branch)       rvm_ruby_branch="$1";
-                         rvm_action="${rvm_action:-use}"
-                         shift                             ;;
 
+      --rev|--revision)
+        rvm_ruby_rev="$1";
+        rvm_action="${rvm_action:-use}"
+        shift
+      ;;
 
-      -P|--prefix)       rvm_prefix_path="$1"      ; shift ;;
+      -b|--branch)
+        rvm_ruby_branch="$1";
+        rvm_action="${rvm_action:-use}"
+        shift
+      ;;
 
-      --rubygems)        rvm_rubygems_flag=1               ;;
-      --rvm|--gem)       rvm_update_flag=1                 ;;
       --bin)
         if [ "$rvm_action" = "update" ] ; then
           rvm_bin_flag=1
@@ -213,34 +221,27 @@ function __rvm_parse-args {
         fi
         ;;
 
-       --source)         rvm_source_path="$1"      ; shift ;;
-       --archive)        rvm_archives_path="$1"    ; shift ;;
-      -G|--gems)         rvm_gem_path="$1"         ; shift ;;
-      -C|--configure)
+      -j)
         if [ ! -z "$1" ] ; then
-          rvm_ruby_configure="$(echo $1 | tr ',' ' ')"
+          rvm_make_flags="$rvm_make_flags -j$1"
           shift
         else
           rvm_action="error"
-          rvm_error_message="--configure *must* be followed by configure flags."
+          rvm_error_message="-j *must* be followed by an integer (normally the # of CPU's in your machine)."
         fi
       ;;
 
-      --re-configure)    rvm_re_configure=1                ;;
-      --make)            rvm_ruby_make="$1"        ; shift ;;
-      --make-install)    rvm_ruby_make_install="$1"; shift ;;
-      -j)
+
+      -C|--configure)
         if [ ! -z "$1" ] ; then
-          rvm_make_flags="$rvm_make_flags -j$1"
+          rvm_ruby_configure="$(echo $1 | tr ',' ' ')"
           shift
         else
           rvm_action="error"
-          rvm_error_message="-j *must* be followed by an integer (normally the # of CPU's in your machine)."
+          rvm_error_message="--configure *must* be followed by configure flags."
         fi
       ;;
-      --nice)            rvm_niceness="$1"         ; shift ;;
-      -l|--level)        rvm_ruby_patch_level="$1" ; shift ;;
-         --summary)      rvm_summary=1                     ;;
+
       -r|--require)
         if [ -z "$1" ] ; then
           rvm_action="error"
@@ -250,6 +251,7 @@ function __rvm_parse-args {
           shift
         fi
       ;;
+
       -I|--include)
         if [ -z "$1" ] ; then
           rvm_action="error"
@@ -259,47 +261,53 @@ function __rvm_parse-args {
           shift
         fi
       ;;
+
       -f|--file)
-                         rvm_action="rubydo"
-                         rvm_ruby_args="$1"
-                         shift
+        rvm_action="rubydo"
+        rvm_ruby_args="$1"
+        shift
       ;;
+
       -S|--script|-e|--execute)
-                         rvm_action="rubydo"
-                         rvm_ruby_args="$@"
-                         rvm_parse_break=1
+        rvm_action="rubydo"
+        rvm_ruby_args="$@"
+        rvm_parse_break=1
       ;;
 
-      -h|--help)         rvm_action=help           ; shift ;;
-      -d|--default)      rvm_set_default=1                 ;;
-      --trace|--debug)   rvm_debug=1                       ;;
-      --force)           rvm_force=1                       ;;
-         --all)          rvm_all=1                         ;;
-      -m|--gem-set)      rvm_gem_set_name="$1"     ; shift ;;
-         --rm-gem-set)   rvm_gem_set_name_rm="$1"  ; shift ;;
-         --dump)         rvm_dump=1                        ;;
-         --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
+      --load)
+        rvm_load_flag=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
       ;;
 
-      --jit)            rvm_rubinius_jit="RBX_LLVM=1"     ;;
-      --latest)         rvm_latest=1                      ;;
-      --tests|--specs)  rvm_action="tests"                ;;
-
       default|system)
         rvm_action="use"
         rvm_ruby_interpreter="system"
       ;;
 
+      --prefix)          rvm_prefix_path="$1"      ; shift ;;
+      -G|--gems)         rvm_gem_path="$1"         ; shift ;;
+      --source)          rvm_source_path="$1"      ; shift ;;
+      --archives)        rvm_archives_path="$1"    ; shift ;;
+      --make)            rvm_ruby_make="$1"        ; shift ;;
+      --make-install)    rvm_ruby_make_install="$1"; shift ;;
+      --nice)            rvm_niceness="$1"         ; shift ;;
+      -l|--level)        rvm_ruby_patch_level="$1" ; shift ;;
+      -h|--help)         rvm_action=help           ; shift ;;
+      -m|--gem-set)      rvm_gem_set_name="$1"     ; shift ;;
+         --rm-gem-set)   rvm_gem_set_name_rm="$1"  ; shift ;;
+      tests|specs)       rvm_action="tests"                ;;
+
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|debug|--force|--all|--dump|--summary|--jit|--latest|--spec|--test)
+        eval "rvm_$(echo $rvm_token | sed 's/-//g')_flag=1"
+      ;;
+
       reboot|flush|asdf|damnit|wtf|argh|work|workdamnit|BOOM|boom|wth)
         $rvm_action="reboot"
       ;;
@@ -337,8 +345,6 @@ function __rvm_parse-args {
   done
 
   if [ ! -z "$rvm_error_message" ] ; then popd 2> /dev/null ; return 1 ; fi
-  if [ -z "$rvm_debug" ] ; then set +x ; else set -x ; fi
-
 }
 
 function rvm {
@@ -349,38 +355,42 @@ function rvm {
   __rvm_load-defaults
   __rvm_parse-args $@
 
-  status=0
+  if [ -z "$rvm_debug_flag" ] ; then set +x ; else set -x ; fi
+  result=0
   case "$rvm_action" in
-    install)   __rvm_install-ruby ;status=$? ;;
-    uninstall) __rvm_uninstall    ;status=$? ;;
-    use)       __rvm_use          ;status=$? ;;
-    gemdir)    __rvm_gem-dir      ;status=$? ;;
-    srcdir)    __rvm_src-dir      ;status=$? ;;
-    gemdup)    __rvm_gem-dup      ;status=$? ;;
-    list)      __rvm_list         ;status=$? ;;
-    symlinks)  __rvm_symlinks     ;status=$? ;;
-    version)   __rvm_version      ;status=$? ;;
+    install)    __rvm_install-ruby     ; result=$? ;;
+    uninstall)  __rvm_uninstall        ; result=$? ;;
+    use)        __rvm_use              ; result=$? ;;
+    gemdir)     __rvm_gem-dir          ; result=$? ;;
+    srcdir)     __rvm_src-dir          ; result=$? ;;
+    gemdup)     __rvm_gem-dup          ; result=$? ;;
+    list)       __rvm_list             ; result=$? ;;
+    symlinks)   __rvm_symlinks         ; result=$? ;;
+    version)    __rvm_version          ; result=$? ;;
+    reset)      __rvm_reset            ; result=$? ;;
+                # TODO: how can we use bin_path here for reload, default file?
+    reload)     __rvm_reload           ; result=$? ;;
+    implode)    __rvm_implode          ; result=$? ;;
+    update)     __rvm_update           ; result=$? ;;
+    readline)   __rvm_readline_install ; result=$? ;;
+    iconv)      __rvm_iconv_install    ; result=$? ;;
+    reboot)     __rvm_reboot           ; result=$? ;;
+    usage|help) __rvm_usage            ; result=$? ;;
+    rubydo|rakedo|gemdo) __rvm_do      ; result=$? ;;
+
     tests|specs)
-      rvm_do_summary=1
+      rvm_summary_flag=1
       rvm_action="rake"
       __rvm_do
     ;;
-    rubydo|rakedo|gemdo) __rvm_do ; status=$? ;;
-    reset)      __rvm_reset            ;;
-                # TODO: how can we use bin_path here for reload, default file?
-    reload)     __rvm_reload           ;;
-    implode)    __rvm_implode          ;;
-    update)     __rvm_update           ;;
-    readline)   __rvm_readline_install ;;
-    iconv)      __rvm_iconv_install    ;;
-    reboot)     __rvm_reboot           ;;
-    usage|help) __rvm_usage            ;;
+
     info|debug)
-                __rvm_version
-                __rvm_info
-                if [ "$rvm_action" = "debug" ] ; then __rvm_debug ; fi
-                return 0
+      __rvm_version
+      __rvm_info
+      if [ "$rvm_action" = "debug" ] ; then __rvm_debug ; fi
+      result=0
     ;;
+
     error)      __rvm_log "fail" "$rvm_error_message ( see: 'rvm usage' )" ; popd 2> /dev/null ; return 1; ;;
     *)
       if [ ! -z "$rvm_action" ] ; then
@@ -388,11 +398,10 @@ function rvm {
       else
         __rvm_usage
       fi
-      return 1
+      result=1
   esac
-
-  if [ "$rvm_debug" = "1" ] ; then set +x ; unset rvm_debug ; fi
-  return $status
+  if [ "$rvm_debug_flag" = "1" ] ; then set +x ; unset rvm_debug_flag ; fi
+  return $result
 }
 
 

data/scripts/rvm-install

@@ -136,7 +136,7 @@ if [ "$system" = "Linux" ] ; 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 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 "
+    echo -e "\033[0;32m <i> \033[0msudo apt-get install libreadline5-dev libssl-dev bison"
 
   elif [ ! -z "$rvm_emerge_binary" ] ; then
     echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"

data/scripts/rvm-prompt

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

data/scripts/rvm-ruby-installer

@@ -4,13 +4,13 @@ function __rvm_install-source {
 
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
-  status=0
+  result=0
   __rvm_log "info" "Installing Ruby from source to: $rvm_ruby_home"
   mkdir -p $rvm_ruby_log_path
 
   pushd $rvm_source_path > /dev/null
 
-  if [ ! -z "$rvm_force" ] ; then
+  if [ ! -z "$rvm_force_flag" ] ; then
     rm -rf $rvm_ruby_home
     rm -rf $rvm_ruby_src_path
   fi
@@ -20,11 +20,11 @@ function __rvm_install-source {
       rvm_url="${rvm_url:-"ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_name.tar.gz"}"
       __rvm_log "info" "\tDownloading $rvm_ruby_package_name, this may take a while depending on your connection..."
       __rvm_fetch $rvm_url
-      if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+      if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
       __rvm_log "info" "\tExtracting $rvm_ruby_package_name ..."
       mkdir -p $rvm_ruby_src_path # Is this line necessary considering -C below?    v
       __rvm_run "extract" tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path
-      if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+      if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
     fi
   else
     __rvm_log "info" "\tRetrieving Ruby from $rvm_url"
@@ -33,14 +33,14 @@ function __rvm_install-source {
         cd $rvm_ruby_src_path
         if [ -z "$rvm_ruby_rev" ] ; then
           git pull origin master
-          if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+          if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
         else
           git checkout ${rvm_ruby_rev:-HEAD}
-          if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+          if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
         fi
       else
         git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path
-        if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+        if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
       fi
     else
       if [ -z "$rvm_ruby_rev" ] ; then
@@ -67,36 +67,33 @@ function __rvm_install-source {
       else
         svn checkout -q $rvm_rev --force $rvm_url $rvm_ruby_src_path
       fi
-      if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+      if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
     fi
   fi
 
   cd $rvm_ruby_src_path
-  if [ $? -gt 0 ] ; then status=$? ; __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd > /dev/null ; return $status ; fi
-
-  # Readline
-  if [ ! -d $rvm_path/usr/include/readline ] ; then __rvm_readline_install ; fi
+  if [ $? -gt 0 ] ; then result=$? ; __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd > /dev/null ; return $result ; fi
 
   if [ ! -s "$rvm_ruby_src_path/configure" -a "$rvm_ruby_interpreter" = "ruby" ] ; then
     rvm_autoconf=`which autoconf`
-    if [ $? -gt 0 ] ; then __rvm_log "fail" "rvm expects autoconf" ; status=$? ; return $status ; fi
+    if [ $? -gt 0 ] ; then __rvm_log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
     __rvm_run "autoconf" $rvm_autoconf
-    if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+    if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
   fi
 
-  if [ -s ./Makefile -a -z "$rvm_re_configure" ] ; then
+  if [ -s ./Makefile -a -z "$rvm_reconfigure_flag" ] ; then
     __rvm_log "warn" "\tSkipping configure step, Makefile exists so configure must have already been run."
   elif [ -s ./configure ] ; then
     __rvm_log "info" "\tConfiguring $rvm_ruby_package_name using $rvm_ruby_configure, this may take a while depending on your cpu(s)..."
     if [ -d $rvm_path/usr/include/readline/ ] ; then
-      parameters="$parameters --with-readline-dir=$rvm_path/usr/include/readline/"
+      configure_parameters="$configure_parameters --with-readline-dir=$rvm_path/usr/include/readline/"
     fi
     if [ -d $rvm_path/usr/include/iconv/ ] ; then
-      parameters="$parameters --with-iconv-dir=$rvm_path/usr/include/iconv/"
+      configure_parameters="$configure_parameters --with-iconv-dir=$rvm_path/usr/include/iconv/"
     fi
-    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home --enable-shared=true $rvm_ruby_configure $parameters"
-    unset parameters
-    if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure $configure_parameters"
+    unset configure_parameters
+    if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
   else
     __rvm_log "error" "\tSkipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
   fi
@@ -107,7 +104,7 @@ function __rvm_install-source {
   else
     __rvm_run "make" $rvm_ruby_make
   fi
-  if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+  if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
 
   if [ -z "$rvm_ruby_make" ] ; then
     __rvm_log "info" "\tInstalling $rvm_ruby_package_name"
@@ -115,16 +112,16 @@ function __rvm_install-source {
   else
     __rvm_run "install" $rvm_ruby_make_install
   fi
-  if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+  if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
 
-  __rvm_run "chmod.bin" chmod +x $rvm_ruby_home/bin/*
-  __rvm_bin_script
   __rvm_log "info" "Installation of $rvm_ruby_package_name is complete."
 
   GEM_HOME="$rvm_gem_home" ; export GEM_HOME
   GEM_PATH="$rvm_gem_home" ; export GEM_PATH
 
   __rvm_rubygems_setup
+  __rvm_bin_script
+  __rvm_run "chmod.bin" chmod +x $rvm_ruby_home/bin/*
 
   popd > /dev/null
 
@@ -195,8 +192,8 @@ function __rvm_install-ruby {
       __rvm_run "install" ./installer -a $rvm_path/ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level --dont-install-useful-gems --no-tcmalloc $rvm_ruby_configure
       chmod +x $rvm_ruby_home/bin/*
 
-      __rvm_bin_script
       __rvm_rubygems_setup
+      __rvm_bin_script
 
       popd > /dev/null
 
@@ -219,17 +216,20 @@ function __rvm_install-ruby {
       #rvm_ruby_rev="head"
       # TODO: Check if already git repo, then git pull origin master && build
 
-      __rvm_bin_script
-
       if [ ! -d $rvm_ruby_home -o ! -d $rvm_ruby_home/.git ] ; then
         rm -rf $rvm_ruby_home
         git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_home
       fi
       cd $rvm_ruby_home
-      __rvm_run "build" $rvm_rubinius_jit rake build
+      if [ ! -z "$rvm_jit_flag" ]; then
+        __rvm_run "build" RBX_LLVM=1 rake build
+      else
+        __rvm_run "build" rake build
+      fi
       for binary in ruby irb ; do
         ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary
       done
+      __rvm_bin_script
     ;;
 
     jruby)
@@ -273,10 +273,12 @@ function __rvm_install-ruby {
         ln -fs $rvm_ruby_home/bin/$binary $rvm_ruby_home/bin/${binary#j}
       done
 
+      __rvm_bin_script
+
       ln -fs $rvm_ruby_home/bin/ruby $rvm_path/bin/$rvm_ruby_package_name
       for rvm_gem_name in rake jruby-openssl ; do
         __rvm_log "info" "Installing $rvm_gem_name"
-        __rvm_run "gems" $rvm_ruby_home/bin/jgem install $rvm_gem_name --no-rdoc --no-ri -q
+        __rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q
       done
     ;;
 
@@ -348,9 +350,9 @@ function __rvm_post_install {
   __rvm_log "info" "Installation of gems for $rvm_ruby_package_name is complete."
 
   binary=rake
-  if [ -x $rvm_ruby_src_path/bin/$binary ] ; then
-    if [ "$rvm_ruby_src_path" != "$rvm_ruby_home" ] ; then
-      cp $rvm_ruby_src_path/bin/$binary $rvm_ruby_home/bin/$binary
+  if [ -x $rvm_gem_home/bin/$binary ] ; then
+    if [ "$rvm_gem_home" != "$rvm_ruby_home" ] ; then
+      cp $rvm_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
     fi
     # TODO: Account for rubygem installed rake vs system rake
     string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_gem_home/bin:' + ENV['PATH']"
@@ -376,16 +378,11 @@ function __rvm_rubygems_setup {
       mkdir -p $rvm_source_path/$rvm_gem_package_name
       __rvm_run "rubygems.extract" tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_source_path
     fi
-    # Well this is fun... fix nil error on require_paths:
-    # Q: Is this necessary any longer?
-    #sed -i.orig "s/require_paths\.join/require_paths.to_a.join/" $rvm_source_path/$rvm_gem_package_name/lib/rubygems/gem_path_searcher.rb
-    #rm -f $rvm_source_path/$rvm_gem_package_name/lib/rubygems/gem_path_searcher.rb.orig
-    __rvm_run "rubygems.install" GEM_HOME=$rvm_gem_path GEM_HOME=$rvm_gem_home $rvm_ruby_home/bin/ruby $rvm_source_path/$rvm_gem_package_name/setup.rb
-    status=$?
-    if [ $status -eq 0 ] ; then
+    __rvm_run "rubygems.install" GEM_PATH=$rvm_gem_path GEM_HOME=$rvm_gem_home $rvm_ruby_home/bin/ruby $rvm_source_path/$rvm_gem_package_name/setup.rb
+    result=$?
+    if [ $result -eq 0 ] ; then
       __rvm_log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
     fi
-    if [ $status -eq 0 ] ; then status=$? ; fi
   else
     # 1.9 has it's own built gem command, let's adjust the shebang line.
     mv $rvm_ruby_src_path/bin/gem $rvm_ruby_src_path/bin/gem.orig
@@ -394,6 +391,6 @@ function __rvm_rubygems_setup {
     __rvm_run "rubygems.update" $rvm_ruby_home/bin/gem update --system
   fi
 
-  return $status
+  return $result
 }
 

data/scripts/rvm-selector

@@ -107,9 +107,6 @@ function __rvm_select {
       fi
     fi
 
-    if [ ! -z "$rvm_load" ] ; then __rvm_gemset_load ; fi
-    if [ ! -z "$rvm_dump" ] ; then __rvm_gemset_dump ; fi
-
     mkdir -p $rvm_gem_home
 
     if [ -z "$rvm_ruby_patch_level" ] ; then
@@ -119,6 +116,7 @@ function __rvm_select {
       if [ "`echo $rvm_ruby_patch_level | awk '{print substr($1, 0, 1)}'`" != "p" ] ; then
         rvm_ruby_patch_level="p$rvm_ruby_patch_level"
       fi
+      rvm_ruby_patch_level="`echo $rvm_ruby_patch_level | sed 's/^pp/p/'`" # sanity check, thanks sfpyra
       rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
       rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
     fi
@@ -131,6 +129,9 @@ function __rvm_select {
 
     export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_version rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_gem_home rvm_path rvm_source_path rvm_bin_path rvm_ruby_binary rvm_ruby_package_name rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_source_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected rvm_ruby_string
 
+    if [ ! -z "$rvm_load_flag" ] ; then __rvm_gemset_load ; fi
+    if [ ! -z "$rvm_dump_flag" ] ; then __rvm_gemset_dump ; fi
+
   else
     rvm_gem_home=$GEM_HOME
   fi
@@ -156,6 +157,7 @@ function __rvm_use {
   elif [ "$rvm_ruby_interpreter" = "system" ] ; then
 
     unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
+    # TODO: Remove .rvm/bin from the path
     PATH="$rvm_system_path" ; export PATH
     if [ -s $rvm_path/system ] ; then
       grep "^MY_RUBY_HOME='$rvm_path" "$rvm_path/system" > /dev/null
@@ -191,7 +193,7 @@ function __rvm_use {
 
     PATH="$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:$rvm_system_path" ; export PATH
 
-    if [ ! -z "$rvm_set_default" ] ; then
+    if [ ! -z "$rvm_default_flag" ] ; then
       RUBY_VERSION="$($MY_RUBY_HOME/bin/ruby -v | sed 's/^\(.*\) (.*$/\1/')"
       export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
 
@@ -213,13 +215,9 @@ function __rvm_use {
         ln -fs $rvm_path/bin/gem-$rvm_ruby_package_name $rvm_path/bin/gem
         ln -fs $rvm_path/bin/irb-$rvm_ruby_package_name $rvm_path/bin/irb
       else
-        rm -f $rvm_path/bin/ruby
-        rm -f $rvm_path/bin/default-ruby
-        rm -f $rvm_path/bin/gem
-        rm -f $rvm_path/bin/irb
+        rm -f $rvm_path/bin/ruby $rvm_path/bin/default-ruby $rvm_path/bin/gem $rvm_path/bin/irb
       fi
-
-      unset rvm_set_default
+      unset rvm_default_flag
     fi
   fi
 }

data/scripts/rvm-update

@@ -136,7 +136,7 @@ if [ "$system" = "Linux" ] ; 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 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 "
+    echo -e "\033[0;32m <i> \033[0msudo apt-get install libreadline5-dev libssl-dev bison"
 
   elif [ ! -z "$rvm_emerge_binary" ] ; then
     echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"

data/scripts/rvm-utility

@@ -78,7 +78,7 @@ function __rvm_run {
   command="$*"
   rvm_ruby_log_path=${rvm_ruby_log_path:-$rvm_path/log}
   mkdir -p $rvm_ruby_log_path
-  if [ $rvm_debug ] ; then __rvm_log "debug" "Executing: $command" ; fi
+  if [ ! -z "$rvm_debug_flag" ] ; then __rvm_log "debug" "Executing: $command" ; fi
   touch $rvm_ruby_log_path/$log_file_name.log $rvm_ruby_log_path/$log_file_name.error.log # for zsh :(
   echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee $rvm_ruby_log_path/$log_file_name.log > $rvm_ruby_log_path/$log_file_name.error.log
   if [ -z "$rvm_niceness" -o "$rvm_niceness" = "0" ] ; then
@@ -91,7 +91,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_all rvm_re_configure rvm_summary rvm_ruby_string rvm_make_flags rvm_bin_flag
+  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_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_ruby_tag rvm_ruby_rev rvm_url rvm_ruby_make rvm_ruby_configure rvm_ruby_make_install rvm_config_path rvm_ruby_string rvm_bin_path rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_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
 }
 
 # TODO: root user loadng of /etc/rvmrc
@@ -133,16 +133,16 @@ function __rvm_fetch {
 
   pushd $rvm_archives_path > /dev/null
   eval $rvm_fetch "$1"
-  status=$?
-  if [ $status -gt 0 ] ; then
-    if [ $status -eq 78 ] ; then
+  result=$?
+  if [ $result -gt 0 ] ; then
+    if [ $result -eq 78 ] ; then
       __rvm_log "error" "The requested url does not exist: '$1'"
     else
       __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
     fi
   fi
   popd 2> /dev/null
-  return $status
+  return $result
 }
 
 function __rvm_load-defaults {
@@ -326,7 +326,7 @@ function __rvm_symlinks {
 
 function __rvm_list {
 
-  if [ "$rvm_all" ] ; then
+  if [ "$rvm_all_flag" ] ; then
     svn list http://svn.ruby-lang.org/repos/ruby/tags/ | grep 'v1_[8|9]' | sed 's/^v1_//' | sed 's/\/$//' | awk -F'_' '{print "1."$1"."$2 " -l "$3}' | sed 's/p$//'
 
     echo "jruby 1.2.0"
@@ -407,10 +407,10 @@ function __rvm_initialize {
     if [ $? -ne 0 ] ; then
       __rvm_log "fail" "rvm expects either curl or wget, neither seem to be in your path :("
     else
-      rvm_fetch="wget -q -c "
+      rvm_fetch="wget -c " # -q for quiet
     fi
   else
-    rvm_fetch="$rvm_fetch -O -L -s --create-dirs -C - "
+    rvm_fetch="$rvm_fetch -O -L --create-dirs -C - " # -s for silent
   fi
 
   # TODO: Sanitize user input, ensure that there is a / a the end...
@@ -447,17 +447,18 @@ function __rvm_initialize {
     PATH=$rvm_bin_path:$PATH ; export PATH
   fi
 
-  mkdir -p $rvm_source_path $rvm_bin_path $rvm_archives_path
+  mkdir -p $rvm_source_path $rvm_bin_path $rvm_archives_path $rvm_path/tmp
 }
 
 function __rvm_update {
-  if [ "$rvm_ruby_rev" = "head" -o "$rvm_update_flag" ] ; then
+  if [ "$rvm_ruby_rev" = "head" -o ! -z "$rvm_self_flag" -o ! -z "$rvm_update_flag" ] ; then
     __rvm_version
     __rvm_update_rvm
     __rvm_version
   fi
   __rvm_reload
   __rvm_select
+  # if [ "$rvm_gem_flag" ]      ; then __rvm_gem_scripts    ; fi
   if [ "$rvm_bin_flag" ]      ; then __rvm_bin_scripts    ; fi
   if [ "$rvm_rubygems_flag" ] ; then __rvm_rubygems_setup ; fi
 }
@@ -512,8 +513,33 @@ function __rvm_reload {
   source $rvm_path/scripts/rvm
 }
 
+function __rvm_ruby_do {
+  __rvm_select
+  __rvm_use
+  #__rvm_
+  binary=`echo $rvm_action | sed 's/do$//'`
+  lp="$rvm_ruby_home/bin:$rvm_ruby_load_path"
+  if [ "$binary" = "ruby" ] ; then
+    rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_require -I$lp -S $rvm_ruby_args"
+  else
+    rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args"
+  fi
+  echo "$rvm_ruby_string: $($rvm_ruby_home/bin/$binary -v)"
+  eval $rvm_command
+  result=$?
+  if [ $result -eq 0 ]; then
+    successes[${#successes[*]}]=$rvm_ruby_string
+  else
+    errors[${#errors[*]}]=$rvm_ruby_string
+  fi
+  all[${#all[*]}]=$rvm_ruby_string
+  results[${#results[*]}]=$result
+  # TODO: keep track of and re-set the previous selected ruby ;)
+  unset rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_ruby_package_name rvm_ruby_home rvm_ruby_irbrc rvm_ruby_binary rvm_ruby_string lp
+}
+
 function __rvm_do {
-  all=() ; successes=() ; errors=() ; statuses=()
+  all=() ; successes=() ; errors=() ; results=()
   # TODO: Extract the common functionality out of the if below
   if [ ! -z "$rvm_ruby_version" ] ; then
     rvm_ruby_selectors=$(echo $rvm_ruby_version | tr ',' ' ')
@@ -527,68 +553,26 @@ function __rvm_do {
         unset rvm_ruby_version
       fi
       unset temp
-      __rvm_select
-      __rvm_use
-      #__rvm_
-      binary=`echo $rvm_action | sed 's/do$//'`
-      lp="$rvm_ruby_home/bin:$rvm_ruby_load_path"
-      if [ "$binary" = "ruby" ] ; then
-        rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_require -I$lp -S $rvm_ruby_args"
-      else
-        rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args"
-      fi
-      echo "$rvm_ruby_string: $($rvm_ruby_home/bin/$binary -v)"
-      eval $rvm_command
-      status=$?
-      if [ $status -eq 0 ]; then
-        successes[${#successes[*]}]=$rvm_ruby_string
-      else
-        errors[${#errors[*]}]=$rvm_ruby_string
-      fi
-      all[${#all[*]}]=$rvm_ruby_string
-      statuses[${#statuses[*]}]=$status
-      # TODO: keep track of and re-set the previous selected ruby ;)
-      unset rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_ruby_package_name rvm_ruby_home rvm_ruby_irbrc rvm_ruby_binary rvm_ruby_string lp
+      __rvm_ruby_do
     done
   else # all
-    rvm_ruby_binaries=`/bin/ls $rvm_path/*/bin/ruby`
+    rvm_ruby_binaries=`/bin/ls $rvm_path/*/bin/ruby 2> /dev/null`
     for rvm_ruby_binary in $rvm_ruby_binaries ; do
       if [ -x $rvm_ruby_binary ] ; then
         rvm_ruby_string=`dirname $rvm_ruby_binary | xargs dirname | xargs basename`
-        __rvm_select
-        __rvm_use
-        rvm_ruby_string="$(dirname $rvm_ruby_home/bin/$binary | xargs dirname | xargs basename)"
-        lp="$rvm_ruby_home/bin:$rvm_ruby_load_path"
-        if [ "$binary" = "ruby" ] ; then
-          rvm_command="$rvm_ruby_binary $rvm_ruby_require -I$lp -S $rvm_ruby_args"
-        else
-          rvm_command="$rvm_ruby_binary $rvm_ruby_args"
-        fi
-        echo "$(basename $rvm_ruby_binary):"
-        eval $rvm_command
-        status=$?
-        if [ $status -eq 0 ]; then
-          successes[${#successes[*]}]=$rvm_ruby_string
-        else
-          errors[${#errors[*]}]=$rvm_ruby_string
-        fi
-        all[${#all[*]}]=$rvm_ruby_string
-        statuses[${#statuses[*]}]=$status
-        unset rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_ruby_package_name rvm_ruby_home rvm_ruby_irbrc rvm_ruby_binary rvm_ruby_string lp
+        __rvm_ruby_do
       fi
     done
   fi
 
-  export successes errors statuses
-
-  if [ ! -z "$rvm_summary" ] ; then
+  if [ ! -z "$rvm_summary_flag" ] ; then
+    export successes errors results
     echo -e "\n\033[0;32msuccessful (${#successes[*]}) : [ $(echo "${successes[*]}" | sed 's/ /, /g') ]\033[0m"
     echo -e "\n\033[0;31merrors (${#errors[*]}) : [ $(echo "${errors[*]}" | sed 's/ /, /g') ]\033[0m"
     echo -e "all (${#all[*]}) : [ $(echo "${all[*]}" | sed 's/ /, /g') ]"
-    echo -e "exit statuses: [ $(echo "${statuses[*]}" | sed 's/ /, /g') ]\n"
-    # unset binary successes errors rvm_summary
+    echo -e "exit results: [ $(echo "${results[*]}" | sed 's/ /, /g') ]\n"
   else
-    unset binary successes errors rvm_summary
+    unset binary successes errors rvm_summary_flag
   fi
   return ${#errors[*]}
 }
@@ -621,24 +605,20 @@ Config
 
 function __rvm_ruby_string {
   if [ "$rvm_ruby_interpreter" = "system" ] ; then
-    rvm_ruby_string=""
+    unset rvm_ruby_string
   elif [ ! -z "$rvm_ruby_string" ] ; then
-    echo $rvm_ruby_string | grep "enterprise" > /dev/null
-    if [ $? -eq 0 ] ; then
-      rvm_ruby_interpreter="ruby-enterprise"
-    else
-      rvm_ruby_interpreter=`echo $rvm_ruby_string |  tr '-' ' ' | awk '{print $1}'`
-    fi
-    rvm_ruby_vesion=`echo $rvm_ruby_string | awk -F'-' '{print $(NF-1)}'`
-    revision=`echo $rvm_ruby_string | awk '{print $NF}'`
+    rvm_ruby_string=`echo "$rvm_ruby_string" | sed 's/ruby-enterprise/ree/g'`
+    rvm_ruby_interpreter=`echo $rvm_ruby_string |  tr '-' ' ' | awk '{print $1}'`
+    rvm_ruby_vesion=`echo $rvm_ruby_string | awk -F'-' '{print $2}'`
+    revision=`echo $rvm_ruby_string | awk -F'-' '{print $3}'`
     if [ "$revision" = "head" -o "$revision" = "preview" ] ; then
       rvm_ruby_revision="$revision"
     else
-      echo $revision | grep 'p[0-9]\+' > /dev/null
+      echo $revision | grep '^p[0-9]\+' > /dev/null
       if [ $? -eq 0 ] ; then
         rvm_ruby_patch_level=`echo $revision | awk -F'p' '{print $2}'`
       else
-        echo $revision | grep '[0-9]\+' > /dev/null
+        echo $revision | grep '^[0-9]\+' > /dev/null
         if [ $? -eq 0 ] ; then
           rvm_ruby_rev="$revision"
         else
@@ -662,7 +642,7 @@ function __rvm_gemset_dump {
   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
+    if [ -z "$rvm_latest_flag" ] ; then
       versions=`echo $gem | awk -F';' '{print $2}' | sed 's/,/ /g'`
       for version in $versions ; do
         echo "$name -v$version" >> $file_name.gemset
@@ -678,38 +658,59 @@ function __rvm_gemset_dump {
 
 function __rvm_gemset_load {
   echo "Loading $rvm_load_file file..."
-  while read line < `cat "$rvm_load_file" | awk '/^[a-zA-Z]/{print}'` ; do
+  rvm_ruby_gem_list=`/bin/ls $rvm_gem_home/specifications/ | sed 's/\.gemspec$//' 2> /dev/null`
+  while read line
+  do # Keep this on 2nd line :( bash fail.
     # TODO: Switch to a different field separator than ; to allow for evals
     gem=`echo $line | awk -F';' '{print $1}'`
     gem_prefix=`echo $line | awk -F';' '{print $2}'`
     gem_name=`echo $gem | awk '{print $1}'`
     gem_version=`echo $gem | sed 's/^.*-v[=]*[ ]*//' | awk '{print $1}'`
     gem_postfix=`echo $gem | sed "s/$gem_name//" | sed "s/-v[=]*[ ]*$gem_version//"`
-    gem_file="$gem_name-$gem_version.gem"
 
     if [ -z "$gem_version" ] ; then # no version
-      file=`/bin/ls -t $rvm_gem_home/cache/${gem_name}* | head -n 1`
+      gem_file_name="${gem_name}*.gem"
     else # version
-      file=`/bin/ls $rvm_gem_home/cache/$gem_file`
+      gem_file_name="$gem_name-$gem_version.gem"
     fi
-
-    if [ -z "$file" ] ; then # not cached
-      gem="$gem_name-$gem_version"
+    cache_file=`/bin/ls -t $rvm_gem_path/*/*/cache/${gem_file_name}* | head -n1 2> /dev/null`
+    if [ -z "$cache_file" ] ; then
+      if [ -z "$gem_version" ] ; then
+        gem="$gem_name"
+      else
+        gem="$gem_name -v $gem_version"
+      fi
     else # cached
-      gem="$file -l" # install as a named local gem
+      gem_file_name=`basename $cache_file`
+      gem_string=`echo "$gem_file_name" | sed 's/\.gem$//'`
+      if [ ! -z "`echo "$rvm_ruby_gem_list" | awk "/$gem_string/{print}"`" ] ; then
+        if [ ! -z "$rvm_force_flag" ] ; then
+          cp $cache_file $rvm_path/tmp/$gem_file_name
+          gem="$rvm_path/tmp/$gem_file_name -l" # install as a named local gem
+        else
+          unset gem
+          __rvm_log "info" "$gem_name $gem_version is already installed, skipping. (use --force to force these to install regardless)"
+        fi
+      else
+        gem="$cache_file -l"
+      fi
     fi
 
-    # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line.
-    if [ -z "$vars" ] ; then
-      GEM_HOME="$rvm_gem_home" GEM_PATH="$rvm_gem_home" $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix
-    else
-      eval "GEM_HOME='$rvm_gem_home' GEM_PATH='$rvm_gem_home' $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix"
+    if [ ! -z "$gem" ] ; then
+      # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line.
+      if [ -z "$vars" ] ; then
+        GEM_HOME="$rvm_gem_home" GEM_PATH="$rvm_gem_home" $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix
+      else
+        eval "GEM_HOME='$rvm_gem_home' GEM_PATH='$rvm_gem_home' $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix"
+      fi
     fi
-    unset gem gem_prefix gem_name gem_version gem_file gem_postfix file
-  done
+    unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
+  done < <(awk '/^[a-zA-Z]/{print}' "$rvm_load_file")
 }
 
-# -C --with-readline-dir=$rvm_path/usr
+#
+# ruby supporting libraries:
+#
 function __rvm_readline_install {
   pushd $rvm_path/src > /dev/null
   package=readline
@@ -732,7 +733,6 @@ function __rvm_readline_install {
   popd > /dev/null
 }
 
-# -C --with-iconv-dir=$rvm_path/usr
 function __rvm_iconv_install {
   pushd $rvm_path/src > /dev/null
   package=libiconv
@@ -746,3 +746,4 @@ function __rvm_iconv_install {
 
   popd > /dev/null
 }
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.40
+  version: 0.0.41
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 -04:00
+date: 2009-09-16 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []