rvm 0.1.20 → 0.1.21

data/README

@@ -26,28 +26,24 @@ Action
   rake      - runs a rake task against specified and/or all rubies
   tests     - runs 'rake test' across selected ruby versions
   specs     - runs 'rake spec' across selected ruby versions
+  monitor   - Monitor cwd for testing, run `rake {spec,test}` on changes.
 
-  gems      - gems(ets): http://rvm.beginrescueend.com/gemsets/#managing
+  gemset    - gemsets: http://rvm.beginrescueend.com/gemsets/
 
-  gemdir    - switch to gem directory for installation (new login shell)
-  srcdir    - switch to src directory for the current ruby installation
+  gemdir    - display the path to the current gem directory (GEM_HOME).
+  srcdir    - display the path to rvm source directory (may be yanked)
 
   fetch     - Performs an archive / src fetch only of the selected ruby.
-  srcdir    - display the path to rvm source directory (may be yanked)
   list      - show currently installed rubies, interactive output.
-  rubies    - (query info) default, installed, or expand_string <str>
-  iconv     - Install iconv
-  openssl   - Install openssl
-  ncurses   - Install ncurses
-  zlib      - Install zlib
-  readline  - with install, install readline versions 5.2 & 6.0
-  monitor   - Monitor cwd for testing, run `rake {spec,test}` on changes.
+              http://rvm.beginrescueend.com/listing/
+  package   - Install a dependency package {readline,iconv,zlib,openssl}
+              http://rvm.beginrescueend.com/packages/
   notes     - Display notes, with operating system specifics.
 
 Implementation
 
-  * ruby    - MRI/YARV Ruby (The Standard), defaults to 1.8.6
-  jruby     - JRuby
+  * ruby    - MRI/YARV Ruby (The Standard) {1.8.6,1.8.7,1.9.1,1.9.2...}
+  jruby     - JRuby {1.3.1,1.4.0}
   rbx       - rubinius
   ree       - ruby Enterprise Edition
   macruby   - MacRuby (Mac OS X Only)
@@ -64,7 +60,6 @@ Flags
   --default     - with ruby select, sets a default ruby for new shells.
   --debug       - Toggle debug mode on for very verbose output.
   --force       - Force install, removes old install & source before install.
-  --all         - Used with 'rvm list' to display 'most' available versions.
   --dump        - Used with gemset to dump the current ruby's gemset.
   --load        - Used with gemset to load a specified gemset file
   --summary     - Used with rubydo to print out a summary of the commands run.

data/config/db

@@ -34,6 +34,6 @@ 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_version=1.0-rc2
 ironruby_repo_url=git://github.com/ironruby/ironruby.git
-ironruby_url=http://cloud.github.com/downloads/nrk/ironruby/
+ironruby_url=http://github.com/ironruby/ironruby/zipball/

data/config/md5

@@ -59,3 +59,4 @@ 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-ironruby-c912e86.tar.gz=80708c23577ff9bf557f63f0f716fe26

data/examples/rvmrc

@@ -44,7 +44,11 @@
 
 # Install On Use Flag
 # Install rubies when used if are not installed.
-#export ruby_install_on_use=1
+#export rvm_install_on_use_flag=1
+
+# Gemset Creat on use Flag
+# This will create a gemset when the gemset is used if it does not exist
+# export rvm_gemset_create_on_use_flag=1
 
 # Make Flags, I have 8 cpu's so I might use 7 make threads:
 #export rvm_make_flags="-j7"

data/install

@@ -92,7 +92,7 @@ if [[ ! -s "$rvm_config_path/user" ]] ; then
   echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
-scripts="monitor match log install color db fetch log set libraries"
+scripts="monitor match log install color db fetch log set package"
 for script_name in $(echo $scripts) ; do
   chmod +x $rvm_scripts_path/$script_name
 done

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 20
+:patch: 21

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.20"
+  s.version = "0.1.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-02-28}
+  s.date = %q{2010-03-02}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -65,7 +65,6 @@ Gem::Specification.new do |s|
      "scripts/utility",
      "scripts/version"
   ]
-  s.has_rdoc = false
   s.homepage = %q{http://github.com/wayneeseguin/rvm}
   s.post_install_message = %q{********************************************************************************
 

data/scripts/cli

@@ -50,30 +50,54 @@ __rvm_parse_args() {
 
       gemset)
         rvm_action=$rvm_token
+
+        export rvm_ruby_gem_home="$GEM_HOME"
+
         if [[ "clear" = "$1" ]] ; then
           unset rvm_gemset_name ; shift
-          export rvm_ruby_gem_home="$(echo $GEM_HOME | sed 's/%.*$//')"
-          export GEM_HOME="$rvm_ruby_gem_home"
-          export BUNDLE_PATH="$rvm_ruby_gem_home"
-          export GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home%global/bin"
           rvm_ruby_args="clear"
-          rvm_parse_break=1
-        elif [[ "delete" = "$1" ]] || [[ "use" = "$1" ]] ; then
-          export rvm_${1}_flag=1
-          export rvm_ruby_args="$@" ; shift
+        elif [[ "use" = "$1" ]] ; then
+          rvm_use_flag=1
+          rvm_ruby_args="$@" ; shift
+          export rvm_use_flag rvm_ruby_args
           rvm_gemset_name="$1"; shift
-          export rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)%.*/\1/')
-          export rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*%\(.*\)/\1/')
-          if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then export rvm_ruby_string ; fi
+          if [[ ! -z "$(echo $rvm_gemset_name | grep '%')" ]] ; then
+            rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)%.*/\1/')
+            rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*%\(.*\)/\1/')
+            if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then
+              export rvm_ruby_string="$rvm_ruby_string%$rvm_gemset_name"
+            else
+              unset rvm_ruby_string
+            fi
+            export rvm_ruby_gem_home="$rvm_ruby_gem_home%$rvm_gemset_name"
+          fi
+          if [[ ! -z "$rvm_gemset_name" ]] ; then export rvm_gemset_name ; fi
+        elif [[ "delete" = "$1" ]] ; then
+          rvm_delete_flag=1
+          rvm_ruby_args="$@" ; shift
+          rvm_gemset_name="$1"; shift
+          export rvm_delete_flag rvm_ruby_args rvm_gemset_name
+          if [[ ! -z "$(echo $rvm_gemset_name | grep '%')" ]] ; then
+            rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)%.*/\1/')
+            rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*%\(.*\)/\1/')
+            if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then
+              export rvm_ruby_string="$rvm_ruby_string%$rvm_gemset_name"
+            else
+              unset rvm_ruby_string
+            fi
+            export rvm_ruby_gem_home="$rvm_ruby_gem_home%$rvm_gemset_name"
+          fi
           if [[ ! -z "$rvm_gemset_name" ]] ; then export rvm_gemset_name ; fi
         else
           if [[ -z "$1" ]] ; then
             rvm_action="error"
-            rvm_error_message="'gems' must be followed by a gemset action, see http://rvm.beginrescueend.com/gemsets/ for details."
+            rvm_error_message="'gemset' must be followed by a gemset action, see http://rvm.beginrescueend.com/gemsets/ for details."
           else
-            export rvm_ruby_args="$*" ; export rvm_${1}_flag=1 ; shift
+            if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then export rvm_ruby_string ; else unset rvm_ruby_string ; fi
+            rvm_ruby_args="$@" ; export rvm_ruby_args
           fi
         fi
+        rvm_parse_break=1
       ;;
 
       gemdir)
@@ -278,7 +302,6 @@ __rvm_parse_args() {
       --nice)               rvm_niceness="$1"          ; shift  ;;
       -l|--level)           rvm_ruby_patch_level="p$1" ; shift  ;;
       # TODO: handle this below better (if $1 is null)
-      -m|--gemset)          rvm_gemset_name="$1"       ; shift  ;;
       --sdk)                rvm_sdk="$1"               ; shift  ;;
       --archflags)          rvm_archflags="$1"         ; shift  ;;
       --symlink)            rvm_symlink_name="$1"      ; shift  ;;
@@ -408,14 +431,26 @@ rvm() {
       result=$?
     ;;
     gemset)
+      #if $rvm_scripts_path/match $rvm_ruby_args use ; then
       if [[ "$rvm_use_flag" -eq 1 ]] ; then
         __rvm_gemset_select
-        result=$?
-        if [[ $result -eq 0 ]] ; then
+        result=$? ; if [[ $result -eq 0 ]] ; then
           __rvm_gemset_use
         fi
       else
         $rvm_scripts_path/gemsets $rvm_ruby_args
+
+        # Clear the gemset.
+        if [[ "$rvm_delete_flag" -eq 1 ]] ; then
+          gem_prefix="$(echo $GEM_HOME | sed 's/%.*$//')"
+          if [[ "$GEM_HOME" = "$gem_prefix%$rvm_gemset_name" ]] ; then
+            rvm_ruby_gem_home="$gem_prefix"
+            GEM_HOME="$rvm_ruby_gem_home"
+            BUNDLE_PATH="$rvm_ruby_gem_home"
+            GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home%global/bin"
+            export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
+          fi ; unset gem_prefix
+        fi
       fi
       result=$?
     ;;

data/scripts/fetch

@@ -6,27 +6,35 @@ trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_
 
 record_md5() {
   if [[ "Darwin" = "$(uname)" ]] || [[ "FreeBSD" = "$(uname)" ]]; then
-    archive_md5="$(md5 $archive | awk '{print $NF}')"
+    archive_md5="$(/sbin/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"
 }
 
+builtin cd "$rvm_archives_path"
+
+if [[ -z "$1" ]] ; then $rvm_scripts_path/log "fail" "BUG: $0 called without an argument :/" ; exit 1 ; fi
+
+url="$1"; download=1 ; package_name="$2"
+
 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
 elif [[ ! -z ${rvm_proxy} ]] ; then
-  fetch_command="curl -x${rvm_proxy} -O -L --create-dirs -C - " # -s for silent
+  fetch_command="curl -x${rvm_proxy} -L --create-dirs -C - " # -s for silent
 else
-  fetch_command="curl -O -L --create-dirs -C - " # -s for silent
+  fetch_command="curl -L --create-dirs -C - " # -s for silent
 fi
 
-builtin cd "$rvm_archives_path"
-
-if [[ -z "$1" ]] ; then $rvm_scripts_path/log "fail" "BUG: $0 called without an argument :/" ; exit 1 ; fi
-
-archive=$(basename "$1") ; downlaod=1
+if [[ ! -z "$package_name" ]] ; then
+  fetch_command="${fetch_command} -o ${package_name} "
+  archive="$package_name"
+else
+  fetch_command="${fetch_command} -O "
+  archive=$(basename "$url")
+fi
 
 if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Fetching $archive" ; fi
 
@@ -49,12 +57,12 @@ fi
 
 if [[ $download -gt 0 ]] ; then
   rm -f $archive
-  eval $fetch_command "$1"
+  eval $fetch_command "$url"
   result=$?
   if [[ $result -gt 0 ]] ; then
     retry=0
     if [[ $result -eq 78 ]] ; then
-      $rvm_scripts_path/log "error" "The requested url does not exist: '$1'"
+      $rvm_scripts_path/log "error" "The requested url does not exist: '$url'"
     elif [[ $result -eq 18 ]] ; then
       $rvm_scripts_path/log "error" "Partial file. Only a part of the file was transferred. Removing partial and re-trying."
       rm -f "$archive"
@@ -68,7 +76,7 @@ if [[ $download -gt 0 ]] ; then
     fi
 
     if [[ $retry -eq 1 ]] ; then
-      eval $fetch_command "$1"
+      eval $fetch_command "$url"
       result=$?
       if [[ $result -gt 0 ]] ; then
         $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"

data/scripts/gemsets

@@ -23,9 +23,10 @@ __rvm_gemset_dir() {
 }
 
 __rvm_gemset_create() {
+  rvm_ruby_gem_prefix=$(echo $rvm_ruby_gem_home | sed 's/%.*$//')
   for gemset in $(echo $gems_args) ; do
-    gem_home="$rvm_ruby_gem_home%${gems_args/ /}"
-    mkdir -p $gem_home 
+    gem_home="$rvm_ruby_gem_prefix%${gems_args/ /}"
+    mkdir -p $gem_home
     ln -nfs "$HOME/.gem/cache" "$gem_home/cache"
     $rvm_scripts_path/log "info" "Gemset '$gemset' created."
   done ; unset gem_home
@@ -34,7 +35,7 @@ __rvm_gemset_create() {
 __rvm_gemset_list() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
-  $rvm_scripts_path/log "info" "gems(ets) : for $rvm_ruby_string (found in $rvm_gems_path/)"
+  $rvm_scripts_path/log "info" "gemsets : for $rvm_ruby_string (found in $rvm_gems_path/)"
 
   if [[ ! -z "$rvm_gems_path" ]] ; then
     if [[ ! -z $rvm_ruby_string ]] ; then
@@ -68,7 +69,7 @@ __rvm_gemset_delete() {
       $rvm_scripts_path/log "info" "$gemdir already does not exist."
     fi ; unset gemdir
   else
-    $rvm_scripts_path/log "error" "A gems name must be specified in order to delete a gems."
+    $rvm_scripts_path/log "error" "A gemset name must be specified in order to delete a gems."
   fi
 }
 
@@ -78,7 +79,7 @@ __rvm_gemset_empty() {
   if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
     cd $gemdir && rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
   elif [[ -d "$gemdir" ]] ; then
-    $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gems for gemset '%$rvm_gemset_name' ($gemdir)?"
+    $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gemset for gemset '%$rvm_gemset_name' ($gemdir)?"
     echo -n "(anything other than 'yes' will cancel) > "
     read response
     if [[ "yes" = "$response" ]] ; then
@@ -96,10 +97,10 @@ __rvm_gemset_copy() {
   source_ruby="$(echo $gems_args | awk '{print $1}')"
   destination_ruby="$(echo $gems_args | awk '{print $2}')"
   if [[ -z "$source_ruby" ]] ; then
-    $rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gems copy X Y'"
+    $rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gemset copy X Y'"
   fi
   if [[ -z "$destination_ruby" ]] ; then
-    $rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gems copy X Y'"
+    $rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gemset copy X Y'"
   fi
   source_path="$($rvm_bin_path/rvm $source_ruby gem env gemdir | tail -n 1)"
   destination_path="$($rvm_bin_path/rvm $destination_ruby gem env gemdir | tail -n 1)"
@@ -135,7 +136,7 @@ __rvm_gemset_export() {
     fi
   fi
 
-  $rvm_scripts_path/log "info" "Exporting current environments gems to $rvm_file_name"
+  $rvm_scripts_path/log "info" "Exporting current environments gemset to $rvm_file_name"
 
   touch $rvm_file_name
   echo "# $rvm_file_name generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_file_name
@@ -318,6 +319,7 @@ fi
 
 action="$(echo $* | awk '{print $1}')"
 gems_args=$(echo "$*" | awk '{$1="" ; print}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+export rvm_gemset_name
 
 if [[ "import" = "$action" ]] || [[ "load" = "$action" ]] ; then
   __rvm_gemset_import
@@ -345,7 +347,7 @@ elif [[ "clear" = "$action" ]] ; then
   $rvm_scripts_path/log "info" "gemset cleared."
   exit 0
 else
-  $rvm_scripts_path/log "error" "Unrecognized gems action '$action'.\n\nValid gems actions are: {create,use,import,export,copy,delete,empty,name,list,gemdir,install}"
+  $rvm_scripts_path/log "error" "Unrecognized gemset action '$action'.\n\nValid gems actions are: {create,use,import,export,copy,delete,empty,name,list,gemdir,install}"
 fi
 
 exit $?

data/scripts/install

@@ -92,7 +92,7 @@ if [[ ! -s "$rvm_config_path/user" ]] ; then
   echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
-scripts="monitor match log install color db fetch log set libraries"
+scripts="monitor match log install color db fetch log set package"
 for script_name in $(echo $scripts) ; do
   chmod +x $rvm_scripts_path/$script_name
 done

data/scripts/manage

@@ -135,7 +135,7 @@ __rvm_install_ruby() {
             $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 '/'"
+          __rvm_run "macruby/extract" "sudo /usr/sbin/installer -pkg '$rvm_archives_path/macruby_nightly.pkg' -target '/'"
           mkdir -p "$rvm_ruby_home/bin"
         else
           macruby_path="/usr/local/bin"
@@ -148,7 +148,7 @@ __rvm_install_ruby() {
           mkdir -p $rvm_ruby_src_path
           unzip -o -j "$rvm_archives_path/$rvm_ruby_package_file" "MacRuby 0.5/MacRuby 0.5.pkg" -d "$rvm_ruby_src_path"
           mv "$rvm_ruby_src_path/MacRuby 0.5.pkg" "$rvm_ruby_src_path/$rvm_ruby_string.pkg"
-          __rvm_run "macruby/extract" "sudo installer -pkg '$rvm_ruby_src_path/$rvm_ruby_string.pkg' -target '/'"
+          __rvm_run "macruby/extract" "sudo /usr/sbin/installer -pkg '$rvm_ruby_src_path/$rvm_ruby_string.pkg' -target '/'"
           mkdir -p "$rvm_ruby_home/bin"
         fi
 
@@ -516,38 +516,42 @@ RubyWrapper
 
           __rvm_fetch_ruby
           if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
-
-          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
-
-          rm -rf $rvm_ruby_home/*
-          mkdir -p $rvm_ruby_home/bin $rvm_ruby_home/lib $rvm_ruby_home/lib/ruby $rvm_ruby_home/lib/IronRuby
-
-          cp -r $rvm_ruby_src_path/Merlin/Main/Bin/mono_release/* $rvm_ruby_home/bin/
-          cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Scripts/bin/* $rvm_ruby_home/bin/
-          cp -r $rvm_ruby_src_path/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/* $rvm_ruby_home/lib/ruby
-          cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Libs/* $rvm_ruby_home/lib/IronRuby
       else
         $rvm_scripts_path/log "info" "Retrieving IronRuby"
-        $rvm_scripts_path/fetch "$rvm_url"
+        $rvm_scripts_path/fetch "$rvm_url" "$rvm_ruby_package_file"
         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
 
-        __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 ..."
+        __rvm_run "extract" "tar zxf $rvm_archives_path/$rvm_ruby_package_file -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_ruby_home/ironruby/* $rvm_ruby_home
-        rm -rf $rvm_ruby_home/ironruby
-        mv $rvm_ruby_home/lib/ironruby $rvm_ruby_home/lib/IronRuby
+        rm -rf $rvm_ruby_src_path
+        mv $rvm_src_path/$rvm_ruby_package_name $rvm_ruby_src_path
+
+        #mv $rvm_ruby_home/ironruby/* $rvm_ruby_home
+        #rm -rf $rvm_ruby_home/ironruby
+        #mv $rvm_ruby_src_path/$rvm_ruby_package_file/* $rvm_ruby_home
+        #mv $rvm_ruby_home/lib/ironruby $rvm_ruby_home/lib/IronRuby
       fi
 
+      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
+
+      rm -rf $rvm_ruby_home/*
+      mkdir -p $rvm_ruby_home/bin $rvm_ruby_home/lib $rvm_ruby_home/lib/ruby $rvm_ruby_home/lib/IronRuby
+
+      cp -r $rvm_ruby_src_path/Merlin/Main/Bin/mono_release/* $rvm_ruby_home/bin/
+      cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Scripts/bin/* $rvm_ruby_home/bin/
+      cp -r $rvm_ruby_src_path/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/* $rvm_ruby_home/lib/ruby
+      cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Libs/* $rvm_ruby_home/lib/IronRuby
+
       binaries="gem irb rake rdoc ri ruby"
       for binary_name in $(echo $binaries); do
         binary_path=""

data/scripts/rvm-install

@@ -92,7 +92,7 @@ if [[ ! -s "$rvm_config_path/user" ]] ; then
   echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
-scripts="monitor match log install color db fetch log set libraries"
+scripts="monitor match log install color db fetch log set package"
 for script_name in $(echo $scripts) ; do
   chmod +x $rvm_scripts_path/$script_name
 done

data/scripts/selector

@@ -104,17 +104,19 @@ __rvm_select() {
     ironruby)
       unset rvm_ruby_patch_level
       if [[ "$rvm_head_flag" -eq 1 ]] ; then
-        rvm_ruby_version="head"
-        rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
-        rvm_ruby_package_name="${rvm_ruby_string}"
-        rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
-        rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
+        export rvm_ruby_version="head"
+        export rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
+        export rvm_ruby_package_name="${rvm_ruby_string}"
+        export rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
+        export rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
       else
-        rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ironruby_version")"}
-        rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
-        rvm_ruby_package_file="${rvm_ruby_string}.zip"
-        rvm_ruby_package_name="${rvm_ruby_string}"
-        rvm_url="$(__rvm_db "ironruby_url")${rvm_ruby_package_file}"
+        export rvm_archive_extension="tar.gz"
+        export rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ironruby_version")"}
+        export rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
+        sha1=$(curl -s http://github.com/api/v2/yaml/repos/show/ironruby/ironruby/tags | awk '/'${rvm_ruby_version}'/{print $NF}')
+        export rvm_ruby_package_file="ironruby-ironruby-${sha1:0:7}.${rvm_archive_extension}"
+        export rvm_ruby_package_name="ironruby-ironruby-${sha1:0:7}"
+        export rvm_url="$(__rvm_db "ironruby_url")v${rvm_ruby_version}"
       fi
     ;;
 
@@ -194,7 +196,7 @@ __rvm_select() {
       rvm_minor_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $3 }')
     fi
 
-    rvm_ruby_package_name="$rvm_ruby_string"
+    rvm_ruby_package_name="${rvm_ruby_package_name:-$rvm_ruby_string}"
     rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_string"
     rvm_ruby_log_path="$rvm_log_path/$rvm_ruby_string"
     rvm_ruby_src_path="$rvm_src_path/$rvm_ruby_string"

data/scripts/update

@@ -92,7 +92,7 @@ if [[ ! -s "$rvm_config_path/user" ]] ; then
   echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
-scripts="monitor match log install color db fetch log set libraries"
+scripts="monitor match log install color db fetch log set package"
 for script_name in $(echo $scripts) ; do
   chmod +x $rvm_scripts_path/$script_name
 done

data/scripts/utility

@@ -409,7 +409,7 @@ __rvm_list_known() {
   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 "mput(-head) # shyouhei head, the default mput"
-  echo -e "ironruby-0.9.3 # (1.0 RC1)\nironruby-head"
+  echo -e "ironruby-0.9.3\nironruby-1.0-rc2\nironruby-head"
   if [[ "Darwin" = "$(uname)" ]] ; then
     echo -e "macruby(-nightly) # the default macruby\nmacruby-head # Build from the macruby git repository"
   fi
@@ -651,12 +651,16 @@ __rvm_gemset_select() {
     fi
     if [[ -z "$rvm_gemset_name" ]] ; then unset rvm_gemset_name ; fi
   else
-    rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gemset_name"
+    if [[ ! -z "$(echo $rvm_ruby_gem_home | grep '%')" ]] ; then
+      rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gemset_name"
+    fi
   fi
 
   # If the gemset does not exist, then notify the user as such and abort the action.
-  if [[ ! -d "$rvm_ruby_gem_home" ]] && [[ ! -z "$rvm_gemset_name" ]] && [[ -z "$rvm_create_flag" ]]; then
-    $rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gems create '$rvm_gemset_name' first."
+  if [[ ! -z "$rvm_gemset_name" ]] && [[ ! -d "$rvm_ruby_gem_home%$rvm_gemset_name" ]] && [[ "$rvm_gemset_create_on_use_flag" -ne 1 ]] && [[ "$rvm_create_flag" -ne 1 ]] && [[ "$rvm_delete_flag" -ne 1 ]] ; then
+    $rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
+    return 1
+  elif [[ "$rvm_delete_flag" -eq 1 ]] ; then
     return 1
   fi
 
@@ -702,22 +706,24 @@ __rvm_gemset_select() {
 
 # Use a gemset specified by 'rvm_ruby_gem_home'
 __rvm_gemset_use() {
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
-
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
-      $rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gems create '$rvm_gemset_name' first."
-      return 1
+      if [[ "$rvm_gemset_create_on_use_flag" -eq 1 ]] ; then
+        $rvm_scripts_path/gemsets create $rvm_gemset_name
+      else
+        $rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
+        return 1
+      fi
     fi
 
-    if [[ "$rvm_interactive" = 1 ]] ; then
-      $rvm_scripts_path/log "info" "gemset : ${rvm_gemset_name:-default}"
+    if [[ "$rvm_interactive" -eq 1 ]] || [[ "$rvm_verbose_flag" -eq 1 ]] ; then
+      $rvm_scripts_path/log "info" "Now using gemset '${rvm_gemset_name:-default}'"
     fi
-
-    export GEM_HOME="$rvm_ruby_gem_home"
-    export GEM_PATH="$rvm_ruby_gem_path"
-    export BUNDLE_PATH="$rvm_ruby_gem_home"
-    __rvm_use
+    rvm_ruby_gem_home="$(echo $GEM_HOME | sed 's/%.*$//')%$rvm_gemset_name"
+    GEM_HOME="$rvm_ruby_gem_home"
+    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
   fi
   return 0
 }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 20
-  version: 0.1.20
+  - 21
+  version: 0.1.21
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 -05:00
+date: 2010-03-02 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -73,7 +73,7 @@ files:
 - scripts/update
 - scripts/utility
 - scripts/version
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/wayneeseguin/rvm
 licenses: []