rvm 0.0.999 → 0.0.9999

data/config/db

@@ -1,20 +1,12 @@
 niceness=0
 ruby_repo_url=http://svn.ruby-lang.org/repos/ruby
-rubinius_repo_url=git://github.com/evanphx/rubinius.git
-shyouhei_repo_url=git://github.com/shyouhei/ruby.git
-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
-jruby_version=1.4.0
-jruby_repo_url=git://github.com/jruby/jruby.git
-jruby_url=http://jruby.kenai.com/downloads/
-ironruby_version=0.9.3
-ironruby_repo_url=git://github.com/ironruby/ironruby.git
-ironruby_url=http://cloud.github.com/downloads/nrk/ironruby/
 ruby_configure=--enable-shared
 interpreter=ruby
 ruby_version=1.8.6
 ruby_patchlevel=383
+rbx_version=1.0.0
+rbx_patch_level=rc2
+rbx_url=http://asset.rubini.us/rubinius-1.0.0-rc2-20100104.tar.gz
 ree_version=1.8.7
 ree_1.8.6_patch_level=20090610
 ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677
@@ -22,11 +14,22 @@ ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
 ree_1.8.7_url=http://rubyforge.org/frs/download.php/66162
 ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
 ree_1.8.7_patch_level=2009.10
-rbx_version=1.0.0
-rbx_patch_level=rc2
-rbx_url=http://asset.rubini.us/rubinius-1.0.0-rc2-20100104.tar.gz
-ruby_1.9.1_patch_level=376
+ruby_1.9.1_patch_level=378
 ruby_1.9.2_patch_level=preview1
 ruby_1.8.5_patch_level=231
 ruby_1.8.6_patch_level=383
 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_repo_url=git://git.macruby.org/macruby/MacRuby.git
+macruby_nightly_url=http://macruby.icoretech.org/latest/macruby_nightly-latest.pkg
+maglev_version=22710
+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=0.9.3
+ironruby_repo_url=git://github.com/ironruby/ironruby.git
+ironruby_url=http://cloud.github.com/downloads/nrk/ironruby/

data/config/md5

@@ -1,11 +1,3 @@
-curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
-jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
-jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7
-libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
-ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
-openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3
-readline-5.2.tar.gz=e39331f32ad14009b9ff49cc10c5e751
-readline-6.0.tar.gz=b7f65a48add447693be6e86f04a63019
 rubinius-1.0.0-rc1-20091125.tar.gz=c1cf037f05caf1bc962c09e220b435f4
 ruby-1.8.5-p115.tar.gz=20ca6cc87eb077296806412feaac0356
 ruby-1.8.5-p231.tar.gz=e900cf225d55414bffe878f00a85807c
@@ -15,12 +7,25 @@ ruby-1.8.6-p369.tar.gz=8c140ae28b4c3947b92dfad69109d90b
 ruby-1.8.6-p383.tar.gz=4f49544d4a4d0d34e9d86c41e853db2e
 ruby-1.8.7-p160.tar.gz=945398f97e2de6dd8ab6df68d10bb1a1
 ruby-1.8.7-p174.tar.gz=18dcdfef761a745ac7da45b61776afa5
+ruby-1.8.7-p248.tar.gz=60a65374689ac8b90be54ca9c61c48e3
 ruby-1.9.1-p129.tar.gz=c71f413514ee6341c627be2957023a5c
 ruby-1.9.1-p243.tar.gz=515bfd965814e718c0943abf3dde5494
 ruby-1.9.1-p376.tar.gz=ebb20550a11e7f1a2fbd6fdec2a3e0a3
+ruby-1.9.1-p376.tar.gz=ebb20550a11e7f1a2fbd6fdec2a3e0a3
+ruby-1.9.1-p378.tar.gz=9fc5941bda150ac0a33b299e1e53654c
 ruby-1.9.2-preview1.tar.gz=e2b8cdbf300f53472be09699a5837fd1
 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
+MagLev-22683.Darwin-i386.tar.gz=bf58b17bc2ca62ac0ca9304e8909985c
+GemStone-22683.Darwin-i386.tar.gz=62ff6be1a99ae708e97d6d43eb044e5a
 zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
+curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
+jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
+jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7
+libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
+ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
+openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3
+readline-5.2.tar.gz=e39331f32ad14009b9ff49cc10c5e751
+readline-6.0.tar.gz=b7f65a48add447693be6e86f04a63019

data/install

@@ -28,8 +28,8 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+if [[ -s /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
+if [[ -s "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
 if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   unset rvm_path

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 999
+:patch: 9999

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.999"
+  s.version = "0.0.9999"
 
   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-07}
+  s.date = %q{2010-01-16}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
      "scripts/irbrc.rb",
      "scripts/libraries",
      "scripts/log",
+     "scripts/maglev",
      "scripts/manage",
      "scripts/match",
      "scripts/md5",

data/scripts/cd

@@ -1,13 +1,14 @@
 #!/usr/bin/env bash
 
 # Source a .rvmrc file in a directory after changing to it, if it exists.
-cd() {
-  builtin cd "$@"
-  if [[ "$rvm_project_rvmrc" != 0 ]] ; then
+# To disable this fature, set rvm_project_rvmrc=0 in $HOME/.rvmrc
+if [[ "$rvm_project_rvmrc" != 0 ]] ; then
+  cd() {
+    builtin cd "$@"
     local cwd ; cwd=$(pwd)
     while : ; do
       if [[ -z "$cwd" ]] || [[ "$HOME" = "$cwd" ]] || [[ "/" = "$cwd" ]] ; then
-        if [[ "$rvm_project_rvmrc_default" != 0 ]] ; then
+        if [[ "$rvm_project_rvmrc_default" = 1 ]] ; then
           rvm default 1>/dev/null 2>&1
         fi
         break
@@ -20,6 +21,5 @@ cd() {
         fi
       fi
     done
-  fi
-}
-
+  }
+fi

data/scripts/cli

@@ -40,7 +40,8 @@ __rvm_parse_args() {
         rvm_ruby_string="$rvm_token"
       ;;
 
-      jruby|ree|macruby|rbx|rubinius|mput|shyouhei|ironruby|default|all)
+      # Can likely remove this due to the *) case
+      jruby|ree|macruby|rbx|rubinius|mput|shyouhei|ironruby|default|maglev|all)
         rvm_ruby_interpreter="$rvm_token"
         rvm_ruby_string="$rvm_token"
         rvm_action="${rvm_action:-use}"
@@ -116,7 +117,7 @@ __rvm_parse_args() {
               rvm_ruby_version=$(echo "$1" | tr ',' ' ') ; shift
               unset rvm_ruby_interpreter
             else
-              if $rvm_scripts_path/match "ruby rbx jruby macruby ree rubinius mput shyouhei ironruby" "$1" ; then
+              if $rvm_scripts_path/match "ruby rbx jruby macruby ree rubinius maglev mput shyouhei ironruby" "$1" ; then
                 rvm_ruby_interpreter=$1 ; shift
               else
                 unset rvm_ruby_interpreter rvm_ruby_version

data/scripts/gems

@@ -130,10 +130,12 @@ __rvm_gems_load() {
 
     while read -r line
     do # Keep this on 2nd line :(
-      __rvm_gem_install $line
-    done < <(awk '/^[\.\/a-zA-Z]/{print}' "$rvm_file_name")
+      if [[ ! -z "$(echo $line | sed 's/\s//g')" ]] ; then
+        __rvm_gem_install $line
+      fi
+    done < <(awk '/^[^#]+/{print}' "${rvm_file_name}")
   else
-    $rvm_scripts_path/log "error" "$rvm_file_name does not exist to load from."
+    $rvm_scripts_path/log "error" "${rvm_file_name} does not exist to load from."
   fi
 }
 
@@ -173,7 +175,7 @@ __rvm_gem_install() {
   __rvm_parse_gem_line $*
 
   installed_gems="$(ls ${rvm_ruby_gem_home}/specifications/ 2>/dev/null)"
-  if [[ -z "$rvm_force_flag" ]] && [[ ! -z "$(echo $installed_gems | awk '/'${gem_file_name}spec'/')" ]] ; then
+  if [[ -z "$rvm_force_flag" ]] && [[ ! -z "$(echo $installed_gems | awk '/'$(basename $gem_file_name)'spec/')" ]] ; then
     unset gem
     $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$yellow exists, skipping (--force to re-install)"
   else
@@ -256,7 +258,7 @@ if [[ -z "$(which gem 2>/dev/null)" ]] ; then
   return 1
 fi
 
-action="$1" ; shift
+action="$(echo $* | awk '{print $1}')" ; shift
 gems_args="$*"
 
 if [[ "load" = "$action" ]] ; then

data/scripts/install

@@ -28,8 +28,8 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+if [[ -s /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
+if [[ -s "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
 if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   unset rvm_path

data/scripts/maglev

@@ -0,0 +1,196 @@
+#!/usr/bin/env bash
+
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; fi
+
+system="$(uname -s)"
+if [[ $system = "SunOS" ]] && [[ "$(uname -m)" = "i86pc" ]] ; then OS="Solaris-x86" ; fi
+version="MagLev-${1}.${system}"
+gsname="GemStone-${1}.${system}"
+zipfile=${version}.zip
+
+# Check we're on a suitable 64-bit machine
+case "$system" in
+  Linux)
+  if [[ "$(uname -sm)" != "Linux x86_64" ]]; then
+    $rvm_scripts_path/log "error" "This script only works on a 64-bit Linux OS."
+    echo "The result from \"uname -sm\" is \"`uname -sm`\" not \"Linux x86_64\""
+    exit 1
+  fi
+  ;;
+  Darwin)
+  system_version="$(sw_vers -productVersion)"
+  MAJOR="$(echo $system_version | cut -f1 -d.)"
+  MINOR="$(echo $system_version | cut -f2 -d.)"
+  CPU_TYPE="$(uname -p)"
+  CPU_CAPABLE="$(sysctl hw.cpu64bit_capable | cut -f2 -d' ')"
+  #
+  # Check the CPU and Mac OS profile.
+  if [[ $CPU_TYPE != "i386" || $CPU_CAPABLE -ne 1 || $MAJOR -lt 10 || $MINOR -lt 5 ]] ; then
+    $rvm_scripts_path/log "error" "This script requires Mac OS 10.5 or later on a 64-bit Intel CPU."
+    exit 1
+  fi
+  ;;
+  Solaris-x86)
+  if [[ "$(uname -sm)" != "SunOS i86pc" ]]; then
+    $rvm_scripts_path/log "error" "This script only works on a 64-bit Solaris-x86 OS."
+    echo "The result from \"uname -sm\" is \"`uname -sm`\" not \"SunOS i86pc\""
+    exit 1
+  fi
+  ;;
+  *)
+  $rvm_scripts_path/log "error" "This script only works on a 64-bit Linux, Mac OS X, or Solaris-x86 machine"
+  echo "The result from \"uname -sm\" is \"`uname -sm`\""
+  exit 1
+  ;;
+esac
+
+# We should run this as a normal user, not root.
+if [[ `id | cut -f2 -d= | cut -f1 -d\(` -eq 0 ]]; then
+  $rvm_scripts_path/log "error" "This script should be run as a normal user, not root."
+  exit 1
+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
+  exit 1
+fi
+
+# We're good to go. Let user know.
+machine_name="`uname -n`"
+$rvm_scripts_path/log "info" "Starting installation of $version on $machine_name"
+
+# Do a trivial sudo to test we can and get the password prompt out of the way
+sudo date
+
+# Figure out how much total memory is installed
+$rvm_scripts_path/log "info" "Setting up shared memory"
+#
+# Ref: http://wiki.finkproject.org/index.php/Shared_Memory_Regions_on_Darwin
+# Ref: http://developer.postgresql.org/pgdocs/postgres/kernel-resources.html
+# Ref: http://www.idevelopment.info/data/Oracle/DBA_tips/Linux/LINUX_8.shtml
+#
+case "$system" in
+  Linux)
+  # use TotalMem: kB because Ubuntu doesn't have Mem: in Bytes
+  totalMemKB=`awk '/MemTotal:/{print($2);}' /proc/meminfo`
+  totalMem=$(($totalMemKB * 1024))
+  # Figure out the max shared memory segment size currently allowed
+  shmmax=`cat /proc/sys/kernel/shmmax`
+  # Figure out the max shared memory currently allowed
+  shmall=`cat /proc/sys/kernel/shmall`
+  ;;
+  Darwin)
+  totalMem="`sysctl hw.memsize | cut -f2 -d' '`"
+  # Figure out the max shared memory segment size currently allowed
+  shmmax="`sysctl kern.sysv.shmmax | cut -f2 -d' '`"
+  # Figure out the max shared memory currently allowed
+  shmall="`sysctl kern.sysv.shmall | cut -f2 -d' '`"
+  ;;
+  Solaris-x86)
+  # TODO: figure memory needs for Solaris-x86
+  # Investigate project.max-shm-memory
+  totalMemMB="`/usr/sbin/prtconf | grep Memory | cut -f3 -d' '`"
+  totalMem=$(($totalMemMB * 1048576))
+  shmmax=$(($totalMem / 4))
+  shmall=$(($shmmax / 4096))
+  ;;
+  *)
+  $rvm_scripts_path/log "error" "Can't determine operating system. Check script."
+  exit 1
+  ;;
+esac
+totalMemMB=$(($totalMem / 1048576))
+shmmaxMB=$(($shmmax / 1048576))
+shmallMB=$(($shmall / 256))
+
+# Print current values
+echo "  Total memory available is $totalMemMB MB"
+echo "  Max shared memory segment size is $shmmaxMB MB"
+echo "  Max shared memory allowed is $shmallMB MB"
+
+# Figure out the max shared memory segment size (shmmax) we want
+# Use 75% of available memory but not more than 2GB
+shmmaxNew=$(($totalMem * 3/4))
+[[ $shmmaxNew -gt 2147483648 ]] && shmmaxNew=2147483648
+shmmaxNewMB=$(($shmmaxNew / 1048576))
+
+# Figure out the max shared memory allowed (shmall) we want
+# The Darwin (OSX) default is 4MB, way too small
+# The Linux default is 2097152 or 8GB, so we should never need this
+# but things will certainly break if it's been reset too small
+# so ensure it's at least big enough to hold a fullsize shared memory segment
+shmallNew=$(($shmmaxNew / 4096))
+[[ $shmallNew -lt $shmall ]] && shmallNew=$shmall
+shmallNewMB=$(($shmallNew / 256))
+
+# Increase shmmax if appropriate
+if [[ $shmmaxNew -gt $shmmax ]]; then
+  $rvm_scripts_path/log "info" "Increasing max shared memory segment size to $shmmaxNewMB MB"
+  [[ $system = "Darwin" ]] && sudo sysctl -w kern.sysv.shmmax=$shmmaxNew
+  [[ $system = "Linux" ]] && sudo bash -c "echo $shmmaxNew > /proc/sys/kernel/shmmax"
+  [[ $system = "Solaris-x86" ]] && echo "[[Warning]] shmmax must be set manually on Solaris-x86"
+else
+  $rvm_scripts_path/log "info" "No need to increase max shared memory segment size"
+fi
+
+# Increase shmall if appropriate
+if [[ $shmallNew -gt $shmall ]]; then
+  $rvm_scripts_path/log "info" "Increasing max shared memory allowed to $shmallNewMB MB"
+  [[ $system = "Darwin" ]] && sudo sysctl -w kern.sysv.shmall=$shmallNew
+  [[ $system = "Linux" ]] && sudo bash -c "echo $shmallNew > /proc/sys/kernel/shmall"
+  [[ $system = "Solaris-x86" ]] && echo "[[Warning]]shmall must be set manually on Solaris-x86"
+else
+  $rvm_scripts_path/log "info" "No need to increase max shared memory allowed"
+fi
+
+# At this point, shared memory settings contain the values we want,
+# put them in sysctl.conf so they are preserved.
+if [[ ! -f /etc/sysctl.conf ]] || [[ "$(grep -sc "kern.*.shm" /etc/sysctl.conf)" -eq 0 ]] ; then
+  case "$system" in
+    Linux)
+      echo "# kernel.shm* settings added by MagLev installation" > /tmp/sysctl.conf.$$
+      echo "kernel.shmmax=$(cat /proc/sys/kernel/shmmax)" >> /tmp/sysctl.conf.$$
+      echo "kernel.shmall=$(cat /proc/sys/kernel/shmall)" >> /tmp/sysctl.conf.$$
+    ;;
+    Darwin)
+      # On Mac OS X Leopard, you must have all five settings in sysctl.conf
+      # before they will take effect.
+      echo "# kern.sysv.shm* settings added by MagLev installation" > /tmp/sysctl.conf.$$
+      sysctl kern.sysv.shmmax kern.sysv.shmall kern.sysv.shmmin kern.sysv.shmmni \
+      kern.sysv.shmseg  | tr ":" "=" | tr -d " " >> /tmp/sysctl.conf.$$
+    ;;
+    Solaris-x86)
+      # Do nothing in Solaris-x86 since /etc/sysctl.conf is ignored on Solaris 10.
+      # Must configure shared memory settings manually.
+    ;;
+    *)
+      $rvm_scripts_path/log "error" "Can't determine operating system. Check script."
+      exit 1
+    ;;
+  esac
+  # Do nothing on Solaris-x86 since /etc/sysctl.conf is ignored on Solaris 10.
+  if [[ "$system" != "Solaris-x86" ]]; then
+    $rvm_scripts_path/log "info" "Adding the following section to /etc/sysctl.conf"
+    cat /tmp/sysctl.conf.$$
+    sudo bash -c "cat /tmp/sysctl.conf.$$ >> /etc/sysctl.conf"
+    /bin/rm -f /tmp/sysctl.conf.$$
+  fi
+else
+  $rvm_scripts_path/log "info" "The following shared memory settings already exist in /etc/sysctl.conf"
+  echo "To change them, remove the following lines from /etc/sysctl.conf and rerun this script"
+  grep "kern.*.shm" /etc/sysctl.conf
+fi
+
+# Now setup for NetLDI in case we ever need it.
+$rvm_scripts_path/log "info" "Setting up GemStone netldi service port"
+if [[ $(grep -sc "^gs64ldi" /etc/services) -eq 0 ]]; then
+  echo '[[Info]] Adding "gs64ldi  50378/tcp" to /etc/services'
+  sudo bash -c 'echo "gs64ldi         50378/tcp        # Gemstone netldi"  >> /etc/services'
+else
+  $rvm_scripts_path/log "info" "GemStone netldi service port is already set in /etc/services"
+  echo "To change it, remove the following line from /etc/services and rerun this script"
+  grep "^gs64ldi" /etc/services
+fi
+

data/scripts/manage

@@ -176,7 +176,8 @@ RubyWrapper
           fi
 
           rm -rf "$rvm_ruby_src_path"
-          __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file..."
+          __rvm_run "extract" "cat $rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension | 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
@@ -249,10 +250,11 @@ RubyWrapper
             $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" "tar xzf $rvm_archives_path/$(basename $rvm_url) -C $rvm_src_path" "Extracting $(basename $rvm_url) ..."
-          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
+        __rvm_run "extract" "cat $rvm_archives_path/$(basename $rvm_url) | 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
       else
         __rvm_db "rubinius_repo_url" "rvm_ruby_repo_url"
@@ -377,6 +379,85 @@ RubyWrapper
       done ; unset rvm_gem_name
     ;;
 
+    maglev)
+      export rvm_install_on_use_flag=1 ; $rvm_bin_path/rvm 1.8.7 --install # This should install if missing.
+
+      $rvm_scripts_path/log "info" "Running MagLev prereqs checking script."
+      $rvm_scripts_path/maglev
+        result=$? ; if [[ "$result" -gt 0 ]] ; then
+          $rvm_scripts_path/log "error" "Prerequisite checks have failed. Aborting the installation." ; __rvm_pushpop ; return $result
+        fi
+
+      mkdir -p "$rvm_ruby_log_path"
+      __rvm_pushpop $rvm_src_path
+
+      if [[ ! -d "$rvm_src_path/$rvm_ruby_string" ]] || [[ ! -z "$rvm_force_flag" ]] ; then
+        rm -rf "$rvm_src_path/$rvm_ruby_string/" "$rvm_src_path/$rvm_ruby_string/"
+        __rvm_fetch_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
+      fi
+
+      $rvm_scripts_path/log "info" "Downloading the gemstone package, this may take a while depending on your connection..."
+      $rvm_scripts_path/fetch "$rvm_gemstone_url"
+      result=$? ; if [[ "$result" -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "There has been an error while trying to fetch the gemstone package. Aborting the installation." ; __rvm_pushpop ; return $result
+      fi
+
+      builtin cd "$rvm_src_path"
+
+      mv "$rvm_ruby_package_file" "$rvm_ruby_string"
+
+      builtin cd "$rvm_ruby_src_path"
+
+      __rvm_run "gemstone.extract" "cat $rvm_archives_path/${rvm_gemstone_package_file}.${rvm_archive_extension} | gunzip | tar xf - -C $rvm_ruby_src_path"
+      result=$? ; if [[ "$result" -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "There has been an error while trying to extract the gemstone package. Aborting the installation." ; __rvm_pushpop ; return $result
+      fi
+
+      mv "$rvm_gemstone_package_file" "gemstone"
+      chmod -R 777 gemstone # for now.
+
+      __rvm_pushpop
+
+      if [[ -z "$rvm_ruby_home" ]] || [[ "$rvm_ruby_home" = "/" ]] ; then echo "WTH?!?! rvm_ruby_home == / ??? not removing." ; return 1000000 ; fi
+      rm -rf $rvm_ruby_home
+      __rvm_run "install" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home" "Installing maglev to $rvm_ruby_home"
+
+      __rvm_pushpop $rvm_ruby_home/bin/
+      for binary in maglev-irb maglev-ruby maglev-gem ; do
+        ln -nfs $binary ${binary#maglev-}
+      done ; unset binary
+      __rvm_pushpop
+
+      for binary in maglev-ruby maglev-irb maglev-gem ; do
+        __rvm_inject_gem_env $rvm_ruby_home/bin/$binary
+      done ; unset binary
+
+      builtin cd "$rvm_ruby_home"
+
+      #ln -fs "$rvm_ruby_home/$(echo $rvm_gemstone_package_file | awk -F'.' '{print $1}')" "$rvm_ruby_home/gemstone"
+
+      if [[ ! -e ${rvm_ruby_home}/etc/conf.d/maglev.conf ]] ; then
+        $rvm_scripts_path/log "info" "Creating default 'maglev' repository." ; __rvm_pushpop ; return $result
+        $rvm_bin_path/rvm 1.8.7 rake "stone:create[maglev]" >/dev/null
+      fi
+
+      $rvm_scripts_path/log "info" "Generating maglev HTML documentation" ; __rvm_pushpop ; return $result
+      $rvm_bin_path/rvm 1.8.7 rake rdoc >/dev/null 2>&1
+
+      $rvm_scripts_path/log "info" "Generating smalltalk FFI." ; __rvm_pushpop ; return $result
+      $rvm_bin_path/rvm 1.8.7 rake stwrappers >/dev/null 2>&1
+
+
+      # TODO: Figure out if anything needs to be done with rubygems.
+      #__rvm_rubygems_setup
+      __rvm_irbrc
+      __rvm_bin_script
+      __rvm_use
+    ;;
+
     ironruby|ir)
       if ! which mono &> /dev/null ; then
         echo -e "mono must be installed and in your path in order to install IronRuby." ; return 1
@@ -418,7 +499,7 @@ RubyWrapper
           $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
 
-        __rvm_run "extract" "unzip $rvm_archives_path/$rvm_ruby_package_file ironruby/bin/* ironruby/lib/* -d $rvm_ruby_home" "Extracting $rvm_ruby_package_file ..."
+        __rvm_run "extract" "unzip -q -o $rvm_archives_path/$rvm_ruby_package_file ironruby/bin/* ironruby/lib/* -d $rvm_ruby_home" "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
@@ -545,7 +626,7 @@ __rvm_fetch_ruby() {
   if [[ -z "$rvm_head_flag" ]] && [[ -z "$rvm_ruby_tag" ]] && [[ -z "$rvm_ruby_revision" ]] ; then
     rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_string"}"
     rvm_ruby_package_file="${rvm_ruby_package_file:-"$rvm_ruby_package_name"}"
-    rvm_archive_extension="tar.gz"
+    rvm_archive_extension="${rvm_archive_extension:-tar.gz}"
     if [[ ! -s "$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension" ]] ; then
       if [[ "ruby" = "$rvm_ruby_interpreter" ]] ; then
         rvm_url="ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_file.$rvm_archive_extension"
@@ -553,6 +634,8 @@ __rvm_fetch_ruby() {
         rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")/$rvm_ruby_package_file.$rvm_archive_extension"
       elif [[ "jruby" = "$rvm_ruby_interpreter" ]] ; then
         rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_url")/$rvm_ruby_version/$rvm_ruby_package_file.$rvm_archive_extension"
+      elif [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
+        : # Should already be set from selector
       else
         rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_url")/$rvm_ruby_package_file.$rvm_archive_extension"
       fi
@@ -561,13 +644,24 @@ __rvm_fetch_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
-
-    fi
-    __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension -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
 
+    # Only re-extract if forced.
+    if [[ ! -d "$rvm_src_path/$rvm_ruby_string" ]] || [[ ! -z "$rvm_force_flag" ]] ; then
+      if [[ "tar.gz" = "$rvm_archive_extension" ]] || [[ "tgz" = "$rvm_archive_extension" ]] ; then
+        __rvm_run "extract" "cat $rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension | 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
+      elif [[ "zip" = "$rvm_archive_extension" ]] ; then
+        __rvm_run "extract" "unzip -q -o $rvm_archives_path/$rvm_ruby_package_file -d $rvm_src_path"
+        result=$? ; if [[ "$result" -gt 0 ]] ; then
+          $rvm_scripts_path/log "error" "There has been an error while trying to extract $rvm_ruby_package_file. Aborting the installation." ; __rvm_pushpop ; return $result
+        fi
+      fi
+    else
+      $rvm_scripts_path/log "info" "$rvm_ruby_src_path has already been extracted." ; __rvm_pushpop ; return 0
+    fi
   else
     if [[ ! -z "$(echo $rvm_url | awk '/^git/')" ]] ; then
       if [[ -d "$rvm_ruby_src_path/.git" ]] ; then
@@ -731,7 +825,7 @@ __rvm_rubygems_setup() {
         $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
       fi
       mkdir -p "$rvm_src_path/$rvm_gem_package_name"
-      __rvm_run "rubygems.extract" "tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_src_path" "Extracting $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"

data/scripts/notes

@@ -1,19 +1,20 @@
 #!/usr/bin/env bash
 
 system="$(uname)"
-
 item="$(tput setaf 2)* $(tput sgr0)"
 
-echo -e "\n$(tput setaf 2)${system} Notes:$(tput sgr0)\n"
-
-echo -e "    $item curl is required.\n"
-
 if [[ "Linux" = "$system" ]] ; then
+  for file in /etc/*-release ; do
+    release="( $(cat $file) )" ; break
+  done
+  echo -e "\n$(tput setaf 2)Notes for ${system} $release$(tput sgr0)\n"
+
   rvm_apt_get_binary="$(which aptitude 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 "\n    $item curl is required.\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"
@@ -45,7 +46,9 @@ if [[ "Linux" = "$system" ]] ; then
     echo -e "\n      The Mono Runtime and Development Platform (version 2.6 or greater is recommended)."
   fi
 elif [[ "Darwin" = "$system"  ]] ; then
-  echo -e "    $item For Snow Leopard be sure to have XCode Tools Version 3.2.1 (1613) or later (there were bugs with the dvd release version)."
+  release="( $(sw_vers -productName) )"
+  echo -e "\n$(tput setaf 2)Notes for ${system} $release $(tput sgr0)\n"
+  echo -e "\n    $item For Snow Leopard be sure to have XCode Tools Version 3.2.1 (1613) or later (there were bugs with the dvd release version)."
   echo -e "\n    $item You should download the latest XCode tools from developer.apple.com. This is necessary since the dvd install for Snow Leopard has bugs."
   echo -e "\n    $item If you intend on installing MacRuby you must install LLVM first."
   echo -e "\n    $item If you intend on installing JRuby you must install the JDK."

data/scripts/rvm-install

@@ -28,8 +28,8 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+if [[ -s /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
+if [[ -s "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
 if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   unset rvm_path

data/scripts/selector

@@ -11,6 +11,8 @@ __rvm_select() {
 
   __rvm_ruby_string
 
+  rvm_archive_extension="tar.gz"
+
   case "$rvm_ruby_interpreter" in
     macruby)
       if [[ "Darwin" = "$(uname)" ]] ; then
@@ -75,6 +77,37 @@ __rvm_select() {
       alias jruby_ng_server="jruby --ng-server"
     ;;
 
+    maglev)
+      unset rvm_ruby_patch_level
+      if [[ ! -z "$rvm_head_flag" ]] ; then
+        rvm_ruby_version="head"
+        rvm_ruby_string="maglev-head"
+        rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "maglev_repo_url")}"
+        rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "maglev_repo_url")}"
+      else
+        system="$(uname -s)"
+        arch="$(uname -m)"
+        # It would be nice if we didn't have to do this if..else..
+        #if [[ "Darwin" = "$system" ]] ; then
+        #  rvm_ruby_package_file="MagLev-${rvm_ruby_version}.MacOSX"
+        #  rvm_gemstone_package_file="GemStone-${rvm_ruby_version}.MacOSX"
+        #elif [[ "SunOS" = "$system" ]] && [[ "i86pc" = "$(uname -m)" ]] ; then
+        #  rvm_ruby_package_file="MagLev-${rvm_ruby_version}.Solaris-x86"
+        #  rvm_gemstone_package_file="GemStone-${rvm_ruby_version}.Solaris-x86"
+        #else
+        rvm_ruby_package_file="MagLev-${rvm_ruby_version}.${system}-${arch}"
+        rvm_gemstone_package_file="GemStone-${rvm_ruby_version}.${system}-${arch}"
+        #fi
+        rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "maglev_version")"}"
+        rvm_ruby_package_name="${rvm_ruby_interpreter}-${rvm_ruby_version}"
+        rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
+        maglev_url="$(__rvm_db "maglev_url")"
+        rvm_url="${rvm_ruby_url:-"$maglev_url/${rvm_ruby_package_file}.${rvm_archive_extension}"}"
+        rvm_gemstone_url="${rvm_gemstone_url:-"$maglev_url/${rvm_gemstone_package_file}.${rvm_archive_extension}"}"
+        export MAGLEV_HOME="$rvm_path/$rvm_ruby_string"
+      fi
+    ;;
+
     ironruby)
       unset rvm_ruby_patch_level
       if [[ "$rvm_head_flag" -eq 1 ]] ; then
@@ -172,6 +205,11 @@ __rvm_select() {
     rvm_ruby_irbrc="$rvm_ruby_home/.irbrc"
     rvm_ruby_gem_home="${rvm_gem_path}/${rvm_ruby_string}"
 
+    if [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
+      export MAGLEV_HOME="$rvm_ruby_home"
+      export GEMSTONE_GLOBAL_DIR=$MAGLEV_HOME
+    fi
+
     if [[ ! -z "$rvm_gem_set_name" ]] ; then
       rvm_ruby_gem_home="${rvm_ruby_gem_home}%${rvm_gem_set_name}"
     fi
@@ -280,7 +318,7 @@ __rvm_use() {
 
       echo "export PATH=\"$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_path/bin:\$PATH\"" > $rvm_path/default
 
-      for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name ; do
+      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"
         eval value=\$${variable}
         if [[ ! -z "$value" ]] ; then
@@ -295,16 +333,21 @@ __rvm_use() {
   fi
   unset rvm_default_flag
 
-  if [[ ! -z "$rvm_symlink_name" ]] ; then $rvm_scripts_path/symlink "$rvm_symlink_name" ; unset rvm_symlink_name ; fi
-  if [[ ! -z "$rvm_editor_flag" ]] ; then $rvm_scripts_path/symlink "editor" ; unset rvm_editor_flag ; fi
-  if [[ ! -z "$rvm_passenger_flag" ]] ; then $rvm_scripts_path/symlink "passenger" ; unset rvm_passenger_flag; fi
-
+  if [[ ! -z "$rvm_symlink_name" ]]   ; then $rvm_scripts_path/symlink "$rvm_symlink_name" ; unset rvm_symlink_name   ; fi
+  if [[ ! -z "$rvm_editor_flag" ]]    ; then $rvm_scripts_path/symlink "editor"            ; unset rvm_editor_flag    ; fi
+  if [[ ! -z "$rvm_passenger_flag" ]] ; then $rvm_scripts_path/symlink "passenger"         ; unset rvm_passenger_flag ; fi
   # Export ruby string and gem set name for extrnal scripts to take advantage of them.
-  if [[ ! -z "$rvm_ruby_string" ]] ; then export rvm_ruby_string ; fi
-  if [[ ! -z "$rvm_gem_set_name" ]] ; then export rvm_gem_set_name ; fi
-
-  if [[ ! -z "$new_path" ]] ; then
-    export PATH="$new_path" ; unset new_path
+  if [[ ! -z "$rvm_ruby_string" ]]    ; then export rvm_ruby_string  ; fi
+  if [[ ! -z "$rvm_gem_set_name" ]]   ; then export rvm_gem_set_name ; fi
+  if [[ ! -z "$new_path" ]]           ; then export PATH="$new_path" ; unset new_path ; fi
+
+  if [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
+    export MAGLEV_HOME="$rvm_ruby_home"
+    export GEMSTONE_GLOBAL_DIR=$MAGLEV_HOME
+    if [[ -x "$MAGLEV_HOME/gemstone/bin/gslist" ]] ; then
+      $MAGLEV_HOME/gemstone/bin/gslist -clv > /dev/null 2>&1 ; result=$?
+      if [[ $result -eq 1 ]] ; then $rvm_ruby_home/bin/maglev start ; fi
+    fi
   fi
 
   $rvm_scripts_path/hook "after_use"
@@ -358,6 +401,9 @@ __rvm_ruby_string() {
       if [[ "ree" = "$rvm_ruby_interpreter" ]] ; then
         rvm_ruby_patch_level="$string"
         unset rvm_ruby_revision
+      elif [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
+        rvm_ruby_version="$string"
+        unset rvm_ruby_revision rvm_ruby_patch_level
       else
         rvm_ruby_revision="r$string"
       fi
@@ -378,7 +424,7 @@ __rvm_ruby_string() {
     elif $rvm_scripts_path/match "$string" "^u[a-z0-9]" ; then
       unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag rvm_ruby_patch
       rvm_ruby_user_tag="$string"
-    elif $rvm_scripts_path/match "ruby rbx jruby macruby ree rubinius mput shyouhei ironruby" "$string" ; then
+    elif $rvm_scripts_path/match "ruby rbx jruby macruby ree rubinius maglev mput shyouhei ironruby" "$string" ; then
       rvm_ruby_interpreter="$string"
     else
       $rvm_scripts_path/log "error" "Unknown ruby string component: '$string'"
@@ -408,6 +454,7 @@ __rvm_ruby_string() {
     rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
   fi
 
+  # Head
   if [[ "$rvm_head_flag" -eq 1 ]] ; then
     rvm_ruby_string="${rvm_ruby_string}-head"
   elif [[ ! -z "$rvm_ruby_revision" ]]  ; then

data/scripts/update

@@ -28,8 +28,8 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+if [[ -s /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
+if [[ -s "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
 if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   unset rvm_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.999
+  version: 0.0.9999
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 -05:00
+date: 2010-01-16 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -56,6 +56,7 @@ files:
 - scripts/irbrc.rb
 - scripts/libraries
 - scripts/log
+- scripts/maglev
 - scripts/manage
 - scripts/match
 - scripts/md5