rvm 0.0.55 → 0.0.56

data/config/db

@@ -1,7 +1,7 @@
 niceness=0
 ruby_repo_url=http://svn.ruby-lang.org/repos/ruby
 rubinius_repo_url=git://github.com/evanphx/rubinius.git
-macruby_repo_url=http://svn.macosforge.org/repository/ruby/MacRuby
+macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://macruby.icoretech.org/latest
 jruby_repo_url=git://kenai.com/jruby~main
 ruby_configure=--enable-shared
@@ -9,7 +9,6 @@ interpreter=ruby
 ruby_version=1.8.6
 ruby_patchlevel=383
 jruby_version=1.3.1
-ree_interpreter=ruby-enterprise
 ree_version=1.8.7
 ree_1.8.6_patch_level=20090610
 ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677

data/examples/rvmrc

@@ -33,3 +33,6 @@
 
 # Install rubies on use when they are not installed
 #ruby_install_on_use=1
+
+# Make Flags, I have 2 cpu's so I can do 2 make threads:
+#rvm_make_flags="-j 2"

data/install

@@ -21,6 +21,7 @@ for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p $rvm_path/$dir_name
 done
 
+rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib ; do
   mkdir -p $rvm_path/$dir_name
   /bin/cp -Rf $source_dir/$dir_name $rvm_path

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 55
+:patch: 56

data/scripts/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/lib/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`"
-  rvm_meta_updated="2009.10.05"
+  rvm_meta_updated="2009.10.09"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -103,7 +103,7 @@ Resources:
 " | ${PAGER:-/usr/bin/less}
 }
 
-function __rvm_parse-args {
+function __rvm_parse_args {
   while [ $# -gt 0 ] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
@@ -140,18 +140,14 @@ function __rvm_parse-args {
         fi
       ;;
 
-      gemset)
-        rvm_action=$rvm_token
-        if [ "$1" = "delete" ] ; then
-          rvm_delete_flag=1
-          shift
-          if [ -z "$1" -a -z "$rvm_gem_set_name" ] ; then
-            rvm_action="error"
-            rvm_error_message="A gem set name must be specified with 'gemset delete'"
-          else
-            rvm_gem_set_name="$1"
-            shift
-          fi
+      gems|gemset)
+        rvm_action="gems"
+        if [ "$1" = "name" -o "$1" = "dir" -o "$1" = "list" -o "$1" = "empty" -o "$1" = "delete" ] ; then
+          eval "rvm_${1}_flag=1" ; shift
+        elif [ "$1" = "dump" -o "$1" = "load" ] ; then
+          eval "rvm_${1}_flag=1" ; shift
+        else
+          rvm_use_flag=1 # Default is to use the (named) gem set.
         fi
       ;;
 
@@ -163,14 +159,13 @@ function __rvm_parse-args {
       ;;
 
       --load|load|dump)
-        rvm_action=gemset
+        rvm_action=gems
         eval "rvm_${rvm_token}_flag=1"
         if [ ! -z "$1" ] ; then
-          rvm_gem_set_name=$(echo $1 | sed 's/\.gemset//' | xargs basename)
-          rvm_file_name="$(echo $1 | sed 's/\.gemset//').gemset"
+          rvm_file_name="$(echo $1 | sed 's/\.gems//').gems"
           shift
         else
-          rvm_file_name="$rvm_gem_set_name.gemset"
+          rvm_file_name="$rvm_gem_set_name.gems"
         fi
       ;;
 
@@ -194,7 +189,7 @@ function __rvm_parse-args {
         if [ "$rvm_action" = "do" ] ; then rvm_action="ruby" ; fi
         rvm_action=$(echo $rvm_token | sed 's/do//g')
 
-        if [ "$rvm_action" = "rake" -o "$rvm_action" = "gem" ] ; then
+        if [ "$rvm_action" = "rake" -o "$rvm_action" = "gem" -o "$rvm_action" = "ruby" ] ; then
           rvm_action="ruby"
           rvm_ruby_args="$rvm_token $@"
           rvm_parse_break=1
@@ -263,13 +258,13 @@ function __rvm_parse-args {
       ;;
 
       --head)
-        rvm_ruby_rev="head"
+        rvm_ruby_revision="head"
         rvm_head_flag=1
         rvm_action="${rvm_action:-use}"
       ;;
 
       --rev|--revision)
-        rvm_ruby_rev="$1";
+        rvm_ruby_revision="$1";
         rvm_action="${rvm_action:-use}"
         shift
       ;;
@@ -347,17 +342,16 @@ function __rvm_parse-args {
       ;;
 
       --install)            rvm_install_on_use_flag=1         ;;
+      -h|--help|usage|help) rvm_action=help                   ;;
       --prefix)             rvm_prefix_path="$1"      ; shift ;;
       -G|--gems)            rvm_gem_path="$1"         ; shift ;;
-      --source)             rvm_source_path="$1"      ; shift ;;
+      --source)             rvm_src_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|usage|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"                ;;
 
       --trace)
@@ -374,13 +368,18 @@ function __rvm_parse-args {
 
       *)
         if [ ! -z "$rvm_token" ] ; then
-          if [ ! -z "`echo $rvm_token | awk '/,/'`" ] ; then
+          if [ "$rvm_action" = "gems" ] ; then
+            if [ -z "$(echo $rvm_token | awk '/\.gems$/')" ] ; then
+              rvm_gem_set_name=$(echo $rvm_token | sed 's/\.gems//g')
+            else
+              rvm_file_name="$(echo $rvm_token | sed 's/\.gems//g').gems"
+            fi
+          elif [ ! -z "$(echo $rvm_token | awk '/,/')" ] ; then
             rvm_ruby_version="$rvm_token"
             if [ -z "$rvm_action" ] ; then
-              rvm_action="ruby" # Not sure if we really want to do this but we'll try it out.
+              rvm_action="do" # Not sure if we really want to do this but we'll try it out.
             fi
           else
-
             if [ ! -z "`echo $rvm_token | awk '/\.rb$/{print}' 2> /dev/null`" ] ; then # we have a specified ruby script
               rvm_ruby_args=$rvm_token
               rvm_ruby_file=$rvm_token
@@ -409,11 +408,13 @@ function __rvm_parse-args {
 
 function rvm {
 
+  trap '__rvm_cleanup_variables ; rm -f "/tmp/rvm/$$" >/dev/null 2>&1' 0 1 2 3 15
+
   __rvm_cleanup_variables
   __rvm_load-rvmrc
   __rvm_initialize
   __rvm_load_defaults
-  __rvm_parse-args $@
+  __rvm_parse_args $@
 
   if [ -z "$rvm_trace_flag" ] ; then set +x ; else set -x ; fi
   result=0
@@ -436,27 +437,15 @@ function rvm {
     benchmark)  __rvm_benchmark        ; result=$? ;;
     ruby)       __rvm_do               ; result=$? ;;
     inspect)    __rvm_inspect          ; result=$? ;;
+    gems)       __rvm_gems             ; result=$? ;;
 
     install|uninstall|remove)
       __rvm_manage_rubies
       result=$?
     ;;
 
-    gemset)
-      if [ ! -z "$rvm_load_flag" ] ; then
-        __rvm_gemset_load
-      elif [ ! -z "$rvm_dump_flag" ] ; then
-        __rvm_gemset_load
-      elif [ ! -z "$rvm_delete_flag" ] ; then
-        __rvm_gemset_delete
-      else
-        rvm_action="error"
-        rvm_error_message="At least one of load, dump, or delete must be specified with 'gemset'."
-      fi
-    ;;
-
     gemsync)
-      rvm_source_gem_path=`__rvm_select ; echo $rvm_gem_home`
+      rvm_source_gem_path=`__rvm_select ; echo $rvm_ruby_gem_home`
       __rvm_gem_sync
     ;;
 

data/scripts/completion

@@ -83,7 +83,7 @@ _rvm ()
       --install)         rvm_install_on_use_flag=1         ;;
       --prefix)          rvm_prefix_path="$1"      ; shift ;;
       -G|--gems)         rvm_gem_path="$1"         ; shift ;;
-      --source)          rvm_source_path="$1"      ; shift ;;
+      --source)          rvm_src_path="$1"         ; shift ;;
       --archives)        rvm_archives_path="$1"    ; shift ;;
       --make)            rvm_ruby_make="$1"        ; shift ;;
       --make-install)    rvm_ruby_make_install="$1"; shift ;;
@@ -135,7 +135,7 @@ function _rvm {
   __rvm_load-rvmrc
   __rvm_initialize
   __rvm_load_defaults
-  __rvm_parse-args $@
+  __rvm_parse_args $@
 
   result=0
   case "$rvm_action" in

data/scripts/gems

@@ -0,0 +1,180 @@
+#!/bin/bash
+__rvm_gems() {
+  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
+
+  if [ ! -z "$rvm_use_flag" ] ; then
+    __rvm_gems_use
+  elif [ ! -z "$rvm_load_flag" ] ; then
+    __rvm_gems_load
+  elif [ ! -z "$rvm_dump_flag" ] ; then
+    __rvm_gems_dump
+  elif [ ! -z "$rvm_delete_flag" ] ; then
+    __rvm_gems_delete
+  elif [ ! -z "$rvm_name_flag" ] ; then
+    __rvm_gems_name
+  elif [ ! -z "$rvm_dir_flag" ] ; then
+    __rvm_gems_dir
+  elif [ ! -z "$rvm_list_flag" ] ; then
+    __rvm_gems_list
+  elif [ ! -z "$rvm_clear_flag" ] ; then
+    __rvm_gems_clear
+  fi
+}
+
+__rvm_gems_select() {
+  if [ -z "$rvm_gem_set_name" ] ; then
+    if [ -z "$GEM_HOME" ] ; then
+      rvm_ruby_gem_home=$(gem env gemdir)
+    elif [ ! -z "$GEM_HOME" ] ; then
+      rvm_ruby_gem_home="$GEM_HOME"
+    elif [ ! -z "$rvm_ruby_interpreter" -a ! -z "$rvm_ruby_version" -a "$rvm_ruby_interpreter" != "system" ] ; then
+      rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
+    else
+      __rvm_log "error" "Cannot select gem home, something definitely wrong :/"
+    fi
+
+    if [ -z "$rvm_gem_set_name" -a ! -z "$rvm_ruby_gem_home" -a ! -z "$rvm_ruby_version" ] ; then
+      rvm_gem_set_name=$(echo $rvm_ruby_gem_home | xargs basename | sed "s/${rvm_ruby_version}-//")
+    fi
+
+    if [ -z "$rvm_gem_set_name" ] ; then unset rvm_gem_set_name ; fi
+
+    if [ ! -z "$rvm_gem_set_name" -a ! -z "$(echo $rvm_gem_set_name | awk '/^'$rvm_ruby_version'/')" ] ; then
+      rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
+    else
+      rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
+    fi
+  else
+    rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
+  fi
+}
+
+__rvm_gems_use() {
+  __rvm_gems_select ; mkdir -p "$rvm_ruby_gem_home" ; GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
+}
+
+__rvm_gems_name() {
+  __rvm_gems_select ; echo "$rvm_gem_set_name"
+}
+
+__rvm_gems_dir() {
+  __rvm_gems_select ; echo "$rvm_ruby_gem_home"
+}
+
+__rvm_gems_list() {
+  __rvm_gems_select ; gem list
+}
+
+__rvm_gems_clear() {
+  __rvm_gems_use
+  if [ -d "$rvm_ruby_gem_home" -a "$rvm_ruby_gem_home" != '/' ] ; then
+    rm -rf "$rvm_ruby_gem_home"
+  fi
+}
+
+__rvm_gems_dump() {
+  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
+  __rvm_gems_select
+  rvm_gem_set_name="${rvm_gem_set_name:-"default"}"
+  rvm_file_name="${rvm_file_name:-"$rvm_gem_set_name.gems"}"
+
+  echo "# $rvm_file_name generated gem dump file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_file_name
+
+  for gem in $(gem list | sed 's/[\(|\)]//g' | sed 's/, /,/g' | tr ' ' ';') ; do
+    name="$(echo $gem | awk -F';' '{print $1}')"
+    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" >> $rvm_file_name
+      done ; unset version versions
+    else
+      echo "$name" >> $rvm_file_name
+    fi ; unset name
+  done ; unset file_name
+}
+
+__rvm_gems_load() {
+  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
+  __rvm_gems_select
+  rvm_gem_set_name="${rvm_gem_set_name:-"default"}"
+  rvm_file_name="${rvm_file_name:-"$rvm_gem_set_name.gems"}"
+
+  echo "Loading $rvm_file_name file..."
+  rvm_ruby_gem_list=$(/bin/ls $rvm_ruby_gem_home/specifications/ 2> /dev/null | 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//")"
+
+    if [ -f "$gem" ] ; then
+      gem_file_name="${gem}"
+    elif [ -z "$gem_version" ] ; then # no version
+      gem_file_name="${gem_name}*.gem"
+    else # version
+      gem_file_name="$gem_name-$gem_version.gem"
+    fi
+
+    cache_file=$(/bin/ls -t $rvm_gem_path/*/*/cache/${gem_file_name}* 2> /dev/null | head -n1)
+    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_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_temp_path/$gem_file_name
+          gem="$rvm_temp_path/$gem_file_name" # 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"
+      fi
+    fi
+
+    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_ruby_gem_home" GEM_PATH="$rvm_ruby_gem_home" $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix
+      else
+        eval "GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_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_name gem_postfix cache_file gem_file_name gem_string
+  done < <(awk '/^[\.\/a-zA-Z]/{print}' "$rvm_file_name")
+}
+
+__rvm_gems_delete () {
+  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
+  __rvm_gems_select
+  if [ ! -z "$rvm_gem_set_name" ] ; then
+    gemdir="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
+    if [ -d "$gemdir" -a ! -z "$rvm_force_flag" ] ; then
+        rm -rf  $gemdir
+    elif [ -d "$gemdir" ] ; then
+      __rvm_log "warn" "Are you SURE you wish to remove the installed gems '$rvm_gem_set_name ' ($gemdir)?"
+      echo -n "(anything other than 'yes' will cancel) > "
+      read response
+      if [ "$response" = "yes" ] ; then
+        rm -rf  $gemdir
+      else
+        __rvm_log "info" "Not doing anything, phew... close call that one eh?"
+      fi
+    else
+      __rvm_log "info" "$gemdir already does not exist."
+    fi ; unset gemdir
+  else
+    __rvm_log "error" "A gems name must be specified in order to delete a gems."
+  fi
+}
+
+

data/scripts/install

@@ -21,6 +21,7 @@ for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p $rvm_path/$dir_name
 done
 
+rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib ; do
   mkdir -p $rvm_path/$dir_name
   /bin/cp -Rf $source_dir/$dir_name $rvm_path

data/scripts/ruby-installer

@@ -1,38 +1,37 @@
 #!/bin/bash
 
 function __rvm_install_source {
-  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
   __rvm_log "info" "Installing Ruby from source to: $rvm_ruby_home"
-  mkdir -p $rvm_ruby_log_path
+  mkdir -p "$rvm_ruby_log_path"
 
-  __rvm_pushpop $rvm_source_path
+  __rvm_pushpop "$rvm_src_path"
 
   if [ ! -z "$rvm_force_flag" ] ; then
-    rm -rf $rvm_ruby_home
-    rm -rf $rvm_ruby_src_path
+    rm -rf "$rvm_ruby_home" "$rvm_ruby_src_path"
   fi
 
   result=0
-  if [ -z "$rvm_ruby_tag" -a -z "$rvm_ruby_rev" ] ; then
+  if [ -z "$rvm_ruby_tag" -a -z "$rvm_ruby_revision" ] ; then
     if [ ! -f $rvm_archives_path/$rvm_ruby_package_name.tar.gz ]  ; then
       rvm_url="${rvm_url:-"ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_name.tar.gz"}"
       __rvm_log "info" "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
-      __rvm_fetch $rvm_url
+      __rvm_fetch "$rvm_url"
       if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
     fi
-    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" "Extracting $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_src_path" "Extracting $rvm_ruby_package_name ..."
     if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
   else
     __rvm_log "info" "Retrieving Ruby from $rvm_url"
     if [ ! -z "`echo $rvm_url | awk '/^git/'`" ] ; then
       if [ -d "$rvm_ruby_src_path/.git" ] ; then
         cd $rvm_ruby_src_path
-        if [ -z "$rvm_ruby_rev" ] ; then
+        if [ -z "$rvm_ruby_revision" ] ; then
           git pull origin master
           if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
         else
-          git checkout ${rvm_ruby_rev:-HEAD}
+          git checkout ${rvm_ruby_revision:-HEAD}
           if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
         fi
       else
@@ -40,17 +39,17 @@ function __rvm_install_source {
         if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
       fi
     else
-      if [ -z "$rvm_ruby_rev" ] ; then
+      if [ -z "$rvm_ruby_revision" ] ; then
         # TODO: Check if tag v is valid
         rvm_url="$rvm_ruby_repo_url/tags/$rvm_ruby_tag"
         rvm_rev=""
       else
-        if [ "$rvm_ruby_rev" = "head" -o "$rvm_ruby_rev" = "trunk" ] ; then
+        if [ "$rvm_ruby_revision" = "head" -o "$rvm_ruby_revision" = "trunk" ] ; then
           rvm_url="$rvm_ruby_repo_url/trunk"
           rvm_rev=""
         else
           rvm_url=$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}
-          rvm_rev="-r $rvm_ruby_rev"
+          rvm_rev="-r $rvm_ruby_revision"
         fi
       fi
 
@@ -106,8 +105,8 @@ function __rvm_install_source {
 
   __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
+  GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
+  GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH
 
   __rvm_rubygems_setup
   __rvm_bin_script
@@ -118,9 +117,9 @@ function __rvm_install_source {
 
 function __rvm_install_ruby {
 
-  if [ -z "$rvm_selected" ]   ; then __rvm_select $* ; fi
-  if [ ! -z "$RUBYOPT" ]      ; then ruby_options=$RUBYOPT ; unset RUBYOPT ; fi
-  if [ "`uname`" = "Darwin" ] ; then ARCHFLAGS="-arch x86_64 -arch i386" ; export ARCHFLAGS ; fi
+  if [ -z "$rvm_selected_flag" ]   ; then __rvm_select $* ; fi
+  if [ ! -z "$RUBYOPT" ]      ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
+  if [ "`uname`" = "Darwin" ] ; then ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS ; fi
 
   case "$rvm_ruby_interpreter" in
     macruby)
@@ -136,29 +135,28 @@ function __rvm_install_ruby {
       __rvm_irbrc
     ;;
 
-    ruby-enterprise|ree)
+    ree)
       if [ ! -z "$(echo $rvm_ruby_version | awk '/^1\.8/')" -a -z "$rvm_head_flag" ] ; then
-        # ruby-enterprise-1.8.7-20090928.tar.gz
-        rvm_url="`__rvm_db "ree_${rvm_ruby_version}_url"`/$rvm_ruby_package_name.tar.gz"
+        rvm_url="$(__rvm_db "ree_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
         __rvm_log "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
-        __rvm_pushpop $rvm_source_path
-        if [ -d $rvm_ruby_src_path ]  ; then
-          cd $rvm_ruby_src_path
+        __rvm_pushpop "$rvm_src_path"
+        if [ -z "$rvm_force_flag" -a -d "$rvm_ruby_src_path" -a ! -z $($rvm_ruby_src_path/*) ]  ; then
+          __rvm_log "It appears that the archive has already been extracted. Skipping extract (use --force to force re-download and extract)."
         else
-          __rvm_log "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
-          __rvm_fetch $rvm_url
+          __rvm_log "Downloading $rvm_ruby_package_file, this may take a while depending on your connection..."
+          __rvm_fetch "$rvm_url"
           if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
-          mkdir -p $rvm_ruby_src_path
-          __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path" "Extracting $rvm_ruby_package_name..."
+          rm -rf "$rvm_ruby_src_path"
+          __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file..."
           if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+          mv "$rvm_src_path/$rvm_ruby_package_file" "$rvm_ruby_src_path"
         fi
+        cd "$rvm_ruby_src_path"
 
-        mkdir -p $rvm_ruby_log_path
-
-        cd $rvm_ruby_src_path
-        mkdir -p $rvm_ruby_home/lib/ruby/gems/1.8/gems
+        mkdir -p "$rvm_ruby_log_path"
+        mkdir -p "${rvm_ruby_home}/lib/ruby/gems/1.8/gems"
         if [ ! -z "$rvm_ruby_configure" ] ; then rvm_ruby_configure="-c $rvm_ruby_configure"; fi
-        __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" "Installing $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
+        __rvm_run "install" "./installer -a $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level --dont-install-useful-gems --no-tcmalloc $rvm_ruby_configure" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
         if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
         chmod +x $rvm_ruby_home/bin/*
 
@@ -167,6 +165,9 @@ function __rvm_install_ruby {
         for rvm_gem_name in rake ; do
           __rvm_run "gems" "$rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q" "Installing $rvm_gem_name"
         done
+        __rvm_inject_ruby_shebang "$rvm_ruby_gem_home/bin/rake"
+        __rvm_inject_gem_env "$rvm_ruby_gem_home/bin/rake"
+
         __rvm_irbrc
         __rvm_bin_scripts
         __rvm_post_install
@@ -195,15 +196,15 @@ function __rvm_install_ruby {
       rvm_ruby_make="rake"
       rvm_ruby_make_install="rake install"
       rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
-      #rvm_ruby_rev="head"
+      #rvm_ruby_revision="head"
 
       # For Installer, can do this once it's ready:
       RBX_PREFIX=$rvm_ruby_home ; export RBX_PREFIX
       # Also see 'rakelib/configuration.rake'
 
-      if [ ! -d $rvm_ruby_home -o ! -d $rvm_ruby_home/.git ] ; then
-        rm -rf $rvm_ruby_home
-        __rvm_run "rbx.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_home" "Cloning $rvm_ruby_repo_url"
+      if [ ! -d $rvm_ruby_src_path -o ! -d $rvm_ruby_src_path/.git ] ; then
+        rm -rf $rvm_ruby_src_path
+        __rvm_run "rbx.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path" "Cloning $rvm_ruby_repo_url"
         cd $rvm_ruby_home
       else
         cd $rvm_ruby_home
@@ -215,12 +216,15 @@ function __rvm_install_ruby {
       echo `rvm 1.8.6 -m rbx ; gem install --no-rdoc --no-ri rake ParseTree` # This should install if missing.
       rvm_ruby_interpreter="rbx"
       __rvm_select
+
       if [ ! -z "$rvm_jit_flag" ]; then
-        __rvm_run "build" "\`rvm 1.8.6 -m rbx ; RBX_LLVM=1 rake build\`" "Building rbx with RBX_LLVM=1"
+        __rvm_run "configure" "./configure --prefix=$rvm_ruby_home --enable-llvm" "Configuring rbx with LLVM enabled"
       else
-        __rvm_run "build" "\`rvm 1.8.6 -m rbx ; rake build\`" "Building rbx"
+        __rvm_run "configure" "./configure --prefix=$rvm_ruby_home" "Configuring rbx"
       fi
 
+      __rvm_run "build" "\`rvm 1.8.6 -m rbx ; rake build\`" "Building rbx"
+
       binaries="ruby irb" # Trick to work in more shells :)
       for binary_name in $(echo $binaries) ; do
         ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary_name
@@ -228,9 +232,9 @@ function __rvm_install_ruby {
 
       __rvm_run "rake.install" "$rvm_ruby_home/bin/rbx gem install rake --no-rdoc --no-ri" "Installing Rake"
       binary=rake
-      if [ -f $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
+      if [ -f $rvm_ruby_gem_home/bin/$binary ] ; then
+        if [ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ] ; then
+          cp $rvm_ruby_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
         fi
         chmod +x $rvm_ruby_home/bin/$binary
         __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$binary"
@@ -246,10 +250,10 @@ function __rvm_install_ruby {
         ruby_wrapper=$(cat <<RubyWrapper
 #!/bin/bash
 
-GEM_HOME="$rvm_gem_home" ; export GEM_HOME
-GEM_PATH="$rvm_gem_home" ; export GEM_PATH
+GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
+GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH
 MY_RUBY_HOME="$rvm_ruby_home" ; export MY_RUBY_HOME
-PATH="$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH" ; export PATH
+PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH" ; export PATH
 
 exec $rvm_ruby_home/bin/rbx $prefix $binary_name "\$@"
 RubyWrapper
@@ -268,9 +272,9 @@ RubyWrapper
 
     jruby)
       mkdir -p $rvm_ruby_log_path
-      __rvm_pushpop $rvm_source_path
+      __rvm_pushpop $rvm_src_path
 
-      if [ ! -z "$rvm_ruby_rev" ] ; then
+      if [ ! -z "$rvm_ruby_revision" ] ; then
         if [ ! -d $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version -o ! -d $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version/.git ] ; then
           git clone --depth 1 $rvm_jruby_repo_url $rvm_ruby_src_path
           cd $rvm_ruby_src_path && ant # TODO: Test if 'ant' is installed, if not throw error.
@@ -285,9 +289,9 @@ RubyWrapper
             __rvm_log "info" "Downloading $rvm_package_file, this may take a while depending on your connection..."
             __rvm_fetch $rvm_url
           fi
-          __rvm_run "extract" "tar zxf $rvm_archives_path/$rvm_package_file.tar.gz -C $rvm_source_path" "Extracting $rvm_package_file..."
+          __rvm_run "extract" "tar zxf $rvm_archives_path/$rvm_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_package_file..."
           if [ "$rvm_package_file" != "$rvm_ruby_string" ] ; then
-            mv $rvm_source_path/$rvm_package_file $rvm_source_path/$rvm_ruby_string
+            mv $rvm_src_path/$rvm_package_file $rvm_src_path/$rvm_ruby_string
           fi
           cd $rvm_ruby_src_path
         fi
@@ -326,9 +330,8 @@ RubyWrapper
 
     ruby)
       if [ "`uname`" = "Darwin" ] ; then
-        ARCHFLAGS="-arch x86_64 -arch i386" ; export ARCHFLAGS
         if [ "$(echo $rvm_ruby_version | awk '/1\.8/')" ] ; then
-          rvm_ruby_configure="${rvm_ruby_configure:-"--enable-shared --disable-pthread"} "
+          rvm_ruby_configure="${rvm_ruby_configure:-"--enable-shared"} "
         else
           rvm_ruby_configure="${rvm_ruby_configure:-"--enable-shared"} "
         fi
@@ -387,7 +390,7 @@ function __rvm_manage_rubies {
 }
 
 function __rvm_uninstall_ruby {
-  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
 
   if [ ! -z "$rvm_ruby_package_name" ] ; then
     for dir in $rvm_path ; do
@@ -408,10 +411,10 @@ function __rvm_uninstall_ruby {
 }
 
 function __rvm_remove_ruby {
-  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
 
   if [ ! -z "$rvm_ruby_package_name" ] ; then
-    for dir in $rvm_source_path $rvm_path ; do
+    for dir in $rvm_src_path $rvm_path ; do
       if [ -d $dir/$rvm_ruby_package_name ] ; then
         __rvm_log "info" "Removing $dir/$rvm_ruby_package_name..."
         rm -rf $dir/$rvm_ruby_package_name
@@ -434,8 +437,8 @@ function __rvm_post_install {
     if [ -e $rvm_ruby_home/bin/$binary -o -e $rvm_ruby_src_path/bin/$binary ] ; then
       if [ "$rvm_ruby_src_path" != "$rvm_ruby_home" -a -f $rvm_ruby_src_path/bin/$binary ] ; then
         cp -f $rvm_ruby_src_path/bin/$binary $rvm_ruby_home/bin/$binary
-      elif [ -f "$rvm_gem_home/bin/$binary" ] ; then
-        cp -f $rvm_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
+      elif [ -f "$rvm_ruby_gem_home/bin/$binary" ] ; then
+        cp -f $rvm_ruby_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
       fi
       __rvm_inject_gem_env $rvm_ruby_home/bin/$binary
       __rvm_inject_ruby_shebang $rvm_ruby_home/bin/$binary
@@ -452,9 +455,9 @@ function __rvm_post_install {
   __rvm_log "info" "Installation of gems for $rvm_ruby_package_name is complete."
 
   binary=rake
-  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
+  if [ -x $rvm_ruby_gem_home/bin/$binary ] ; then
+    if [ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ] ; then
+      cp $rvm_ruby_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
     fi
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$binary"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/$binary"
@@ -478,15 +481,15 @@ function __rvm_rubygems_setup {
     __rvm_log "info" "Installing rubygems dedicated to $rvm_ruby_package_name..."
     rvm_gem_package_name="rubygems-1.3.5"
     rvm_gem_url="http://rubyforge.org/frs/download.php/60718/$rvm_gem_package_name.tgz"
-    if [ -d $rvm_source_path/$rvm_gem_package_name ]  ; then
-      cd $rvm_source_path/$rvm_gem_package_name
+    if [ -d $rvm_src_path/$rvm_gem_package_name ]  ; then
+      cd $rvm_src_path/$rvm_gem_package_name
     else
       __rvm_log "info" "Retrieving $rvm_gem_package_name"
       __rvm_fetch $rvm_gem_url
-      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" "Extracting $rvm_gem_package_name"
+      mkdir -p $rvm_src_path/$rvm_gem_package_name
+      __rvm_run "rubygems.extract" "tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_src_path" "Extracting $rvm_gem_package_name"
     fi
-    __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" "Installing rubygems for $rvm_ruby_home/bin/ruby"
+    __rvm_run "rubygems.install" "GEM_PATH=$rvm_gem_path GEM_HOME=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby $rvm_src_path/$rvm_gem_package_name/setup.rb" "Installing rubygems for $rvm_ruby_home/bin/ruby"
     result=$?
     if [ $result -eq 0 ] ; then
       __rvm_log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
@@ -510,9 +513,9 @@ function __rvm_inject_gem_env {
   __rvm_actual_file $1
   if [ -f $actual_file ] ; then
     if [ ! -z "`head -n 1 $actual_file | awk '/[j]*ruby/'`" ] ; then
-      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']"
+      string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_ruby_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_ruby_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:' + ENV['PATH']"
     elif [ ! -z "`head -n 1 $actual_file | awk '/bash/'`" ] ; then
-      string="GEM_HOME=\${GEM_HOME:-'$rvm_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_gem_home'}\nPATH=$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH"
+      string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_home'}\nPATH=$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH"
     fi
     if [ ! -z "$string" ] ; then
       awk "NR==2 {print \"$string\"} {print}" $actual_file > $actual_file.new