rvm 0.0.50 → 0.0.51

data/config/db

@@ -2,7 +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
+macruby_nightly_url=http://macruby.icoretech.org/latest
 jruby_repo_url=git://kenai.com/jruby~main
 ruby_configure=--enable-shared
 interpreter=ruby
@@ -10,11 +10,13 @@ ruby_version=1.8.6
 ruby_patchlevel=383
 jruby_version=1.3.1
 ree_interpreter=ruby-enterprise
-ree_version=1.8.6
-ree_patch_level=20090610
+ree_version=1.8.7
+ree_1.8.6_patch_level=20090610
+ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677
 ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
+ree_1.8.7_url=http://rubyforge.org/frs/download.php/64475
 ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
-macruby_version=2009-09-04
+ree_1.8.7_patch_level=20090928
 ruby_1.9.1_patch_level=243
 ruby_1.9.2_patch_level=preview1
 ruby_1.8.5_patch_level=115

data/install

@@ -12,23 +12,23 @@ cwd=$(pwd)
 source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
 if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
-rvm_dir=~/.rvm
+rvm_path=~/.rvm
 
 # State what is required to use rvm
 echo -e "\n\033[0;32mrvm\033[0m\n\n    shell scripts that allows a user to manage multiple ruby versions in their own account."
 echo -e "\n    Installing rvm to ~/.rvm/ ..."
 for dir_name in src scripts bin log archives config gems examples ; do
-  mkdir -p $rvm_dir/$dir_name
+  mkdir -p $rvm_path/$dir_name
 done
 
 for dir_name in config scripts examples lib ; do
-  mkdir -p $rvm_dir/$dir_name
-  /bin/cp -Rf $source_dir/$dir_name $rvm_dir
+  mkdir -p $rvm_path/$dir_name
+  /bin/cp -Rf $source_dir/$dir_name $rvm_path
 done ; unset dir_name
 
 for file_name in rvm-prompt gemsync ; do
-  mv $rvm_dir/scripts/$file_name $rvm_dir/bin/
-  chmod +x $rvm_dir/bin/$file_name
+  mv $rvm_path/scripts/$file_name $rvm_path/bin/
+  chmod +x $rvm_path/bin/$file_name
 done ; unset file_name
 
 results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
@@ -167,7 +167,7 @@ echo -e "\n    \033[0;33mRTFM: \033[0m http://rvm.beginrescueend.com/ \n"
 echo -e '\033[0;32mw⦿‿⦿t!\033[0m'
 echo -e "\n    ~ Wayne\n"
 
-source $rvm_dir/scripts/rvm
+source $rvm_path/scripts/rvm
 rvm -v
 echo
 

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 50
+:patch: 51

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.50"
+  s.version = "0.0.51"
 
   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-28}
+  s.date = %q{2009-09-29}
   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/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.09.24"
+  rvm_meta_updated="2009.09.29"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -428,7 +428,7 @@ function rvm {
     info|debug)
       __rvm_version
       __rvm_info
-      if [ "$rvm_action" = "debug" ] ; then __rvm_debug ; fi
+      if [ "$rvm_action" = "debug" ] ; then rvm_debug_flag=1 ; __rvm_debug ; fi
     ;;
 
     error)
@@ -436,6 +436,7 @@ function rvm {
       __rvm_pushpop
       result=1;
     ;;
+
     *)
       if [ ! -z "$rvm_action" ] ; then
         __rvm_log "fail"  "unknown action '$rvm_action'"
@@ -444,7 +445,9 @@ function rvm {
       fi
       result=1
   esac
+
   if [ "$rvm_trace_flag" = "1" ] ; then set +x ; unset rvm_trace_flag ; fi
+
   return $result
 }
 

data/scripts/install

@@ -12,23 +12,23 @@ cwd=$(pwd)
 source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
 if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
-rvm_dir=~/.rvm
+rvm_path=~/.rvm
 
 # State what is required to use rvm
 echo -e "\n\033[0;32mrvm\033[0m\n\n    shell scripts that allows a user to manage multiple ruby versions in their own account."
 echo -e "\n    Installing rvm to ~/.rvm/ ..."
 for dir_name in src scripts bin log archives config gems examples ; do
-  mkdir -p $rvm_dir/$dir_name
+  mkdir -p $rvm_path/$dir_name
 done
 
 for dir_name in config scripts examples lib ; do
-  mkdir -p $rvm_dir/$dir_name
-  /bin/cp -Rf $source_dir/$dir_name $rvm_dir
+  mkdir -p $rvm_path/$dir_name
+  /bin/cp -Rf $source_dir/$dir_name $rvm_path
 done ; unset dir_name
 
 for file_name in rvm-prompt gemsync ; do
-  mv $rvm_dir/scripts/$file_name $rvm_dir/bin/
-  chmod +x $rvm_dir/bin/$file_name
+  mv $rvm_path/scripts/$file_name $rvm_path/bin/
+  chmod +x $rvm_path/bin/$file_name
 done ; unset file_name
 
 results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
@@ -167,7 +167,7 @@ echo -e "\n    \033[0;33mRTFM: \033[0m http://rvm.beginrescueend.com/ \n"
 echo -e '\033[0;32mw⦿‿⦿t!\033[0m'
 echo -e "\n    ~ Wayne\n"
 
-source $rvm_dir/scripts/rvm
+source $rvm_path/scripts/rvm
 rvm -v
 echo
 

data/scripts/ruby-installer

@@ -16,12 +16,10 @@ function __rvm_install_source {
   if [ -z "$rvm_ruby_tag" -a -z "$rvm_ruby_rev" ] ; then
     if [ ! -d $rvm_ruby_src_path ]  ; 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_run "fetch" "__rvm_fetch $rvm_url" "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
       if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
-      __rvm_log "info" "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_source_path
+      __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path" "Extracting $rvm_ruby_package_name ..."
       if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
     fi
   else
@@ -75,21 +73,20 @@ function __rvm_install_source {
   if [ ! -s "$rvm_ruby_src_path/configure" ] ; then
     rvm_autoconf=`which autoconf`
     if [ $? -gt 0 ] ; then __rvm_log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
-    __rvm_run "autoconf" "$rvm_autoconf"
+    __rvm_run "autoconf" "$rvm_autoconf" "Running autoconf"
     # if [ $? -gt 0 ] ; then result=$? ; return $result ; fi # Don't barf on autoconf fail...
   fi
 
   if [ -s ./Makefile -a -z "$rvm_reconfigure_flag" ] ; then
     __rvm_log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
   elif [ -s ./configure ] ; then
-    __rvm_log "info" "Configuring $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
-      configure_parameters="$configure_parameters --with-readline-dir=$rvm_path/usr/include/readline/ --with-search-path=$rvm_path/usr"
+      configure_parameters="$configure_parameters --with-readline-dir=$rvm_path/usr/include/readline/"
     fi
     if [ -d $rvm_path/usr/include/iconv/ ] ; then
-      configure_parameters="$configure_parameters --with-iconv-dir=$rvm_path/usr/include/iconv/ --with-search-path=$rvm_path/usr"
+      configure_parameters="$configure_parameters --with-iconv-dir=$rvm_path/usr/include/iconv/"
     fi
-    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure $configure_parameters --with-search-path=/usr --with-search-path=/usr/local"
+    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure $configure_parameters" "Configuring $rvm_ruby_package_name using $rvm_ruby_configure, this may take a while depending on your cpu(s)..."
     if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
     unset configure_parameters
   elif [ ! -z "rvm_ruby_configure" ] ; then
@@ -98,14 +95,12 @@ function __rvm_install_source {
     __rvm_log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
   fi
 
-  __rvm_log "info" "Compiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
   rvm_ruby_make=${rvm_ruby_make:-"/usr/bin/make"}
-  __rvm_run "make" "$rvm_ruby_make $rvm_make_flags"
+  __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
   if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
 
-  __rvm_log "info" "Installing $rvm_ruby_package_name"
   rvm_ruby_make_install=${rvm_ruby_make_install:-"/usr/bin/make install"}
-  __rvm_run "install" "$rvm_ruby_make_install"
+  __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_package_name"
   if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
 
   __rvm_log "info" "Installation of $rvm_ruby_package_name is complete."
@@ -115,7 +110,7 @@ function __rvm_install_source {
 
   __rvm_rubygems_setup
   __rvm_bin_script
-  __rvm_run "chmod.bin" chmod +x $rvm_ruby_home/bin/*
+  __rvm_run "chmod.bin" "chmod +x $rvm_ruby_home/bin/*"
   __rvm_post_install
   __rvm_pushpop
 }
@@ -129,40 +124,10 @@ function __rvm_install_ruby {
   case "$rvm_ruby_interpreter" in
     macruby)
       if [ "`uname`" = "Darwin" ] ; then
-        rvm_ruby_interpreter="system"
-        __rvm_select
-        __rvm_use
-        rvm_ruby_interpreter="macruby"
-        __rvm_gi "rake" # Make sure that rake is present
-        #rvm_macruby_repo_url="${rvm_macruby_repo_url:-"http://svn.macosforge.org/repository/ruby/MacRuby"}"
-        rvm_macruby_repo_url="${rvm_macruby_repo_url:-"git://github.com/masterkain/macruby.git"}"
-        rvm_ruby_repo_url=$rvm_macruby_repo_url
-        #rvm_macruby_nightly_url=`__rvm_db "macruby_nightly_url"`
-        rvm_ruby_configure=" "
-        rvm_make_flags=" "
-        rvm_ruby_make="cd $rvm_ruby_src_path; /usr/bin/rake macruby:build framework_instdir=$rvm_path/macruby-head framework_name=/macruby-head --trace"
-        rvm_ruby_make_install="cd $rvm_ruby_src_path; /usr/bin/rake framework:install"
-        rvm_ruby_rev="${rvm_ruby_rev:-head}" # Hard coding this for now
-        rvm_url=$rvm_ruby_repo_url
-
-        DESTDIR="$rvm_ruby_home" ; export DESTDIR
-        if [ -z "$rvm_ruby_rev" ] ; then
-          # TODO: Check if tag v is valid
-          #rvm_ruby_repo_url=$rvm_ruby_repo_url/tags/$rvm_ruby_tag
-          rvm_ruby_rev="head" # For now, until nightly release are available.
-        else
-          if [ "$rvm_ruby_rev" = "head" -o "$rvm_ruby_rev" = "trunk" ] ; then
-            #rvm_ruby_repo_url=$rvm_ruby_repo_url/trunk
-            rvm_ruby_rev="head"
-          else
-            #rvm_ruby_repo_url=$rvm_ruby_repo_url/trunk
-            rvm_ruby_rev="-r $rvm_ruby_rev"
-          fi
-        fi
-        #__rvm_fetch $rvm_url
-        #__rvm_run /usr/sbin/installer -pkg $rvm_ruby_package_name.pkg -target "$rvm_path/$rvm_ruby_package_name/"
-        __rvm_install_source
-        unset DESTDIR
+        rvm_url=`__rvm_db "macruby_nightly_url"`
+        __rvm_run "macruby/fetch" "__rvm_fetch $rvm_url" "Retrieving latest macruby" # $rvm_archives_path/macruby_nightly.pkg
+        mv $rvm_archives_path/latest $rvm_archives_path/macruby_nightly.pkg
+        __rvm_run "macruby/extract" "xar -x -f $rvm_archives_path/macruby_nightly.pkg -C $rvm_ruby_home" "Extracting macruby nightly package."
       else
         __rvm_log "fail" "MacRuby can only be installed on a Darwin OS."
       fi
@@ -170,37 +135,34 @@ function __rvm_install_ruby {
     ;;
 
     ruby-enterprise|ree)
-      if [ "$rvm_ruby_version" = "1.8.6" -a -z "$rvm_head_flag" ] ; then
-        rvm_url="http://rubyforge.org/frs/download.php/58677/$rvm_ruby_package_name.tar.gz"
+      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_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
         else
-          __rvm_log "info" "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
-          __rvm_fetch $rvm_url
+          __rvm_run "fetch" "__rvm_fetch $rvm_url" "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
           if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
-          __rvm_log "info" "Extracting $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
+          __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path" "Extracting $rvm_ruby_package_name..."
           if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
         fi
 
-        __rvm_log "info" "Installing $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
         mkdir -p $rvm_ruby_log_path
 
         cd $rvm_ruby_src_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
+        __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)..."
         if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
         chmod +x $rvm_ruby_home/bin/*
 
         __rvm_rubygems_setup
 
         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
+          __rvm_run "gems" "$rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q" "Installing $rvm_gem_name"
         done
         __rvm_irbrc
         __rvm_bin_scripts
@@ -231,28 +193,37 @@ function __rvm_install_ruby {
       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
 
       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
+        cd $rvm_ruby_home
+      else
+        cd $rvm_ruby_home
+        git pull origin master
       fi
-      cd $rvm_ruby_home
 
       # prereqs, 1.8.6 w/ParseTree & rake. Yes this could all be one line... not pushing our luck.
-      echo `rvm install 1.8.6` # This should install if missing.
+      echo `export rvm_install_on_use_flag=1 ; rvm 1.8.6` # This should install if missing.
       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\`"
+        __rvm_run "build" "\`rvm 1.8.6 -m rbx ; RBX_LLVM=1 rake build\`" "Building rbx with RBX_LLVM=1"
       else
-        __rvm_run "build" "\`rvm 1.8.6 -m rbx ; rake build\`"
+        __rvm_run "build" "\`rvm 1.8.6 -m rbx ; rake build\`" "Building rbx"
       fi
 
-      for binary in ruby irb ; do
+      binaries="ruby irb"
+      for binary in $(echo $binaries) ; do
         ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary
-      done
+      done ; unset binary binaries
+
       $rvm_ruby_home/bin/rbx -S gem install rake --no-rdoc --no-ri
 
+      binaries="erb ri rdoc"
+      __rvm_post_install
+
       for binary_name in gem rake ; do
         ruby_wrapper=$(cat <<RubyWrapper
 #!/bin/bash
@@ -265,12 +236,12 @@ PATH="$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH" ; export PATH
 exec $rvm_ruby_home/bin/rbx -S $binary_name "\$@"
 RubyWrapper
 )
-        rm -f $rvm_path/bin/$binary-$rvm_ruby_package_name
         for file_name in $rvm_path/bin/$binary-$rvm_ruby_package_name $rvm_ruby_home/bin/$binary ; do
+          rm -f $file_name
           echo "$ruby_wrapper" > $file_name
           if [ -f $file_name ] ; then chmod +x $file_name ; fi
-        done
-        unset ruby_wrapper binary_name file_name
+        done ; unset file_name
+        unset ruby_wrapper binary_name
       done
       __rvm_irbrc
       __rvm_bin_scripts
@@ -281,7 +252,6 @@ RubyWrapper
       rvm_url="http://dist.codehaus.org/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.zip"
       rvm_jruby_repo_url="${rvm_jruby_repo_url:-"git://kenai.com/jruby~main"}"
 
-      __rvm_log "info" "Installing JRuby to: $rvm_ruby_home"
       mkdir -p $rvm_ruby_log_path
       __rvm_pushpop $rvm_source_path
 
@@ -297,28 +267,25 @@ RubyWrapper
           if [ -z "$rvm_force_flag" -a -f $rvm_package_file -a -s $rvm_package_file ] ; then
             __rvm_log "info" "It appears that $rvm_package_file has already been downloaded, skipping. Use --force to force re-download."
           else
-            __rvm_log "info" "Downloading $rvm_package_file, this may take a while depending on your connection..."
-            __rvm_fetch $rvm_url
+            __rvm_run "fetch" "__rvm_fetch $rvm_url" "Downloading $rvm_package_file, this may take a while depending on your connection..."
           fi
-          __rvm_log "info" "Extracting $rvm_package_file..."
           rvm_unzip=`which unzip`
           if [ $? -ne 0 ] ; then
             __rvm_log "error" "'unzip' was not found in your PATH. jRuby official release comes as a .zip file, hence 'unzip' is required to extract it. Please install 'unzip' and try again."
           else
-            __rvm_run "extract" unzip -q $rvm_archives_path/$rvm_package_file.zip -d $rvm_source_path
+            __rvm_run "extract" "unzip -q $rvm_archives_path/$rvm_package_file.zip -d $rvm_source_path" "Extracting $rvm_package_file..."
           fi
           cd $rvm_ruby_src_path
         fi
       fi
 
-      __rvm_log "info" "Installing $rvm_ruby_package_name..."
       mkdir -p $rvm_ruby_home/bin/
-      __rvm_run "nailgun" "cd $rvm_ruby_src_path/tool/nailgun && /usr/bin/make $rvm_make_flags"
+      __rvm_run "nailgun" "cd $rvm_ruby_src_path/tool/nailgun && /usr/bin/make $rvm_make_flags" "Installing $rvm_ruby_package_name..."
       __rvm_pushpop
 
       if [ -z "$rvm_ruby_home" -o "$rvm_ruby_home" = "/" ] ; then echo "WTH?!?! rvm_ruby_home == / ??? not removing." ; return 1000000 ; fi
       rm -rf $rvm_ruby_home
-      __rvm_run "sync" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home"
+      __rvm_run "install" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home" "Installing JRuby to $rvm_ruby_home"
 
       __rvm_pushpop $rvm_ruby_home/bin/
       for binary in jirb jruby jgem ; do
@@ -333,15 +300,13 @@ RubyWrapper
         chmod +x $rvm_ruby_home/bin/$binary
       done ; unset binary
 
-      __rvm_inject_gem_env $rvm_ruby_home/bin/gem # Ensure the env is set properly for gem.
-
+      __rvm_rubygems_setup
       __rvm_irbrc
       __rvm_bin_script
       __rvm_use
 
       for rvm_gem_name in jruby-openssl ; 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
+        __rvm_run "gems" "$rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q" "Installing $rvm_gem_name"
       done ; unset rvm_gem_name
     ;;
 
@@ -450,7 +415,8 @@ function __rvm_remove_ruby {
 }
 
 function __rvm_post_install {
-  for binary in gem irb erb ri rdoc testrb rake ; do
+  binaries="${binaries:-"gem irb erb ri rdoc testrb rake"}"
+  for binary in $(echo $binaries) ; do
     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
@@ -461,13 +427,12 @@ function __rvm_post_install {
       __rvm_inject_ruby_shebang $rvm_ruby_home/bin/$binary
       chmod +x $rvm_ruby_home/bin/$binary
     fi
-  done ; unset binary
+  done ; unset binary binaries
 
   __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
+    __rvm_run "gems.install" "$rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q" "Installing $rvm_gem_name"
   done ; unset rvm_gem_name
 
   __rvm_log "info" "Installation of gems for $rvm_ruby_package_name is complete."
@@ -486,13 +451,15 @@ function __rvm_rubygems_setup {
   if [ ! -z "`echo $rvm_ruby_version | awk '/^1\.9/'`" ] ; then
     # 1.9 has it's own built-in gem command
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
+    __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
     cp $rvm_ruby_src_path/bin/gem $rvm_ruby_home/bin/gem
-    __rvm_run "rubygems.update" $rvm_ruby_home/bin/gem update --system
-  elif [ ! -z "`echo $rvm_ruby_interpreter | awk '/^jruby/'`" ] ; then
-    # jruby has it's own built-in gem command
-    __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
-    cp $rvm_ruby_src_path/bin/gem $rvm_ruby_home/bin/gem
-    __rvm_run "rubygems.update" $rvm_ruby_home/bin/gem update --system
+    __rvm_run "rubygems.update" "$rvm_ruby_home/bin/gem update --system" "Updating rubygems for $rvm_ruby_string"
+    __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
+    __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
+
+  elif [ ! -z "`echo $rvm_ruby_interpreter | awk '/^rbx|jruby/'`" ] ; then
+    __rvm_log "debug" "Skipping rubygems update for $rvm_ruby_version"
+
   else
     __rvm_log "info" "Installing rubygems dedicated to $rvm_ruby_package_name..."
     rvm_gem_package_name="rubygems-1.3.5"
@@ -500,14 +467,16 @@ function __rvm_rubygems_setup {
     if [ -d $rvm_source_path/$rvm_gem_package_name ]  ; then
       cd $rvm_source_path/$rvm_gem_package_name
     else
-      __rvm_fetch $rvm_gem_url
+      __rvm_run "rubygems.fetch" "__rvm_fetch $rvm_gem_url" "Retrieving $rvm_gem_package_name"
       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
+      __rvm_run "rubygems.extract" "tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_source_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
+    __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"
     result=$?
     if [ $result -eq 0 ] ; then
       __rvm_log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
+    else
+      __rvm_log "warning" "Installation of rubygems $rvm_ruby_package_name did not complete successfully."
     fi
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
   fi

data/scripts/rvm-install

@@ -12,23 +12,23 @@ cwd=$(pwd)
 source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
 if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
-rvm_dir=~/.rvm
+rvm_path=~/.rvm
 
 # State what is required to use rvm
 echo -e "\n\033[0;32mrvm\033[0m\n\n    shell scripts that allows a user to manage multiple ruby versions in their own account."
 echo -e "\n    Installing rvm to ~/.rvm/ ..."
 for dir_name in src scripts bin log archives config gems examples ; do
-  mkdir -p $rvm_dir/$dir_name
+  mkdir -p $rvm_path/$dir_name
 done
 
 for dir_name in config scripts examples lib ; do
-  mkdir -p $rvm_dir/$dir_name
-  /bin/cp -Rf $source_dir/$dir_name $rvm_dir
+  mkdir -p $rvm_path/$dir_name
+  /bin/cp -Rf $source_dir/$dir_name $rvm_path
 done ; unset dir_name
 
 for file_name in rvm-prompt gemsync ; do
-  mv $rvm_dir/scripts/$file_name $rvm_dir/bin/
-  chmod +x $rvm_dir/bin/$file_name
+  mv $rvm_path/scripts/$file_name $rvm_path/bin/
+  chmod +x $rvm_path/bin/$file_name
 done ; unset file_name
 
 results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
@@ -167,7 +167,7 @@ echo -e "\n    \033[0;33mRTFM: \033[0m http://rvm.beginrescueend.com/ \n"
 echo -e '\033[0;32mw⦿‿⦿t!\033[0m'
 echo -e "\n    ~ Wayne\n"
 
-source $rvm_dir/scripts/rvm
+source $rvm_path/scripts/rvm
 rvm -v
 echo
 

data/scripts/selector

@@ -65,7 +65,8 @@ function __rvm_select {
       rvm_ruby_interpreter="ree"
       rvm_ruby_interpreter=`__rvm_db "ree_interpreter"`
       rvm_ruby_version=${rvm_ruby_version:-`__rvm_db "ree_version"`}
-      rvm_ruby_patch_level="${3:-`__rvm_db "ree_patch_level"`}"
+      rvm_ruby_patch_level="${3:-`__rvm_db "ree_${rvm_ruby_version}_patch_level"`}"
+      rvm_ruby_package_name="ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level"
       if [ -z "$(echo $rvm_ruby_version | awk '/^1\.8/')" ] ; then
         __rvm_log "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
       fi

data/scripts/update

@@ -12,23 +12,23 @@ cwd=$(pwd)
 source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
 if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
-rvm_dir=~/.rvm
+rvm_path=~/.rvm
 
 # State what is required to use rvm
 echo -e "\n\033[0;32mrvm\033[0m\n\n    shell scripts that allows a user to manage multiple ruby versions in their own account."
 echo -e "\n    Installing rvm to ~/.rvm/ ..."
 for dir_name in src scripts bin log archives config gems examples ; do
-  mkdir -p $rvm_dir/$dir_name
+  mkdir -p $rvm_path/$dir_name
 done
 
 for dir_name in config scripts examples lib ; do
-  mkdir -p $rvm_dir/$dir_name
-  /bin/cp -Rf $source_dir/$dir_name $rvm_dir
+  mkdir -p $rvm_path/$dir_name
+  /bin/cp -Rf $source_dir/$dir_name $rvm_path
 done ; unset dir_name
 
 for file_name in rvm-prompt gemsync ; do
-  mv $rvm_dir/scripts/$file_name $rvm_dir/bin/
-  chmod +x $rvm_dir/bin/$file_name
+  mv $rvm_path/scripts/$file_name $rvm_path/bin/
+  chmod +x $rvm_path/bin/$file_name
 done ; unset file_name
 
 results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
@@ -167,7 +167,7 @@ echo -e "\n    \033[0;33mRTFM: \033[0m http://rvm.beginrescueend.com/ \n"
 echo -e '\033[0;32mw⦿‿⦿t!\033[0m'
 echo -e "\n    ~ Wayne\n"
 
-source $rvm_dir/scripts/rvm
+source $rvm_path/scripts/rvm
 rvm -v
 echo
 

data/scripts/utility

@@ -80,10 +80,11 @@ function __rvm_remove-rvm-from-path {
 function __rvm_gi { gem install -q --no-rdoc --no-ri $* ; }
 
 function __rvm_run {
-  log_file_name="$1" ; shift
-  command="$*"
+  log_file_name="$1" ; command="$2" ; message="$3"
   rvm_ruby_log_path=${rvm_ruby_log_path:-$rvm_path/log}
-  mkdir -p $rvm_ruby_log_path
+  mkdir -p `dirname $rvm_ruby_log_path/$log_file_name.log`
+
+  if [ ! -z "$message" ] ; then __rvm_log "info" "$message" ; fi
   __rvm_log "debug" "Executing: $command"
   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
@@ -540,7 +541,6 @@ function __rvm_ruby_do {
     fi
     eval "rubies=(${rubies[*]} $rvm_ruby_string)"
     eval "statuses=(${statuses[*]} $result)"
-    # TODO: keep track of and re-set the previous selected ruby ;)
   else
     __rvm_log "warn" "'$rvm_ruby_home/bin/$binary' either does not exist or is not executable? :("
   fi
@@ -799,33 +799,33 @@ function __rvm_inspect {
 #
 function __rvm_readline_install {
   __rvm_pushpop $rvm_source_path
-  package="readline" ; version="5.2"
+  package="readline" ; version="5.2" ; archive_format="tar.gz"
   # TODO: Figure out how to list, grab and apply the patches
-  __rvm_fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.tar.gz"
-  __rvm_run "$package.extract" tar zxf $rvm_archives_path/$package-$version.tar.gz -C $rvm_source_path
+  __rvm_run "$package/fetch" "__rvm_fetch ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format" "Retrieving $package-$version.$archive_format"
+  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_source_path" "Extracting $package-$version.$archive_format"
   cd $rvm_source_path/$package-$version
   if [ "`uname`" = "Darwin" ] ; then
     sdk=`ls -t /Developer/SDKs/ | head -n 1`
     CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
     LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/$sdk -arch i386 -arch x86_64"
     export CFLAGS LDFLAGS
-    __rvm_run "$package.configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared"
+    __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
   else
-    __rvm_run "$package.configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared"
+    __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
   fi
-  __rvm_run "$package.make" "/usr/bin/make $rvm_make_flags"
-  __rvm_run "$package.make.install" "/usr/bin/make install"
+  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
   __rvm_pushpop
 }
 
 function __rvm_iconv_install {
   __rvm_pushpop $rvm_source_path
-  package="libiconv" ; version=1.13.1
-  __rvm_fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.tar.gz"
-  __rvm_run "$package.extract" "tar zxf $rvm_archives_path/$package-$version.tar.gz -C $rvm_source_path"
+  package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
+  __rvm_run "$package/fetch" "__rvm_fetch http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format" "Retrieving $package-$version.$archive_format"
+  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_source_path" "Extracting $package-$version.$archive_format"
   cd $rvm_source_path/$package-$version
-  __rvm_run "$package.configure" "./configure --prefix=$rvm_path/usr --disable-shared"
-  __rvm_run "$package.make" "/usr/bin/make $rvm_make_flags"
-  __rvm_run "$package.make.install" "/usr/bin/make install"
+  __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-static --enable-shared" "Configuring $package."
+  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
   __rvm_pushpop
 }

metadata

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