wayneeseguin-rvm 0.0.35 → 0.0.36

data/config/db

@@ -12,7 +12,6 @@ ree_interpreter=ruby-enterprise
 ree_version=1.8.6
 ree_patch_level=20090610
 macruby_version=2009-09-04
-ruby_version=1.8.6
 ruby_1.9.1_patch_level=p243
 ruby_1.9.2_patch_level=preview1
 ruby_1.8.5_patch_level=p115

data/scripts/rvm-cli

@@ -49,8 +49,9 @@ function __rvm_parse-args {
         fi
       ;;
 
-      do|rubydo)
+      do|rubydo|rakedo|gemdo)
         rvm_action=$rvm_token
+        if [ "$rvm_action" = "do" ] ; then rvm_action="do" ; fi
         temp=$(echo $1 | awk '{print substr($1, 0, 1)}')
         if [ "$temp" != "-" ] ; then
           if [ ! -z "$(echo $temp | grep '[0-9]')" ] ; then
@@ -116,6 +117,10 @@ function __rvm_parse-args {
       -l|--level)        rvm_ruby_patch_level="$1" ; shift ;;
       -n|--nice)         rvm_niceness="$1"         ; shift ;;
       -f|--file)         rvm_ruby_args="$1"        ; shift ;;
+      -e|--execute)
+                         rvm_ruby_args="$@"
+                         rvm_parse_break=1
+      ;;
       -h|--help)         rvm_action=help           ; shift ;;
       -d|--default)      rvm_set_default=1                 ;;
       --head)            rvm_ruby_rev="head"               ;;
@@ -132,11 +137,11 @@ function __rvm_parse-args {
         rvm_ruby_interpreter="system"
       ;;
       *)
-      rvm_action="error"
-      rvm_error_message="Unrecognized command line argument(s): '$rvm_token $*'"
-      break;
+        rvm_action="error"
+        rvm_error_message="Unrecognized command line argument(s): '$rvm_token $@'"
+        break;
     esac
-    if [ ! -z "$rvm_ruby_args" -o ! -z "$rvm_error_message" ] ; then break; fi
+    if [ ! -z "$rvm_parse_break" -o ! -z "$rvm_error_message" ] ; then unset rvm_parse_break; break; fi
   done
 
   if [ ! -z "$rvm_error_message" ] ; then popd 2> /dev/null ; return 1 ; fi
@@ -150,7 +155,7 @@ function rvm {
   __rvm_load-rvmrc
   __rvm_initialize
   __rvm_load-defaults
-  __rvm_parse-args $*
+  __rvm_parse-args $@
 
   case "$rvm_action" in
     install)   __rvm_install-ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
@@ -162,7 +167,7 @@ function rvm {
     gemdup)    __rvm_gem-dup      $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
     symlinks)  __rvm_symlinks                                                                   ;;
     version)   __rvm_version                                                                    ;;
-    rubydo)
+    rubydo|rakedo|gemdo)
       if [ ! -z "$rvm_ruby_version" ] ; then
         rvm_ruby_versions=$(echo $rvm_ruby_version | tr ',' ' ')
         for rvm_ruby_version in $rvm_ruby_versions ; do
@@ -175,14 +180,14 @@ function rvm {
           fi
           unset temp
           __rvm_select $rvm_ruby_interpreter $rvm_ruby_version
-
-          rvm_command="$rvm_ruby_binary $rvm_ruby_args"
-          echo "$(basename $rvm_ruby_binary):"
+          binary=`echo $rvm_action | sed 's/do$//'`
+          rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args"
+          echo "$(basename $rvm_ruby_home/bin/$binary):"
           eval $rvm_command
           unset rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_ruby_package_name rvm_ruby_home rvm_ruby_irbrc rvm_ruby_binary
         done
       else # all
-        rvm_ruby_versions=`/bin/ls $rvm_install_path/bin/ruby-*`
+        rvm_ruby_versions=`/bin/ls $rvm_bin_path/ruby-*`
         for rvm_ruby_binary in $rvm_ruby_versions ; do
           if [ -x $rvm_ruby_binary ] ; then
             rvm_command="$rvm_ruby_binary $rvm_ruby_args"
@@ -199,14 +204,13 @@ function rvm {
     update)
       if [ "$rvm_ruby_rev" = "head" ] ; then
         if [ -d $rvm_source_path/rvm/.git ] ; then
-          cd $rvm_source_path/rvm/ && git pull origin master
+          cd $rvm_source_path/rvm/ && git pull origin master && ./scripts/rvm-install
         else
-          cd $rvm_source_path && git clone git://github.com/wayneeseguin/rvm.git && cd rvm/
+          cd $rvm_source_path && git clone git://github.com/wayneeseguin/rvm.git && cd rvm/ && ./scripts/rvm-install
         fi
-        ./scripts/rvm-update
       else
         # TODO: rvm_install_path:
-        gem install rvm --no-rdoc --no-ri -q && rvm-update && source ~/.rvm/scripts/rvm
+        gem install rvm --no-rdoc --no-ri -q && rvm-install && source ~/.rvm/scripts/rvm
       fi
     ;;
     error)      __rvm_log "fail" "$rvm_error_message ( see: rvm usage )" ; popd 2> /dev/null ; return 1; ;;

data/scripts/rvm-install

@@ -15,86 +15,134 @@ source_dir="${source_dir:-$cwd}"
 rvm_dir=~/.rvm
 
 echo -e "Installing rvm source to ~/.rvm/scripts/rvm..."
-mkdir -p $rvm_dir
-
 for dir in src scripts bin log archives config gems examples ; do
   mkdir -p $rvm_dir/$dir
 done
 
-for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
-  if [ -s $file ] ; then
-    echo -e "\n\033[0;32m<i>\033[0m Ensuring that rvm script location in $file is scripts/rvm not bin/rvm"
-    actual_file=$(file ~/.zshrc | awk '{print $5}')
-    sed -i.orig 's/rvm\/bin\/rvm/rvm\/scripts\/rvm/g' $actual_file
-  fi
-done
-
-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
-
 # 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"
 
-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 "$info Please make sure that this line is in place."
-    break
-  fi
-done
-
-if [ "${response:0:1}" = "s" ] ; then
-
+results=$(grep 'scripts/rvm' ~/.bash_profile ~/.bashrc ~/.zshrc > /dev/null)
+if [ $? -gt 0 ] ; 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)? "
+    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}" = "a" ] ; then
-      user_shell="bash"
-      break
-    elif [ "${response:0:1}" = "z" ] ; then
-      user_shell="zsh"
+    if [ "${response:0:1}" = "s" ] ; then
+      echo 'w00t!'
       break
-    elif [ "${response:0:1}" = "o" ] ; then
-      user_shell="both"
+    elif [ "${response:0:1}" = "m" ] ; then
+      echo -e "$info Please make sure that this line is in place."
       break
     fi
   done
 
-  if [ "$user_shell" = "bash" -o "$user_shell" = "both" ] ; then
+  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
+
+    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 "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 "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bashrc
+      fi
 
-    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 "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 "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.bashrc
+
+    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 "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.zshrc
+      fi
     fi
 
   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 "if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" >> ~/.zshrc
+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"
+for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
+  if [ -s $file ] ; then
+    if [ -L $file ] ; then         # If the file is a symlink,
+      actual_file=`readlink $file` # read the link target so we can preserve it.
+    else
+      actual_file="$file"
     fi
+    sed -i.orig 's/rvm\/bin\/rvm/rvm\/scripts\/rvm/g' $actual_file
   fi
+done
 
+if [ -f ~/.rvm/bin/rvm ] ; then
+  echo -e "\n\033[0;32m<i>\033[0m Removing old rvm file from ~/.rvm/bin/rvm"
+  rm -f ~/.rvm/bin/rvm
 fi
 
-source $rvm_dir/scripts/rvm-update
+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
+
+system=`uname`
+if [ "$system" = "Linux" ] ; then
+  rvm_apt_get_binary=`which apt-get 2> /dev/null`
+  rvm_emerge_binary=`which emerge 2> /dev/null`
+  rvm_pacman_binary=`which pacman 2> /dev/null`
+  rvm_yum_binary=`which yum 2> /dev/null`
+
+  echo -e "\033[0;33m <w> \033[0mFor jRuby & ree (if you wish to use it) you will need:"
+  if [ ! -z "$rvm_apt_get_binary" ] ; then
+    echo -e "\033[0;32m <i> \033[0msudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk libreadline5-dev libssl-dev "
+
+  elif [ ! -z "$rvm_emerge_binary" ] ; then
+    echo -e "\033[0;32m <i> \033[0msudo emerge dev-java/sun-jdk dev-java/sun-jre-bin"
+
+  elif [ ! -z "$rvm_pacman_binary" ] ; then
+    echo -e "\033[0;32m <i> \033[0msudo pacman -Sy jdk jre"
+
+  elif [ ! -z "$rvm_yum_binary" ] ; then
+    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..."
+
+  else
+    echo -e "\033[0;32m <i> \033[0mThe SUN java runtime environment and development kit."
+  fi
+elif [ "$sytem" = "Darwin" ] ; then
+  echo -e "\033[0;32m <i> \033[0mIf 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   * note that ruby gems are now all installed into ~/.rvm/gems"
+
+echo -e "\n$info  Please visit the website for much more information: http://rvm.beginrescueend.com/\n"
+echo '    w⦿‿⦿t! '
+echo -e "\n        ~ Wayne"
+
+source $rvm_dir/scripts/rvm
+rvm symlinks
+echo
+rvm -v
 

data/scripts/rvm-ruby-installer

@@ -102,7 +102,9 @@ function __rvm_install-source {
   __rvm_bin_scripts
   __rvm_log "info" "Installation of $rvm_ruby_package_name is complete."
 
+
   __rvm_log "info" "\tInstalling rubygems dedicated to $rvm_ruby_package_name..."
+  GEM_HOME="$rvm_gem_home" ; export GEM_HOME
   rvm_gem_package_name="rubygems-1.3.5"
   rvm_gem_url="http://rubyforge.org/frs/download.php/60718/$rvm_gem_package_name.tgz"
   if [ -d $rvm_source_path/$rvm_gem_package_name ]  ; then
@@ -126,7 +128,7 @@ function __rvm_install-source {
       mv $rvm_ruby_home/bin/$binary.new $rvm_ruby_home/bin/$binary
       chmod +x $rvm_ruby_home/bin/$binary
     else
-      __rvm_log "warn" "$rvm_ruby_home/bin/$binary is missing"
+      __rvm_log "warn" "$rvm_ruby_src_path/bin/$binary is missing"
     fi
   done
 
@@ -136,22 +138,17 @@ function __rvm_install-source {
   done
 
   __rvm_log "info" "Installation of rubygems for $rvm_ruby_package_name is complete."
+
+  binary=rake
   if [ -x $rvm_gem_home/bin/$binary ] ; then
+    cp $rvm_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
     string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_gem_home/bin:' + ENV['PATH']"
-    mv $rvm_gem_home/bin/$binary $rvm_gem_home/bin/$binary.orig
-    awk "NR==2 {print \"$string\"} {print}" $rvm_gem_home/bin/$binary.orig > $rvm_gem_home/bin/$binary
-    chmod +x $rvm_gem_home/bin/$binary
+    awk "NR==2 {print \"$string\"} {print}" $rvm_ruby_home/bin/$binary > $rvm_ruby_home/bin/$binary.new
+    mv $rvm_ruby_home/bin/$binary.new $rvm_ruby_home/bin/$binary
+    chmod +x $rvm_ruby_home/bin/$binary
   else
     __rvm_log "warn" "$rvm_gem_home/bin/$binary is missing"
   fi
-
-  binary=rake
-  if [ -x $rvm_ruby_home/bin/$binary ] ; then
-    mv $rvm_ruby_home/bin/$binary $rvm_gem_home/bin/$binary.orig
-    awk "NR==2 {print \"$string\"} {print}" $rvm_gem_home/bin/$binary.orig > $rvm_gem_home/bin/$binary
-  else
-    __rvm_log "warn" "$rvm_gem_home/bin/$binary is missing."
-  fi
   unset binary
 }
 

data/scripts/rvm-selector

@@ -6,6 +6,12 @@ function __rvm_select {
   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 [ "$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
 
@@ -45,7 +51,7 @@ function __rvm_select {
 
     ruby-enterprise|ree)
       rvm_ruby_interpreter=`__rvm_db "ree_interpreter"`
-      rvm_ruby_version=${rvm_ruby_version:-`__rvm_db "ruby_version"`}
+      rvm_ruby_version=${rvm_ruby_version:-`__rvm_db "ree_version"`}
       rvm_ruby_patch_level="${3:-`__rvm_db "ree_patch_level"`}"
 
       if [ "$rvm_ruby_version" != "1.8.6" ] ; then
@@ -115,7 +121,7 @@ function __rvm_select {
     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
 
   else
-    unset rvm_selected
+    rvm_gem_home=$GEM_HOME
   fi
 
 }
@@ -135,6 +141,7 @@ function __rvm_use {
     GEM_HOME=$rvm_gem_home ; export GEM_HOME
     MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME
     IRBRC="$rvm_ruby_irbrc" ; export IRBRC
+    if [ -z "$IRBRC" ] ; then unset IRBRC ; fi
 
     # Install if not installed
     if [ ! -d $MY_RUBY_HOME ] ; then
@@ -143,7 +150,7 @@ function __rvm_use {
     fi
 
     if [ ! -s "$rvm_ruby_irbrc" ] ; then
-      rvm_irbrc_file=$(cat <<Config
+      rvm_irbrc_file=`cat <<Config
   ; # No, this is not a stray ';' :)
   require "irb/completion" rescue nil
   @prompt = {
@@ -158,10 +165,11 @@ function __rvm_use {
   IRB.conf[:PROMPT][@prompt_mode] = @prompt
   IRB.conf[:PROMPT_MODE] = @prompt_mode
 Config
-)
+`
       if [ -s ~/.irbrc ] ; then
         cp ~/.irbrc $rvm_ruby_home/.irbrc
       fi
+      touch $rvm_ruby_home/.irbrc
       echo "$rvm_irbrc_file" >> $rvm_ruby_home/.irbrc
     fi
     PATH="$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:$rvm_default_path" ; export PATH
@@ -175,12 +183,16 @@ Config
       RUBY_VERSION="$($MY_RUBY_HOME/bin/ruby -v | sed 's/^\(.*\) (.*$/\1/')"
       export GEM_HOME MY_RUBY_HOME RUBY_VERSION
 
-      echo "PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:$rvm_default_path ; export PATH" > $rvm_path/current
+      echo "PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:\$PATH ; export PATH" > $rvm_path/current
 
-      for variable in rvm_prompt RUBY_VERSION GEM_HOME MY_RUBY_HOME ; do
+      for variable in rvm_prompt RUBY_VERSION GEM_HOME MY_RUBY_HOME IRBRC ; do
         eval "export $variable"
         eval value=\$${variable}
-        echo "${variable}='$value' ; export ${variable}" >> $rvm_path/current
+        if [ ! -z "$variable" ] ; then
+          echo "${variable}='$value' ; export ${variable}" >> $rvm_path/current
+        else
+          echo "unset ${variable}" >> $rvm_path/current
+        fi
       done
     fi
   fi

data/scripts/rvm-utility

@@ -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="0.0.35"
-  rvm_meta_updated="2009.09.05"
+  rvm_meta_version="0.0.36"
+  rvm_meta_updated="2009.09.06"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -169,14 +169,16 @@ function __rvm_gi { gem install -q --no-rdoc --no-ri $* ; }
 function __rvm_run {
   log_file_name="$1" ; shift
   command="$*"
+  mkdir -p $rvm_ruby_log_path
   if [ $rvm_debug ] ; then __rvm_log "debug" "Executing: $command" ; fi
+  touch $rvm_ruby_log_path/$log_file_name.log $rvm_ruby_log_path/$log_file_name.error.log # for zsh :(
   eval "nice -n $rvm_niceness $command" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
   if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/$log_file_name.error.log" ; popd 2> /dev/null ; return 1 ; fi
   unset log_file command
 }
 
 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_debug rvm_prefix_path rvm_ruby_package_name rvm_gem_path rvm_command rvm_error_message IRBRC rvm_ruby_home rvm_ruby_binary rvm_gem_set_name rvm_delete_flag rvm_ruby_tag rvm_ruby_rev rvm_url rvm_ruby_make rvm_ruby_make_install rvm_config_path rvm_bin_path rvm_force rvm_set_prompt rvm_all rvm_re_configure
+  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_debug 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_delete_flag rvm_ruby_tag rvm_ruby_rev rvm_url rvm_ruby_make rvm_ruby_make_install rvm_config_path rvm_bin_path rvm_force rvm_set_prompt rvm_all rvm_re_configure
 }
 
 # TODO: root user loadng of /etc/rvmrc
@@ -191,7 +193,7 @@ ruby_wrapper=$(cat <<-RubyWrapper
 #!/bin/bash
 GEM_HOME=$rvm_gem_home ; export GEM_HOME
 MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME
-PATH=$rvm_ruby_home/bin:$rvm_gem_home/bin:$rvm_default_path ; export PATH
+PATH=$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH ; export PATH
 
 exec "$rvm_ruby_binary" "\$@"
 RubyWrapper
@@ -275,6 +277,10 @@ function __rvm_reset {
 
   __rvm_select "system"
 
+  for default in default_ps1 default_path default_system_ruby default_system_gem_path default_user_gem_path ; do
+    __rvm_db "$default" "delete"
+  done ; unset default variable
+
 }
 
 function __rvm_implode {
@@ -357,7 +363,7 @@ function __rvm_db {
     else
       value="$*"
       if [ -z "$value" ] ; then # get
-        grep "^$key=" $rvm_hash_file | awk -F'=' '{print $2}'
+        grep "^$key=" $rvm_hash_file | head -n 1 | awk -F'=' '{print $2}'
       else # set
         if [ -z "$(grep "^$key=" $rvm_hash_file)" ] ; then # append
           echo "$key=$value" >> $rvm_hash_file
@@ -395,6 +401,7 @@ function __rvm_list {
     echo "jruby head"
     echo "rubinius head"
     echo "rbx head"
+    echo "rbx head --jit"
     echo "ree 20090610"
   else
     echo -e "\nruby:\n$(/bin/ls -l $rvm_path/ | awk '/ ruby-[1-2].*/ { print " - " $NF  }')\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wayneeseguin-rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,15 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 -07:00
-default_executable: 
+date: 2009-09-08 00:00:00 -07:00
+default_executable: rvm-install
 dependencies: []
 
 description: Manages Ruby interpreter installations and switching between them.
 email: wayneeseguin@gmail.com
 executables: 
 - rvm-install
-- rvm-update
 extensions: []
 
 extra_rdoc_files: 
@@ -29,13 +28,11 @@ files:
 - config/db
 - examples/rvmrc
 - lib/rvm.rb
-- rvm.gemspec
 - scripts/rvm
 - scripts/rvm-cli
 - scripts/rvm-install
 - scripts/rvm-ruby-installer
 - scripts/rvm-selector
-- scripts/rvm-update
 - scripts/rvm-utility
 has_rdoc: false
 homepage: http://github.com/wayneeseguin/rvm

data/bin/rvm-update

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-# Hot potato!!! Bash it!
-exec "bash -l -c 'cd #{File.dirname(File.dirname(__FILE__))} && ./scripts/rvm-update #{ARGV.join(' ')} && source ~/.rvm/scripts/rvm'"
-

data/rvm.gemspec

@@ -1,51 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{rvm}
-  s.version = "0.0.35"
-
-  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-05}
-  s.description = %q{Manages Ruby interpreter installations and switching between them.}
-  s.email = %q{wayneeseguin@gmail.com}
-  s.executables = ["rvm-install", "rvm-update"]
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    "INSTALL",
-     "LICENCE",
-     "README",
-     "config/db",
-     "examples/rvmrc",
-     "lib/rvm.rb",
-     "rvm.gemspec",
-     "scripts/rvm",
-     "scripts/rvm-cli",
-     "scripts/rvm-install",
-     "scripts/rvm-ruby-installer",
-     "scripts/rvm-selector",
-     "scripts/rvm-update",
-     "scripts/rvm-utility"
-  ]
-  s.homepage = %q{http://github.com/wayneeseguin/rvm}
-  s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{dynamicreports}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Ruby Version Manager (rvm)}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end

data/scripts/rvm-update

@@ -1,77 +0,0 @@
-#!/bin/bash
-
-user=`whoami`
-if [ "$user" = "root" ] ; then
-  echo -e "\033[0;31m <e> \033[0mroot user support is not implemented yet.\033[0m"
-  exit 1
-fi
-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
-
-info="\n\033[0;32m<i>\033[0m"
-
-echo -e "$info Updating rvm source ~/.rvm/scripts/rvm ..."
-for dir in src scripts bin log archives config gems examples ; do
-  mkdir -p $rvm_dir/$dir
-done
-
-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"
-for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
-  if [ -s $file ] ; then sed -i.orig 's/rvm\/bin\/rvm/rvm\/scripts\/rvm/g' $file ; fi
-done
-
-if [ -f ~/.rvm/bin/rvm ] ; then
-  echo -e "\n\033[0;32m<i>\033[0m Removing old rvm file from ~/.rvm/bin/rvm"
-  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
-
-system=`uname`
-if [ "$system" = "Linux" ] ; then
-  rvm_apt_get_binary=`which apt-get 2> /dev/null`
-  rvm_emerge_binary=`which emerge 2> /dev/null`
-  rvm_pacman_binary=`which pacman 2> /dev/null`
-  rvm_yum_binary=`which yum 2> /dev/null`
-
-  echo -e "\033[0;33m <w> \033[0mFor jRuby & ree (if you wish to use it) you will need:"
-  if [ ! -z "$rvm_apt_get_binary" ] ; then
-    echo -e "\033[0;32m <i> \033[0msudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk libreadline5-dev libssl-dev "
-
-  elif [ ! -z "$rvm_emerge_binary" ] ; then
-    echo -e "\033[0;32m <i> \033[0msudo emerge dev-java/sun-jdk dev-java/sun-jre-bin"
-
-  elif [ ! -z "$rvm_pacman_binary" ] ; then
-    echo -e "\033[0;32m <i> \033[0msudo pacman -Sy jdk jre"
-
-  elif [ ! -z "$rvm_yum_binary" ] ; then
-    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..."
-
-  else
-    echo -e "\033[0;32m <i> \033[0mThe SUN java runtime environment and development kit."
-  fi
-elif [ "$sytem" = "Darwin" ] ; then
-  echo -e "\033[0;32m <i> \033[0mIf 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   * note that ruby gems are now all installed into ~/.rvm/gems"
-
-echo -e "\n$info  Please visit the website for much more information: http://rvm.beginrescueend.com/\n"
-echo '    w⦿‿⦿t! '
-echo -e "\n        ~ Wayne"
-
-source $rvm_dir/scripts/rvm
-rvm symlinks
-echo
-rvm -v
-