rvm 0.0.52 → 0.0.53

data/install

@@ -31,66 +31,14 @@ for file_name in rvm-prompt gemsync ; do
   chmod +x $rvm_path/bin/$file_name
 done ; unset file_name
 
-results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
-if [ $? -gt 0 ] ; then
-  if [ ! -z "`echo $PS1`" ] ; then
-    while : ; do
-      echo -n -e "$question Do you want this (s)cript to set this up for you, or do it (m)anually yourself ('s' or 'm')? "
-      read response
-      if [ "${response:0:1}" = "s" ] ; then
-        echo 'w00t!'
-        break
-      elif [ "${response:0:1}" = "m" ] ; then
-        echo -e "    Please make sure that this line is in place."
-        break
-      fi
-    done
-
-    if [ "${response:0:1}" = "s" ] ; then
-
-      while : ; do
-        echo -n -e "$question Do you use b(a)sh or (z)sh or b(o)th for your shell (the default on most *nix systems is bash, press control + C to cancel the installation)\n(a/z/o)? "
-        read response
-        if [ "${response:0:1}" = "a" ] ; then
-          user_shell="bash"
-          break
-        elif [ "${response:0:1}" = "z" ] ; then
-          user_shell="zsh"
-          break
-        elif [ "${response:0:1}" = "o" ] ; then
-          user_shell="both"
-          break
-        fi
-      done
-    fi
-  else
-    user_shell="both"
-  fi
-
-  if [ "$user_shell" = "bash" -o "$user_shell" = "both" ] ; then
-    touch ~/.bash_profile
-    if [ -z "`grep '\.rvm/scripts/rvm' ~/.bash_profile`" ] ; then
-      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.bash_profile."
-      echo -e "\n" >> ~/.bash_profile
-      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bash_profile
-    fi
-    touch ~/.bashrc
-    if [ -z "`grep '\.rvm/scripts/rvm' ~/.bashrc`" ] ; then
-      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.bashrc."
-      echo -e "\n" >> ~/.bashrc
-      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bashrc
+if [ -z "$rvm_loaded_flag" ] ; then
+  for rcfile in .bash_profile .bashrc .zshrc ; do
+    if [ ! -e ~/$rcfile ] ; then touch ~/$rcfile ; fi
+    if [ -z "$(awk '/\.rvm\/scripts\/rvm/' ~/$rcfile)" ] ; then
+      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/$rcfile."
+      echo -e "\n# rvm installer added line:\nif [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
     fi
-
-  fi
-
-  if [ "$user_shell" = "zsh" -o "$user_shell" = "both" ] ; then
-    touch ~/.zshrc
-    if [ -z "`grep '\.rvm/scripts/rvm' ~/.zshrc`" ] ; then
-      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.zshrc."
-      echo -e "\n" >> ~/.zshrc
-      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.zshrc
-    fi
-  fi
+  done
 fi
 
 echo -e "\n    Ensuring that rvm script location in $file is scripts/rvm not bin/rvm for: ~/.bash_profile, ~/.bashrc, ~/.zshrc..."

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 52
+:patch: 53

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.52"
+  s.version = "0.0.53"
 
   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-29}
+  s.date = %q{2009-10-01}
   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.29"
+  rvm_meta_updated="2009.10.01"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }

data/scripts/install

@@ -31,66 +31,14 @@ for file_name in rvm-prompt gemsync ; do
   chmod +x $rvm_path/bin/$file_name
 done ; unset file_name
 
-results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
-if [ $? -gt 0 ] ; then
-  if [ ! -z "`echo $PS1`" ] ; then
-    while : ; do
-      echo -n -e "$question Do you want this (s)cript to set this up for you, or do it (m)anually yourself ('s' or 'm')? "
-      read response
-      if [ "${response:0:1}" = "s" ] ; then
-        echo 'w00t!'
-        break
-      elif [ "${response:0:1}" = "m" ] ; then
-        echo -e "    Please make sure that this line is in place."
-        break
-      fi
-    done
-
-    if [ "${response:0:1}" = "s" ] ; then
-
-      while : ; do
-        echo -n -e "$question Do you use b(a)sh or (z)sh or b(o)th for your shell (the default on most *nix systems is bash, press control + C to cancel the installation)\n(a/z/o)? "
-        read response
-        if [ "${response:0:1}" = "a" ] ; then
-          user_shell="bash"
-          break
-        elif [ "${response:0:1}" = "z" ] ; then
-          user_shell="zsh"
-          break
-        elif [ "${response:0:1}" = "o" ] ; then
-          user_shell="both"
-          break
-        fi
-      done
-    fi
-  else
-    user_shell="both"
-  fi
-
-  if [ "$user_shell" = "bash" -o "$user_shell" = "both" ] ; then
-    touch ~/.bash_profile
-    if [ -z "`grep '\.rvm/scripts/rvm' ~/.bash_profile`" ] ; then
-      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.bash_profile."
-      echo -e "\n" >> ~/.bash_profile
-      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bash_profile
-    fi
-    touch ~/.bashrc
-    if [ -z "`grep '\.rvm/scripts/rvm' ~/.bashrc`" ] ; then
-      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.bashrc."
-      echo -e "\n" >> ~/.bashrc
-      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bashrc
+if [ -z "$rvm_loaded_flag" ] ; then
+  for rcfile in .bash_profile .bashrc .zshrc ; do
+    if [ ! -e ~/$rcfile ] ; then touch ~/$rcfile ; fi
+    if [ -z "$(awk '/\.rvm\/scripts\/rvm/' ~/$rcfile)" ] ; then
+      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/$rcfile."
+      echo -e "\n# rvm installer added line:\nif [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
     fi
-
-  fi
-
-  if [ "$user_shell" = "zsh" -o "$user_shell" = "both" ] ; then
-    touch ~/.zshrc
-    if [ -z "`grep '\.rvm/scripts/rvm' ~/.zshrc`" ] ; then
-      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.zshrc."
-      echo -e "\n" >> ~/.zshrc
-      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.zshrc
-    fi
-  fi
+  done
 fi
 
 echo -e "\n    Ensuring that rvm script location in $file is scripts/rvm not bin/rvm for: ~/.bash_profile, ~/.bashrc, ~/.zshrc..."

data/scripts/ruby-installer

@@ -16,12 +16,13 @@ function __rvm_install_source {
   if [ -z "$rvm_ruby_tag" -a -z "$rvm_ruby_rev" ] ; 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_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
-      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 ..."
+      __rvm_log "info" "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
+      __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 ..."
+    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
@@ -41,7 +42,7 @@ function __rvm_install_source {
     else
       if [ -z "$rvm_ruby_rev" ] ; then
         # TODO: Check if tag v is valid
-        rvm_url=$rvm_ruby_repo_url/tags/$rvm_ruby_tag
+        rvm_url="$rvm_ruby_repo_url/tags/$rvm_ruby_tag"
         rvm_rev=""
       else
         if [ "$rvm_ruby_rev" = "head" -o "$rvm_ruby_rev" = "trunk" ] ; then
@@ -125,7 +126,8 @@ function __rvm_install_ruby {
     macruby)
       if [ "`uname`" = "Darwin" ] ; then
         rvm_url=`__rvm_db "macruby_nightly_url"`
-        __rvm_run "macruby/fetch" "__rvm_fetch $rvm_url" "Retrieving latest macruby" # $rvm_archives_path/macruby_nightly.pkg
+        __rvm_log "info" "Retrieving latest macruby" # $rvm_archives_path/macruby_nightly.pkg
+        __rvm_fetch $rvm_url
         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
@@ -143,7 +145,8 @@ function __rvm_install_ruby {
         if [ -d $rvm_ruby_src_path ]  ; then
           cd $rvm_ruby_src_path
         else
-          __rvm_run "fetch" "__rvm_fetch $rvm_url" "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
+          __rvm_log "Downloading $rvm_ruby_package_name, 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..."
@@ -283,7 +286,8 @@ 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_run "fetch" "__rvm_fetch $rvm_url" "Downloading $rvm_package_file, this may take a while depending on your connection..."
+            __rvm_log "info" "Downloading $rvm_package_file, this may take a while depending on your connection..."
+            __rvm_fetch $rvm_url
           fi
           rvm_unzip=`which unzip`
           if [ $? -ne 0 ] ; then
@@ -483,7 +487,8 @@ function __rvm_rubygems_setup {
     if [ -d $rvm_source_path/$rvm_gem_package_name ]  ; then
       cd $rvm_source_path/$rvm_gem_package_name
     else
-      __rvm_run "rubygems.fetch" "__rvm_fetch $rvm_gem_url" "Retrieving $rvm_gem_package_name"
+      __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"
     fi

data/scripts/rvm

@@ -14,5 +14,7 @@ source $rvm_path/scripts/selector
 source $rvm_path/scripts/ruby-installer # TODO: Script not function.
 source $rvm_path/scripts/cli
 
+rvm_loaded_flag=1 ; export rvm_loaded_flag
+
 if [ -f $rvm_path/default ] ; then source $rvm_path/default ; fi
 

data/scripts/rvm-install

@@ -31,66 +31,14 @@ for file_name in rvm-prompt gemsync ; do
   chmod +x $rvm_path/bin/$file_name
 done ; unset file_name
 
-results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
-if [ $? -gt 0 ] ; then
-  if [ ! -z "`echo $PS1`" ] ; then
-    while : ; do
-      echo -n -e "$question Do you want this (s)cript to set this up for you, or do it (m)anually yourself ('s' or 'm')? "
-      read response
-      if [ "${response:0:1}" = "s" ] ; then
-        echo 'w00t!'
-        break
-      elif [ "${response:0:1}" = "m" ] ; then
-        echo -e "    Please make sure that this line is in place."
-        break
-      fi
-    done
-
-    if [ "${response:0:1}" = "s" ] ; then
-
-      while : ; do
-        echo -n -e "$question Do you use b(a)sh or (z)sh or b(o)th for your shell (the default on most *nix systems is bash, press control + C to cancel the installation)\n(a/z/o)? "
-        read response
-        if [ "${response:0:1}" = "a" ] ; then
-          user_shell="bash"
-          break
-        elif [ "${response:0:1}" = "z" ] ; then
-          user_shell="zsh"
-          break
-        elif [ "${response:0:1}" = "o" ] ; then
-          user_shell="both"
-          break
-        fi
-      done
-    fi
-  else
-    user_shell="both"
-  fi
-
-  if [ "$user_shell" = "bash" -o "$user_shell" = "both" ] ; then
-    touch ~/.bash_profile
-    if [ -z "`grep '\.rvm/scripts/rvm' ~/.bash_profile`" ] ; then
-      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.bash_profile."
-      echo -e "\n" >> ~/.bash_profile
-      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bash_profile
-    fi
-    touch ~/.bashrc
-    if [ -z "`grep '\.rvm/scripts/rvm' ~/.bashrc`" ] ; then
-      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.bashrc."
-      echo -e "\n" >> ~/.bashrc
-      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bashrc
+if [ -z "$rvm_loaded_flag" ] ; then
+  for rcfile in .bash_profile .bashrc .zshrc ; do
+    if [ ! -e ~/$rcfile ] ; then touch ~/$rcfile ; fi
+    if [ -z "$(awk '/\.rvm\/scripts\/rvm/' ~/$rcfile)" ] ; then
+      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/$rcfile."
+      echo -e "\n# rvm installer added line:\nif [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
     fi
-
-  fi
-
-  if [ "$user_shell" = "zsh" -o "$user_shell" = "both" ] ; then
-    touch ~/.zshrc
-    if [ -z "`grep '\.rvm/scripts/rvm' ~/.zshrc`" ] ; then
-      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.zshrc."
-      echo -e "\n" >> ~/.zshrc
-      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.zshrc
-    fi
-  fi
+  done
 fi
 
 echo -e "\n    Ensuring that rvm script location in $file is scripts/rvm not bin/rvm for: ~/.bash_profile, ~/.bashrc, ~/.zshrc..."

data/scripts/selector

@@ -147,7 +147,6 @@ function __rvm_select {
     rvm_selected=1
 
     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
-
   else
     rvm_gem_home=$GEM_HOME
   fi

data/scripts/update

@@ -31,66 +31,14 @@ for file_name in rvm-prompt gemsync ; do
   chmod +x $rvm_path/bin/$file_name
 done ; unset file_name
 
-results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
-if [ $? -gt 0 ] ; then
-  if [ ! -z "`echo $PS1`" ] ; then
-    while : ; do
-      echo -n -e "$question Do you want this (s)cript to set this up for you, or do it (m)anually yourself ('s' or 'm')? "
-      read response
-      if [ "${response:0:1}" = "s" ] ; then
-        echo 'w00t!'
-        break
-      elif [ "${response:0:1}" = "m" ] ; then
-        echo -e "    Please make sure that this line is in place."
-        break
-      fi
-    done
-
-    if [ "${response:0:1}" = "s" ] ; then
-
-      while : ; do
-        echo -n -e "$question Do you use b(a)sh or (z)sh or b(o)th for your shell (the default on most *nix systems is bash, press control + C to cancel the installation)\n(a/z/o)? "
-        read response
-        if [ "${response:0:1}" = "a" ] ; then
-          user_shell="bash"
-          break
-        elif [ "${response:0:1}" = "z" ] ; then
-          user_shell="zsh"
-          break
-        elif [ "${response:0:1}" = "o" ] ; then
-          user_shell="both"
-          break
-        fi
-      done
-    fi
-  else
-    user_shell="both"
-  fi
-
-  if [ "$user_shell" = "bash" -o "$user_shell" = "both" ] ; then
-    touch ~/.bash_profile
-    if [ -z "`grep '\.rvm/scripts/rvm' ~/.bash_profile`" ] ; then
-      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.bash_profile."
-      echo -e "\n" >> ~/.bash_profile
-      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bash_profile
-    fi
-    touch ~/.bashrc
-    if [ -z "`grep '\.rvm/scripts/rvm' ~/.bashrc`" ] ; then
-      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.bashrc."
-      echo -e "\n" >> ~/.bashrc
-      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bashrc
+if [ -z "$rvm_loaded_flag" ] ; then
+  for rcfile in .bash_profile .bashrc .zshrc ; do
+    if [ ! -e ~/$rcfile ] ; then touch ~/$rcfile ; fi
+    if [ -z "$(awk '/\.rvm\/scripts\/rvm/' ~/$rcfile)" ] ; then
+      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/$rcfile."
+      echo -e "\n# rvm installer added line:\nif [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
     fi
-
-  fi
-
-  if [ "$user_shell" = "zsh" -o "$user_shell" = "both" ] ; then
-    touch ~/.zshrc
-    if [ -z "`grep '\.rvm/scripts/rvm' ~/.zshrc`" ] ; then
-      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/.zshrc."
-      echo -e "\n" >> ~/.zshrc
-      echo "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.zshrc
-    fi
-  fi
+  done
 fi
 
 echo -e "\n    Ensuring that rvm script location in $file is scripts/rvm not bin/rvm for: ~/.bash_profile, ~/.bashrc, ~/.zshrc..."

data/scripts/utility

@@ -56,13 +56,13 @@ function __rvm_log {
   case "$1" in
     debug) shift ;
       if [ ! -z "$rvm_debug_flag" ] ; then
-        echo -e "\033[0;35m<debug>\033[0m $* \033[0;35m</debug> \033[0m "
+        echo -e "\033[0;35m<d>\033[0m $* \033[0;35m</d> \033[0m "
       fi
     ;;
-    info)  shift ; echo -e "\033[0;32m<info>\033[0m $* \033[0;32m</info> \033[0m " ;;
-    warn)  shift ; echo -e "\033[0;33m<warning>\033[0m $* \033[0;33m</warning> \033[0m " ;;
-    error) shift ; echo -e "\033[0;31m<error>\033[0m $* \033[0;31m</error> \033[0m " ;;
-    fail)  shift ; echo -e "\033[0;31m<fail>\033[0m $* \033[0;31m</fail> \033[0m " ; __rvm_pushpop ; return 1 ;;
+    info)  shift ; echo -e "\033[0;32m<i>\033[0m $* \033[0;32m</i> \033[0m " ;;
+    warn)  shift ; echo -e "\033[0;33m<w>\033[0m $* \033[0;33m</w> \033[0m " ;;
+    error) shift ; echo -e "\033[0;31m<e>\033[0m $* \033[0;31m</e> \033[0m " ;;
+    fail)  shift ; echo -e "\033[0;31m<f>\033[0m $* \033[0;31m</f> \033[0m " ; __rvm_pushpop ; return 1 ;;
     *) echo -e "$*"
   esac
 }
@@ -527,7 +527,10 @@ function __rvm_ruby_do {
   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"
+      if [ -z "$(echo $rvm_ruby_args | awk '/\.rb$/')" ] ; then
+        rvm_ruby_args="-S $rvm_ruby_args"
+      fi
+      rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_require -I$load_path $rvm_ruby_args"
     else
       rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args"
     fi
@@ -537,7 +540,7 @@ function __rvm_ruby_do {
       touch ./log/$rvm_ruby_string/$rvm_action.log ./log/$rvm_ruby_string/$rvm_action.error.log
       eval "$rvm_command" >> ./log/$rvm_ruby_string/$rvm_action.log 2>> ./log/$rvm_ruby_string/$rvm_action.error.log
     else
-      echo -e "\n$rvm_ruby_string: $($rvm_ruby_home/bin/$binary -v)"
+      echo -e "\n\n\033[0;32m$rvm_ruby_string: $($rvm_ruby_home/bin/$binary -v | tr "\n" ' ')\033[0m\n"
       eval "$rvm_command"
     fi
     result=$?
@@ -652,16 +655,14 @@ function __rvm_json {
 
 function __rvm_benchmark {
   rvm_code="$(cat <<RubyCode
-#!/usr/bin/env ruby
-require "benchmark"
-Benchmark.bmbm do|benchmark|
-  benchmark.report("benchmarking '$rvm_ruby_file'") do
-
+require "benchmark" \n
+Benchmark.bmbm do |benchmark| \n
+  benchmark.report("$rvm_ruby_file") do \n
 RubyCode
 )"
-  echo "$rvm_code" > $rvm_temp_path/$$.rb
+  echo -e "$rvm_code" > $rvm_temp_path/$$.rb
   cat $rvm_ruby_file >> $rvm_temp_path/$$.rb
-  echo -e "\n  end\nend\n" >> $rvm_temp_path/$$.rb
+  echo -e "\n end \nend\n" >> $rvm_temp_path/$$.rb
   unset rvm_code
   rvm_ruby_args="$rvm_temp_path/$$.rb"
   rvm_action="ruby"
@@ -813,7 +814,8 @@ function __rvm_readline_install {
   __rvm_pushpop $rvm_source_path
   package="readline" ; version="5.2" ; archive_format="tar.gz"
   # TODO: Figure out how to list, grab and apply the patches
-  __rvm_run "$package/fetch" "__rvm_fetch ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format" "Retrieving $package-$version.$archive_format"
+  __rvm_log "info" "Retrieving $package-$version.$archive_format"
+  __rvm_fetch ftp://ftp.gnu.org/gnu/readline/$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
@@ -833,7 +835,8 @@ function __rvm_readline_install {
 function __rvm_iconv_install {
   __rvm_pushpop $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_log "info" "Retrieving $package-$version.$archive_format"
+  __rvm_fetch http://ftp.gnu.org/pub/gnu/libiconv/$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-static --enable-shared" "Configuring $package."
@@ -841,3 +844,4 @@ function __rvm_iconv_install {
   __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.52
+  version: 0.0.53
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-29 00:00:00 -04:00
+date: 2009-10-01 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []