rvm 1.0.13 → 1.0.14

data/binscripts/rvm-update-head

@@ -1,26 +1,35 @@
 #!/usr/bin/env bash
 
-rvm_ignore_rvmrc=${rvm_ignore_rvmrc:-0}
-if [[ $rvm_ignore_rvmrc -eq 0 ]]; then
-  [[ -s /etc/rvmrc ]] && source /etc/rvmrc
-  [[ -s "$HOME/.rvmrc" ]] && source "$HOME/.rvmrc"
+set -o errtrace
+set -o errexit
+
+export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
+
+if [[ ${rvm_ignore_rvmrc:-0} -eq 0 ]]; then
+  for file in /etc/rvmrc "$HOME/.rvmrc" ; do
+    if [[ -s "$file" ]] ; then
+      source $file
+    fi
+  done
 fi
 
-rvm_path="${rvm_path:-$HOME/.rvm}"
+rvm_path="${rvm_path:-"$HOME/.rvm"}"
 
-[ -d "$rvm_path/src" ] || \mkdir -p $rvm_path/src/
+mkdir -p "$rvm_path/src/"
 
-cd "$rvm_path/src"
+builtin cd "$rvm_path/src"
 
-[ -d ./rvm ] && \rm -rf ./rvm/
+rm -rf ./rvm/
 
-git clone --depth 1 git://github.com/wayneeseguin/rvm.git ||
-  git clone http://github.com/wayneeseguin/rvm.git
+url="http://github.com/wayneeseguin/rvm.git"
+
+if ! git clone "$url" ; then
+  printf "ERROR: Cloning from $url failed.\n"
+  exit 1
+fi
 
-cd rvm &&
+builtin cd rvm
 
-# v v v This is a good idea however it does not preserve the executible bit.
-# Needs more thought, perhaps a simple sed instead...
-# dos2unix scripts/* >/dev/null 2>&1
+chmod +x "$PWD/scripts/install"
 
-bash scripts/install
+exec "$PWD/scripts/install"

data/config/db

@@ -44,7 +44,7 @@ ree_1.8.7_patch_level=2010.02
 jruby_version=1.5.3
 jruby_repo_url=git://github.com/jruby/jruby.git
 jruby_url=http://jruby.org.s3.amazonaws.com/downloads
-macruby_version=0.6
+macruby_version=0.7
 macruby_url=http://www.macruby.org/files
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg

data/config/known

@@ -43,7 +43,9 @@ maglev-head
 mput[-head]
 
 # Mac OS X Snow Leopard Only
-macruby[-nightly] # the default macruby
+macruby-0.6
+macruby-[0.7] # the default macruby
+macruby-nightly
 macruby-head      # Build from the macruby git repository
 
 # IronRuby -- Not implemented yet.

data/config/md5

@@ -63,6 +63,7 @@ rubygems-1.3.6.tgz=789ca8e9ad1d4d3fe5f0534fcc038a0d
 rubygems-1.3.7.tgz=e85cfadd025ff6ab689375adbf344bbe
 MacRuby%200.5.zip=675454a8c7bc19d606d90a726e08427c
 MacRuby%200.6.zip=a80afd3700c88cf95c539fc63b272faf
+MacRuby%200.7.zip=0bb60588c9ec9b1517665743bb05132f
 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

data/install

@@ -366,8 +366,8 @@ if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
           echo "    Adding profile sourcing line to $rcfile."
 
           printf "
-# rvm-install added line:
-[[ -s \$HOME/.profile ]] && source \$HOME/.profile
+# rvm install added line:
+[[ -s \"$rvm_path/.profile\" ]] && source \"$rvm_path/.profile\"
 " >> "$rcfile"
 
         fi
@@ -379,7 +379,7 @@ if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
         echo "    Adding rvm loading line to $rcfile."
 
         printf "
-# rvm-install added:
+# rvm install added:
 [[ -s \"$rvm_path/.rvm/scripts/rvm\" ]] && . \"$rvm_path/.rvm/scripts/rvm\"
 " >> "$rcfile"
 
@@ -403,6 +403,7 @@ if [[ -d gemsets/ ]] ; then
   for gemset_file in $(find "$PWD/gemsets" -iname '*.gems' | sed 's/^\.\///') ; do
 
     cwd="${PWD//\//\\/}\/gemsets\/"
+
     destination="$rvm_path/gemsets/${gemset_file/$cwd}"
 
     destination_path="$(dirname "$destination")"
@@ -417,8 +418,6 @@ if [[ -d gemsets/ ]] ; then
 
   done
 
-  unset destination destination_path gemset_file
-
 fi
 
 if [[ -d patchsets/ ]] ; then

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 13
+:patch: 14

data/man/man1/rvm.1

@@ -0,0 +1,385 @@
+'\" t
+.\"     Title: rvm
+.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 07/16/2010
+.\"    Manual: [FIXME: manual]
+.\"    Source: [FIXME: source]
+.\"  Language: English
+.\"
+.TH "RVM" "1" "07/16/2010" "[FIXME: source]" "[FIXME: manual]"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+rvm \- The Ruby Version Manager
+.SH "SYNOPSIS"
+.sp
+\fBrvm\fR [\fIFLAGS\fR] [\fIOPTIONS\fR] \fIACTION\fR [\fIIMPLEMENTATION\fR[,\fIIMPLEMENTATION\fR[,\fI\&...\fR]]
+.SH "DESCRIPTION"
+.sp
+RVM is a command line tool which allows us to easily install, manage and work with multiple ruby environments from interpreters to sets of gems\&.
+.SH "FLAGS"
+.PP
+\fB\-\-head\fR
+.RS 4
+with update, updates rvm to git head version\&.
+.RE
+.PP
+\fB\-\-rubygems\fR
+.RS 4
+with update, updates rubygems for selected ruby
+.RE
+.PP
+\fB\-\-default\fR
+.RS 4
+with ruby select, sets a default ruby for new shells\&.
+.RE
+.PP
+\fB\-\-debug\fR
+.RS 4
+Toggle debug mode on for very verbose output\&.
+.RE
+.PP
+\fB\-\-trace\fR
+.RS 4
+Toggle trace mode on to see EVERYTHING rvm is doing\&.
+.RE
+.PP
+\fB\-\-force\fR
+.RS 4
+Force install, removes old install & source before install\&.
+.RE
+.PP
+\fB\-\-summary\fR
+.RS 4
+Used with rubydo to print out a summary of the commands run\&.
+.RE
+.PP
+\fB\-\-latest\fR
+.RS 4
+with gemset \-\-dump skips version strings for latest gem\&.
+.RE
+.PP
+\fB\-\-gems\fR
+.RS 4
+with uninstall/remove removes gems with the interpreter\&.
+.RE
+.PP
+\fB\-\-docs\fR
+.RS 4
+with install, attempt to generate ri after installation\&.
+.RE
+.PP
+\fB\-\-reconfigure\fR
+.RS 4
+Force \&./configure on install even if Makefile already exists\&.
+.RE
+.SH "OPTIONS"
+.PP
+\fB\-v, \-\-version\fR
+.RS 4
+Emit rvm version loaded for current shell\&.
+.RE
+.PP
+\fB\-l, \-\-level\fR
+.RS 4
+patch level to use with rvm use / install
+.RE
+.PP
+\fB\-\-prefix\fR
+.RS 4
+path for all rvm files (\fI~/\&.rvm/\fR), with trailing slash!
+.RE
+.PP
+\fB\-\-bin\fR
+.RS 4
+path for binaries to be placed (\fI~/\&.rvm/bin/\fR)
+.RE
+.PP
+\fB\-\-source\fR
+.RS 4
+src directory to use (\fI~/\&.rvm/src/\fR)
+.RE
+.PP
+\fB\-\-archives\fR
+.RS 4
+directory for downladed files (\fI~/\&.rvm/archives/\fR)
+.RE
+.PP
+\fB\-S\fR
+.RS 4
+Specify a script file to attempt to load and run (rubydo)\&.
+.RE
+.PP
+\fB\-e\fR
+.RS 4
+Execute code from the command line\&.
+.RE
+.PP
+\fB\-G\fR
+.RS 4
+root gem path to use
+.RE
+.PP
+\fB\-\-gems\fR
+.RS 4
+Used to set the
+\fIgems_flag\fR, use with
+\fIremove\fR
+to remove gems\&.
+.RE
+.PP
+\fB\-\-archive\fR
+.RS 4
+Used to set the
+\fIarchive_flag\fR, use with
+\fIremove\fR
+to remove archive\&.
+.RE
+.PP
+\fB\-\-patch\fR, \fB\-\-patches\fR
+.RS 4
+With any ruby build from source, allows you to specify patch paths and patch names to be applied prior to building\&. Values should be a relative / absolute path to a patch or the name of known patch / patchset\&. Optionally, paths or names may be followed by
+\fI%someinteger\fR
+\- e\&.g\&.
+\fI\-\-patches mypatch%2\fR
+\- where the number following the % specifies the value of the \-p argument to patch, defaulting to two\&.
+.RE
+.PP
+\fB\-C, \-\-configure\fR
+.RS 4
+custom configure options\&. If you need to pass several configure options then append them comma separated:
+\fI\-C \-\-\&...,\-\-\&...,\-\-\&...\fR\&.
+.RE
+.PP
+\fB\-\-nice\fR
+.RS 4
+process niceness (for slow computers, default 0)
+.RE
+.PP
+\fB\-\-ree\-options\fR
+.RS 4
+Options passed directly to ree\(cqs
+\fI\&./installer\fR
+on the command line\&.
+.RE
+.SH "ACTIONS"
+.PP
+\fBusage\fR
+.RS 4
+Show this usage information\&.
+.RE
+.PP
+\fBversion\fR
+.RS 4
+Show the rvm version installed in rvm_path\&.
+.RE
+.PP
+\fBuse\fR
+.RS 4
+Setup current shell to use a specific ruby version\&.
+.RE
+.PP
+\fBreload\fR
+.RS 4
+Reload rvm source itself (useful after changing rvm source)\&.
+.RE
+.PP
+\fBenv\fR
+.RS 4
+Displays information about an environment specified but the given ruby string\&. Useful for getting a sourceable path or an evaluatable set of shell variable declarations\&.
+.RE
+.PP
+\fBimplode\fR
+.RS 4
+(seppuku) removes the rvm installation completely\&. This means everything in $rvm_path (\fI~/\&.rvm\fR)\&. This does not touch your profiles, which is why there is an if around the sourcing
+\fIscripts/rvm\fR\&.
+.RE
+.PP
+\fBupdate\fR
+.RS 4
+Upgrades rvm to the latest version\&. (If you experience bugs try this first with \-\-head)\&.
+.RE
+.PP
+\fBreset\fR
+.RS 4
+Remove current and stored default & system settings\&. (If you experience odd behavior try this second)\&.
+.RE
+.PP
+\fBinfo\fR
+.RS 4
+Show the
+\fBcurrent\fR
+environment information for current ruby\&.
+.RE
+.PP
+\fBdebug\fR
+.RS 4
+Show info plus additional information for common issues\&.
+.RE
+.PP
+\fBinstall\fR
+.RS 4
+Install one or many ruby versions\&.
+http://rvm\&.beginrescueend\&.com/rubies/installing/
+.RE
+.PP
+\fBuninstall\fR
+.RS 4
+Uninstall one or many ruby versions, leaves their sources\&.
+.RE
+.PP
+\fBremove\fR
+.RS 4
+Uninstall one or many ruby versions and remove their sources\&.
+.RE
+.PP
+\fBwrapper\fR
+.RS 4
+Generates a set of wrapper executables for a given ruby with the specified ruby and gemset combination\&. Used under the hood for passenger support and the like\&.
+.RE
+.PP
+\fBruby\fR
+.RS 4
+Runs a named ruby file against specified and/or all rubies\&.
+.RE
+.PP
+\fBgem\fR
+.RS 4
+Runs a gem command using selected ruby\(cqs
+\fIgem\fR\&.
+.RE
+.PP
+\fBrake\fR
+.RS 4
+Runs a rake task against specified and/or all rubies\&.
+.RE
+.PP
+\fBtests\fR
+.RS 4
+Runs
+\fIrake test\fR
+across selected ruby versions\&.
+.RE
+.PP
+\fBspecs\fR
+.RS 4
+Runs
+\fIrake spec\fR
+across selected ruby versions\&.
+.RE
+.PP
+\fBmonitor\fR
+.RS 4
+Monitor cwd for testing, run
+\fIrake {spec,test}\fR
+on changes\&.
+.RE
+.PP
+\fBgemset\fR
+.RS 4
+gemsets:
+http://rvm\&.beginrescueend\&.com/gemsets/
+.RE
+.PP
+\fBgemdir\fR
+.RS 4
+Display the path to the current gem directory (\fI$GEM_HOME\fR)\&.
+.RE
+.PP
+\fBsrcdir\fR
+.RS 4
+Display the path to rvm source directory (may be yanked)\&.
+.RE
+.PP
+\fBfetch\fR
+.RS 4
+Performs an archive / src fetch only of the selected ruby\&.
+.RE
+.PP
+\fBlist\fR
+.RS 4
+Show currently installed rubies, interactive output\&.
+http://rvm\&.beginrescueend\&.com/rubies/list/
+.RE
+.PP
+\fBpackage\fR
+.RS 4
+Install a dependency package {readline,iconv,zlib,openssl}\&.
+http://rvm\&.beginrescueend\&.com/packages/
+.RE
+.PP
+\fBnotes\fR
+.RS 4
+Display notes, with operating system specifics\&.
+.RE
+.SH "IMPLEMENTATION"
+.PP
+\fBruby\fR
+.RS 4
+MRI/YARV Ruby (The Gold Standard) {1\&.8\&.6,1\&.8\&.7,1\&.9\&.1,1\&.9\&.2\&...}
+.RE
+.PP
+\fBjruby\fR
+.RS 4
+JRuby, Ruby interpreter on the Java Virtual Machine\&.
+.RE
+.PP
+\fBrbx\fR
+.RS 4
+Rubinius
+.RE
+.PP
+\fBree\fR
+.RS 4
+Ruby Enterprise Edition, MRI Ruby with several custom patches for performance, stability, and memory\&.
+.RE
+.PP
+\fBmacruby\fR
+.RS 4
+MacRuby, insanely fast, can make real apps (Mac OS X Only)\&.
+.RE
+.PP
+\fBmaglev\fR
+.RS 4
+GemStone Ruby, awesome persistent ruby object store\&.
+.RE
+.PP
+\fBironruby\fR
+.RS 4
+IronRuby, NOT supported yet\&. Looking for volunteers to help\&.
+.RE
+.PP
+\fBmput\fR
+.RS 4
+shyouhei(mput)\'s github repository, popular in Japan :)
+.RE
+.PP
+\fBsystem\fR
+.RS 4
+Use the system ruby (eg\&. pre\-rvm state)\&.
+.RE
+.PP
+\fBdefault\fR
+.RS 4
+Use rvm set default ruby and system if it hasn\(cqt been set\&.
+http://rvm\&.beginrescueend\&.com/rubies/default/
+.RE
+.SH "RESOURCES"
+.sp
+Main web site
+.sp
+Online issue\-tracker
+.SH "COPYING"
+.sp
+Copyright (c) 2009 Wayne E\&. Seguin
+.sp
+See LICENCE file for details\&.

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.13"
+  s.version = "1.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-10-03}
+  s.date = %q{2010-10-05}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -99,6 +99,8 @@ Gem::Specification.new do |s|
      "lib/rvm/shell/single_shot_wrapper.rb",
      "lib/rvm/shell/utility.rb",
      "lib/rvm/version.rb",
+     "man/man1/rvm.1",
+     "man/man1/rvm.1.gz",
      "rvm.gemspec",
      "scripts/alias",
      "scripts/aliases",

data/scripts/fetch

@@ -83,7 +83,7 @@ if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
 fi
 
 # Check first if we have the correct archive
-archive_md5="$($rvm_path/scripts/db "$rvm_path/config/md5" "$archive" | head -n1)"
+archive_md5="$("$rvm_path/scripts/db" "$rvm_path/config/md5" "$archive" | head -n1)"
 
 if [[ -e "$archive" && ! -z "$archive_md5" ]] ; then
 

data/scripts/info

@@ -104,7 +104,7 @@ $(__rvm_version)
   $("$rvm_path/scripts/info" "$rvm_ruby_string" "" )
   PATH:\n$(printf "$PATH" | awk -F":" '{print $1":"$2":"$3":"$4":"$5}' )
   uname -a: $(uname -a)
-  permissions: $(\ls -la $rvm_path{,/rubies})
+  permissions: $(\ls -la "$rvm_path" "$rvm_path/rubies")
 "
 
   if [[ "Darwin" = "$(uname)" ]] ; then
@@ -123,7 +123,7 @@ $(__rvm_version)
 
     if [[ -s "$file_name" ]] ; then
 
-      rvm_info="$rvm_info\n$file_name:\n$(\grep 'rvm' $file_name 2>/dev/null || true)"
+      rvm_info="$rvm_info\n$file_name:\n$(\grep 'rvm' "$file_name" 2>/dev/null || true)"
 
     fi
 
@@ -131,19 +131,19 @@ $(__rvm_version)
 
   if [[ "$rvm_selfcontained" = "0" ]] ; then
 
-    debug_files="$rvm_path/config/alias $rvm_path/config/system $rvm_path/config/db /etc/rvmrc /etc/gemrc"
+   debug_files=("$rvm_path/config/alias" "$rvm_path/config/system" "$rvm_path/config/db" "/etc/rvmrc" "/etc/gemrc")
 
   else
 
-    debug_files="$rvm_path/config/alias $rvm_path/config/system $rvm_path/config/db $HOME/.rvmrc $HOME/.gemrc"
+  debug_files=("$rvm_path/config/alias" "$rvm_path/config/system" "$rvm_path/config/db" "$HOME/.rvmrc" "$HOME/.gemrc")
 
   fi
 
-  for file_name in $(echo $debug_files); do
+  for file_name in "${debug_files[@]}" ; do
 
-    if [[ -f "$file_name" ]] && [[ -s "$file_name" ]] ; then
+    if [[ -f "$file_name" && -s "$file_name" ]] ; then
 
-      rvm_info="$rvm_info\n$file_name \(filtered\):\n$(awk '!/assword|_key/' < $file_name)\n"
+      rvm_info="$rvm_info\n$file_name \(filtered\):\n$(awk '!/assword|_key/' "$file_name" )\n"
 
     fi
 

data/scripts/install

@@ -366,8 +366,8 @@ if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
           echo "    Adding profile sourcing line to $rcfile."
 
           printf "
-# rvm-install added line:
-[[ -s \$HOME/.profile ]] && source \$HOME/.profile
+# rvm install added line:
+[[ -s \"$rvm_path/.profile\" ]] && source \"$rvm_path/.profile\"
 " >> "$rcfile"
 
         fi
@@ -379,7 +379,7 @@ if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
         echo "    Adding rvm loading line to $rcfile."
 
         printf "
-# rvm-install added:
+# rvm install added:
 [[ -s \"$rvm_path/.rvm/scripts/rvm\" ]] && . \"$rvm_path/.rvm/scripts/rvm\"
 " >> "$rcfile"
 
@@ -403,6 +403,7 @@ if [[ -d gemsets/ ]] ; then
   for gemset_file in $(find "$PWD/gemsets" -iname '*.gems' | sed 's/^\.\///') ; do
 
     cwd="${PWD//\//\\/}\/gemsets\/"
+
     destination="$rvm_path/gemsets/${gemset_file/$cwd}"
 
     destination_path="$(dirname "$destination")"
@@ -417,8 +418,6 @@ if [[ -d gemsets/ ]] ; then
 
   done
 
-  unset destination destination_path gemset_file
-
 fi
 
 if [[ -d patchsets/ ]] ; then

data/scripts/manage

@@ -364,9 +364,12 @@ __rvm_install_ruby()
 
           mkdir -p ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string
 
-          unzip -o -j "${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file" "MacRuby ${rvm_ruby_version}/MacRuby ${rvm_ruby_version}.pkg" -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
+          unzip -o -j "${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file" \
+            "MacRuby ${rvm_ruby_version}/MacRuby ${rvm_ruby_version}.pkg" \
+            -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
-          mv "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/MacRuby ${rvm_ruby_version}.pkg" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/$rvm_ruby_string.pkg"
+          mv "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/MacRuby ${rvm_ruby_version}.pkg" \
+            "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/$rvm_ruby_string.pkg"
 
           __rvm_run "macruby/extract" \
             "sudo /usr/sbin/installer -pkg '${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/$rvm_ruby_string.pkg' -target '/'"
@@ -1482,7 +1485,8 @@ __rvm_fetch_ruby()
 
     rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
-    cp -R "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
+    cp -R "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string" \
+      "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
   fi
 
   return ${result:-0}
@@ -1492,13 +1496,17 @@ __rvm_check_default()
 {
   local default_ruby_interpreter current_ruby_interpreter
 
-  default_ruby_interpreter="$(rvm alias show default 2>/dev/null | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}')"
+  default_ruby_interpreter="$(rvm alias show default 2>/dev/null \
+    | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}')"
 
-  current_ruby_interpreter="$(echo "$rvm_ruby_string" | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}')"
+  current_ruby_interpreter="$(echo "$rvm_ruby_string" \
+    | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}')"
 
-  if [[ -n "$current_ruby_interpreter" && "$current_ruby_interpreter" = "$default_ruby_interpreter" ]]; then
+  if [[ -n "$current_ruby_interpreter" \
+    && "$current_ruby_interpreter" = "$default_ruby_interpreter" ]]; then
 
-    __rvm_run_with_env 'default.restore' 'system' 'rvm use system --default' 'Removing default ruby interpreter'
+    __rvm_run_with_env 'default.restore' 'system' \
+      'rvm use system --default' 'Removing default ruby interpreter'
 
   fi
 
@@ -1572,7 +1580,8 @@ __rvm_remove_ruby()
 
       else
 
-        "$rvm_path/scripts/log" "info" "it seems that $dir/$rvm_ruby_string is already non existent."
+        "$rvm_path/scripts/log" "info" \
+          "it seems that $dir/$rvm_ruby_string is already non existent."
 
       fi
 
@@ -1616,7 +1625,8 @@ __rvm_remove_gemsets()
 
     "$rvm_path/scripts/log" "info" "Removing $rvm_ruby_string gemsets..."
 
-    gemsets=($(builtin cd "${rvm_gems_path:-"$rvm_path/gems"}"/ ; find . -maxdepth 1 -mindepth 1 -type d))
+    gemsets=($(builtin cd "${rvm_gems_path:-"$rvm_path/gems"}"/ ; \
+      find . -maxdepth 1 -mindepth 1 -type d))
 
     for gemset in "${gemsets[@]//.\/}" ; do
 
@@ -1726,9 +1736,11 @@ __rvm_post_install()
 
     for binary in "${binaries[@]}" ; do
 
-      if [[ -e "$rvm_ruby_home/bin/$binary" || -e "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/$binary" ]] ; then
+      if [[ -e "$rvm_ruby_home/bin/$binary" \
+        || -e "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/$binary" ]] ; then
 
-        if [[ "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" != "$rvm_ruby_home" && -f "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/$binary" ]] ; then
+        if [[ "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" != "$rvm_ruby_home" \
+          && -f "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/$binary" ]] ; then
 
           cp -f "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/$binary" "$rvm_ruby_home/bin/$binary"
 

data/scripts/package

@@ -60,8 +60,17 @@ install_package()
 
     builtin cd "$src_path/$package-$version"
 
+    if [[ ! -z "$patches" ]] ; then
+      for patch in $(echo $patches | tr ',' ' ') ; do
+        __rvm_run "$package/patch" "patch -p0 -f < $patch" "Applying patch '$patch'..."
+        if [[ $? -gt 0 ]] ; then
+          $rvm_scripts_path/log "error" "Patch $patch did not apply cleanly... back to the patching board :(" ; exit 1
+        fi
+      done
+    fi
+
     __rvm_run "$package/configure" \
-      "${configure:-"./configure --prefix=${prefix_path:-"$usr_path"}"} $configure_flags" \
+      "${configure:-"./configure --prefix=\"${prefix_path:-"$usr_path"}\""} $configure_flags" \
       "Configuring $package in $src_path/$package-$version."
 
     unset configure_flags
@@ -96,10 +105,15 @@ install_package()
 readline()
 {
   package="readline" ; archive_format="tar.gz"
-  for version in 5.2 6.0 ; do
-    configure_flags="--disable-dependency-tracking --disable-static --enable-shared"
-    install_package
-  done
+  configure="env CFLAGS=-I${usr_path}/include LDFLAGS=-L${usr_path}/lib ./configure --prefix=${usr_path} --disable-dependency-tracking --disable-static --enable-shared"
+
+  version="5.2"
+  patches="$rvm_path/patches/$package-$version/shobj-conf.patch"
+  install_package
+
+  version="6.0"
+  patches=""
+  install_package
 }
 
 iconv()
@@ -150,7 +164,7 @@ openssl()
     fi
     configure_command="./Configure"
 
-    patches="$rvm_path/patches/$package/Makefile.org.patch,$rvm_patch/patches/$package/crypto-Makefile.patch"
+    patches="$rvm_path/patches/$package/Makefile.org.patch,$rvm_path/patches/$package/crypto-Makefile.patch"
 
     # Don't use -j option for make OpenSSL
     if [[ ! -z "$rvm_make_flags" ]] ; then
@@ -210,7 +224,7 @@ glib()
   pkgconfig
   gettext
   package="glib" ; version="2.23.1" ; archive_format="tar.gz"
-  configure="CC=\"cc -L$usr_path/lib -I$usr_path/include\" PKG_CONFIG=\"$usr_path/bin/pkg-config\" ./configure --prefix=$usr_path"
+  configure="CC=\"cc -L$usr_path/lib -I$usr_path/include\" PKG_CONFIG=\"$usr_path/bin/pkg-config\" ./configure --prefix=\"$usr_path\""
 
   install_package
 }
@@ -242,6 +256,11 @@ llvm()
   )
 }
 
+reset()
+{
+  unset package version archive_format patches prefix_path configure configure_flags
+}
+
 # Tools to make managing ruby dependencies inside of rvm easier.
 args=($*)
 action="${args[0]:-""}"
@@ -258,6 +277,12 @@ if [[ -n "$library" ]] ; then
     readline|iconv|curl|openssl|zlib|autoconf|ncurses|pkgconfig|gettext|glib|mono|llvm|libxml2)
       ${library}
     ;;
+    ree_dependencies)
+      for i in zlib ncurses readline openssl iconv; do
+        ${i}
+        reset
+      done
+    ;;
     *)
       "$rvm_path/scripts/log" "error" "Package '${library}' is unknown."
     ;;
@@ -268,5 +293,9 @@ if [[ -n "$library" ]] ; then
 else
   "$rvm_path/scripts/log" "info" \
     "Usage: 'rvm package {install,uninstall} {readline,iconv,curl,openssl,zlib,autoconf,ncurses,pkgconfig,gettext,glib,mono,llvm,libxml2}'"
+  "$rvm_path/scripts/log" "info" \
+    "  'ree_dependencies' installs zlib, ncurses, readline, openssl and iconv in this order."
+  "$rvm_path/scripts/log" "info" \
+    "  still need to add '-C --with-readline-dir=\$rvm_path/usr,--with-iconv-dir=\$rvm_path/usr,--with-zlib-dir=\$rvm_path/usr,--with-openssl-dir=\$rvm_path/usr' to 'rvm install ree'"
   exit 1
 fi

data/scripts/repair

@@ -144,7 +144,7 @@ repair_archives()
 
     [[ -f "${rvm_archives_path:-"$rvm_path/archives"}/$archive_file" ]] || continue
 
-    stored_md5sum="$($rvm_path/scripts/db "$rvm_path/config/md5" "$archive_file" | head -n1)"
+    stored_md5sum="$("$rvm_path/scripts/db" "$rvm_path/config/md5" "$archive_file" | head -n1)"
 
     if [[ -n "$stored_md5sum" ]] ; then
 

data/scripts/rvm-install

@@ -366,8 +366,8 @@ if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
           echo "    Adding profile sourcing line to $rcfile."
 
           printf "
-# rvm-install added line:
-[[ -s \$HOME/.profile ]] && source \$HOME/.profile
+# rvm install added line:
+[[ -s \"$rvm_path/.profile\" ]] && source \"$rvm_path/.profile\"
 " >> "$rcfile"
 
         fi
@@ -379,7 +379,7 @@ if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
         echo "    Adding rvm loading line to $rcfile."
 
         printf "
-# rvm-install added:
+# rvm install added:
 [[ -s \"$rvm_path/.rvm/scripts/rvm\" ]] && . \"$rvm_path/.rvm/scripts/rvm\"
 " >> "$rcfile"
 
@@ -403,6 +403,7 @@ if [[ -d gemsets/ ]] ; then
   for gemset_file in $(find "$PWD/gemsets" -iname '*.gems' | sed 's/^\.\///') ; do
 
     cwd="${PWD//\//\\/}\/gemsets\/"
+
     destination="$rvm_path/gemsets/${gemset_file/$cwd}"
 
     destination_path="$(dirname "$destination")"
@@ -417,8 +418,6 @@ if [[ -d gemsets/ ]] ; then
 
   done
 
-  unset destination destination_path gemset_file
-
 fi
 
 if [[ -d patchsets/ ]] ; then

data/scripts/selector

@@ -269,12 +269,13 @@ __rvm_use()
 
     new_path="$(__rvm_remove_rvm_from_path ; printf "$PATH"):${rvm_bin_path:-"$rvm_path/bin"}"
 
-    if [[ -s $rvm_path/config/system ]] ; then
+    if [[ -s "$rvm_path/config/system" ]] ; then
 
       \grep "MY_RUBY_HOME='$rvm_path/rubies" "$rvm_path/config/system" > /dev/null
 
       if [[ $? -eq 0 ]] ; then
-        [[ -f "$rvm_path/config/system" ]] && \rm -f $rvm_path/config/system # 'system' should *not* point to an rvm ruby.
+        # 'system' should *not* point to an rvm ruby.
+        [[ -f "$rvm_path/config/system" ]] && \rm -f "$rvm_path/config/system"
       else
         source "$rvm_path/config/system"
       fi

data/scripts/update

@@ -366,8 +366,8 @@ if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
           echo "    Adding profile sourcing line to $rcfile."
 
           printf "
-# rvm-install added line:
-[[ -s \$HOME/.profile ]] && source \$HOME/.profile
+# rvm install added line:
+[[ -s \"$rvm_path/.profile\" ]] && source \"$rvm_path/.profile\"
 " >> "$rcfile"
 
         fi
@@ -379,7 +379,7 @@ if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
         echo "    Adding rvm loading line to $rcfile."
 
         printf "
-# rvm-install added:
+# rvm install added:
 [[ -s \"$rvm_path/.rvm/scripts/rvm\" ]] && . \"$rvm_path/.rvm/scripts/rvm\"
 " >> "$rcfile"
 
@@ -403,6 +403,7 @@ if [[ -d gemsets/ ]] ; then
   for gemset_file in $(find "$PWD/gemsets" -iname '*.gems' | sed 's/^\.\///') ; do
 
     cwd="${PWD//\//\\/}\/gemsets\/"
+
     destination="$rvm_path/gemsets/${gemset_file/$cwd}"
 
     destination_path="$(dirname "$destination")"
@@ -417,8 +418,6 @@ if [[ -d gemsets/ ]] ; then
 
   done
 
-  unset destination destination_path gemset_file
-
 fi
 
 if [[ -d patchsets/ ]] ; then

data/scripts/utility

@@ -48,7 +48,7 @@ __rvm_teardown()
 
   fi
 
-  unset rvm_ruby_strings rvm_head_flag rvm_prior_cc next_token rvm_bin_path rvm_error_message rvm_gems_cache_path rvm_gems_path rvm_gemset_name rvm_interactive_flag rvm_man_path rvm_parse_break rvm_rc_files rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_selfcontained rvm_token rvm_ruby_load_path rvm_path_flag rvm_ruby_require rvm_project_rvmrc_default rvm_action
+  unset rvm_ruby_strings rvm_head_flag rvm_prior_cc next_token rvm_bin_path rvm_error_message rvm_gems_cache_path rvm_gems_path rvm_gemset_name rvm_interactive_flag rvm_man_path rvm_parse_break rvm_rc_files rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_selfcontained rvm_token rvm_ruby_load_path rvm_path_flag rvm_ruby_require rvm_action
 
   [[ ${rvm_dump_environment_flag:-0} -eq 1 ]] && __rvm_dump_environment
 
@@ -117,11 +117,11 @@ __rvm_db()
   variable=${2:-""}
 
   if [[ -f "$rvm_path/config/user" ]] ; then
-    value="$($rvm_path/scripts/db "$rvm_path/config/user" "$key")"
+    value="$("$rvm_path/scripts/db" "$rvm_path/config/user" "$key")"
   fi
 
   if [[ -z "$value" ]] ; then
-    value="$($rvm_path/scripts/db "$rvm_path/config/db" "$key")"
+    value="$("$rvm_path/scripts/db" "$rvm_path/config/db" "$key")"
   fi
 
   if [[ -n "$value" ]] ; then
@@ -814,8 +814,8 @@ __rvm_update_rvm()
       else
 
         builtin cd "${rvm_src_path:-"$rvm_path/src"}" && \
-          ( git clone --depth 1 git://github.com/wayneeseguin/rvm.git || \
-          git clone http://github.com/wayneeseguin/rvm.git ) && \
+          ( git clone http://github.com/wayneeseguin/rvm.git || \
+          git clone --depth 1 git://github.com/wayneeseguin/rvm.git ) && \
           builtin cd rvm/ && ./scripts/install
       fi
     else
@@ -1420,7 +1420,7 @@ __rvm_record_install()
 
   [[ -z "$1" ]] && return
 
-  recorded_ruby_name="$($rvm_path/scripts/tools strings "$1")"
+  recorded_ruby_name="$("$rvm_path/scripts/tools" strings "$1")"
 
   rvm_install_record_file="$rvm_path/config/installs"
 
@@ -1446,7 +1446,7 @@ __rvm_remove_install_record()
 {
   local recorded_ruby_name rvm_install_record_file
 
-  recorded_ruby_name="$($rvm_path/scripts/tools strings "$1")"
+  recorded_ruby_name="$("$rvm_path/scripts/tools" strings "$1")"
 
   rvm_install_record_file="$rvm_path/config/installs"
 
@@ -1467,7 +1467,7 @@ __rvm_recorded_install_command()
 {
   local recorded_ruby_name recorded_ruby_match
 
-  recorded_ruby_name="$($rvm_path/scripts/tools strings "$1" \
+  recorded_ruby_name="$("$rvm_path/scripts/tools" strings "$1" \
     | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}')"
 
   [[ -z "$recorded_ruby_name" ]] && return 1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 1
   - 0
-  - 13
-  version: 1.0.13
+  - 14
+  version: 1.0.14
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-03 00:00:00 -04:00
+date: 2010-10-05 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -109,6 +109,8 @@ files:
 - lib/rvm/shell/single_shot_wrapper.rb
 - lib/rvm/shell/utility.rb
 - lib/rvm/version.rb
+- man/man1/rvm.1
+- man/man1/rvm.1.gz
 - rvm.gemspec
 - scripts/alias
 - scripts/aliases