rvm 0.0.41 → 0.0.42

data/examples/rvmrc

@@ -30,3 +30,6 @@
 
 # Default gems directory
 # rvm_gem_path="$HOME/.gem"
+
+# Install rubies on use when they are not installed
+#ruby_install_on_use=1

data/lib/VERSION.yml

@@ -0,0 +1,4 @@
+---
+:major: 0
+:minor: 0
+:patch: 42

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.41"
+  s.version = "0.0.42"
 
   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-16}
+  s.date = %q{2009-09-17}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "README",
      "config/db",
      "examples/rvmrc",
+     "lib/VERSION.yml",
      "lib/rvm.rb",
      "rvm.gemspec",
      "scripts/rvm",

data/scripts/rvm-cli

@@ -4,8 +4,8 @@ function __rvm_meta {
   rvm_meta_author="Wayne E. Seguin"
   rvm_meta_author_email="wayneeseguin@gmail.com"
   rvm_meta_website="http://rvm.beginrescueend.com/"
-  rvm_meta_version="`cat $rvm_path/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`"
-  rvm_meta_updated="2009.09.16"
+  rvm_meta_version="`cat $rvm_path/lib/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//'`"
+  rvm_meta_updated="2009.09.17"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -91,9 +91,7 @@ function __rvm_usage {
     --summary     - Used with rubydo to print out a summary of the commands run.
     --jit         - Used with rubinius install to build with JIT
     --latest      - with gemset --dump skips version strings for latest gem.
-    --reconfigure -
-    --spec        -
-    --test        -
+    --reconfigure - Force ./configure on install even if Makefile already exists.
 
   Resources:
 
@@ -108,7 +106,7 @@ 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|readline|iconv)
+      install|uninstall|remove|path|info|setup|version|srcdir|list|symlinks|reset|debug|reload|usage|help|implode|update|readline|iconv)
         rvm_action=$rvm_token
       ;;
 
@@ -268,6 +266,17 @@ function __rvm_parse-args {
         shift
       ;;
 
+      specs|tests)
+        rvm_action="rubydo"
+        rvm_ruby_args="rake $rvm_token"
+      ;;
+
+      rake|gem)
+        rvm_action="rubydo"
+        rvm_ruby_args="$rvm_token $@"
+        rvm_parse_break=1
+      ;;
+
       -S|--script|-e|--execute)
         rvm_action="rubydo"
         rvm_ruby_args="$@"
@@ -304,7 +313,7 @@ function __rvm_parse-args {
          --rm-gem-set)   rvm_gem_set_name_rm="$1"  ; shift ;;
       tests|specs)       rvm_action="tests"                ;;
 
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|debug|--force|--all|--dump|--summary|--jit|--latest|--spec|--test)
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|debug|--force|--all|--dump|--summary|--jit|--latest)
         eval "rvm_$(echo $rvm_token | sed 's/-//g')_flag=1"
       ;;
 
@@ -360,6 +369,7 @@ function rvm {
   case "$rvm_action" in
     install)    __rvm_install-ruby     ; result=$? ;;
     uninstall)  __rvm_uninstall        ; result=$? ;;
+    remove)     __rvm_remove           ; result=$? ;;
     use)        __rvm_use              ; result=$? ;;
     gemdir)     __rvm_gem-dir          ; result=$? ;;
     srcdir)     __rvm_src-dir          ; result=$? ;;

data/scripts/rvm-install

@@ -14,10 +14,16 @@ if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 rvm_dir=~/.rvm
 
-echo -e "\nInstalling rvm source to ~/.rvm/scripts/rvm..."
+echo -e "\nInstalling rvm to ~/.rvm/ ..."
 for dir in src scripts bin log archives config gems examples ; do
   mkdir -p $rvm_dir/$dir
 done
+for dir in config scripts examples lib ; do
+  mkdir -p $rvm_dir/$dir
+  /bin/cp -r $source_dir/$dir/ $rvm_dir/$dir
+done
+cp $source_dir/scripts/rvm-prompt $rvm_dir/bin/
+chmod +x $rvm_dir/bin/rvm-prompt
 
 # State what is required to use rvm
 echo -e "\n\033[0;32mrvm\033[0m is a shell script that allows a user to manage multiple ruby versions in their own account."
@@ -116,15 +122,6 @@ if [ -f ~/.rvm/bin/rvm ] ; then
   rm -f ~/.rvm/bin/rvm
 fi
 
-for dir in config scripts examples ; do
-  mkdir -p $rvm_dir/$dir
-  for file in `/bin/ls $source_dir/$dir/`; 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
   rvm_apt_get_binary=`which apt-get 2> /dev/null`

data/scripts/rvm-ruby-installer

@@ -137,13 +137,15 @@ function __rvm_install-ruby {
 
     macruby)
       if [ "`uname`" = "Darwin" ] ; then
+        #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
-#/macruby_nightly-2009-09-10.pkg
-        rvm_macruby_nightly_url=`__rvm_db "macruby_nightly_url"`
+        #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"
-        #rvm_ruby_rev="${rvm_ruby_rev:-head}" # Hard coding this for now
+        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
@@ -159,9 +161,9 @@ function __rvm_install-ruby {
             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
+        #__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
       else
         __rvm_log "fail" "MacRuby can only be installed on a Darwin OS."
@@ -178,30 +180,34 @@ 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 > /dev/null ; return 1 ; fi
+        if [ $? -gt 0 ] ; then result=$? ; return $result ; 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
+        if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
       fi
 
       __rvm_log "info" "\tInstalling $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
+      if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
       chmod +x $rvm_ruby_home/bin/*
 
       __rvm_rubygems_setup
-      __rvm_bin_script
-
-      popd > /dev/null
 
       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_bin_script
+
+      popd > /dev/null
+    ;;
 
     rbx|rubinius)
       # TODO: check if system is 1.8.X otherwise use rvm's 1.8.X and check for parsetree, install if missing
@@ -283,7 +289,9 @@ function __rvm_install-ruby {
     ;;
 
     ruby)
-      if [ -z "rvm_ruby_configure" ] ; then rvm_ruby_configure="--enable-shared=true --enable-pthread=true " ; fi
+        # Merge configure options with user specified options
+        rvm_ruby_configure="--enable-shared=true --enable-pthread $rvm_ruby_configure "
+        if [ "`uname`" = "Darwin" ] ; then ARCHFLAGS="-arch x86_64 -arch i386" ; export ARCHFLAGS ; fi
       __rvm_install-source $*
     ;;
 
@@ -301,12 +309,34 @@ function __rvm_install-ruby {
 
 }
 
+# TODO: DRY up __rvm_remove and __rvm_uninstall
+function __rvm_remove {
+  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
+
+  if [ ! -z "$rvm_ruby_package_name" ] ; then
+    for dir in $rvm_source_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
+      else
+        __rvm_log "info" "it seems that $dir/$rvm_ruby_package_name is already non existent."
+      fi
+      if [ -e $rvm_bin_path/$rvm_ruby_package_name ] ; then
+        rm -f $rvm_bin_path/$rvm_ruby_package_name
+      fi
+    done ; unset dir
+    rm -rf $rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version*/
+  else
+    __rvm_log "fail" "Cannot uninstall unknown package '$rvm_ruby_package_name'"
+  fi
+}
+
 function __rvm_uninstall {
 
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
   if [ ! -z "$rvm_ruby_package_name" ] ; then
-    for dir in $rvm_source_path $rvm_path ; do
+    for dir in $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
@@ -327,7 +357,7 @@ function __rvm_uninstall {
 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 [ -f $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

data/scripts/rvm-selector

@@ -3,7 +3,7 @@
 # __rvm_select implementation version patch_level
 function __rvm_select {
 
-  __rvm_ruby_string
+  if [ ! -z "$rvm_ruby_string" ] ; then __rvm_ruby_string ; fi
 
   rvm_ruby_interpreter="${1:-$rvm_ruby_interpreter}"
   rvm_ruby_interpreter="${rvm_ruby_interpreter:-ruby}" # Default is standard ruby
@@ -22,9 +22,11 @@ function __rvm_select {
     macruby)
       if [ "`uname`" = "Darwin" ] ; then
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-`__rvm_db "macruby_repo_url"`}"
-        rvm_ruby_version="${rvm_ruby_version:-`__rvm_db "macruby_version"`}"
-        rvm_ruby_package_name=${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}
-        rvm_url="http://dl.getdropbox.com/u/163257/$rvm_ruby_package_name.pkg" # For now we are only supporting the 'nightly' builds
+        rvm_ruby_version="head"
+        rvm_ruby_package_name=${rvm_ruby_interpreter}-${rvm_ruby_version}
+        #rvm_ruby_version="${rvm_ruby_version:-`__rvm_db "macruby_version"`}"
+        #rvm_ruby_package_name=${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}
+        #rvm_url="http://dl.getdropbox.com/u/163257/$rvm_ruby_package_name.pkg" # 'nightly' builds
         unset rvm_ruby_patch_level
       else
         __rvm_log "fail" "MacRuby can only be installed on a Darwin OS."
@@ -67,8 +69,9 @@ function __rvm_select {
         rvm_ruby_version=$(echo $rvm_ruby_tag | sed 's/^v//' | sed 's/\///' | awk -F'_' '{print 1 "." $2 "." $3 }')
         rvm_ruby_patch_level=$rvm_ruby_tag # $(echo $rvm_ruby_tag | sed 's/^v//' | sed 's/\///' | awk -F'_' '{print $4 }')
       fi
-
-      rvm_ruby_version=${rvm_ruby_version:-`__rvm_db "ruby_version"`} # Default verison is 1.8.6
+      if [ -z "$rvm_ruby_version" ] ; then
+        rvm_ruby_version=`__rvm_db "ruby_version"` # Default verison is 1.8.6
+      fi
       rvm_ruby_patch_level=${rvm_ruby_patch_level:-`__rvm_db "ruby_${rvm_ruby_version}_patch_level"`} # Default verison is 1.8.6
       if [ -z "rvm_ruby_patch_level" ] ; then unset rvm_ruby_patch_level ; fi
 
@@ -113,10 +116,12 @@ function __rvm_select {
       rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_interpreter-$rvm_ruby_version"}"
       rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"}"
     else
-      if [ "`echo $rvm_ruby_patch_level | awk '{print substr($1, 0, 1)}'`" != "p" ] ; then
-        rvm_ruby_patch_level="p$rvm_ruby_patch_level"
+      if [ "$rvm_ruby_interpreter" != "ruby-enterprise" ] ; then
+        if [ ! -z "`echo $rvm_ruby_patch_level | awk '/[0-9]+/{print}'`" ] ; then
+          rvm_ruby_patch_level="p$rvm_ruby_patch_level"
+        fi
+        rvm_ruby_patch_level="`echo $rvm_ruby_patch_level | sed 's/^pp/p/'`" # sanity check, thanks sfpyra
       fi
-      rvm_ruby_patch_level="`echo $rvm_ruby_patch_level | sed 's/^pp/p/'`" # sanity check, thanks sfpyra
       rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
       rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
     fi
@@ -127,7 +132,7 @@ function __rvm_select {
     rvm_ruby_string="$rvm_ruby_package_name"
     rvm_selected=1
 
-    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_version rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_gem_home rvm_path rvm_source_path rvm_bin_path rvm_ruby_binary rvm_ruby_package_name rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_source_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected rvm_ruby_string
+    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_gem_home rvm_path rvm_source_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_source_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected rvm_ruby_string
 
     if [ ! -z "$rvm_load_flag" ] ; then __rvm_gemset_load ; fi
     if [ ! -z "$rvm_dump_flag" ] ; then __rvm_gemset_dump ; fi
@@ -176,15 +181,9 @@ function __rvm_use {
     IRBRC="$rvm_ruby_irbrc" ; export IRBRC
     if [ -z "$IRBRC" ] ; then unset IRBRC ; fi
 
-    # Install if not installed
     if [ ! -d $MY_RUBY_HOME ] ; then
       __rvm_log "warn" "$rvm_ruby_interpreter $rvm_ruby_version is not installed."
-      echo -n -e "Would you like rvm to install $rvm_ruby_interpreter $rvm_ruby_version for you now?\n(Y/n) ? "
-      read response
-      if [ "$response" = 'n' ] ; then
-        __rvm_log "warn" "Please run 'rvm install $rvm_ruby_interpreter $rvm_ruby_version' if you wish to use it.\n"
-        return 0
-      else
+      if [ ! -z "$rvm_install_on_use" ] ; then
         __rvm_install-ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level
       fi
     fi

data/scripts/rvm-update

@@ -14,10 +14,16 @@ if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 rvm_dir=~/.rvm
 
-echo -e "\nInstalling rvm source to ~/.rvm/scripts/rvm..."
+echo -e "\nInstalling rvm to ~/.rvm/ ..."
 for dir in src scripts bin log archives config gems examples ; do
   mkdir -p $rvm_dir/$dir
 done
+for dir in config scripts examples lib ; do
+  mkdir -p $rvm_dir/$dir
+  /bin/cp -r $source_dir/$dir/ $rvm_dir/$dir
+done
+cp $source_dir/scripts/rvm-prompt $rvm_dir/bin/
+chmod +x $rvm_dir/bin/rvm-prompt
 
 # State what is required to use rvm
 echo -e "\n\033[0;32mrvm\033[0m is a shell script that allows a user to manage multiple ruby versions in their own account."
@@ -116,15 +122,6 @@ if [ -f ~/.rvm/bin/rvm ] ; then
   rm -f ~/.rvm/bin/rvm
 fi
 
-for dir in config scripts examples ; do
-  mkdir -p $rvm_dir/$dir
-  for file in `/bin/ls $source_dir/$dir/`; 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
   rvm_apt_get_binary=`which apt-get 2> /dev/null`

data/scripts/rvm-utility

@@ -52,11 +52,11 @@ function __rvm_debug {
 function __rvm_log {
 
   case "$1" in
-    debug) shift ; echo -e "\n\033[0;35m <d> \033[0m $*" ;;
-    info)  shift ; echo -e "\n\033[0;32m <i> \033[0m $*" ;;
-    warn)  shift ; echo -e "\n\033[0;33m <w> \033[0m $*" ;;
-    error) shift ; echo -e "\n\033[0;31m <e> \033[0m $*" ;;
-    fail)  shift ; echo -e "\n\033[0;31m <e> \033[0m $*" ; popd 2> /dev/null ; return 1 ;;
+    debug) shift ; echo -e "\033[0;35m <d> \033[0m $*" ;;
+    info)  shift ; echo -e "\033[0;32m <i> \033[0m $*" ;;
+    warn)  shift ; echo -e "\033[0;33m <w> \033[0m $*" ;;
+    error) shift ; echo -e "\033[0;31m <e> \033[0m $*" ;;
+    fail)  shift ; echo -e "\033[0;31m <e> \033[0m $*" ; popd 2> /dev/null ; return 1 ;;
     *) echo -e "$*"
   esac
 }
@@ -91,7 +91,7 @@ function __rvm_run {
 }
 
 function __rvm_cleanup-variables {
-  unset rvm_selected rvm_action rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_irbrc_file rvm_ruby_irbrc rvm_source_path rvm_path rvm_prefix_path rvm_ruby_package_name rvm_gem_path rvm_command rvm_error_message rvm_ruby_home rvm_ruby_binary rvm_gem_set_name rvm_ruby_tag rvm_ruby_rev rvm_url rvm_ruby_make rvm_ruby_configure rvm_ruby_make_install rvm_config_path rvm_ruby_string rvm_bin_path rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag
+  unset rvm_selected rvm_action rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_irbrc_file rvm_ruby_irbrc rvm_source_path rvm_path rvm_prefix_path rvm_ruby_package_name rvm_gem_path rvm_command rvm_error_message rvm_ruby_home rvm_ruby_binary rvm_gem_set_name rvm_ruby_tag rvm_ruby_rev rvm_url rvm_ruby_make rvm_ruby_configure rvm_ruby_make_install rvm_config_path rvm_ruby_string rvm_bin_path rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_install_on_use
 }
 
 # TODO: root user loadng of /etc/rvmrc
@@ -204,7 +204,7 @@ function __rvm_reset {
   for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME ; do unset $variable ; done
 
   for file in system default ; do
-    if [ -f $rvm_path/$file ] ; then rm -f $rvm_path/file ; fi
+    if [ -f $rvm_path/$file ] ; then rm -f $rvm_path/$file ; fi
   done
   __rvm_select "system"
 
@@ -435,8 +435,6 @@ function __rvm_initialize {
   rvm_ruby_repo_url="${rvm_ruby_repo_url:-"http://svn.ruby-lang.org/repos/ruby"}"
   # Rubinius sha1's will be available after RC1.
   rvm_rubinius_repo_url="${rvm_rubinius_repo_url:-"git://github.com/evanphx/rubinius.git"}"
-  #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_jruby_repo_url="${rvm_jruby_repo_url:-"git://kenai.com/jruby~main"}"
   rvm_ruby_load_path="."
   rvm_ruby_require=""
@@ -516,34 +514,36 @@ function __rvm_reload {
 function __rvm_ruby_do {
   __rvm_select
   __rvm_use
-  #__rvm_
   binary=`echo $rvm_action | sed 's/do$//'`
-  lp="$rvm_ruby_home/bin:$rvm_ruby_load_path"
-  if [ "$binary" = "ruby" ] ; then
-    rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_require -I$lp -S $rvm_ruby_args"
-  else
-    rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args"
-  fi
-  echo "$rvm_ruby_string: $($rvm_ruby_home/bin/$binary -v)"
-  eval $rvm_command
-  result=$?
-  if [ $result -eq 0 ]; then
-    successes[${#successes[*]}]=$rvm_ruby_string
+  if [ -x $rvm_ruby_home/bin/$binary ] ; then
+    load_path="$rvm_ruby_home/bin:$rvm_ruby_load_path"
+    if [ "$binary" = "ruby" ] ; then
+      rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_require -I$load_path -S $rvm_ruby_args"
+    else
+      rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args"
+    fi
+    echo -e "\n$rvm_ruby_string: $($rvm_ruby_home/bin/$binary -v)"
+    eval $rvm_command
+    result=$?
+    if [ $result -eq 0 ]; then
+      eval "successes=(${successes[*]} $rvm_ruby_string)"
+    else
+      eval "errors=(${errors[*]} $rvm_ruby_string)"
+    fi
+    eval "all=(${all[*]} $rvm_ruby_string)"
+    eval "results=(${results[*]} $result)"
+    # TODO: keep track of and re-set the previous selected ruby ;)
   else
-    errors[${#errors[*]}]=$rvm_ruby_string
+    __rvm_log "warn" "'$rvm_ruby_home/bin/$binary' either does not exist or is not executable? :("
   fi
-  all[${#all[*]}]=$rvm_ruby_string
-  results[${#results[*]}]=$result
-  # TODO: keep track of and re-set the previous selected ruby ;)
-  unset rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_ruby_package_name rvm_ruby_home rvm_ruby_irbrc rvm_ruby_binary rvm_ruby_string lp
+    unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_home rvm_ruby_binary rvm_ruby_package_name rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected
 }
 
 function __rvm_do {
   all=() ; successes=() ; errors=() ; results=()
   # TODO: Extract the common functionality out of the if below
   if [ ! -z "$rvm_ruby_version" ] ; then
-    rvm_ruby_selectors=$(echo $rvm_ruby_version | tr ',' ' ')
-    for rvm_ruby_selector in $rvm_ruby_selectors ; do
+    for rvm_ruby_selector in `echo $rvm_ruby_version | tr ',' ' '` ; do
       temp=$(echo $rvm_ruby_selector | awk '{print substr($1, 0, 1)}')
       if [ ! -z "$(echo $temp | grep '[0-9]')" ] ; then
         rvm_ruby_interpreter="ruby"
@@ -556,61 +556,38 @@ function __rvm_do {
       __rvm_ruby_do
     done
   else # all
-    rvm_ruby_binaries=`/bin/ls $rvm_path/*/bin/ruby 2> /dev/null`
-    for rvm_ruby_binary in $rvm_ruby_binaries ; do
-      if [ -x $rvm_ruby_binary ] ; then
-        rvm_ruby_string=`dirname $rvm_ruby_binary | xargs dirname | xargs basename`
+    while read bin_line
+    do # Keep this on second line damnit!
+      if [ -x $bin_line ] ; then
+        rvm_ruby_string="`dirname $bin_line | xargs dirname | xargs basename`"
         __rvm_ruby_do
       fi
-    done
+    done < <(/bin/ls $rvm_path/*/bin/ruby 2> /dev/null)
   fi
 
   if [ ! -z "$rvm_summary_flag" ] ; then
     export successes errors results
-    echo -e "\n\033[0;32msuccessful (${#successes[*]}) : [ $(echo "${successes[*]}" | sed 's/ /, /g') ]\033[0m"
-    echo -e "\n\033[0;31merrors (${#errors[*]}) : [ $(echo "${errors[*]}" | sed 's/ /, /g') ]\033[0m"
+    echo -e "\nSummary:"
+    echo -e "\033[0;32msuccessful (${#successes[*]}) : [ $(echo "${successes[*]}" | sed 's/ /, /g') ]\033[0m"
+    echo -e "\033[0;31merrors (${#errors[*]}) : [ $(echo "${errors[*]}" | sed 's/ /, /g') ]\033[0m"
     echo -e "all (${#all[*]}) : [ $(echo "${all[*]}" | sed 's/ /, /g') ]"
     echo -e "exit results: [ $(echo "${results[*]}" | sed 's/ /, /g') ]\n"
   else
-    unset binary successes errors rvm_summary_flag
+    unset bin_line  rvm_summary_flag
+    # successes errors
   fi
   return ${#errors[*]}
 }
 
-function __rvm_irbrc {
-  if [ ! -s "$rvm_ruby_irbrc" ] ; then
-    rvm_irbrc_file=`cat <<-Config
-load '$HOME/.irbrc' if File.exists?('$HOME/.irbrc') rescue nil
-
-require "irb/completion" rescue nil
-
-@prompt = {
-  :PROMPT_I => "${rvm_ruby_package_name} > ",  # default prompt
-  :PROMPT_S => "${rvm_ruby_package_name}%l> ", # known continuation
-  :PROMPT_C => "${rvm_ruby_package_name} > ",
-  :PROMPT_N => "${rvm_ruby_package_name} ?> ", # unknown continuation
-  :RETURN => " => %s \n",
-  :AUTO_INDENT => true
-}
-@prompt_mode = :DEFAULT
-IRB.conf[:PROMPT][@prompt_mode] = @prompt
-IRB.conf[:PROMPT_MODE] = @prompt_mode
-Config
-`
-    touch $rvm_ruby_home/.irbrc
-    echo -e "\n$rvm_irbrc_file" > $rvm_ruby_home/.irbrc
-  fi
-
-}
-
 function __rvm_ruby_string {
   if [ "$rvm_ruby_interpreter" = "system" ] ; then
-    unset rvm_ruby_string
+    rvm_ruby_string="system"
   elif [ ! -z "$rvm_ruby_string" ] ; then
-    rvm_ruby_string=`echo "$rvm_ruby_string" | sed 's/ruby-enterprise/ree/g'`
+    rvm_ruby_string=`echo "$rvm_ruby_string" | sed 's/ruby-enterprise/ree/g'` # dash-antics :)
     rvm_ruby_interpreter=`echo $rvm_ruby_string |  tr '-' ' ' | awk '{print $1}'`
-    rvm_ruby_vesion=`echo $rvm_ruby_string | awk -F'-' '{print $2}'`
+    rvm_ruby_version=`echo $rvm_ruby_string | awk -F'-' '{print $2}'`
     revision=`echo $rvm_ruby_string | awk -F'-' '{print $3}'`
+
     if [ "$revision" = "head" -o "$revision" = "preview" ] ; then
       rvm_ruby_revision="$revision"
     else
@@ -626,6 +603,8 @@ function __rvm_ruby_string {
         fi
       fi
     fi
+
+    if [ "rvm_ruby_interpreter" = "ree" ] ; then rvm_ruby_interpreter="ruby-enterprise" ; fi
   fi
   return 0
 }
@@ -686,13 +665,13 @@ function __rvm_gemset_load {
       if [ ! -z "`echo "$rvm_ruby_gem_list" | awk "/$gem_string/{print}"`" ] ; then
         if [ ! -z "$rvm_force_flag" ] ; then
           cp $cache_file $rvm_path/tmp/$gem_file_name
-          gem="$rvm_path/tmp/$gem_file_name -l" # install as a named local gem
+          gem="$rvm_path/tmp/$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 -l"
+        gem="$cache_file"
       fi
     fi
 
@@ -708,6 +687,33 @@ function __rvm_gemset_load {
   done < <(awk '/^[a-zA-Z]/{print}' "$rvm_load_file")
 }
 
+function __rvm_irbrc {
+  if [ -d $rvm_ruby_home -a ! -s $rvm_ruby_irbrc ] ; then
+    rvm_irbrc_file=`cat <<-Config
+load '$HOME/.irbrc' if File.exists?('$HOME/.irbrc') rescue nil
+
+require "irb/completion" rescue nil
+
+@prompt = {
+  :PROMPT_I => "${rvm_ruby_package_name} > ",  # default prompt
+  :PROMPT_S => "${rvm_ruby_package_name}%l> ", # known continuation
+  :PROMPT_C => "${rvm_ruby_package_name} > ",
+  :PROMPT_N => "${rvm_ruby_package_name} ?> ", # unknown continuation
+  :RETURN => " => %s \n",
+  :AUTO_INDENT => true
+}
+@prompt_mode = :DEFAULT
+IRB.conf[:PROMPT][@prompt_mode] = @prompt
+IRB.conf[:PROMPT_MODE] = @prompt_mode
+Config
+`
+    touch $rvm_ruby_irbrc
+    echo -e "\n$rvm_irbrc_file" > $rvm_ruby_home/.irbrc
+  fi
+
+}
+
+
 #
 # ruby supporting libraries:
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 -04:00
+date: 2009-09-17 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -27,6 +27,7 @@ files:
 - README
 - config/db
 - examples/rvmrc
+- lib/VERSION.yml
 - lib/rvm.rb
 - rvm.gemspec
 - scripts/rvm