rvm 0.1.2 → 0.1.3

data/config/db

@@ -25,7 +25,7 @@ jruby_url=http://jruby.kenai.com/downloads
 macruby_version=nightly
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://macruby.icoretech.org/latest/macruby_nightly-latest.pkg
-maglev_version=22725
+maglev_version=22780
 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

@@ -21,9 +21,13 @@ rubygems-1.3.5.tgz=6e317335898e73beab15623cdd5f8cff
 MagLev-22683.Darwin-i386.tar.gz=bf58b17bc2ca62ac0ca9304e8909985c
 MagLev-22725.Darwin-i386.tar.gz=31f615a51c1bd02b002ba502d3af6b9b
 MagLev-22725.Linux-x86_64.tar.gz=b20d1ccf2071537c66d382079db947ae
+MagLev-22780.Darwin-i386.tar.gz=e0a23dff3a9c67a6873faf4b82727bd9
+MagLev-22780.Linux-x86_64.tar.gz=63e3acc32ef49c8198c811fcc29c52de
 GemStone-22725.Linux-x86_64.tar.gz=41747ab3ff3207a007026a8161e286bc
 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
 zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
 curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
 jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117

data/lib/VERSION.yml

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

data/rvm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]

data/scripts/manage

@@ -708,18 +708,25 @@ __rvm_fetch_ruby() {
         fi
       fi
     else
-      if [[ ! -z "$rvm_head_flag" ]] || [[  "trunk" = "$rvm_ruby_revision" ]] ; then
-        rvm_url="${rvm_url:-"$rvm_ruby_repo_url/trunk"}"
-        rvm_rev=""
-      elif [[ ! -z "$rvm_ruby_tag" ]] ; then
+      if [[ ! -z "$rvm_ruby_tag" ]] ; then
         # TODO: Check if tag v is valid
         rvm_url="${rvm_url:-"$rvm_ruby_repo_url/tags/$(echo $rvm_ruby_tag | sed 's/^t//')"}"
-        rvm_rev=""
-      elif [[ "$rvm_major_version.$rvm_minor_version" = "8.8" ]] ; then
+      elif [[ -z "$rvm_ruby_version" ]] && [[ ! -z "$rvm_head_flag" ]] ; then
+        rvm_url="${rvm_url:-"$rvm_ruby_repo_url/trunk"}"
+      elif [[  "$rvm_major_version" = "9" ]] ; then
+        if [[ -z "$rvm_minor_version" ]] || [[ "$rvm_minor_version" = 2 ]] ; then
+          rvm_url="${rvm_url:-"$rvm_ruby_repo_url/trunk"}"
+        else
+          rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}"}"
+        fi
+      elif [[ -z "$rvm_minor_version" ]] || [[ "$rvm_major_version.$rvm_minor_version" = "8.8" ]] ; then
         rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}"}"
-        rvm_rev="-$rvm_ruby_revision"
       else
         rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}"}"
+      fi
+
+      rvm_rev=""
+      if [ ! -z "$rvm_ruby_revision" ] ; then
         rvm_rev="-$rvm_ruby_revision"
       fi
 

data/scripts/selector

@@ -153,8 +153,11 @@ __rvm_select() {
     ;;
 
     ruby)
-      rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "ruby_repo_url")"}"
-      if [[ -z "$rvm_ruby_version" ]] ; then $rvm_scripts_path/log "fail" "Unknown ruby version: $rvm_ruby_version" ; fi
+      if [[ -z "$rvm_ruby_version" ]]  && [[ -z "$rvm_head_flag" ]]; then
+        $rvm_scripts_path/log "fail" "Unknown ruby version: $rvm_ruby_version"
+      else
+        rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "ruby_repo_url")"}"
+      fi
     ;;
 
     current)
@@ -385,8 +388,6 @@ __rvm_ruby_string() {
     elif $rvm_scripts_path/match "$string" "^rc[0-9]" ; then
       rvm_ruby_patch_level="$string"
     elif $rvm_scripts_path/match "$string" "^[0-9]\.[0-9]" ; then
-      if [[ "1.8" = "$string" ]] ; then string="1.8.6" ; fi
-      if [[ "1.9" = "$string" ]] ; then string="1.9.1" ; fi
       rvm_ruby_version="$string"
       unset rvm_ruby_revision rvm_ruby_tag
     elif $rvm_scripts_path/match "$string" "^p[0-9]" ; then

data/scripts/utility

@@ -754,7 +754,10 @@ __rvm_gems_use() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
-    mkdir -p "$rvm_ruby_gem_home"
+    if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
+      mkdir -p "$rvm_ruby_gem_home"
+      gem update --system
+    fi
     GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
     GEM_PATH="$GEM_HOME" ; export GEM_PATH
     __rvm_use

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Wayne E. Seguin