rvm 0.0.95 → 0.0.96

data/config/db

@@ -8,6 +8,9 @@ macruby_nightly_url=http://macruby.icoretech.org/latest/macruby_nightly-latest.p
 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

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 95
+:patch: 96

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.95"
+  s.version = "0.0.96"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-12-15}
+  s.date = %q{2009-12-17}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
      "scripts/rvm",
      "scripts/rvm-install",
      "scripts/selector",
+     "scripts/symlink",
      "scripts/update",
      "scripts/utility"
   ]

data/scripts/cli

@@ -73,11 +73,16 @@ __rvm_parse_args() {
         if [[ "user" = "$1"  ]]   ; then export rvm_user_flag=1  ;  shift ; fi
       ;;
 
-      -S|-e)
+      -S)
         rvm_action="ruby"
         rvm_ruby_args="$rvm_token $@"
         rvm_parse_break=1
       ;;
+      -e)
+        rvm_action="ruby"
+        rvm_ruby_args="$rvm_token \"$@\""
+        rvm_parse_break=1
+      ;;
 
       do|ruby|rake|gem|rubydo|rakedo|gemdo)
         if [[ "do" = "$rvm_action" ]] ; then rvm_action="ruby" ; fi
@@ -260,8 +265,9 @@ __rvm_parse_args() {
 
       tests|specs)          rvm_action="tests"                  ;;
       --trace)              export rvm_trace_flag=1    ; set -x ;;
+      --symlink)            rvm_symlink_name="$1"      ; shift  ;;
 
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--load)
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--load|--passenger|--editor)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
         if [[ "--debug" = "$rvm_token" ]] ; then export rvm_debug_flag ; fi
       ;;
@@ -337,7 +343,7 @@ __rvm_parse_args() {
 
 rvm() {
   if [[ -z "$ZSH_VERSION" ]] ; then
-    trap 'rm -rf "/tmp/rvm/$$" >/dev/null 2>&1' 0 1 2 3 15
+    trap 'rm -rf "$rvm_path/tmp/$$" >/dev/null 2>&1' 0 1 2 3 15
   fi
 
   # Check that this is the current version.

data/scripts/completion

@@ -50,7 +50,7 @@ _rvm ()
       system|default)
       ;;
 
-      ruby|jruby|ree|macruby|rbx|rubinius|default|all)
+      ruby|jruby|ree|macruby|rbx|rubinius|ironruby|default|all)
       ;;
 
       gemdir)

data/scripts/gems

@@ -12,7 +12,8 @@ color_none=$($rvm_scripts_path/color "none")
 if [[ -z "$rvm_ruby_gem_home" ]] ; then rvm_ruby_gem_home="$(gem env home)" ; fi
 if [[ "$rvm_trace_flag" -eq 1 ]] ; then set -x ; export rvm_trace_flag ; fi
 
-trap "rm -f $rvm_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
+trap "rm -f $rvm_path/tmp/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
+
 
 __rvm_gems_name() {
   echo "$rvm_gem_set_name"
@@ -155,7 +156,7 @@ __rvm_gems_load() {
 }
 __rvm_gem_install() {
 
-  installed_gem="$(ls ${rvm_ruby_gem_home}/specifications/${gem_file_name}*spec | head -n 1)"
+  installed_gem="$(ls ${rvm_ruby_gem_home}/specifications/${gem_file_name}*spec 2>/dev/null | head -n 1)"
   if [[ -z "$rvm_force_flag" ]] && [[ -f "$installed_gem" ]] ; then
     unset gem
     $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$yellow exists, skipping (--force to re-install)"

data/scripts/manage

@@ -7,7 +7,7 @@ original_ruby_string=$rvm_ruby_string
 
 source $rvm_scripts_path/rvm
 
-trap "rm -f $rvm_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
+trap "rm -f $rvm_path/tmp/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
 
 __rvm_install_source() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
@@ -240,10 +240,10 @@ RubyWrapper
 
       builtin cd "$rvm_ruby_src_path"
       # TODO: Once installer is done add the prefix:
-      rvm_ruby_configure="./configure --prefix=$rvm_ruby_home" ; message="Configuring rbx"
+      rvm_ruby_configure="./configure --prefix=$rvm_ruby_home --disable-llvm" ; message="Configuring rbx"
       #rvm_ruby_configure="./configure" ; message="Configuring rbx"
       if [[ ! -z "$rvm_jit_flag" ]] ; then
-        rvm_ruby_configure="$rvm_ruby_configure --enable-llvm" ; message="$message with LLVM enabled"
+        rvm_ruby_configure="$rvm_ruby_configure" ; message="$message with LLVM enabled"
       fi
       __rvm_run "configure" "$rvm_ruby_configure" "$message"
 
@@ -351,6 +351,47 @@ RubyWrapper
       done ; unset rvm_gem_name
     ;;
 
+    ironruby|ir)
+      if [[ -z "$(which mono 2>/dev/null)" ]] ; then
+        echo -e "mono must be installed and in your path in order to install IronRuby." ; return 1
+      fi
+
+      $rvm_scripts_path/log "info" "Retrieving IronRuby"
+      $rvm_scripts_path/fetch "$rvm_url"
+      result=$? ; if [[ "$result" -gt 0 ]] ; then 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 ..."
+      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
+
+      binaries="gem irb rake rdoc ri ruby"
+      for binary_name in $(echo $binaries); do
+        binary_path=""
+        if [[ "ruby" != "$binary_name" ]] ; then
+          binary_path="$rvm_ruby_home/bin/i$binary_name"
+        fi
+        ruby_wrapper=$(cat <<RubyWrapper
+#!/bin/bash
+
+GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
+GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH
+MY_RUBY_HOME="$rvm_ruby_home" ; export MY_RUBY_HOME
+PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH" ; export PATH
+
+exec mono $rvm_ruby_home/bin/ir.exe $binary_path "\$@"
+RubyWrapper
+)
+        files="$rvm_ruby_home/bin/$binary_name $rvm_path/bin/$binary_name-$rvm_ruby_string"
+        for file_name in $(echo $files)  ; do
+          rm -f $file_name
+          echo "$ruby_wrapper" > $file_name
+          if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
+        done
+        unset file_name ruby_wrapper binary_name binary_path files prefix
+      done
+    ;;
+
     mput|shyouhei)
       if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
       unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
@@ -414,8 +455,6 @@ RubyWrapper
 
     ruby)
       if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
-      if [[ -z "$rvm_ruby_configure_flags" ]] ; then rvm_ruby_configure_flags="--enable-shared" ; fi
-
       __rvm_install_source $*
     ;;
 

data/scripts/monitor

@@ -9,7 +9,7 @@ source $rvm_scripts_path/rvm
 
 rvm_monitor_sleep="${rvm_monitor_sleep:-2}"
 
-trap "rm -f $rvm_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
+trap "rm -f $rvm_path/tmp/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
 
 timestamp() {
   if [[ "Darwin" = "$(uname)" ]] ; then

data/scripts/notes

@@ -16,9 +16,9 @@ if [[ "Linux" = "$system" ]] ; then
 
   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 sun-java6-bin sun-java6-jre sun-java6-jdk"
+    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 bison build-essential zlib1g-dev libssl-dev libreadline5-dev libxml2-dev"
+    echo -e "\n       $ aptitude install curl bison build-essential zlib1g-dev libssl-dev libreadline5-dev libxml2-dev"
 
   elif [[ ! -z "$rvm_emerge_binary" ]] ; then
     echo -e "    $item For JRuby (if you wish to use it) you will need:"

data/scripts/selector

@@ -67,6 +67,15 @@ __rvm_select() {
       alias jruby_ng_server="jruby --ng-server"
     ;;
 
+    ironruby)
+      unset rvm_ruby_patch_level
+      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}"
+    ;;
+
     ree)
       rvm_ruby_interpreter=ree
       rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ree_version")"}
@@ -265,19 +274,17 @@ __rvm_use() {
           fi
         done ; unset variable value
 
-        if [[ -s "$rvm_path/bin/$rvm_ruby_string" ]] ; then
-          rm -f $rvm_path/bin/default*
-          ln -fs "$rvm_path/bin/$rvm_ruby_string" "$rvm_path/bin/default_ruby" # So that people know what it's for :)
-          ln -fs "$rvm_path/$rvm_ruby_string/bin/gem" "$rvm_path/bin/default_gem"
-          ln -fs "$rvm_path/$rvm_ruby_string/bin/irb" "$rvm_path/bin/default_irb"
-        else
-          rm -f $rvm_path/bin/default*
-        fi
+        if [[ ! -z "$rvm_default_flag" ]] ; then $rvm_scripts_path/symlink "default" ; fi
       fi
     fi
+
     unset rvm_default_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

data/scripts/symlink

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+if [[ "$rvm_trace_flag" -eq 1 ]] ; then set -x ; export rvm_trace_flag ; fi
+
+trap "rm -f $rvm_path/tmp/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
+
+flag="$1" ; symlink_flag=0
+if [[ -s "$rvm_path/bin/$rvm_ruby_string" ]] ; then
+  rm -f ${rvm_path}/bin/${flag}_*
+  ln -fs "$rvm_path/bin/$rvm_ruby_string" "$rvm_path/bin/${flag}_ruby"
+  for binary in gem irb rake ; do
+    ln -fs "$rvm_ruby_home/bin/${binary}" "$rvm_path/bin/${flag}_${binary}"
+  done
+  exit 0
+else
+  $rvm_scripts_path/log "error" "Cannot set ${flag}_ruby since $rvm_path/bin/$rvm_ruby_string is missing."
+  exit 1
+fi

data/scripts/utility

@@ -217,6 +217,8 @@ __rvm_reset() {
 
   for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME ; do unset $variable ; done
 
+  for flag in default passenger editor ; do rm -f "$rvm_bin_path"/${flag}_* ; done
+
   for file in system default ; do
     if [[ -f "$rvm_path/$file" ]] ; then rm -f $rvm_path/$file ; fi
   done
@@ -276,6 +278,7 @@ __rvm_list() {
     echo -e "rbx(-head) # rubinius head, the default rbx \nrbx(-head) --jit (rubinius head with LLVM enabled)"
     echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
     echo -e "mput(-head) # shyouhei head, the default mput"
+    echo -e "ironruby-0.9.3 # (1.0 RC1)"
     if [[ "Darwin" = "$(uname)" ]] ; then
       echo -e "macruby(-nightly) # the default macruby\nmacruby-head # Build from the macruby git repository"
     fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.95
+  version: 0.0.96
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 -05:00
+date: 2009-12-17 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -62,6 +62,7 @@ files:
 - scripts/rvm
 - scripts/rvm-install
 - scripts/selector
+- scripts/symlink
 - scripts/update
 - scripts/utility
 has_rdoc: true