rvm 0.1.3 → 0.1.5

data/config/db

@@ -22,10 +22,11 @@ ruby_1.8.7_patch_level=248
 jruby_version=1.4.0
 jruby_repo_url=git://github.com/jruby/jruby.git
 jruby_url=http://jruby.kenai.com/downloads
-macruby_version=nightly
+macruby_version=0.5
+macruby_url=http://www.macruby.org/files/
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://macruby.icoretech.org/latest/macruby_nightly-latest.pkg
-maglev_version=22780
+maglev_version=22816
 maglev_url=http://glass-downloads.gemstone.com/maglev
 maglev_repo_url=git://github.com/MagLev/maglev.git
 rubinius_repo_url=git://github.com/evanphx/rubinius.git

data/config/md5

@@ -28,6 +28,14 @@ GemStone-22683.Darwin-i386.tar.gz=62ff6be1a99ae708e97d6d43eb044e5a
 GemStone-22725.Darwin-i386.tar.gz=a183fd8dc593258a0ca067283414227a
 GemStone-22780.Darwin-i386.tar.gz=54d5c92153f9473e4f892f583706106c
 GemStone-22780.Linux-x86_64.tar.gz=97a511b4f4d835653d4a2c6ccef3e9e1
+GemStone-22804.Darwin-i386.tar.gz=0963cce504839169a601e27f916d101f
+GemStone-22804.Linux-x86_64.tar.gz=95058982c5d09a2ef77f4999a6683fbb
+MagLev-22804.Darwin-i386.tar.gz=930a85c821f8d80d22f2b53b03c18181
+MagLev-22804.Linux-x86_64.tar.gz=047d5b6404a5fbfad1c9a9243e6e67a7
+GemStone-22816.Darwin-i386.tar.gz=b12426c17b3925f1c8c7086a3285f15f
+GemStone-22816.Linux-x86_64.tar.gz=21d1e8e7a4b10ac8a1c199eb0cbfaec1
+MagLev-22816.Darwin-i386.tar.gz=b1b3e6530e90d7dcf36f81e097776643
+MagLev-22816.Linux-x86_64.tar.gz=424ca92c34cfce6d0da63170755b000c
 zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
 curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
 jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117

data/install

@@ -30,17 +30,23 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
+
+if [[ -z "$rvm_path" ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/rvm"
   else
-    rvm_path="$HOME/.rvm"
+    if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
+      rvm_path="$HOME/.rvm"
+    elif [[ -d "/usr/local/rvm" ]] && [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+      rvm_path="/usr/local/rvm"
+    else
+      rvm_path="$HOME/.rvm"
+    fi
   fi
 fi
 
 source scripts/initialize
-
 __rvm_initialize
 
 #
@@ -61,6 +67,7 @@ rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
 rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
+rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
@@ -152,7 +159,7 @@ if [[ "root" = "$(whoami)" ]] ; then
 fi
 
 echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-$rvm_scripts_path/notes
+./scripts/notes
 
 echo -e "$(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
 echo -e "\n$(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm "

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 3
+:patch: 5

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.3"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-01-24}
+  s.date = %q{2010-02-03}
   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

@@ -56,7 +56,7 @@ __rvm_parse_args() {
           unset rvm_gem_set_name ; shift
           export rvm_ruby_gem_home="$(echo $GEM_HOME | sed 's/%.*$//')"
           export GEM_HOME="$rvm_ruby_gem_home"
-          export GEM_PATH="$GEM_HOME"
+          export GEM_PATH="$rvm_ruby_gem_path"
           rvm_ruby_args="clear"
           rvm_parse_break=1
         elif [[ "delete" = "$1" ]] ; then

data/scripts/fetch

@@ -4,6 +4,15 @@ if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 
 trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
 
+record_md5() {
+  if [[ "Darwin" = "$(uname)" ]] ; then
+    archive_md5="$(md5 $archive | awk '{print $NF}')"
+  else
+    archive_md5="$(md5sum $archive | awk '{print $1}')"
+  fi
+  $rvm_scripts_path/db "$rvm_config_path/md5" "$archive" "$archive_md5"
+}
+
 if ! which curl &> /dev/null; then
   $rvm_scripts_path/log "fail" "rvm requires curl, which does not seem to exist in your path :("
   exit 1
@@ -11,7 +20,7 @@ else
   fetch_command="curl -O -L --create-dirs -C - " # -s for silent
 fi
 
-pushd "$rvm_archives_path" > /dev/null 2>&1
+builtin cd "$rvm_archives_path"
 
 if [[ -z "$1" ]] ; then $rvm_scripts_path/log "fail" "BUG: $0 called without an argument :/" ; exit 1 ; fi
 
@@ -60,11 +69,13 @@ if [[ $download -gt 0 ]] ; then
       result=$?
       if [[ $result -gt 0 ]] ; then
         $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
+      else
+        record_md5
       fi
     fi
-
+  else
+    record_md5
   fi
-  popd > /dev/null 2>&1
 fi
 
 exit $result

data/scripts/gems

@@ -25,7 +25,7 @@ __rvm_gems_dir() {
 __rvm_gems_list() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
-  $rvm_scripts_path/log "info" "Listing gems(ets) for $rvm_ruby_string found in $rvm_gem_path/"
+  $rvm_scripts_path/log "info" "gems(ets) : for $rvm_ruby_string (found in $rvm_gem_path/)"
 
   if [[ ! -z "$rvm_gem_path" ]] ; then
     if [[ ! -z $rvm_ruby_string ]] ; then
@@ -68,7 +68,7 @@ __rvm_gems_dump() {
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME ;
-    GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH ;
+    GEM_PATH="$rvm_ruby_gem_path" ; export GEM_PATH ;
   fi
 
   if [[ -z "$rvm_file_name" ]] ; then
@@ -100,7 +100,7 @@ __rvm_gems_load() {
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
-    export GEM_PATH="$rvm_ruby_gem_home"
+    export GEM_PATH="$rvm_ruby_gem_path"
   fi
 
   if [[ ! -z "$(echo "$gems_args" | awk '/\.gem.*$/')" ]] ; then
@@ -222,7 +222,7 @@ __rvm_gem_install() {
     if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
 
     if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ "$rvm_ruby_gem_home" != "$rvm_gem_path" ]] ; then
-      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix gem install $rvm_gem_options $gem $gem_postfix $vars"
+      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_path' $gem_prefix gem install $rvm_gem_options $gem $gem_postfix $vars"
     else
       command="$gem_prefix gem install $rvm_gem_options -q $gem $gem_postfix $vars"
     fi

data/scripts/initialize

@@ -11,14 +11,6 @@ if [[ ! -z "$rvm_archflags" ]] ; then rvm_make_flags_flag=1 ; fi
 rvm_project_rvmrc="${rvm_project_rvmrc:-1}"
 rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-0}"
 
-if [[ -z "$rvm_scripts_path" ]] ; then
-  if [[ -d "$HOME/.rvm/scripts" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
-    rvm_scripts_path="$HOME/.rvm/scripts"
-  elif [[ -d "$rvm_path/scripts" ]] && [[ -s "$rvm_path/scripts/rvm" ]]; then
-    rvm_scripts_path="$rvm_path/scripts"
-  fi
-fi
-
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"

data/scripts/install

@@ -30,17 +30,23 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
+
+if [[ -z "$rvm_path" ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/rvm"
   else
-    rvm_path="$HOME/.rvm"
+    if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
+      rvm_path="$HOME/.rvm"
+    elif [[ -d "/usr/local/rvm" ]] && [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+      rvm_path="/usr/local/rvm"
+    else
+      rvm_path="$HOME/.rvm"
+    fi
   fi
 fi
 
 source scripts/initialize
-
 __rvm_initialize
 
 #
@@ -61,6 +67,7 @@ rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
 rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
+rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
@@ -152,7 +159,7 @@ if [[ "root" = "$(whoami)" ]] ; then
 fi
 
 echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-$rvm_scripts_path/notes
+./scripts/notes
 
 echo -e "$(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
 echo -e "\n$(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm "

data/scripts/irbrc

@@ -5,5 +5,5 @@
 # ruby then edit this file. It will only be deleted if you do
 # an "rvm install" over this ruby version.
 
-require File.join(ENV["HOME"], ".rvm", "scripts", "irbrc")
+require File.join(ENV["rvm_path"], "scripts", "irbrc")
 

data/scripts/libraries

@@ -135,7 +135,7 @@ __rvm_install_llvm() {
   builtin cd "$rvm_src_path"
   if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
     rm -rf "$rvm_src_path/llvm"
-    svn co -r 82747 https://llvm.org/svn/llvm-project/llvm/trunk llvm
+    svn co -r 89156 https://llvm.org/svn/llvm-project/llvm/trunk llvm
     builtin cd "$rvm_src_path/llvm"
     ./configure --enable-bindings=none
     UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make -j2

data/scripts/manage

@@ -88,7 +88,7 @@ __rvm_install_source() {
   $rvm_scripts_path/log "info" "Installation of $rvm_ruby_string is complete."
 
   GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
-  GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH
+  GEM_PATH="$rvm_ruby_gem_path" ; export GEM_PATH
 
   __rvm_rubygems_setup
   __rvm_bin_script
@@ -127,7 +127,6 @@ __rvm_install_ruby() {
           result=$? ; if [[ "$result" -gt 0 ]] ; then
             $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
           fi
-
           mv "$rvm_archives_path/macruby_nightly-latest.pkg" "$rvm_archives_path/macruby_nightly.pkg"
           __rvm_run "macruby/extract" "sudo installer -pkg '$rvm_archives_path/macruby_nightly.pkg' -target '/'"
           mkdir -p "$rvm_ruby_home/bin"
@@ -140,9 +139,9 @@ __rvm_install_ruby() {
 #!/bin/bash
 
 GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
-GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH
+GEM_PATH="$rvm_ruby_gem_path" ; export GEM_PATH
 MY_RUBY_HOME="$rvm_ruby_home" ; export MY_RUBY_HOME
-PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH" ; export PATH
+PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home%global/bin:\$PATH" ; export PATH
 
 exec $macruby_path/mac$binary_name $prefix "\$@"
 RubyWrapper
@@ -315,9 +314,9 @@ RubyWrapper
 #!/usr/bin/env bash
 
 GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
-GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH
+GEM_PATH="$rvm_ruby_gem_path" ; export GEM_PATH
 MY_RUBY_HOME="$rvm_ruby_home" ; export MY_RUBY_HOME
-PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH" ; export PATH
+PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home%global/bin:\$PATH" ; export PATH
 
 exec $rvm_ruby_home/bin/rbx $prefix$binary_name "\$@"
 RubyWrapper
@@ -496,6 +495,7 @@ RubyWrapper
 
           builtin cd $rvm_ruby_src_path
 
+          # MONO_LIB=/Library/Frameworks/Mono.framework/Versions/current/lib/
           rvm_ruby_make="rake MERLIN_ROOT=\"$rvm_ruby_src_path/Merlin/Main\" compile mono=1 configuration=release --trace"
           __rvm_run "rake" "$rvm_ruby_make" "Building IronRuby..."
           if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
@@ -534,9 +534,9 @@ RubyWrapper
 #!/bin/bash
 
 GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
-GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH
+GEM_PATH="$rvm_ruby_gem_path" ; export GEM_PATH
 MY_RUBY_HOME="$rvm_ruby_home" ; export MY_RUBY_HOME
-PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH" ; export PATH
+PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home%global/bin:\$PATH" ; export PATH
 
 exec mono $rvm_ruby_home/bin/ir.exe $binary_path "\$@"
 RubyWrapper
@@ -613,7 +613,7 @@ RubyWrapper
       $rvm_scripts_path/log "info" "Installation of $rvm_ruby_string is complete."
 
       GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
-      GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH
+      GEM_PATH="$rvm_ruby_gem_path" ; export GEM_PATH
 
       __rvm_rubygems_setup
       __rvm_bin_script
@@ -809,7 +809,10 @@ __rvm_post_install() {
   $rvm_scripts_path/log "info" "Installing gems for $rvm_ruby_string."
 
   for rvm_gem_name in rake ; do
+    home="$GEM_HOME" ; export GEM_HOME="$rvm_ruby_global_gems_path"
+    path="$GEM_PATH" ; export GEM_PATH="$rvm_ruby_global_gems_path"
     __rvm_run "gems.install" "$rvm_ruby_home/bin/gem install $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name"
+    export GEM_HOME="$home" ; export GEM_PATH="$path" ; unset home path
   done ; unset rvm_gem_name
 
   $rvm_scripts_path/log "info" "Installation of gems for $rvm_ruby_string is complete."
@@ -822,6 +825,7 @@ __rvm_post_install() {
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$binary"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/$binary"
   fi ; unset binary
+  __rvm_irbrc
 }
 
 __rvm_rubygems_setup() {
@@ -830,19 +834,27 @@ __rvm_rubygems_setup() {
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
     cp $rvm_ruby_src_path/bin/gem $rvm_ruby_home/bin/gem
+    home="$GEM_HOME" ; export GEM_HOME="$rvm_ruby_global_gems_path"
+    path="$GEM_PATH" ; export GEM_PATH="$rvm_ruby_global_gems_path"
     __rvm_run "rubygems.update" "$rvm_ruby_home/bin/gem update --system" "Updating rubygems for $rvm_ruby_string"
+    export GEM_HOME="$home" ; export GEM_PATH="$path" ; unset home path
+
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
-
+    ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/1.$rvm_major_version"
   elif [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^rbx|jruby/')" ]] ; then
     (($rvm_debug_flag)) && $rvm_scripts_path/log "debug" "Skipping rubygems update for $rvm_ruby_version"
+    ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/jruby"
   else
     $rvm_scripts_path/log "info" "Installing rubygems dedicated to $rvm_ruby_string..."
     rvm_gem_package_name="rubygems-1.3.5"
     rvm_gem_url="http://rubyforge.org/frs/download.php/60718/$rvm_gem_package_name.tgz"
 
     # Sanity check...
-    if [[ ! -f "$rvm_src_path/$rvm_gem_package_name/setup.rb" ]]; then rm -rf "$rvm_src_path/$rvm_gem_package_name" ; fi
+    if [[ ! -f "$rvm_src_path/$rvm_gem_package_name/setup.rb" ]]; then
+      rm -rf "$rvm_src_path/$rvm_gem_package_name"
+    fi
+
     if [[ ! -d "$rvm_src_path/$rvm_gem_package_name" ]] ; then
       $rvm_scripts_path/log "info" "Retrieving $rvm_gem_package_name"
       $rvm_scripts_path/fetch "$rvm_gem_url"
@@ -852,16 +864,34 @@ __rvm_rubygems_setup() {
       mkdir -p "$rvm_src_path/$rvm_gem_package_name"
       __rvm_run "rubygems.extract" "cat $rvm_archives_path/$rvm_gem_package_name.tgz | gunzip | tar xf - -C $rvm_src_path" "Extracting $rvm_gem_package_name ..."
     fi
+
     builtin cd "$rvm_src_path/$rvm_gem_package_name"
-    __rvm_run "rubygems.install" "GEM_PATH=$rvm_gem_path GEM_HOME=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby $rvm_src_path/$rvm_gem_package_name/setup.rb" "Installing rubygems for $rvm_ruby_home/bin/ruby"
+
+    __rvm_run "rubygems.install" "GEM_PATH=$rvm_ruby_gem_path GEM_HOME=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby $rvm_src_path/$rvm_gem_package_name/setup.rb" "Installing rubygems for $rvm_ruby_home/bin/ruby"
     result=$?
     if [[ $result -eq 0 ]] ; then
       $rvm_scripts_path/log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
     else
       $rvm_scripts_path/log "warning" "Installation of rubygems $rvm_ruby_package_name did not complete successfully."
     fi
+
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
+
+    if [[ ! -z "$rvm_major_version" ]] ; then
+      ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/1.$rvm_major_version"
+    else
+      ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/$interpreter"
+    fi
   fi
+
+  # Add ruby's gem path to ruby's lib direcotry.
+  mkdir -p $(dirname $ruby_lib_gem_path)
+  if [[ -d "$ruby_lib_gem_path" ]] ; then
+    rm -rf "$ruby_lib_gem_path"
+  fi
+  ln -nfs "$rvm_ruby_gem_home" "$ruby_lib_gem_path"
+  unset ruby_lib_gem_path
+
   return $result
 }
 
@@ -878,9 +908,9 @@ __rvm_inject_gem_env() {
   __rvm_actual_file $1
   if [[ -f "$actual_file" ]] ; then
     if [[ ! -z "$(head -n 1 $actual_file | awk '/[j]*ruby/')" ]] ; then
-      string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_ruby_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_ruby_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:' + ENV['PATH']"
+      string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_ruby_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_ruby_gem_path'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:' + ENV['PATH']"
     elif [[ ! -z "$(head -n 1 $actual_file | awk '/bash/')" ]] ; then
-      string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_home'}\nPATH=$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH"
+      string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_path'}\nPATH=$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH"
     fi
     if [[ ! -z "$string" ]] ; then
       awk "NR==2 {print \"$string\"} {print}" "$actual_file" > "$actual_file.new"

data/scripts/notes

@@ -23,6 +23,7 @@ if [[ "Linux" = "$system" ]] ; then
   rvm_yum_binary="$(which yum 2> /dev/null)"
 
   echo -e "\n    $item curl is required.\n"
+  echo -e "\n    $item patch is required (for ree, some ruby head's).\n"
   if [[ ! -z "$rvm_apt_get_binary" ]] ; then
     echo -e "    $item For JRuby (if you wish to use it) you will need:"
     echo -e "\n       $ aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk"

data/scripts/rvm

@@ -18,19 +18,34 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
       if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
         rvm_path="$HOME/.rvm"
       elif [[ -d "/usr/local/rvm" ]] && [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
-        rvm_path="${rvm_path:-"/usr/local/rvm"}"
+        rvm_path="/usr/local/rvm"
+      else
+        rvm_path="$HOME/.rvm"
       fi
     fi
   fi
+
+  if [[ -z "$rvm_scripts_path" ]] || [[ ! -d "$rvm_scripts_path" ]] ; then
+    if [[ -d "$HOME/.rvm/scripts" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
+      rvm_scripts_path="$HOME/.rvm/scripts"
+    elif [[ -d "$rvm_path/scripts" ]] && [[ -s "$rvm_path/scripts/rvm" ]]; then
+      rvm_scripts_path="$rvm_path/scripts"
+    else
+      if [[ "root" = "$(whoami)" ]] ; then
+        rvm_scripts_path="/usr/local/rvm"
+      else
+        rvm_scripts_path="$HOME/.rvm"
+      fi
+    fi
+  fi
+
   if [[ -d "$rvm_path" ]] ; then
-    rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
     source $rvm_scripts_path/array
     source $rvm_scripts_path/utility
     source $rvm_scripts_path/initialize
     source $rvm_scripts_path/version
     source $rvm_scripts_path/selector
     source $rvm_scripts_path/cli
-    #source $rvm_scripts_path/gems
     source $rvm_scripts_path/libraries
     source $rvm_scripts_path/cd
 

data/scripts/rvm-install

@@ -30,17 +30,23 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
+
+if [[ -z "$rvm_path" ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/rvm"
   else
-    rvm_path="$HOME/.rvm"
+    if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
+      rvm_path="$HOME/.rvm"
+    elif [[ -d "/usr/local/rvm" ]] && [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+      rvm_path="/usr/local/rvm"
+    else
+      rvm_path="$HOME/.rvm"
+    fi
   fi
 fi
 
 source scripts/initialize
-
 __rvm_initialize
 
 #
@@ -61,6 +67,7 @@ rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
 rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
+rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
@@ -152,7 +159,7 @@ if [[ "root" = "$(whoami)" ]] ; then
 fi
 
 echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-$rvm_scripts_path/notes
+./scripts/notes
 
 echo -e "$(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
 echo -e "\n$(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm "

data/scripts/selector

@@ -30,9 +30,9 @@ __rvm_select() {
           rvm_ruby_package_file="$rvm_ruby_package_name"
         else
           __rvm_db "macruby_version" "rvm_ruby_version"
-          rvm_ruby_package_name="MacRuby%200.5%20beta%201.zip"
+          rvm_ruby_package_name="MacRuby%200.5.zip"
           rvm_ruby_package_file="$rvm_ruby_package_name"
-          rvm_url="http://www.macruby.org/files/MacRuby%200.5%20beta%201.zip"
+          rvm_url="http://www.macruby.org/files/$rvm_ruby_package_name"
         fi
 
         unset rvm_ruby_patch_level
@@ -225,8 +225,8 @@ __rvm_use() {
 
   if [[ "default" = "$rvm_ruby_interpreter" ]] ; then
 
-    new_path=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
-    new_path=$rvm_bin_path:$new_path
+    new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
+    new_path="$rvm_bin_path:$new_path"
 
     if [[ -s $rvm_config_path/default ]] ; then
       unset new_path
@@ -244,8 +244,8 @@ __rvm_use() {
   elif [[ "system" = "$rvm_ruby_interpreter" ]] ; then
 
     unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
-    new_path=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
-    new_path=$rvm_bin_path:$new_path
+    new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
+    new_path="$rvm_bin_path:$new_path"
     if [[ -s $rvm_config_path/system ]] ; then
       grep "MY_RUBY_HOME='$rvm_rubies_path" "$rvm_config_path/system" > /dev/null
       if [[ $? -eq 0 ]] ; then
@@ -268,10 +268,10 @@ __rvm_use() {
     export rvm_ruby_string="system"
 
   else
-    GEM_HOME=$rvm_ruby_gem_home
-    GEM_PATH=$rvm_ruby_gem_home
-    MY_RUBY_HOME=$rvm_ruby_home
-    RUBY_VERSION=$rvm_ruby_string
+    GEM_HOME="$rvm_ruby_gem_home"
+    GEM_PATH="$rvm_ruby_gem_path"
+    MY_RUBY_HOME="$rvm_ruby_home"
+    RUBY_VERSION="$rvm_ruby_string"
     IRBRC="$rvm_ruby_irbrc"
 
     export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
@@ -292,8 +292,8 @@ __rvm_use() {
       $rvm_scripts_path/log "info" "Now using $(echo $rvm_ruby_string | tr '-' ' ')"
     fi
 
-    new_path=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
-    new_path=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_bin_path:$new_path
+    new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
+    new_path="$MY_RUBY_HOME/bin:$GEM_HOME/bin:$GEM_HOME%global/bin:$rvm_bin_path:$new_path"
   fi
 
   if [[ ! -z "$rvm_default_flag" ]] && [[ "default" != "$rvm_ruby_interpreter" ]] ; then
@@ -313,7 +313,7 @@ __rvm_use() {
       RUBY_VERSION="$($rvm_ruby_home/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
       export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
 
-      echo "export PATH=\"$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_bin_path:\$PATH\"" > $rvm_config_path/default
+      echo "export PATH=\"$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home%global/bin:$rvm_bin_path:\$PATH\"" > $rvm_config_path/default
 
       for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name MAGLEV_HOME ; do
         eval "export $variable"

data/scripts/update

@@ -30,17 +30,23 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
+
+if [[ -z "$rvm_path" ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/rvm"
   else
-    rvm_path="$HOME/.rvm"
+    if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
+      rvm_path="$HOME/.rvm"
+    elif [[ -d "/usr/local/rvm" ]] && [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+      rvm_path="/usr/local/rvm"
+    else
+      rvm_path="$HOME/.rvm"
+    fi
   fi
 fi
 
 source scripts/initialize
-
 __rvm_initialize
 
 #
@@ -61,6 +67,7 @@ rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
 rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
+rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
@@ -152,7 +159,7 @@ if [[ "root" = "$(whoami)" ]] ; then
 fi
 
 echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-$rvm_scripts_path/notes
+./scripts/notes
 
 echo -e "$(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
 echo -e "\n$(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm "

data/scripts/utility

@@ -63,6 +63,7 @@ if [[ ! -z "$MAGLEV_HOME" ]] ; then echo "  MAGLEV_HOME: $MAGLEV_HOME" ; fi
 __rvm_debug() {
   $rvm_scripts_path/log "debug" "PATH:\n$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}')"
   $rvm_scripts_path/log "debug" "uname -a: $(uname -a)"
+  $rvm_scripts_path/log "debug" "permissions: $(ls -la $rvm_path{,/rubies})"
 
   if [[ "Darwin" = "$(uname)" ]] ; then
     $rvm_scripts_path/log "debug" "uname -r: $(uname -r)"
@@ -128,6 +129,7 @@ __rvm_run() {
     $rvm_scripts_path/log "debug" "Executing: $command"
   fi
 
+  mkdir -p "$(dirname "$rvm_ruby_log_path/$log_file_name.log")"
   touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :(
   echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee "$rvm_ruby_log_path/$log_file_name.log" >> "$rvm_ruby_log_path/$log_file_name.error.log"
   if [[ -z "$rvm_niceness" ]] || [[ "0" = "$rvm_niceness" ]] ; then
@@ -151,7 +153,7 @@ __rvm_cleanup_variables() {
 
 # Unset ruby-specific variables
 __rvm_unset_ruby_variables() {
-  unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_patch rvm_ruby_package_file rvm_ruby_package_name
+  unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_patch rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_gem_path
 }
 
 __rvm_load_rvmrc() {
@@ -178,9 +180,9 @@ ruby_wrapper=$(cat <<RubyWrapper
 #!/bin/bash
 
 GEM_HOME=$rvm_ruby_gem_home ; export GEM_HOME
-GEM_PATH=$rvm_ruby_gem_home ; export GEM_PATH
+GEM_PATH=$rvm_ruby_gem_path ; export GEM_PATH
 MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME
-PATH=$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH ; export PATH
+PATH=$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_bin_path:\$PATH ; export PATH
 
 exec "$rvm_ruby_binary" "\$@"
 RubyWrapper
@@ -234,8 +236,8 @@ __rvm_load_defaults() {
 # Reset any rvm gathered information about the system and its state.
 # rvm will refresh the stored information the next time it is called after reset.
 __rvm_reset() {
-  PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
-  PATH=$rvm_bin_path:$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
 
@@ -718,6 +720,8 @@ __rvm_make_flags() {
 __rvm_gems_select() {
   if [[ -z "$(which gem 2>/dev/null)" ]] ; then return 0 ; fi
 
+  rvm_ruby_global_gems_path="$rvm_gem_path/$rvm_ruby_string%global"
+
   if [[ -z "$rvm_gem_set_name" ]] ; then
     # No longer defaulting to 'sticky' gem sets.
     # Set 'rvm_sticky_gemsets=1' in ~/.rvmrc to enable.
@@ -747,6 +751,20 @@ __rvm_gems_select() {
   else
     rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_string%$rvm_gem_set_name"
   fi
+  rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
+
+  # Careful not to nuke system gems cache.
+  if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ ! -z "$(echo $rvm_ruby_gem_home | awk '/rvm/')" ]] ; then
+    # Global gems cache
+    mkdir -p "$rvm_ruby_gem_home"
+    if [[ ! -L "$rvm_ruby_gem_home/cache" ]] ; then
+      for file in "$rvm_ruby_gem_home"/cache/* ; do
+        mv $file "$rvm_gem_path/cache/" > /dev/null 2>&1
+      done
+      rm -rf "$rvm_ruby_gem_home/cache"
+      ln -nfs "$rvm_gem_path/cache" "$rvm_ruby_gem_home/cache"
+    fi
+  fi
 }
 
 # Use a gems(et) specified by 'rvm_ruby_gem_home'
@@ -756,10 +774,14 @@ __rvm_gems_use() {
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
       mkdir -p "$rvm_ruby_gem_home"
-      gem update --system
     fi
+
+    if [[ "$rvm_interactive" = 1 ]] ; then
+      $rvm_scripts_path/log "info" "gems(et) : ${rvm_gem_set_name:-default}"
+    fi
+
     GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
-    GEM_PATH="$GEM_HOME" ; export GEM_PATH
+    GEM_PATH="$rvm_ruby_gem_path" ; export GEM_PATH
     __rvm_use
   fi
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 -05:00
+date: 2010-02-03 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []