rvm 0.1.22 → 0.1.23

data/config/db

@@ -29,11 +29,11 @@ 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=22907
+maglev_version=22949
 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
 shyouhei_repo_url=git://github.com/shyouhei/ruby.git
 ironruby_version=1.0-rc2
 ironruby_repo_url=git://github.com/ironruby/ironruby.git
-ironruby_url=http://github.com/ironruby/ironruby/zipball/
+ironruby_url=http://github.com/ironruby/ironruby/tarball/

data/config/md5

@@ -47,6 +47,10 @@ GemStone-22907.Darwin-i386.tar.gz=c55d586da20dc4dd65da2e7f731f1d74
 GemStone-22907.Linux-x86_64.tar.gz=47c2d4527e3ea04715808048669d69ce
 MagLev-22907.Darwin-i386.tar.gz=8b7b351581611d076c7c9c1f90a04160
 MagLev-22907.Linux-x86_64.tar.gz=9f88d6bf8f607f5fdc1c476f7a6ab851
+GemStone-22949.Darwin-i386.tar.gz=2ac3417790bf813bab0632b1cf976109
+GemStone-22949.Linux-x86_64.tar.gz=5518cd8a8b8bd24d57cee04bc22fc7fa
+MagLev-22949.Darwin-i386.tar.gz=b90de35669eee6b270089606c0ceee58
+MagLev-22949.Linux-x86_64.tar.gz=4556d8b38e497124add43dcd24908bac
 MacRuby%200.5.zip=675454a8c7bc19d606d90a726e08427c
 jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
 jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 22
+:patch: 23

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.22"
+  s.version = "0.1.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-03-03}
+  s.date = %q{2010-03-04}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/manage

@@ -539,8 +539,10 @@ RubyWrapper
 
       builtin cd $rvm_ruby_src_path
 
+      $rvm_bin_path/rvm 1.8.7 -S gem install pathname2 --no-rdoc --no-ri
+
       # 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_ruby_make="$rvm_bin_path/rvm 1.8.7 -S 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
 

data/scripts/package

@@ -41,7 +41,7 @@ install_package() {
 
   unset configure_flags
 
-  if [[ "$rvm_uninstall_flag" -eq 1 ]] || [[ "$rvm_remove_flag" -eq 1 ]] ; then
+  if [[ "$action" = "uninstall" ]] ; then
     __rvm_run "$package/make.uninstall" "/usr/bin/make uninstall" "Uninstalling $package from $rvm_usr_path"
   else
     __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package in $rvm_src_path/$package-$version."
@@ -153,3 +153,4 @@ else
   $rvm_scripts_path/log "info" "Usage: 'rvm package {install,uninstall} {openssl,zlib,readline,iconv,ncurses}'"
   exit 1
 fi
+

data/scripts/utility

@@ -407,7 +407,7 @@ __rvm_list_known() {
   echo -e "jruby-1.2.0\njruby-1.3.1\njruby(-1.4.0) # the default\njruby-head"
   echo -e "rbx(-prc1) # 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"
-  echo -e "maglev(-22907)\nmaglev-head"
+  echo -e "maglev(-22949)\nmaglev-head"
   echo -e "mput(-head) # shyouhei head, the default mput"
   echo -e "ironruby-0.9.3\nironruby-1.0-rc2\nironruby-head"
   if [[ "Darwin" = "$(uname)" ]] ; then
@@ -668,18 +668,23 @@ __rvm_gemset_select() {
 
   # TODO: Remove next section after a several releases.
   # Migrate original rvm global gem cache directory to $HOME/.gem/cache
-  if [[ -d "$rvm_path/gems/cache" ]] && [[ ! -L "$rvm_path/gems/cache" ]] ; then
-    if [[ ! -z "$(ls -A "$rvm_path"/gems/cache/)" ]] ; then
-      mv $rvm_path/gems/cache/* $HOME/.gem/cache/
+  if [[ "$(whoami)" != "root" ]] ; then
+    if [[ -d "$rvm_path/gems/cache" ]] && [[ ! -L "$rvm_path/gems/cache" ]] ; then
+      if [[ ! -z "$(ls -A "$rvm_path"/gems/cache/)" ]] ; then
+        mv $rvm_path/gems/cache/* $HOME/.gem/cache/
+      fi
+      rmdir $rvm_path/gems/cache
     fi
-    rmdir $rvm_path/gems/cache
-  fi
 
-  # Some sanity checking.
-  if [[ ! -e "$rvm_gems_cache_path" ]] ; then mkdir -p $rvm_gems_cache_path ; fi
-  chmod u+w "$rvm_gems_cache_path"
-  rm -f "$rvm_gems_path/cache"
-  ln -nfs "$rvm_gems_cache_path" "$rvm_gems_path/cache"
+    # Some sanity checking.
+    if [[ ! -d "$rvm_gems_cache_path" ]] ; then
+      mkdir -p $rvm_gems_cache_path
+    fi
+    if [[ "$rvm_gems_cache_path"  != "$rvm_gems_path/cache" ]] ; then
+      rm -f "$rvm_gems_path/cache"
+      ln -nfs "$rvm_gems_cache_path" "$rvm_gems_path/cache"
+    fi
+  fi
   chmod u+w "$rvm_gems_cache_path"
   # /TODO
 
@@ -724,6 +729,7 @@ __rvm_gemset_use() {
     BUNDLE_PATH="$rvm_ruby_gem_home"
     GEM_PATH="$rvm_ruby_gem_home/bin:$(echo $GEM_HOME | sed 's/%.*$//')%global/bin"
     export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
+    __rvm_use
   fi
   return 0
 }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 22
-  version: 0.1.22
+  - 23
+  version: 0.1.23
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 -05:00
+date: 2010-03-04 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []