wayneeseguin-rvm 0.0.37 → 0.0.38

data/config/db

@@ -2,6 +2,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_nightly_url=http://dl.getdropbox.com/u/163257
 jruby_repo_url=git://kenai.com/jruby~main
 ruby_configure=--enable-shared
 interpreter=ruby

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.37"
+  s.version = "0.0.38"
 
   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.date = %q{2009-09-14}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "scripts/rvm-prompt",
      "scripts/rvm-ruby-installer",
      "scripts/rvm-selector",
+     "scripts/rvm-update",
      "scripts/rvm-utility"
   ]
   s.homepage = %q{http://github.com/wayneeseguin/rvm}

data/scripts/rvm

@@ -14,5 +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/default ] ; then source ~/.rvm/default ; fi
+if [ -f $rvm_path/default ] ; then source $rvm_path/default ; fi
 

data/scripts/rvm-cli

@@ -4,17 +4,17 @@ function __rvm_parse-args {
   while [ $# -gt 0 ] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      install|uninstall|path|info|setup|version|srcdir|list|symlinks|reset|debug|reload|usage|help|implode|update)
+      install|uninstall|path|info|setup|version|srcdir|list|symlinks|reset|debug|reload|usage|help|implode|update|readline|iconv)
         rvm_action=$rvm_token
       ;;
 
       use)
         rvm_action=$rvm_token
-        if [ "$1" = "default" ] ; then
-          rvm_ruby_interpreter="system" ; shift
-        elif [ -z "$1" ] ; then
-          rvm_ruby_interpreter="system"
-        fi
+      ;;
+
+      system|default)
+        rvm_action=${rvm_action:-use}
+        rvm_ruby_interpreter="$rvm_token"
       ;;
 
       ruby|jruby|ree|macruby|rbx|rubinius|default|all)
@@ -54,16 +54,20 @@ function __rvm_parse-args {
         rvm_action=$rvm_token
         if [ "$rvm_action" = "do" ] ; then rvm_action="do" ; fi
         temp=$(echo $1 | awk '{print substr($1, 0, 1)}')
-        if [ "$temp" != "-" ] ; then
+        if [ "$temp" = "-" ] ; then
+          unset rvm_ruby_version
+        else
           if [ ! -z "$(echo $temp | grep '[0-9]')" ] ; then
             rvm_ruby_version=$(echo "$1" | tr ',' ' ') ; shift
+            unset rvm_ruby_interpreter
           else
-            rvm_ruby_version=$1 ; shift
+            if [ "$1" = "jruby" -o "$1" = "rbx" -o "$1" = "rubinius" -o "$1" = "macruby" ] ; then
+              rvm_ruby_interpreter=$1 ; shift
+            else
+              unset rvm_ruby_interpreter rvm_ruby_version
+            fi
           fi
-        else
-          unset rvm_ruby_version
         fi
-        unset rvm_ruby_interpreter
       ;;
 
       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)
@@ -83,25 +87,39 @@ function __rvm_parse-args {
                            rvm_action="version"
                          else
                            rvm_ruby_version="$1"
+                           shift
                          fi
-                         shift
       ;;
 
       -t|--tag)          rvm_ruby_tag="$1";
                          rvm_action="${rvm_action:-use}"
                          shift                             ;;
-      -r|--rev)          rvm_ruby_rev="$1";
+      --head)
+                         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_rev="$1";
+      -b|--branch)       rvm_ruby_branch="$1";
                          rvm_action="${rvm_action:-use}"
                          shift                             ;;
 
 
       -P|--prefix)       rvm_prefix_path="$1"      ; shift ;;
-      -B|--bin)          rvm_bin_path="$1"         ; shift ;;
-      -S|--source)       rvm_source_path="$1"      ; shift ;;
-      -A|--archive)      rvm_archives_path="$1"    ; shift ;;
+
+      --rubygems)        rvm_rubygems_flag=1               ;;
+      --rvm|--gem)       rvm_update_flag=1                 ;;
+      --bin)
+        if [ "$rvm_action" = "update" ] ; then
+          rvm_bin_flag=1
+        else
+          rvm_bin_path="$1" ; shift
+        fi
+        ;;
+
+       --source)         rvm_source_path="$1"      ; shift ;;
+       --archive)        rvm_archives_path="$1"    ; shift ;;
       -G|--gems)         rvm_gem_path="$1"         ; shift ;;
       -C|--configure)
         if [ ! -z "$1" ] ; then
@@ -110,54 +128,115 @@ function __rvm_parse-args {
         else
           rvm_action="error"
           rvm_error_message="--configure *must* be followed by configure flags."
-          break;
         fi
       ;;
 
       --re-configure)    rvm_re_configure=1                ;;
-      -M|--make)         rvm_ruby_make="$1"        ; shift ;;
-      -I|--make-install) rvm_ruby_make_install="$1"; shift ;;
+      --make)            rvm_ruby_make="$1"        ; shift ;;
+      --make-install)    rvm_ruby_make_install="$1"; shift ;;
+      -j)
+        if [ ! -z "$1" ] ; then
+          rvm_make_flags="$rvm_make_flags -j$1"
+          shift
+        else
+          rvm_action="error"
+          rvm_error_message="-j *must* be followed by an integer (normally the # of CPU's in your machine)."
+        fi
+      ;;
+      --nice)            rvm_niceness="$1"         ; shift ;;
       -l|--level)        rvm_ruby_patch_level="$1" ; shift ;;
-      -n|--nice)         rvm_niceness="$1"         ; shift ;;
-      -f|--file)         rvm_ruby_args="$1"        ; shift ;;
-      -e|--execute)
+         --summary)      rvm_summary=1                     ;;
+      -r|--require)
+        if [ -z "$1" ] ; then
+          rvm_action="error"
+          rvm_error_message="-r|--require *must* be followed by a library name."
+        else
+          rvm_ruby_require="$rvm_ruby_require -r$1"
+          shift
+        fi
+      ;;
+      -I|--include)
+        if [ -z "$1" ] ; then
+          rvm_action="error"
+          rvm_error_message="-I|--include *must* be followed by a path."
+        else
+          rvm_ruby_load_path="$rvm_ruby_load_path:$1"
+          shift
+        fi
+      ;;
+      -f|--file)
+                         rvm_action="rubydo"
+                         rvm_ruby_args="$1"
+                         shift
+      ;;
+      -S|--script|-e|--execute)
+                         rvm_action="rubydo"
                          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                       ;;
-         --all)          rvm_all=1                 ; shift ;;
+         --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                ; 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
-      ;;
-
-      --latest)         rvm_latest=1              ; shift ;;
+                         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
+      ;;
+
       --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"
       ;;
+
+      reboot|flush|asdf|damnit|wtf|argh|work|workdamnit|BOOM|boom|wth)
+        $rvm_action="reboot"
+      ;;
+
       *)
-        rvm_action="error"
-        rvm_error_message="Unrecognized command line argument(s): '$rvm_token $@'"
-        break;
+        if [ ! -z "$rvm_token" ] ; then
+          echo "$rvm_token" | grep ',' > /dev/null
+          if [ $? -eq 0 ] ; then
+            rvm_ruby_version="$rvm_token"
+            if [ -z "$rvm_action" ] ; then
+              rvm_action="rubydo" # Not sure if we really want to do this but we'll try it out.
+            fi
+          else
+            echo $rvm_token | grep '\.rb$' > /dev/null
+            if [ $? -eq 0 ] ; then # we have a specified ruby script
+              rvm_ruby_args=$rvm_token
+              if [ -z "$rvm_action" ] ; then
+                rvm_action="rubydo" # Not sure if we really want to do this but we'll try it out.
+              fi
+            else
+              rvm_action="error"
+              rvm_error_message="Unrecognized command line argument: '$rvm_token'"
+            fi
+          fi
+        else
+          rvm_action="error"
+          rvm_error_message="Unrecognized command line argument(s): '$rvm_token $@'"
+        fi
+        if [ "$rvm_action" = "error" ] ; then
+          break;
+        fi
+
     esac
     if [ ! -z "$rvm_parse_break" -o ! -z "$rvm_error_message" ] ; then unset rvm_parse_break; break; fi
   done
@@ -175,70 +254,39 @@ function rvm {
   __rvm_load-defaults
   __rvm_parse-args $@
 
+  status=0
   case "$rvm_action" in
-    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 ',' ' ')
-        for rvm_ruby_version in $rvm_ruby_versions ; do
-          temp=$(echo $rvm_ruby_version | awk '{print substr($1, 0, 1)}')
-          if [ ! -z "$(echo $temp | grep '[0-9]')" ] ; then
-            rvm_ruby_interpreter="ruby"
-          else
-            rvm_ruby_interpreter="$rvm_ruby_version"
-            unset rvm_ruby_version
-          fi
-          unset temp
-          __rvm_select $rvm_ruby_interpreter $rvm_ruby_version
-          binary=`echo $rvm_action | sed 's/do$//'`
-          rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args"
-          echo "$(basename $rvm_ruby_home/bin/$binary):"
-          eval $rvm_command
-          unset rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_ruby_package_name rvm_ruby_home rvm_ruby_irbrc rvm_ruby_binary
-        done
-      else # all
-        rvm_ruby_versions=`/bin/ls $rvm_bin_path/ruby-*`
-        for rvm_ruby_binary in $rvm_ruby_versions ; do
-          if [ -x $rvm_ruby_binary ] ; then
-            rvm_command="$rvm_ruby_binary $rvm_ruby_args"
-            echo "$(basename $rvm_ruby_binary):"
-            eval $rvm_command
-          fi
-        done
-      fi
-      ;;
-    reset)     __rvm_reset                                                          ;;
-               # TODO: how can we use bin_path here for reload, default file?
-    reload)    source ~/.rvm/scripts/rvm                                            ;;
-    implode)   __rvm_implode                                                        ;;
-    update)
-      if [ "$rvm_ruby_rev" = "head" ] ; then
-        if [ -d $rvm_source_path/rvm/.git ] ; then
-          cd $rvm_source_path/rvm/ && git pull origin master && ./scripts/rvm-install
-        else
-          cd $rvm_source_path && git clone git://github.com/wayneeseguin/rvm.git && cd rvm/ && ./scripts/rvm-install
-        fi
-      else
-        # TODO: rvm_install_path:
-        gem install rvm --no-rdoc --no-ri -q && rvm-install && source ~/.rvm/scripts/rvm
-      fi
+    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=$? ;;
+    tests|specs)
+      rvm_do_summary=1
+      rvm_action="rake"
+      __rvm_do
     ;;
-    error)      __rvm_log "fail" "$rvm_error_message ( see: rvm usage )" ; popd 2> /dev/null ; return 1; ;;
+    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
     ;;
-    usage|help) __rvm_usage ;;
+    error)      __rvm_log "fail" "$rvm_error_message ( see: 'rvm usage' )" ; popd 2> /dev/null ; return 1; ;;
     *)
       if [ ! -z "$rvm_action" ] ; then
         __rvm_log "fail"  "unknown action '$rvm_action'"
@@ -249,4 +297,6 @@ function rvm {
   esac
 
   if [ "$rvm_debug" = "1" ] ; then set +x ; unset rvm_debug ; fi
+  return $status
 }
+

data/scripts/rvm-functions

@@ -2,10 +2,9 @@
 # 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"
+    cd `gem env gemdir`
   else
-    rvm use $1
-    cd `rvm gemdir`
+    cd `rvm $1 ; rvm gemdir`
     pwd
   fi
 }

data/scripts/rvm-install

@@ -93,7 +93,12 @@ for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
     else
       actual_file="$file"
     fi
-    sed -i.orig 's/rvm\/bin\/rvm/rvm\/scripts\/rvm/g' $actual_file
+
+    grep 'rvm\/bin\/rvm' $actual_file > /dev/null
+    if [ $? -eq 0 ] ; then
+      sed -i.orig 's/rvm\/bin\/rvm/rvm\/scripts\/rvm/g' $actual_file
+      rm -f $actual_file.orig
+    fi
 
     if [ -f ~/.profile ] ; then
       grep '.profile' $actual_file > /dev/null
@@ -117,6 +122,8 @@ for dir in config scripts examples ; do
     cp $source_dir/$dir/$file $rvm_dir/$dir/$file
   done
 done
+cp $source_dir/scripts/rvm-prompt $rvm_dir/bin/
+cp $source_dir/VERSION.yml $rvm_dir/
 
 system=`uname`
 if [ "$system" = "Linux" ] ; then

data/scripts/rvm-ruby-installer

@@ -4,6 +4,7 @@ function __rvm_install-source {
 
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
+  status=0
   __rvm_log "info" "Installing Ruby from source to: $rvm_ruby_home"
   mkdir -p $rvm_ruby_log_path
 
@@ -19,9 +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 [ $status -eq 0 ] ; then status=$? ; 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 [ $status -eq 0 ] ; then status=$? ; fi
     fi
   else
     __rvm_log "info" "\tRetrieving Ruby from $rvm_url"
@@ -30,11 +33,14 @@ function __rvm_install-source {
         cd $rvm_ruby_src_path
         if [ -z "$rvm_ruby_rev" ] ; then
           git pull origin master
+          if [ $status -eq 0 ] ; then status=$? ; fi
         else
           git checkout ${rvm_ruby_rev:-HEAD}
+          if [ $status -eq 0 ] ; then status=$? ; fi
         fi
       else
         git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path
+        if [ $status -eq 0 ] ; then status=$? ; fi
       fi
     else
       if [ -z "$rvm_ruby_rev" ] ; then
@@ -43,7 +49,7 @@ function __rvm_install-source {
         rvm_rev=""
       else
         if [ "$rvm_ruby_rev" = "head" -o "$rvm_ruby_rev" = "trunk" ] ; then
-          rvm_url=$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}
+          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}
@@ -53,39 +59,47 @@ function __rvm_install-source {
 
       if [ -d "$rvm_ruby_src_path/.svn" ] ; then
         cd $rvm_ruby_src_path
-        svn checkout -q $rvm_rev
+        if [ -z "$rvm_rev" ] ; then
+          svn update
+        else
+          svn checkout -q $rvm_rev
+        fi
       else
         svn checkout -q $rvm_rev --force $rvm_url $rvm_ruby_src_path
       fi
+      if [ $status -eq 0 ] ; then status=$? ; fi
     fi
   fi
 
   cd $rvm_ruby_src_path
-  if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd 2> /dev/null ; return 1 ; fi
+  if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd > /dev/null ; return 1 ; fi
 
   if [ ! -s "$rvm_ruby_src_path/configure" -a "$rvm_ruby_interpreter" = "ruby" ] ; then
     rvm_autoconf=`which autoconf`
     if [ $? -ne 0 ] ; then __rvm_log "fail" "rvm expects autoconf" ; fi
     __rvm_run "autoconf" $rvm_autoconf
+    if [ $status -eq 0 ] ; then status=$? ; fi
   fi
 
-  if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd 2> /dev/null ; return 1 ; fi
+  if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd > /dev/null ; return 1 ; fi
 
   if [ -s ./Makefile -a -z "$rvm_re_configure" ] ; 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)..."
     __rvm_run "configure" ./configure --prefix=$rvm_ruby_home $rvm_ruby_configure
+    if [ $status -eq 0 ] ; then status=$? ; fi
   else
     __rvm_log "warn" "\tSkipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
   fi
 
   __rvm_log "info" "\tCompiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
   if [ -z "$rvm_ruby_make" ] ; then
-    __rvm_run "make" make
+    __rvm_run "make" make $rvm_make_flags
   else
     __rvm_run "make" $rvm_ruby_make
   fi
+  if [ $status -eq 0 ] ; then status=$? ; fi
 
   if [ -z "$rvm_ruby_make" ] ; then
     __rvm_log "info" "\tInstalling $rvm_ruby_package_name"
@@ -93,59 +107,27 @@ function __rvm_install-source {
   else
     __rvm_run "install" $rvm_ruby_make_install
   fi
+  if [ $status -eq 0 ] ; then status=$? ; fi
   __rvm_run "chmod.bin" chmod +x $rvm_ruby_home/bin/*
 
-  __rvm_bin_scripts
+  __rvm_bin_script
   __rvm_log "info" "Installation of $rvm_ruby_package_name is complete."
 
-
-  __rvm_log "info" "\tInstalling rubygems dedicated to $rvm_ruby_package_name..."
   GEM_HOME="$rvm_gem_home" ; export GEM_HOME
-  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
-  else
-    __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
-  fi
-  # Well this is fun... fix nil error on require_paths:
-  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
-
-  __rvm_run "rubygems.install" $rvm_ruby_binary $rvm_source_path/$rvm_gem_package_name/setup.rb
-  popd 2> /dev/null
-
-  for binary in gem irb erb ri rdoc testrb rake ; do
-    if [ -x $rvm_ruby_src_path/bin/$binary ] ; then
-      cp $rvm_ruby_src_path/bin/$binary $rvm_ruby_home/bin/$binary
-      string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_gem_home/bin:' + ENV['PATH']"
-      awk "NR==2 {print \"$string\"} {print}" $rvm_ruby_home/bin/$binary > $rvm_ruby_home/bin/$binary.new
-      mv $rvm_ruby_home/bin/$binary.new $rvm_ruby_home/bin/$binary
-      chmod +x $rvm_ruby_home/bin/$binary
-    else
-      __rvm_log "warn" "$rvm_ruby_src_path/bin/$binary is missing"
-    fi
-  done
-
-  for rvm_gem_name in rake ; do
-    __rvm_log "info" "Installing $rvm_gem_name"
-    __rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q
-  done
-
-  __rvm_log "info" "Installation of rubygems for $rvm_ruby_package_name is complete."
+  GEM_PATH="$rvm_gem_home" ; export GEM_PATH
 
-  binary=rake
-  if [ -x $rvm_gem_home/bin/$binary ] ; then
-    cp $rvm_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
-    string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_gem_home/bin:' + ENV['PATH']"
-    awk "NR==2 {print \"$string\"} {print}" $rvm_ruby_home/bin/$binary > $rvm_ruby_home/bin/$binary.new
-    mv $rvm_ruby_home/bin/$binary.new $rvm_ruby_home/bin/$binary
-    chmod +x $rvm_ruby_home/bin/$binary
+  echo $rvm_ruby_vesion | grep '^1\.9' > /dev/null
+  if [ $? -gt 0 ] ; then
+    __rvm_rubygems_install
+    if [ $status -eq 0 ] ; then status=$? ; fi
   else
-    __rvm_log "warn" "$rvm_gem_home/bin/$binary is missing"
+    mv $rvm_ruby_src_path/bin/gem $rvm_ruby_src_path/bin/gem.orig
+    cat $rvm_ruby_src_path/bin/gem.orig | sed -e "s=!# */usr/bin/env ruby=!#/usr/bin/$rvm_ruby_home/bin/ruby=" > $rvm_ruby_src_path/bin/gem
+    chmod +x $rvm_ruby_home/bin/gem
   fi
-  unset binary
+  popd > /dev/null
+
+  __rvm_post_install
 }
 
 function __rvm_install-ruby {
@@ -158,6 +140,8 @@ function __rvm_install-ruby {
     macruby)
       if [ "`uname`" = "Darwin" ] ; then
         rvm_ruby_repo_url=$rvm_macruby_repo_url
+#/macruby_nightly-2009-09-10.pkg
+        rvm_macruby_nightly_url=`__rvm_db "macruby_nightly_url"`
         rvm_ruby_configure=""
         rvm_ruby_make="rake macruby:build framework_instdir=$rvm_path/macruby-head framework_name=/macruby-head --trace"
         rvm_ruby_make_install="rake framework:install framework_instdir=$rvm_path/macruby-head framework_name=/macruby-head --trace"
@@ -187,6 +171,7 @@ function __rvm_install-ruby {
     ;;
 
     ruby-enterprise|ree)
+      __rvm_select
       rvm_url="http://rubyforge.org/frs/download.php/58677/$rvm_ruby_package_name.tar.gz"
       __rvm_log "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
       pushd $rvm_source_path > /dev/null
@@ -195,7 +180,7 @@ function __rvm_install-ruby {
       else
         __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 __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd 2> /dev/null ; return 1 ; fi
+        if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd > /dev/null ; return 1 ; fi
         __rvm_log "info" "\tExtracting $rvm_ruby_package_name..."
         mkdir -p $rvm_ruby_src_path
         __rvm_run "extract" tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path
@@ -205,10 +190,11 @@ function __rvm_install-ruby {
       mkdir -p $rvm_ruby_log_path
 
       cd $rvm_ruby_src_path
-      __rvm_run "install" ./installer -a $rvm_path/ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level --dont-install-useful-gems --no-tcmalloc
+      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
       chmod +x $rvm_ruby_home/bin/*
 
-      ln -fs $rvm_ruby_home/bin/ruby $rvm_path/bin/$rvm_ruby_package_name
+      __rvm_bin_script
 
       __rvm_log "info" "\tInstalling rubygems dedicated to $rvm_ruby_package_name..."
       rvm_gem_package_name="rubygems-1.3.5"
@@ -222,10 +208,11 @@ function __rvm_install-ruby {
       fi
       # Well this is fun... fix nil error on require_paths:
       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 > $rvm_ruby_log_path/rubygems.install.log 2> $rvm_ruby_log_path/rubygems.install.error.log
+      rm -f $rvm_source_path/$rvm_gem_package_name/lib/rubygems/gem_path_searcher.rb.orig
 
       __rvm_run "rubygems.install" $rvm_ruby_home/bin/ruby $rvm_source_path/$rvm_gem_package_name/setup.rb
       __rvm_log "info" "Installation of $rvm_ruby_package_name complete."
-      popd 2> /dev/null
+      popd > /dev/null
 
       for rvm_gem_name in rake ; do
         __rvm_log "info" "Installing $rvm_gem_name"
@@ -235,15 +222,19 @@ function __rvm_install-ruby {
 
     rbx|rubinius)
       # 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
+      unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
+      PATH="$rvm_system_path" ; export PATH
       rvm_ruby_repo_url=$rvm_rubinius_repo_url
       rvm_ruby_configure=""
+      rvm_ruby_src_path=$rvm_ruby_home
       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"
       # 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
@@ -289,8 +280,8 @@ function __rvm_install-ruby {
       __rvm_log "info" "\tInstalling $rvm_ruby_package_name..."
       mkdir -p $rvm_ruby_home/bin/
       __rvm_run "sync" rsync -ag $rvm_ruby_src_path/ $rvm_ruby_home/
-      __rvm_run "nailgun" cd $rvm_ruby_src_path/tool/nailgun && make
-      popd 2> /dev/null
+      __rvm_run "nailgun" cd $rvm_ruby_src_path/tool/nailgun && make $rvm_make_flags
+      popd > /dev/null
       chmod +x $rvm_ruby_home/bin/*
       for binary in jruby jgem jirb ; do
         ln -fs $rvm_ruby_home/bin/$binary $rvm_ruby_home/bin/${binary#j}
@@ -344,3 +335,67 @@ function __rvm_uninstall {
   fi
 
 }
+
+function __rvm_post_install {
+
+  for binary in gem irb erb ri rdoc testrb rake ; do
+    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
+      fi
+      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']"
+      awk "NR==2 {print \"$string\"} {print}" $rvm_ruby_home/bin/$binary > $rvm_ruby_home/bin/$binary.new
+      mv $rvm_ruby_home/bin/$binary.new $rvm_ruby_home/bin/$binary
+      chmod +x $rvm_ruby_home/bin/$binary
+    else
+      __rvm_log "warn" "$rvm_ruby_src_path/bin/$binary is missing"
+    fi
+  done
+
+  __rvm_log "info" "Installing gems for $rvm_ruby_package_name."
+
+  for rvm_gem_name in rake ; do
+    __rvm_log "info" "Installing $rvm_gem_name"
+    __rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q
+  done
+
+  __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
+    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']"
+    awk "NR==2 {print \"$string\"} {print}" $rvm_ruby_home/bin/$binary > $rvm_ruby_home/bin/$binary.new
+    mv $rvm_ruby_home/bin/$binary.new $rvm_ruby_home/bin/$binary
+    chmod +x $rvm_ruby_home/bin/$binary
+  else
+    __rvm_log "warn" "$rvm_gem_home/bin/$binary is missing"
+  fi
+  unset binary
+}
+
+function __rvm_rubygems_install {
+  __rvm_log "info" "\tInstalling 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
+  else
+    __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
+  fi
+  # Well this is fun... fix nil error on require_paths:
+  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_home $rvm_ruby_home/bin/ruby $rvm_source_path/$rvm_gem_package_name/setup.rb
+  status=$?
+  if [ $status -eq 0 ] ; then
+    __rvm_log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
+  fi
+  return $status
+}
+