rvm 0.1.27 → 0.1.29

data/README

@@ -1,7 +1,41 @@
 
 Usage
 
-  rvm Action [Implementation] [Flags] [Options]
+  rvm [Flags] [Options] Action [Implementation[,Implementation[,...]]
+
+Flags
+
+  --head        - with update, updates rvm to git head version.
+  --rubygems    - with update, updates rubygems for selected ruby
+  --default     - with ruby select, sets a default ruby for new shells.
+  --debug       - Toggle debug mode on for very verbose output.
+  --trace       - Toggle trace mode on to see EVERYTHING rvm is doing.
+  --force       - Force install, removes old install & source before install.
+  --summary     - Used with rubydo to print out a summary of the commands run.
+  --jit         - Used with rubinius install to build with JIT
+  --latest      - with gemset --dump skips version strings for latest gem.
+  --gems        - with uninstall/remove removes gems with the interpreter.
+  --reconfigure - Force ./configure on install even if Makefile already exists.
+
+
+Options
+
+  -v|--version    - Emit rvm version loaded for current shell
+  -l|--level      - patch level to use with rvm use / install
+     --prefix     - path for all rvm files (~/.rvm/), with trailing slash!
+     --bin        - path for binaries to be placed (~/.rvm/bin/)
+     --source     - src directory to use (~/.rvm/src/)
+     --archives   - directory for downladed files (~/.rvm/archives/)
+  -S              - Specify a script file to attempt to load and run (rubydo)
+  -e              - Execute code from the command line.
+  -G|--gems       - root gem path to use
+  --patch         - With MRI Rubies you may specify one or more full paths to patches
+                    for multiple, specify comma separated:
+                    --patch /.../.../a.patch,/.../.../.../b.patch
+  -C|--configure  - custom configure options. If you need to pass several configure
+                    options then append them comma separated: -C --...,--...,--...
+  --nice          - process niceness (for slow computers, default 0)
+  --ree-options   - Options passed directly to ree's './installer' on the command line.
 
 Action
 
@@ -9,13 +43,16 @@ Action
   version   - show the rvm version installed in rvm_path
   use       - setup current shell to use a specific ruby version
   reload    - reload rvm source itself (useful after changing rvm source)
-  implode   - removes rvm completely, i.e. everything in ~/.rvm
+  implode   - (seppuku) removes the rvm installation completely.
+              This means everything in $rvm_path (~/.rvm).
+              This does not touch your profiles, which is why
+              there is an if around the sourcing scripts/rvm.
   update    - upgrades rvm to the latest version.
               (If you experience bugs try this first with --head)
   reset     - remove current and stored default & system settings.
               (If you experience odd behavior try this second)
-  info      - show information for current ruby
-  debug     - show environment & configuration information for *current* ruby
+  info      - show the *current* environment information for current ruby
+  debug     - show info plus additional information for common issues
 
   install   - install one or many ruby versions
               See also: http://rvm.beginrescueend.com/rubies/installing/
@@ -43,50 +80,19 @@ Action
 
 Implementation
 
-  * 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)
-  maglev    - GemStone Ruby
-  ironruby  - IronRuby
-  mput      - shyouhei(mput)'s github repository
+  * ruby    - MRI/YARV Ruby (The Gold Standard) {1.8.6,1.8.7,1.9.1,1.9.2...}
+  jruby     - JRuby, Ruby interpreter on the Java Virtual Machine.
+  rbx       - Rubinius
+  ree       - Ruby Enterprise Edition, MRI Ruby with several custom
+              patches for performance, stability, and memory.
+  macruby   - MacRuby, insanely fast, can make real apps (Mac OS X Only).
+  maglev    - GemStone Ruby, awesome persistent ruby object store.
+  ironruby  - IronRuby, NOT supported yet. Looking for volunteers to help.
+  mput      - shyouhei(mput)'s github repository, popular in Japan :)
   system    - use the system ruby (eg. pre-rvm state)
   default   - use rvm set default ruby and system if it hasn't been set.
               http://rvm.beginrescueend.com/rubies/default/
 
-Flags
-
-  --head        - with update, updates rvm to git head version.
-  --rubygems    - with update, updates rubygems for selected ruby
-  --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.
-  --summary     - Used with rubydo to print out a summary of the commands run.
-  --jit         - Used with rubinius install to build with JIT
-  --latest      - with gemset --dump skips version strings for latest gem.
-  --gems        - with uninstall/remove removes gems with the interpreter.
-  --reconfigure - Force ./configure on install even if Makefile already exists.
-
-
-Options
-
-  -v|--version    - Emit rvm version loaded for current shell
-  -h|--help       - Emit this output and exit
-  -l|--level      - patch level to use with rvm use / install
-
-     --prefix     - path for all rvm files (~/.rvm/), with trailing slash!
-     --bin        - path for binaries to be placed (~/.rvm/bin/)
-     --source     - src directory to use (~/.rvm/src/)
-     --archives   - directory for downladed files (~/.rvm/archives/)
-  -S              - Specify a script file to attempt to load and run (rubydo)
-  -e              - Execute code from the command line.
-  -G|--gems       - root gem path to use
-  -C|--configure  - custom configure options, comma separated
-                    default: --enable-shared=true
-  --reconfigure   - Force installer to re-run configure if already run
-  --nice          - process niceness (for slow computers, default 0)
-  --ree-options   - Options passed directly to ree's './installer' on the command line.
 
 Resources:
 

data/binscripts/rvm

@@ -1,13 +1,22 @@
 #!/usr/bin/env bash
 
-if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
+  if [[ -f "$rvmrc" ]] ; then
+    if grep -q '^\s*rvm .*$' $rvmrc ; then
+      echo -e "Error: $rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
+      exit 1
+    else
+      source "$rvmrc"
+    fi
+  fi
+done
+
 if [[ -z "$rvm_prefix" ]] ; then unset rvm_prefix ; fi
 if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
 
-if [[ -z "$rvm_prefix" ]] ; then 
+if [[ -z "$rvm_prefix" ]] ; then
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_prefix="/usr/local" 
+    rvm_prefix="/usr/local"
   else
     rvm_prefix="$HOME"
   fi

data/binscripts/rvm-prompt

@@ -11,7 +11,8 @@ add(){
 }
 
 rvm_gemset_separator=${rvm_gemset_separator:-"+"}
-if [[ ! -z "$(which ruby 2>/dev/null | awk '/rvm/{print}')" ]] ; then
+ruby=$(command -v ruby)
+if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
   unset format
   while [[ $# -gt 0 ]] ; do
     token="$1" ; shift
@@ -34,7 +35,7 @@ if [[ ! -z "$(which ruby 2>/dev/null | awk '/rvm/{print}')" ]] ; then
     add "gemset"
   fi
 
-  ruby_string=$(dirname "$(which ruby 2>/dev/null)" | xargs dirname | xargs basename)
+  ruby_string=$(dirname "$ruby" | xargs dirname | xargs basename)
 
   if [[ ! -z "$interpreter_flag" ]] ; then
     interpreter="$(echo $ruby_string | awk -F'-' '{print $1}')"

data/config/db

@@ -23,18 +23,18 @@ ruby_1.9.2_patch_level=preview1
 ruby_1.8.5_patch_level=231
 ruby_1.8.6_patch_level=399
 ruby_1.8.7_patch_level=249
-jruby_version=1.4.0
+jruby_version=1.5.0.RC1
 jruby_repo_url=git://github.com/jruby/jruby.git
-jruby_url=http://jruby.kenai.com/downloads
-macruby_version=0.5
+jruby_url=http://jruby.org.s3.amazonaws.com/downloads
+macruby_version=0.6
 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=23191
+macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg
+maglev_version=23400
 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_version=1.0
 ironruby_repo_url=git://github.com/ironruby/ironruby.git
-ironruby_url=http://github.com/ironruby/ironruby/tarball/
+ironruby_1.0_url=http://rubyforge.org/frs/download.php/70179/

data/config/md5

@@ -22,39 +22,11 @@ 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
-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
-GemStone-22804.Darwin-i386.tar.gz=0963cce504839169a601e27f916d101f
-GemStone-22804.Linux-x86_64.tar.gz=95058982c5d09a2ef77f4999a6683fbb
-MagLev-22804.Darwin-i386.tar.gz=930a85c821f8d80d22f2b53b03c18181
-MagLev-22804.Linux-x86_64.tar.gz=047d5b6404a5fbfad1c9a9243e6e67a7
-GemStone-22816.Darwin-i386.tar.gz=b12426c17b3925f1c8c7086a3285f15f
-GemStone-22816.Linux-x86_64.tar.gz=21d1e8e7a4b10ac8a1c199eb0cbfaec1
-MagLev-22816.Darwin-i386.tar.gz=b1b3e6530e90d7dcf36f81e097776643
-MagLev-22816.Linux-x86_64.tar.gz=424ca92c34cfce6d0da63170755b000c
-MagLev-22891.Darwin-i386.tar.gz=d8d3a8aaff1473422d6a30ecd2b2e9ff
-GemStone-22891.Darwin-i386.tar.gz=84080bda40c640aac9f19f5ea48403bf
-MagLev-22891.Linux-x86_64.tar.gz=f91f1bec1f3defb49323a70ec25504ef
-GemStone-22891.Linux-x86_64.tar.gz=5fd0d341a0eb586c9f804976cc290810
-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
+MacRuby%200.6.zip=a80afd3700c88cf95c539fc63b272faf
 jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
 jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7
+jruby-bin-1.5.0.RC1.tar.gz=47b4ca2a21659d36a2775ade0a2534c4
 libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
 ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
 openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3
@@ -64,16 +36,12 @@ 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
-GemStone-23082.Darwin-i386.tar.gz=aa5f1768e5bad2bb687913c575f9cff6
-GemStone-23082.Linux-x86_64.tar.gz=7b7fd0df5d1deacf7aa12ccc9a94a33f
-MagLev-23082.Darwin-i386.tar.gz=d9027e7b7c8220573b1d3d588712ffc4
-MagLev-23082.Linux-x86_64.tar.gz=d63c4c94a2eaf19b051182e974413fef
-GemStone-23101.Darwin-i386.tar.gz=09b2c6fbb17b5571d31f2539779a2c24
-GemStone-23101.Linux-x86_64.tar.gz=9710555efbeb3563c607f09db1d33090
-MagLev-23101.Darwin-i386.tar.gz=281c9615cb2ef94f720b67fb893f1e26
-MagLev-23101.Linux-x86_64.tar.gz=3294165bd510129fcf591920573c3af1
-GemStone-23191.Darwin-i386.tar.gz=d3137c1996b9a599d58fa77b9c0573b0
-GemStone-23191.Linux-x86_64.tar.gz=030b8b4951168142436ff958c222f7f1
-MagLev-23191.Darwin-i386.tar.gz=04b71b607392da54cc7366616483cfc9
-MagLev-23191.Linux-x86_64.tar.gz=479917622dd8605393e43e7c18c3fa44
+ironruby-1.0.zip=7a92888837b3507355ed391dbfc0ab83
+GemStone-23351.Darwin-i386.tar.gz=218f90c4ed4198252ab4a98f655610ac
+GemStone-23351.Linux-x86_64.tar.gz=ac142c16d8c0f4b73436ff6e2b51aa83
+MagLev-23351.Darwin-i386.tar.gz=d91fa3afbe8adadca4308c05d649c677
+MagLev-23351.Linux-x86_64.tar.gz=5f00eb87981854219fb949cf4e988781
+GemStone-23400.Darwin-i386.tar.gz=0ae86a5c26577965b960c14efe328aaf
+GemStone-23400.Linux-x86_64.tar.gz=6286c3955ce0c0d4829be99e8009cb52
+MagLev-23400.Darwin-i386.tar.gz=ea16e4e8dc1f43b9c02f3d7dc3f8ce8f
+MagLev-23400.Linux-x86_64.tar.gz=9119b79aa354e7eed49f1d53658a68be

data/help/alias

@@ -0,0 +1,46 @@
+Alias
+
+  RVM allows you to alias you rubies for your convience and pleasure.
+
+Usage
+  rvm [options] alias source destination
+
+  Source and Destination must be an RVM
+  ruby string representing an RVM installed ruby.
+
+  A gemset may be optionally included.
+
+Creating Aliases
+
+  First select a RVM ruby.
+
+    ∴ rvm alias create ree-1.8.7-p2010.01 php
+
+Using Aliases
+
+  Now that you have created an alias, you can use the alias in place of the longer rvm selector string.
+
+    ∴ rvm use php
+    ∴ ruby -v
+    ruby 1.8.7 (2009-12-24 patchlevel 248) [i686-darwin10.3.0], MBARI 0x6770, Ruby Enterprise Edition 2010.01
+
+If you use any aliases that are rather funny, please hop in #rvm and let us know :)
+
+Deleting Aliases
+
+  If you wish to delete an alias
+
+  ∴ rvm alias delete dotnet
+    Listing Aliases
+
+You can also list all current aliases
+
+  ∴ rvm alias list
+    php => ree-1.8.7-p2010.01
+    lisp => maglev-head
+    python => rbx-head
+
+Documentation:
+
+  http://rvm.beginrescueend.com/rubies/alias/
+

data/help/benchmark

@@ -0,0 +1,17 @@
+Benchmark
+
+If you have a bit of code that you would like to benchmark across several versions of ruby all at once you can now do this easily with RVM. Given:
+
+  ∴ cat increment.rb
+    y=0
+    1000.times do |x|
+      y = x + 1
+    end
+We can benchmark this code against multiple ruby versions very easily:
+
+  ∴ rvm 1.8.6,1.8.7,1.9.1,ree benchmark increment.rb
+
+
+Documentation:
+
+http://rvm.beginrescueend.com/set/benchmark/

data/help/debug

@@ -0,0 +1,8 @@
+Debug
+
+  TODO
+
+Documentation:
+
+  TODO
+

data/help/fetch

@@ -0,0 +1,5 @@
+Fetch
+
+Documentation:
+  TODO: For now see:
+  http://rvm.beginrescueend.com/rubies/installing/

data/install

@@ -29,7 +29,7 @@ spinner() {
   index=$((($spinner_counter % 8)))
   echo -e -n "\r${array[$index]}"
   let "spinner_counter=spinner_counter+1"
-  which perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
+  command -v perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
 }
 
 if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
@@ -56,6 +56,7 @@ fi
 if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
+
 if grep -q 'scripts/rvm' $HOME/.bash* || grep -q 'scripts/rvm' $HOME/.zsh*; then
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
     export upgrade_flag=1
@@ -102,7 +103,7 @@ fi
 
 spinner
 
-mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path $rvm_symlink_path $HOME/.gem/cache
+mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path
 
 for file in README LICENCE ; do
   spinner
@@ -112,7 +113,7 @@ done
 #
 # Scripts
 #
-for dir_name in config scripts examples lib hooks ; do
+for dir_name in config scripts examples lib hooks help ; do
   spinner
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -265,17 +266,28 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
 else
   if [[ "root" != "$(whoami)" ]] ; then
     echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
-    echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
+    echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
     echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
     echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-    echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must remove it and split your .bashrc"
-    echo -e "\n   Put everything *except the return code line(s)* into your .bash_profile, and everything above that code in your .bashrc."
-    echo -e "\n   Be *sure* to REMOVE the '&& return' statement line."
+    echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
+    echo -e "\n   if [[ ! -z "$PS1" ]] ; then"
+    echo -e "\n     ... original content that was below the && return line ..."
+    echo -e "\n   fi # <= be sure to close the if."
+    echo -e "\n   #EOF .bashrc"
+    echo -e "\n   Be absolutely *sure* to REMOVE the '&& return'."
     echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
-    echo -e "\n4) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+    echo -e "\n   placing all non-interactive items in the .bashrc"
+    echo -e "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
   fi
   if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
-    echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc. Please remove it and refactor your profiles to be correct. If you have questions about this please visit #rvm on irc.freenode.net.\n"
+    echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc.
+       This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:
+       if [[ ! -z "$PS1" ]] ; then
+         ... original content that was below the && return line ...
+       fi # <= be sure to close the if.
+       #EOF .bashrc
+
+    If you have any questions about this please visit #rvm on irc.freenode.net.\n"
   fi
   echo -e "Installation of RVM to $rvm_path/ is complete.\n\n"
 fi