rvm 0.1.31 → 0.1.32

data/config/db

@@ -4,14 +4,13 @@ ruby_configure=--enable-shared
 interpreter=ruby
 ruby_version=1.8.6
 ruby_patchlevel=383
-rubygems_version=1.3.6
+rubygems_version=1.3.7
 rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
 rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
+rubygems_1.3.7_url=http://rubyforge.org/frs/download.php/70696
 rbx_version=1.0.0
-rbx_patch_level=rc5
-rbx_1.0.0_rc3_url=http://asset.rubini.us/rubinius-1.0.0-rc3-20100216.tar.gz
-rbx_1.0.0_rc4_url=http://asset.rubini.us/rubinius-1.0.0-rc4-20100331.tar.gz
-rbx_1.0.0_rc5_url=http://asset.rubini.us/rubinius-1.0.0-rc5-20100510.tar.gz
+rbx_1.0.0_patch_level=20100514
+rbx_url=http://asset.rubini.us
 ree_version=1.8.7
 ree_1.8.6_patch_level=20090610
 ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677

data/config/md5

@@ -1,6 +1,7 @@
 rubinius-1.0.0-rc1-20091125.tar.gz=c1cf037f05caf1bc962c09e220b435f4
 rubinius-1.0.0-rc4-20100331.tar.gz=c631131cc9542c548b4fc3791d8aa6b2
 rubinius-1.0.0-rc5-20100510.tar.gz=d4fbb5b01aaeee3948cbe1cd38236524
+rubinius-1.0.0-20100514.tar.gz=b05f4e791d3712c5a50b3d210dac6eb0
 ruby-1.8.5-p115.tar.gz=20ca6cc87eb077296806412feaac0356
 ruby-1.8.5-p231.tar.gz=e900cf225d55414bffe878f00a85807c
 ruby-1.8.6-p286.tar.gz=797ea136fe43e4286c9362ee4516674e
@@ -23,6 +24,8 @@ ruby-enterprise-1.8.6-20090610.tar.gz=0bf66ee626918464a6eccdd83c99d63a
 ruby-enterprise-1.8.7-2009.10.tar.gz=3727eef7b6b1b2f31db7d091328d966e
 ruby-enterprise-1.8.7-20090928.tar.gz=ae00018ce89d95419dfde370fcd485ac
 rubygems-1.3.5.tgz=6e317335898e73beab15623cdd5f8cff
+rubygems-1.3.6.tgz=789ca8e9ad1d4d3fe5f0534fcc038a0d
+rubygems-1.3.7.tgz=e85cfadd025ff6ab689375adbf344bbe
 MacRuby%200.5.zip=675454a8c7bc19d606d90a726e08427c
 MacRuby%200.6.zip=a80afd3700c88cf95c539fc63b272faf
 jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
@@ -38,7 +41,6 @@ readline-6.0.tar.gz=b7f65a48add447693be6e86f04a63019
 zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
 curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
 pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
-rubygems-1.3.6.tgz=789ca8e9ad1d4d3fe5f0534fcc038a0d
 ironruby-1.0.zip=7a92888837b3507355ed391dbfc0ab83
 GemStone-23464.Darwin-i386.tar.gz=9e5d393d3daecad39404644b5384fec0
 GemStone-23464.Linux-x86_64.tar.gz=93947d3b8dd651cf8b61753c2387cd19

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 31
+:patch: 32

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.31"
+  s.version = "0.1.32"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-05-12}
+  s.date = %q{2010-05-16}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby Environments.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -107,7 +107,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rvm}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby Version Manager (rvm)}
 
   if s.respond_to? :specification_version then

data/scripts/cli

@@ -42,6 +42,7 @@ __rvm_parse_args() {
 
       # Can likely remove this due to the *) case
       jruby|ree|macruby|rbx|rubinius|mput|shyouhei|ironruby|default|maglev|all)
+        if [[ "rubinius" = "$rvm_token" ]] ; then rvm_token="rbx"; fi
         rvm_ruby_interpreter="$rvm_token"
         rvm_ruby_string="$rvm_token"
         rvm_action="${rvm_action:-use}"

data/scripts/hook

@@ -1,12 +1,8 @@
 #!/usr/bin/env bash
 
-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
-
-if [[ ! -z "$1" ]] ; then
-  if [[ -s "$rvm_hooks_path/$1" ]] ; then
-    if [[ "$rvm_verbose_flag" -eq 1 ]] || [[ "$rvm_debug_flag" -eq 1 ]] ; then $rvm_scripts_path/log "info" "running hook $1" ; fi
-    source "$rvm_hooks_path/$1"
+if [[ ! -z "$rvm_hook" ]] ; then
+  if [[ -s "$rvm_hooks_path/$rvm_hook" ]] ; then
+    if [[ "$rvm_verbose_flag" -eq 1 ]] || [[ "$rvm_debug_flag" -eq 1 ]] ; then $rvm_scripts_path/log "info" "running hook $rvm_hook" ; fi
+    source "$rvm_hooks_path/$rvm_hook"
   fi
-fi
+fi ; unset rvm_hook

data/scripts/maglev

@@ -53,7 +53,7 @@ fi
 # Check that the current directory is writable
 if [[ ! -w "." ]]; then
   $rvm_scripts_path/log "error" "This script requires write permission on your current directory."
-  /bin/ls -ld $PWD
+  \ls -ld $PWD
   exit 1
 fi
 

data/scripts/manage

@@ -7,7 +7,7 @@ source $rvm_scripts_path/initialize
 source $rvm_scripts_path/utility
 source $rvm_scripts_path/selector
 
-trap "rm -f $rvm_tmp_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
+trap "rm -rf ${rvm_tmp_path}/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
 
 if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 
@@ -267,19 +267,20 @@ RubyWrapper
       PATH=$rvm_bin_path:$PATH ; export PATH
 
       if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.0/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
-        if [[ ! -f "$rvm_archives_path/$rvm_ruby_package_file.tar.gz" ]] ; then
+        if [[ ! -f "$rvm_archives_path/$rvm_ruby_package_file" ]] ; then
           $rvm_scripts_path/log "info" "Downloading $rvm_ruby_file, this may take a while depending on your connection..."
           $rvm_scripts_path/fetch "$rvm_url"
           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
         fi
-        __rvm_run "extract" "cat $rvm_archives_path/$(basename $rvm_url) | gunzip | tar xf - -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
+        __rvm_run "extract" "cat $rvm_archives_path/$(basename $rvm_ruby_package_file) | gunzip | tar xf - -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
 
         result=$? ; if [[ "$result" -gt 0 ]] ; then
           $rvm_scripts_path/log "error" "There has been an error while trying to extract the source. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
-        mv "$rvm_src_path/rubinius-$rvm_ruby_version-${rvm_ruby_patch_level/^p//}" $rvm_ruby_src_path
+
+        mv $rvm_src_path/rubinius-${rvm_ruby_version} ${rvm_ruby_src_path}
       else
         __rvm_db "rubinius_repo_url" "rvm_ruby_repo_url"
         #rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version"
@@ -301,6 +302,7 @@ RubyWrapper
       #fi
 
       builtin cd "$rvm_ruby_src_path" ; chmod +x ./configure
+      rvm_ruby_configure_flags="${rvm_ruby_configure_flags:-"--skip-system"}"
       rvm_ruby_configure="./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags" ; message="Configuring rbx"
       if [[ "$rvm_llvm_flag" = "0" ]] ; then
         rvm_ruby_configure="$rvm_ruby_configure --disable-llvm"
@@ -679,7 +681,7 @@ RubyWrapper
 
   esac
 
-  $rvm_scripts_path/hook "after_install"
+  rvm_hook="after_install" ; source $rvm_scripts_path/hook
 
   if [[ ! -z "$ruby_options" ]] ; then RUBYOPT=$ruby_options ; export RUBYOPT ; fi
 }
@@ -1066,4 +1068,3 @@ __rvm_manage_rubies() {
 rvm_action="$1" ; rubies_string="$2"
 __rvm_manage_rubies
 exit $?
-

data/scripts/notes

@@ -21,7 +21,7 @@ if [[ "Linux" = "$system" ]] ; then
     echo -e "\n       $ aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk"
 
     echo -e "\n    $item For MRI & ree (if you wish to use it) you will need:"
-    echo -e "\n       $ aptitude install curl bison build-essential zlib1g zlib1g-dev libssl-dev libreadline5-dev libreadline6-dev libxml2-dev git-core subversion"
+    echo -e "\n       $ aptitude install curl bison build-essential zlib1g zlib1g-dev libssl-dev libreadline5-dev libreadline6-dev libxml2-dev git-core subversion autoconf"
 
     echo -e "\n    $item For IronRuby (if you wish to use it) you will need:"
     echo -e "\n       $ aptitude install curl mono-2.0-devel"

data/scripts/package

@@ -107,7 +107,7 @@ autoconf() {
   package_url="ftp.gnu.org/gnu/autoconf"
   package="autoconf" ; version="2.65" ; archive_format="tar.gz"
 
-  prefix_path="${rvm_symlink_path:-"${rvm_path:-"$HOME/.rvm"}/bin"}"
+  prefix_path="${rvm_symlink_path:-"${rvm_path:-"$HOME/.rvm"}"}"
   install_package
 }
 

data/scripts/selector

@@ -43,19 +43,19 @@ __rvm_select() {
     ;;
 
     rbx|rubinius)
+      rvm_archive_extension="tar.gz"
       rvm_ruby_interpreter="rbx"
       rvm_ruby_version=${rvm_ruby_version:-$(__rvm_db "rbx_version")}
       rvm_ruby_repo_url=${rvm_rbx_repo_url:-$(__rvm_db "rubinius_repo_url")}
-      __rvm_db "rbx_${rvm_ruby_version}_${rvm_ruby_patch_level}_url" "rvm_url"
       if [[ -z "$rvm_head_flag" ]] ; then
         rvm_ruby_patch_level=${rvm_ruby_patch_level:-$(__rvm_db "rbx_patch_level")}
-        rvm_ruby_string="$rvm_ruby_interpreter-$rvm_ruby_version-p$rvm_ruby_patch_level"
         rvm_ruby_string="${rvm_ruby_string/-prc/-rc}"
-        rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-pp#-p#')"
-        rvm_ruby_file="rubinius-$rvm_ruby_version-$rvm_ruby_patch_level"
+        rvm_ruby_string="$(echo "$rvm_ruby_string" | sed 's#-p*#-#')"
+        rvm_ruby_package_file="$(echo "rubinius-${rvm_ruby_version}-${rvm_ruby_patch_level}.${rvm_archive_extension}" | sed 's#-p*#-#' )"
+        __rvm_db "rbx_url" "rvm_url"
+        rvm_url="$rvm_url/$rvm_ruby_package_file"
       else
-        unset rvm_ruby_patch_level
-        unset rvm_ruby_version
+        unset rvm_ruby_patch_level rvm_ruby_version
         rvm_ruby_string="$rvm_ruby_interpreter-head"
       fi
     ;;
@@ -356,7 +356,7 @@ __rvm_use() {
     fi
   fi
 
-  $rvm_scripts_path/hook "after_use"
+  rvm_hook="after_use" ; source $rvm_scripts_path/hook
 }
 
 __rvm_ruby_string() {
@@ -411,6 +411,8 @@ __rvm_ruby_string() {
       if [[ "ree" = "$rvm_ruby_interpreter" ]] ; then
         rvm_ruby_patch_level="$string"
         unset rvm_ruby_revision
+      elif [[ "rbx" = "$rvm_ruby_interpreter" ]] ; then
+        rvm_ruby_patch_level="$string"
       elif [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
         rvm_ruby_version="$string"
         unset rvm_ruby_revision rvm_ruby_patch_level
@@ -480,11 +482,21 @@ __rvm_ruby_string() {
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_user_tag}"
   else
     patch_level="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
-    if [[ ! -z "$patch_level" ]] ; then rvm_ruby_patch_level="p${patch_level}" ; fi
+    if [[ ! -z "$patch_level" ]] ; then
+      if [[ "ree" = "$rvm_ruby_interpreter" ]] || [[ "rbx" = "$rvm_ruby_interpreter" ]] ; then
+        rvm_ruby_patch_level="${patch_level}"
+      else
+        rvm_ruby_patch_level="p${patch_level}"
+      fi
+    fi
     if [[ ! -z "$rvm_ruby_patch_level" ]] ; then
       rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^pp#p#')"
       rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
-      rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-pp#-p#')"
+      if [[ "ree" = "$rvm_ruby_interpreter" ]] || [[ "rbx" = "$rvm_ruby_interpreter" ]] ; then
+        rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-p*#-#')"
+      else
+        rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-pp#-p#')"
+      fi
     fi
   fi
 }

data/scripts/set

@@ -172,6 +172,6 @@ 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
 
-$rvm_scripts_path/hook "after_do"
+rvm_hook="after_do" ; source $rvm_scripts_path/hook
 
 exit ${#errors[*]}

data/scripts/utility

@@ -85,7 +85,7 @@ __rvm_debug() {
   __rvm_environment_info
   $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})"
+  $rvm_scripts_path/log "debug" "permissions: $(\ls -la $rvm_path{,/rubies})"
 
   if [[ "Darwin" = "$(uname)" ]] ; then
     $rvm_scripts_path/log "debug" "uname -r: $(uname -r)"
@@ -419,7 +419,7 @@ __rvm_list_known() {
     echo "${prefix}-t${tag/\//}"
     unset prefix tag
   done < <(svn list http://svn.ruby-lang.org/repos/ruby/tags/ | awk '/^v1_[8|9]/')
-  echo -e "(ruby-)1.8.6(-p399)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p249)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1(-p376)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1\nruby-head\n"
+  echo -e "(ruby-)1.8.6(-p399)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p249)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1(-p376)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1\n(ruby-)1.9.2-head\nruby-head\n"
   echo -e "jruby-1.2.0\njruby-1.3.1\njruby-1.4.0\njruby(-1.5.0) # the default\njruby-head"
   echo -e "rbx(-prc5) # default\nrbx-head"
   echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
@@ -464,7 +464,7 @@ __rvm_list_rubies() {
   if [[ ! -z "$system_ruby" ]] && [[ -x "$system_ruby" ]] ; then
     echo -e "\nSystem Ruby\n"
     system_version=$($system_ruby -v)
-    binary=$(ls -l "$system_ruby" | awk '{print $NF}') # Account for symbolic links.
+    binary=$(\ls -l "$system_ruby" | awk '{print $NF}') # Account for symbolic links.
     string="[ $(file $binary | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
 
     if [[ ! -z "$system_ruby" ]] && [[ "$current_ruby" = "$system_version" ]] ; then echo -n "=> " ; else echo -n "   " ; fi
@@ -526,7 +526,7 @@ __rvm_update_rvm() {
   fi
 
   __rvm_pushpop
-  $rvm_scripts_path/hook "after_update"
+  rvm_hook="after_update" ; source $rvm_scripts_path/hook
 }
 
 __rvm_reboot() {
@@ -601,7 +601,7 @@ __rvm_inspect() {
 __rvm_make_flags() {
   # This is only an issue with Darwin :/
   if [[ "Darwin" = "$(uname)" ]] ; then
-    # ls /usr/lib/gcc/x86_64-apple-darwin10
+    # \ls /usr/lib/gcc/x86_64-apple-darwin10
 
     # Set the build & host type
     if [[ "Power Macintosh" = "$(sysctl hw.machine | awk -F: '{print $2}' | sed 's/^ //')" ]] ; then
@@ -714,7 +714,7 @@ __rvm_gemset_select() {
     # If there is a cache *directory* already,
     # move all the gems to the global cache directory and remove it.
     if [[ -d "$rvm_ruby_gem_home/cache" ]] && [[ ! -L "$rvm_ruby_gem_home/cache" ]] ; then
-      if [[ ! -z "$(ls -A "$rvm_ruby_gem_home"/cache/)" ]] ; then
+      if [[ ! -z "$(\ls -A "$rvm_ruby_gem_home"/cache/)" ]] ; then
         mv "$rvm_ruby_gem_home"/cache/* "$HOME"/.gem/cache/
       fi
       rmdir "$rvm_ruby_gem_home"/cache

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 31
-  version: 0.1.31
+  - 32
+  version: 0.1.32
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 -04:00
+date: 2010-05-16 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []