wayneeseguin-rvm 0.0.45 → 0.0.46

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 45
+:patch: 46

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.45"
+  s.version = "0.0.46"
 
   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-20}
+  s.date = %q{2009-09-22}
   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/rvm-cli

@@ -106,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|benchmark|bench|use|sync)
+      install|uninstall|path|info|setup|version|srcdir|list|symlinks|reset|debug|reload|usage|help|implode|update|readline|iconv|benchmark|bench|use|gemsync)
         rvm_action=$rvm_token
       ;;
 
@@ -302,7 +302,7 @@ function __rvm_parse-args {
         rvm_ruby_interpreter="system"
       ;;
 
-      --install)         rvm_install_on_use=1              ;;
+      --install)         rvm_install_on_use_flag=1         ;;
       --prefix)          rvm_prefix_path="$1"      ; shift ;;
       -G|--gems)         rvm_gem_path="$1"         ; shift ;;
       --source)          rvm_source_path="$1"      ; shift ;;
@@ -365,7 +365,7 @@ function rvm {
   __rvm_cleanup_variables
   __rvm_load-rvmrc
   __rvm_initialize
-  __rvm_load-defaults
+  __rvm_load_defaults
   __rvm_parse-args $@
 
   if [ -z "$rvm_debug_flag" ] ; then set +x ; else set -x ; fi
@@ -393,7 +393,7 @@ function rvm {
     bench|benchmark)  __rvm_benchmark  ; result=$? ;;
     rubydo|rakedo|gemdo) __rvm_do      ; result=$? ;;
 
-    sync)
+    gemsync)
       result=0
       rvm_source_gem_path=`__rvm_select ; echo $rvm_gem_home`
       __rvm_gem_sync
@@ -412,7 +412,11 @@ function rvm {
       result=0
     ;;
 
-    error)      __rvm_log "fail" "$rvm_error_message ( see: 'rvm usage' )" ; __rvm_pushpop ; return 1; ;;
+    error)
+      __rvm_log "fail" "$rvm_error_message ( see: 'rvm usage' )"
+      __rvm_pushpop
+      result=1;
+    ;;
     *)
       if [ ! -z "$rvm_action" ] ; then
         __rvm_log "fail"  "unknown action '$rvm_action'"

data/scripts/rvm-install

@@ -6,7 +6,7 @@ if [ "$user" = "root" ] ; then
   exit 1
 fi
 
-info="\n\033[0;32m<i>\033[0m"
+item="\033[0;32m* \033[0m"
 question="\n\033[0;32m<?>\033[0m"
 cwd=$(pwd)
 source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
@@ -14,7 +14,9 @@ if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 rvm_dir=~/.rvm
 
-echo -e "\nInstalling rvm to ~/.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
 done
@@ -29,12 +31,6 @@ for file_name in rvm-prompt gemsync ; do
   chmod +x $rvm_dir/bin/$file_name
 done ; unset file_name
 
-
-# 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."
-echo -e "$info In order to use rvm the following line must occur in your shell's loading files:"
-echo -e "\n\033[0;32m    (a)\033[0m if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi"
-
 results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
 if [ $? -gt 0 ] ; then
   while : ; do
@@ -44,7 +40,7 @@ if [ $? -gt 0 ] ; then
       echo 'w00t!'
       break
     elif [ "${response:0:1}" = "m" ] ; then
-      echo -e "$info Please make sure that this line is in place."
+      echo -e "    Please make sure that this line is in place."
       break
     fi
   done
@@ -96,7 +92,7 @@ if [ $? -gt 0 ] ; then
   fi
 fi
 
-echo -e "\n\033[0;32m<i>\033[0m Ensuring that rvm script location in $file is scripts/rvm not bin/rvm for: ~/.bash_profile, ~/.bashrc, ~/.zshrc"
+echo -e "\n    Ensuring that rvm script location in $file is scripts/rvm not bin/rvm for: ~/.bash_profile, ~/.bashrc, ~/.zshrc..."
 for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
   if [ -s $file ] ; then
     if [ -L $file ] ; then         # If the file is a symlink,
@@ -123,11 +119,12 @@ for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
 done
 
 if [ -f ~/.rvm/bin/rvm ] ; then
-  echo -e "\n\033[0;32m<i>\033[0m Removing old rvm file from ~/.rvm/bin/rvm"
+  echo -e "\n    Removing old rvm file from ~/.rvm/bin/rvm..."
   rm -f ~/.rvm/bin/rvm
 fi
 
 system=`uname`
+echo -e "\n    \033[0;33mNOTES: \033[0m"
 if [ "$system" = "Linux" ] ; then
   rvm_apt_get_binary=`which apt-get 2> /dev/null`
   rvm_emerge_binary=`which emerge 2> /dev/null`
@@ -135,44 +132,41 @@ if [ "$system" = "Linux" ] ; then
   rvm_yum_binary=`which yum 2> /dev/null`
 
   if [ ! -z "$rvm_apt_get_binary" ] ; then
-    echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
-    echo -e "\033[0;32m <i> \033[0msudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
-    echo -e "\033[0;33m <w> \033[0mFor ree (if you wish to use it) you will need:"
-    echo -e "\033[0;32m <i> \033[0msudo apt-get install libreadline5-dev libssl-dev bison"
+    echo -e "    $item For jRuby (if you wish to use it) you will need:"
+    echo -e "      $ sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
+    echo -e "    $item For ree (if you wish to use it) you will need:"
+    echo -e "      $ sudo apt-get install libreadline5-dev libssl-dev bison"
 
   elif [ ! -z "$rvm_emerge_binary" ] ; then
-    echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
-    echo -e "\033[0;32m <i> \033[0msudo emerge dev-java/sun-jdk dev-java/sun-jre-bin"
+    echo -e "    $item For jRuby (if you wish to use it) you will need:"
+    echo -e "      $ sudo emerge dev-java/sun-jdk dev-java/sun-jre-bin"
 
   elif [ ! -z "$rvm_pacman_binary" ] ; then
-    echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
-    echo -e "\033[0;32m <i> \033[0msudo pacman -Sy jdk jre"
+    echo -e "    $item For jRuby (if you wish to use it) you will need:"
+    echo -e "      $ sudo pacman -Sy jdk jre"
 
   elif [ ! -z "$rvm_yum_binary" ] ; then
-    echo -e "\033[0;33m <w> \033[0mFor ree (if you wish to use it) you will need:"
-    echo -e "\033[0;32m <i> \033[0myum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
+    echo -e "    $item For ree (if you wish to use it) you will need:"
+    echo -e "      $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
 
   else
-    echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
-    echo -e "\033[0;32m <i> \033[0mThe SUN java runtime environment and development kit."
+    echo -e "    $item For jRuby (if you wish to use it) you will need:"
+    echo -e "      The SUN java runtime environment and development kit."
   fi
 elif [ "$system" = "Darwin" ] ; then
-  echo -e "\033[0;32m <i> \033[0mBe sure that you have XCode Tools installed in order to use rvm."
-  echo -e "\033[0;32m <i> \033[0mIf you intend on installing MacRuby you must install LLVM first."
+  echo -e "      $item Be sure that you have XCode Tools installed in order to use rvm."
+  echo -e "      $item If you intend on installing MacRuby you must install LLVM first."
 fi
 
-echo -e "$info There have been a great many updates since previous releases, please:"
-echo -e "$info   * remove sourcing of ~/.rvm/current from your shell profiles."
-echo -e "$info   * CLOSE THIS SHELL AND OPEN A NEW ONE FOR rvm."
+echo -e "      $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
+echo -e "      $item if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi"
+echo -e "      $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
 
-echo -e "\n$info  Please visit the website for much more information: http://rvm.beginrescueend.com/\n"
-echo '    w⦿‿⦿t! '
-echo -e "\n        ~ Wayne"
+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
-
-rvm symlinks
-echo
 rvm -v
 echo
 

data/scripts/rvm-ruby-installer

@@ -102,7 +102,7 @@ function __rvm_install_source {
   if [ -z "$rvm_ruby_make" ] ; then
     __rvm_run "make" make $rvm_make_flags
   else
-    __rvm_run "make" $rvm_ruby_make
+    __rvm_run "make" $rvm_ruby_make $rvm_make_flags
   fi
   if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
 
@@ -235,7 +235,8 @@ function __rvm_install_ruby {
 
     rbx|rubinius)
       unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
-      PATH="$rvm_system_path" ; export PATH
+      PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
+      PATH=$rvm_bin_path:$PATH ; export PATH
       rvm_ruby_repo_url=$rvm_rubinius_repo_url
       rvm_ruby_configure=""
       rvm_ruby_src_path=$rvm_ruby_home
@@ -359,10 +360,7 @@ RubyWrapper
 
   esac
 
-  if [ ! -z "$ruby_options" ] ; then
-    RUBYOPT=$ruby_options ; export RUBYOPT
-  fi
-
+  if [ ! -z "$ruby_options" ] ; then RUBYOPT=$ruby_options ; export RUBYOPT ; fi
 }
 
 # TODO: DRY up __rvm_remove and __rvm_uninstall
@@ -406,24 +404,24 @@ function __rvm_uninstall {
   else
     __rvm_log "fail" "Cannot uninstall unknown package '$rvm_ruby_package_name'"
   fi
-
 }
 
 function __rvm_post_install {
-
   for binary in gem irb erb ri rdoc testrb rake ; do
-    if [ -f $rvm_ruby_home/bin/$binary -o -f $rvm_ruby_src_path/bin/$binary ] ; then
-      if [ "$rvm_ruby_src_path" != "$rvm_ruby_home" -a $rvm_ruby_src_path/bin/$binary] ; then
+    if [ -e $rvm_ruby_home/bin/$binary -o -e $rvm_ruby_src_path/bin/$binary ] ; then
+      if [ "$rvm_ruby_src_path" != "$rvm_ruby_home" -a -f $rvm_ruby_src_path/bin/$binary ] ; then
         cp -f $rvm_ruby_src_path/bin/$binary $rvm_ruby_home/bin/$binary
       elif [ -f "$rvm_gem_home/bin/$binary" ] ; then
         cp -f $rvm_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
       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
+      if [ -f $rvm_ruby_home/bin/$binary ] ; then
+        string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_gem_home/bin:' + ENV['PATH']"
+        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
+      else
+        __rvm_log "info" "Skipping $rvm_ruby_src_path/bin/$binary, it is an executable not a script."
+      fi
       chmod +x $rvm_ruby_home/bin/$binary
-    else
-      __rvm_log "warn" "$rvm_ruby_src_path/bin/$binary is missing"
     fi
   done
 
@@ -441,19 +439,13 @@ function __rvm_post_install {
     if [ "$rvm_gem_home" != "$rvm_ruby_home" ] ; then
       cp $rvm_gem_home/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"
+    __rvm_inject_gem_env "$rvm_ruby_home/bin/$binary"
   fi
   unset binary
 }
 
 function __rvm_rubygems_setup {
-  if [ "`echo $rvm_ruby_version | awk '{print substr($1, 0, 3)}'`" != "1.9" ] ; then
+  if [ -z "`echo $rvm_ruby_version | awk '/^1\.9/'`" ] ; then
     __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"
@@ -469,14 +461,29 @@ function __rvm_rubygems_setup {
     if [ $result -eq 0 ] ; then
       __rvm_log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
     fi
+
+    __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
   else
-    # 1.9 has it's own built gem command, let's adjust the shebang line.
-    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
+    # 1.9 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
   fi
-
   return $result
 }
 
+function __rvm_inject_ruby_shebang {
+  if [ -f $1 ] ; then
+    cat $1 | sed -e "s=#!/usr/bin/env ruby=#!$rvm_ruby_home/bin/ruby=" > $1.new
+    mv $1.new $1 ; chmod +x $1
+  fi
+}
+
+function __rvm_inject_gem_env {
+  if [ -f $1 ] ; then
+    string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_gem_home/bin:' + ENV['PATH']"
+    awk "NR==2 {print \"$string\"} {print}" $1 > $1.new
+    mv $1.new $1 ; chmod +x $1
+  fi
+}
+

data/scripts/rvm-selector

@@ -3,16 +3,25 @@
 # __rvm_select implementation version patch_level
 function __rvm_select {
 
-  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
-
-  temp=$(echo $rvm_ruby_interpreter | awk '{print substr($1, 0, 1)}')
-  if [ ! -z "$(echo $temp | grep '[0-9]')" ] ; then
-    rvm_ruby_version=$rvm_ruby_interpreter
-    rvm_ruby_interpreter="ruby"
-  fi ; unset temp
+  if [ ! -z "$rvm_ruby_string" ] ; then
+    __rvm_ruby_string
+  elif [ ! -z "$rvm_ruby_selector" ] ; then
+      if [ ! -z "$(echo $rvm_ruby_selector | awk '/^[0-9]/')" ] ; then
+        rvm_ruby_interpreter="ruby"
+        rvm_ruby_version=$rvm_ruby_selector
+      else
+        rvm_ruby_interpreter="$rvm_ruby_selector"
+        unset rvm_ruby_version
+      fi
+  elif [ ! -z "$rvm_ruby_interpreter" ] ; then
+    if [ ! -z "$(echo $rvm_ruby_interpreter | awk '/^[0-9]/')" ] ; then
+      rvm_ruby_version=$rvm_ruby_interpreter
+      rvm_ruby_interpreter="ruby"
+    else
+      rvm_ruby_interpreter="${1:-$rvm_ruby_interpreter}"
+      rvm_ruby_interpreter="${rvm_ruby_interpreter:-ruby}" # Default is standard ruby
+    fi
+  fi
 
   if [ "$rvm_ruby_version" = "1.8" ] ; then rvm_ruby_version="1.8.6" ; fi
   if [ "$rvm_ruby_version" = "1.9" ] ; then rvm_ruby_version="1.9.1" ; fi
@@ -117,7 +126,7 @@ function __rvm_select {
       rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"}"
     else
       if [ "$rvm_ruby_interpreter" != "ruby-enterprise" ] ; then
-        if [ ! -z "`echo $rvm_ruby_patch_level | awk '/[0-9]+/{print}'`" ] ; then
+        if [ ! -z "`echo $rvm_ruby_patch_level | awk '/^[0-9]/'`" ] ; 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
@@ -147,20 +156,24 @@ function __rvm_use {
 
   if [ "$rvm_ruby_interpreter" = "default" ] ; then
 
+    PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
+    PATH=$rvm_bin_path:$PATH ; export PATH
+
     if [ -s $rvm_path/default ] ; then
       source $rvm_path/default
     else
       __rvm_log "error" "no default rvm specified, defaulting to pre-rvm sytem."
       unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
-      PATH="$rvm_system_path" ; export PATH
       if [ -s $rvm_path/system ] ; then source $rvm_path/system ; fi
     fi
 
   elif [ "$rvm_ruby_interpreter" = "system" ] ; then
 
     unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
-    # TODO: Remove .rvm/bin from the path
-    PATH="$rvm_system_path" ; export PATH
+
+    PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
+    PATH=$rvm_bin_path:$PATH ; export PATH
+
     if [ -s $rvm_path/system ] ; then
       grep "^MY_RUBY_HOME='$rvm_path" "$rvm_path/system" > /dev/null
       if [ $? -eq 0 ] ; then
@@ -180,14 +193,16 @@ function __rvm_use {
 
     if [ ! -d $MY_RUBY_HOME ] ; then
       __rvm_log "warn" "$rvm_ruby_interpreter $rvm_ruby_version is not installed."
-      if [ ! -z "$rvm_install_on_use" ] ; then
-        __rvm_install-ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level
+      if [ ! -z "$rvm_install_on_use_flag" ] ; then
+        __rvm_install_ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level
       fi
     fi
 
     __rvm_irbrc
 
-    PATH="$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:$rvm_system_path" ; export PATH
+    PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
+    PATH=$rvm_bin_path:$PATH ; export PATH
+    PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:$PATH ; export PATH
 
     if [ ! -z "$rvm_default_flag" ] ; then
       RUBY_VERSION="$($MY_RUBY_HOME/bin/ruby -v | sed 's/^\(.*\) (.*$/\1/')"

data/scripts/rvm-update

@@ -6,7 +6,7 @@ if [ "$user" = "root" ] ; then
   exit 1
 fi
 
-info="\n\033[0;32m<i>\033[0m"
+item="\033[0;32m* \033[0m"
 question="\n\033[0;32m<?>\033[0m"
 cwd=$(pwd)
 source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
@@ -14,7 +14,9 @@ if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 rvm_dir=~/.rvm
 
-echo -e "\nInstalling rvm to ~/.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
 done
@@ -29,12 +31,6 @@ for file_name in rvm-prompt gemsync ; do
   chmod +x $rvm_dir/bin/$file_name
 done ; unset file_name
 
-
-# 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."
-echo -e "$info In order to use rvm the following line must occur in your shell's loading files:"
-echo -e "\n\033[0;32m    (a)\033[0m if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi"
-
 results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
 if [ $? -gt 0 ] ; then
   while : ; do
@@ -44,7 +40,7 @@ if [ $? -gt 0 ] ; then
       echo 'w00t!'
       break
     elif [ "${response:0:1}" = "m" ] ; then
-      echo -e "$info Please make sure that this line is in place."
+      echo -e "    Please make sure that this line is in place."
       break
     fi
   done
@@ -96,7 +92,7 @@ if [ $? -gt 0 ] ; then
   fi
 fi
 
-echo -e "\n\033[0;32m<i>\033[0m Ensuring that rvm script location in $file is scripts/rvm not bin/rvm for: ~/.bash_profile, ~/.bashrc, ~/.zshrc"
+echo -e "\n    Ensuring that rvm script location in $file is scripts/rvm not bin/rvm for: ~/.bash_profile, ~/.bashrc, ~/.zshrc..."
 for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
   if [ -s $file ] ; then
     if [ -L $file ] ; then         # If the file is a symlink,
@@ -123,11 +119,12 @@ for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
 done
 
 if [ -f ~/.rvm/bin/rvm ] ; then
-  echo -e "\n\033[0;32m<i>\033[0m Removing old rvm file from ~/.rvm/bin/rvm"
+  echo -e "\n    Removing old rvm file from ~/.rvm/bin/rvm..."
   rm -f ~/.rvm/bin/rvm
 fi
 
 system=`uname`
+echo -e "\n    \033[0;33mNOTES: \033[0m"
 if [ "$system" = "Linux" ] ; then
   rvm_apt_get_binary=`which apt-get 2> /dev/null`
   rvm_emerge_binary=`which emerge 2> /dev/null`
@@ -135,44 +132,41 @@ if [ "$system" = "Linux" ] ; then
   rvm_yum_binary=`which yum 2> /dev/null`
 
   if [ ! -z "$rvm_apt_get_binary" ] ; then
-    echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
-    echo -e "\033[0;32m <i> \033[0msudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
-    echo -e "\033[0;33m <w> \033[0mFor ree (if you wish to use it) you will need:"
-    echo -e "\033[0;32m <i> \033[0msudo apt-get install libreadline5-dev libssl-dev bison"
+    echo -e "    $item For jRuby (if you wish to use it) you will need:"
+    echo -e "      $ sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
+    echo -e "    $item For ree (if you wish to use it) you will need:"
+    echo -e "      $ sudo apt-get install libreadline5-dev libssl-dev bison"
 
   elif [ ! -z "$rvm_emerge_binary" ] ; then
-    echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
-    echo -e "\033[0;32m <i> \033[0msudo emerge dev-java/sun-jdk dev-java/sun-jre-bin"
+    echo -e "    $item For jRuby (if you wish to use it) you will need:"
+    echo -e "      $ sudo emerge dev-java/sun-jdk dev-java/sun-jre-bin"
 
   elif [ ! -z "$rvm_pacman_binary" ] ; then
-    echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
-    echo -e "\033[0;32m <i> \033[0msudo pacman -Sy jdk jre"
+    echo -e "    $item For jRuby (if you wish to use it) you will need:"
+    echo -e "      $ sudo pacman -Sy jdk jre"
 
   elif [ ! -z "$rvm_yum_binary" ] ; then
-    echo -e "\033[0;33m <w> \033[0mFor ree (if you wish to use it) you will need:"
-    echo -e "\033[0;32m <i> \033[0myum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
+    echo -e "    $item For ree (if you wish to use it) you will need:"
+    echo -e "      $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
 
   else
-    echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
-    echo -e "\033[0;32m <i> \033[0mThe SUN java runtime environment and development kit."
+    echo -e "    $item For jRuby (if you wish to use it) you will need:"
+    echo -e "      The SUN java runtime environment and development kit."
   fi
 elif [ "$system" = "Darwin" ] ; then
-  echo -e "\033[0;32m <i> \033[0mBe sure that you have XCode Tools installed in order to use rvm."
-  echo -e "\033[0;32m <i> \033[0mIf you intend on installing MacRuby you must install LLVM first."
+  echo -e "      $item Be sure that you have XCode Tools installed in order to use rvm."
+  echo -e "      $item If you intend on installing MacRuby you must install LLVM first."
 fi
 
-echo -e "$info There have been a great many updates since previous releases, please:"
-echo -e "$info   * remove sourcing of ~/.rvm/current from your shell profiles."
-echo -e "$info   * CLOSE THIS SHELL AND OPEN A NEW ONE FOR rvm."
+echo -e "      $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
+echo -e "      $item if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi"
+echo -e "      $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
 
-echo -e "\n$info  Please visit the website for much more information: http://rvm.beginrescueend.com/\n"
-echo '    w⦿‿⦿t! '
-echo -e "\n        ~ Wayne"
+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
-
-rvm symlinks
-echo
 rvm -v
 echo
 

data/scripts/rvm-utility

@@ -93,7 +93,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 rvm_install_on_use rvm_json_flag rvm_yaml_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_json_flag rvm_yaml_flag
 }
 
 # TODO: root user loadng of /etc/rvmrc
@@ -139,6 +139,11 @@ function __rvm_fetch {
   if [ $result -gt 0 ] ; then
     if [ $result -eq 78 ] ; then
       __rvm_log "error" "The requested url does not exist: '$1'"
+    elif [ $result -eq 33 ] ; then
+      archive=`basename "$1"`
+      __rvm_log "debug" "Server does not support 'range' command, removing '$archive'"
+      rm -f $archive ; unset archive
+      __rvm_fetch "$1"
     else
       __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
     fi
@@ -147,10 +152,10 @@ function __rvm_fetch {
   return $result
 }
 
-function __rvm_load-defaults {
+function __rvm_load_defaults {
 
   if [ ! -s $rvm_path/system ] ; then
-    for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME PATH ; do
+    for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME ; do
       eval value=\$${variable}
       if [ -z "$value" ] ; then
         echo "unset ${variable}" >> $rvm_path/system
@@ -162,14 +167,6 @@ function __rvm_load-defaults {
     done
   fi
 
-  rvm_system_path=`__rvm_db "system_path"`
-  if [ -z "$rvm_system_path" ] ; then
-    __rvm_clean-path # Clean the path the first time we compute system path.
-    __rvm_remove-rvm-from-path
-    rvm_system_path="$PATH"
-    __rvm_db "system_path" "$rvm_system_path"
-  fi
-
   rvm_system_ps1=`__rvm_db "system_ps1"`
   if [ -z "$rvm_system_ps1" ] ; then
     rvm_system_ps1=$PS1
@@ -202,7 +199,9 @@ function __rvm_load-defaults {
 
 function __rvm_reset {
 
-  PATH="$rvm_path/bin:$rvm_system_path" ; export PATH
+  PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
+  PATH=$rvm_bin_path:$PATH ; export PATH
+
   for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME ; do unset $variable ; done
 
   for file in system default ; do
@@ -210,7 +209,7 @@ function __rvm_reset {
   done
   __rvm_select "system"
 
-  for system_config in system_ps1 system_path system_ruby system_gem_path system_user_gem_path ; do
+  for system_config in system_ps1 system_ruby system_gem_path system_user_gem_path ; do
     __rvm_db "$system_config" "delete"
   done ; unset system_config variable
 
@@ -321,21 +320,6 @@ function __rvm_db {
   fi
 }
 
-# Q: TODO: Is this neccessary any longer?
-function __rvm_symlinks {
-# TODO: Account for the ruby wrapper script files
-
-  mkdir -p ${rvm_path}/bin
-  for release in `/bin/ls $rvm_path 2> /dev/null | grep 'ruby-'` ; do
-    for binary in irb gem rdoc ri erb ; do
-      if [ -x $rvm_path/$release/bin/$binary ] ; then
-        ln -fs $rvm_path/$release/bin/$binary $rvm_path/bin/$binary-${release#ruby-}
-      fi
-    done
-  done
-
-}
-
 function __rvm_list {
 
   if [ "$rvm_all_flag" ] ; then
@@ -558,15 +542,11 @@ function __rvm_do {
 # TODO: Extract the outer looping mechanism with rvm_install's
   rubies=() ; successes=() ; errors=() ; statuses=()
   # TODO: Extract the common functionality out of the if below
-  if [ ! -z "$rvm_ruby_version" ] ; then
+  if [ ! -z "$rvm_ruby_string" ] ; then
+    unset rvm_ruby_interpreter rvm_ruby_version
+    __rvm_ruby_do
+  elif [ ! -z "$rvm_ruby_version" ] ;then
     for rvm_ruby_selector in `echo $rvm_ruby_version | tr ',' ' '` ; do
-      if [ ! -z "$(echo $rvm_ruby_selector | awk '/^[0-9]/')" ] ; then
-        rvm_ruby_interpreter="ruby"
-        rvm_ruby_version="$rvm_ruby_selector"
-      else
-        rvm_ruby_interpreter="$rvm_ruby_selector"
-        unset rvm_ruby_version
-      fi
       unset rvm_ruby_string
       __rvm_ruby_do
     done
@@ -579,69 +559,72 @@ function __rvm_do {
       fi
     done < <(/bin/ls $rvm_path/*/bin/ruby 2> /dev/null)
   fi
-  __rvm_summary
+
+  if [ ! -z "$rvm_summary_flag" ] ; then __rvm_summary ; fi
+  if [ ! -z "$rvm_yaml_flag" ]    ; then __rvm_yaml    ; fi
+  if [ ! -z "$rvm_json_flag" ]    ; then __rvm_json    ; fi
+
   return ${#errors[*]}
 }
 
 function __rvm_summary {
-  if [ ! -z "$rvm_summary_flag" ] ; then
-    export successes errors statuses
-    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 "rubies (${#rubies[*]}) : [ $(echo "${rubies[*]}" | sed 's/ /, /g') ]"
-    echo -e "statuses: [ $(echo "${statuses[*]}" | sed 's/ /, /g') ]\n"
-  fi
+  export successes errors statuses
+  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 "rubies (${#rubies[*]}) : [ $(echo "${rubies[*]}" | sed 's/ /, /g') ]"
+  echo -e "statuses: [ $(echo "${statuses[*]}" | sed 's/ /, /g') ]\n"
+  return ${#errors[*]}
+}
 
-  if [ ! -z "$rvm_yaml_flag" ] ; then
-    export successes errors statuses
-    yaml="\nYAML:\n  totals:\n    rubies: ${#rubies[*]}\n    successes: ${#successes[*]}\n    errors: ${#errors[*]}\n  successes:"
-    for var in ${successes[*]} ; do
-      yaml="$yaml\n    - $var"
-    done
-    yaml="$yaml\n  errors:"
-    for var in ${errors[*]} ; do
-      yaml="$yaml\n    - $var"
-    done
-    yaml="$yaml\n  rubies:"
-    total=${#rubies[*]}
-    if [ ! -z "$ZSH_VERSION" ] ; then array_start=1 ; else array_start=0 ; fi
-    for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
-      echo "${rubies[$index]}: ${statuses[$index]}"
-      yaml="$yaml\n    \"${rubies[$index]}\": ${statuses[$index]}"
-    done ; unset index array_start
-    echo -e "$yaml"
-  fi
+function __rvm_yaml {
+  export successes errors statuses
+  yaml="\ntotals:\n    rubies: ${#rubies[*]}\n    successes: ${#successes[*]}\n    errors: ${#errors[*]}\n  successes:"
+  for var in ${successes[*]} ; do
+    yaml="$yaml\n    - $var"
+  done
+  yaml="$yaml\n  errors:"
+  for var in ${errors[*]} ; do
+    yaml="$yaml\n    - $var"
+  done
+  yaml="$yaml\n  rubies:"
+  total=${#rubies[*]}
+  if [ ! -z "$ZSH_VERSION" ] ; then array_start=1 ; else array_start=0 ; fi
+  for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
+    echo "${rubies[$index]}: ${statuses[$index]}"
+    yaml="$yaml\n    \"${rubies[$index]}\": ${statuses[$index]}"
+  done ; unset index array_start
 
-  if [ ! -z "$rvm_json_flag" ] ; then
-    #
-    # TODO: Merge statuses & rubies:
-    #   rubies:
-    #     "jruby...": 0
-    #     "1.9.1...": 1
-    #
-  json="JSON:\n{"
+  mkdir -p log
+  echo -e "$yaml" | tee -a log/summary.yaml
+
+  return ${#errors[*]}
+}
+
+function __rvm_json {
+  json="{"
   json="$json\n  \"totals\": { \"rubies\": ${#rubies[*]}, \"successes\": ${#successes[*]}, \"errors\": ${#errors[*]}},"
   json="$json\n  \"successful\": [ "$(echo ${successes[*]} | sed 's/ /", "/g')" ],"
   json="$json\n  \"errors\": [ "$(echo ${errors[*]} | sed 's/ /", "/g')" ],"
   json="$json\n  \"rubies\": {"
-    total=${#rubies[*]}
-    if [ ! -z "$ZSH_VERSION" ] ; then array_start=1 ; else array_start=0 ; fi
-    for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
-      echo "${rubies[$index]}: ${statuses[$index]}"
-      json="$json\n    {\"${rubies[$index]}\": ${statuses[$index]}}"
-      if (( $index + 1 < $total + $array_start )) ; then json="$json,  " ; fi
-    done ; unset index array_start
-    json="$json\n  }\n}"
-    echo -e "$json"
-  else
-    unset bin_line rvm_summary_flag
-  fi
+
+  total=${#rubies[*]}
+  if [ ! -z "$ZSH_VERSION" ] ; then array_start=1 ; else array_start=0 ; fi
+  for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
+    echo "${rubies[$index]}: ${statuses[$index]}"
+    json="$json\n    {\"${rubies[$index]}\": ${statuses[$index]}}"
+    if (( $index + 1 < $total + $array_start )) ; then json="$json,  " ; fi
+  done ; unset index array_start
+  json="$json\n  }\n}"
+
+  mkdir -p log
+  echo -e "$json" | tee -a log/summary.json
+
   return ${#errors[*]}
 }
 
 function __rvm_benchmark {
-rvm_code="$(cat <<RubyCode
+  rvm_code="$(cat <<RubyCode
 #!/usr/bin/env ruby
 require "benchmark"
 Benchmark.bmbm do|benchmark|
@@ -649,14 +632,14 @@ Benchmark.bmbm do|benchmark|
 
 RubyCode
 )"
-echo "$rvm_code" > /tmp/$$.rb
-cat $rvm_ruby_file >> /tmp/$$.rb
-echo -e "\n  end\nend\n" >> /tmp/$$.rb
-unset rvm_code
-rvm_ruby_args="/tmp/$$.rb"
-rvm_action="rubydo"
-if [ ! -z "$rvm_debug_flag" ] ; then echo -e "/tmp/$$.rb:\n$(cat /tmp/$$.rb)" ; fi
-__rvm_do
+  echo "$rvm_code" > /tmp/$$.rb
+  cat $rvm_ruby_file >> /tmp/$$.rb
+  echo -e "\n  end\nend\n" >> /tmp/$$.rb
+  unset rvm_code
+  rvm_ruby_args="/tmp/$$.rb"
+  rvm_action="rubydo"
+  if [ ! -z "$rvm_debug_flag" ] ; then echo -e "/tmp/$$.rb:\n$(cat /tmp/$$.rb)" ; fi
+  __rvm_do
 }
 
 function __rvm_ruby_string {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wayneeseguin-rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.45
+  version: 0.0.46
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-20 00:00:00 -07:00
+date: 2009-09-22 00:00:00 -07:00
 default_executable: rvm-install
 dependencies: []