rvm 1.0.11 → 1.0.13

data/binscripts/rvm-prompt

@@ -1,13 +1,22 @@
 #!/usr/bin/env bash
 
 add(){
+
   token=${1:-""}
+
   eval "${token}_flag=1" ; shift
+
   if [[ -n "$format" ]] ; then
+
     format="${format}-\$${token}"
+
   else
+
     format="\$${token}"
+
   fi
+
+  return 0
 }
 
 rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
@@ -15,98 +24,181 @@ rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
 ruby=$(command -v ruby)
 
 if [[ -n "$ruby" && -n "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
+
   unset format
+
   while [[ $# -gt 0 ]] ; do
+
     token="$1" ; shift
+
     case "$token" in
+
       i|interpreter)  add "interpreter"  ;;
+
       v|version)      add "version"      ;;
+
       p|patchlevel)   add "patchlevel"   ;;
+
       r|revision)     add "revision"     ;;
+
       a|architecture) add "architecture" ;;
+
       g|gemset)       add "gemset"       ;;
+
       u|unicode)      add "unicode"      ;;
+
       s|system)       add "system"       ;;
+
       -d|--no-default) no_default=1      ;;
+
       *) echo "Unrecognized command line option '$token' for $0" ; exit 1 ;;
+
     esac
+
   done
 
+
   if [[ -z "$format" ]] ; then
+
     add "interpreter"
+
     add "version"
+
     add "patchlevel"
+
     add "gemset"
+
   fi
 
   ruby_string=$(dirname "$ruby" | xargs dirname | xargs basename)
 
-  # Dont' display anything if no default flag was provided and we're using the default ruby
-  if [[ -n "$no_default" && "$(rvm tools identifier)" = "$(rvm alias show default)" ]]; then
+  default_alias="$(rvm alias show default)"
+
+  identifier="$(rvm tools identifier)"
+
+  # Do not display anything if no default flag was provided
+  #   and we are using the default ruby
+  if [[ -n "$no_default" && "$identifier" = "$default_alias" ]]; then
+
     exit 0
+
   fi
 
+  strings=(${ruby_string//-/ })
+
   if [[ ${interpreter_flag:-0} -gt 0 || -n "$unicode_flag" ]] ; then
-    interpreter="${ruby_string/-*/}"
+
+    interpreter=${strings[0]}
+
   fi
 
   if [[ ${version_flag:-0} -gt 0 || -n "$unicode_flag" ]] ; then
-    version="${ruby_string%-*}" ; version="${version#*-}"
+
+    version=${strings[1]}
+
   fi
 
-  if [[ ${patchlevel_flag:-0} -gt 0 ]] ; then
-    patchlevel="${ruby_string##*-}"
+  if [[ ${#strings[@]} -gt 2 ]] ; then
+
+    if [[ ${patchlevel_flag:-0} -gt 0 ]] ; then
+
+      patchlevel=${strings[2]}
+
+    fi
+
   fi
 
   if [[ ${architecture_flag:-0} -gt 0 ]] ; then
+
     architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
+
   fi
 
   if [[ ${gemset_flag:-0} -gt 0 ]] ; then
+
     case "${GEM_HOME:-""}" in
+
       *${rvm_gemset_separator:-"@"}*)
+
         gemset="${rvm_gemset_separator:-"@"}${GEM_HOME/*${rvm_gemset_separator:-"@"}/}"
+
         ;;
+
     esac
+
   fi
 
   if [[ ${unicode_flag:-0} -gt 0 ]] ; then
+
     case "$interpreter" in
+
       jruby)    unicode="☯" ;;
+
       rbx)      unicode="☃" ;;
+
       ree)      unicode="✈" ;;
+
       macruby)  unicode="⌘" ;;
+
       maglev)   unicode="㎖" ;;
+
       ironruby) unicode="♭" ;;
+
       mput)     unicode="⎈" ;;
+
       system)   unicode="➆" ;;
+
       ruby)
+
         case ${version:-""} in
+
           1.8.6)  unicode="❻"  ;;
+
           1.8.7)  unicode="❼"  ;;
+
           1.9.1)  unicode="❶"  ;;
+
           1.9.2)  unicode="❷"  ;;
+
           *)      unicode="♢"  ;;
+
         esac ;;
+
       *) unicode="♢" ;;
+
     esac
 
     if echo "$ruby_string" | \grep -q '-head' ; then
+
       unicode="${unicode}〠"
+
     fi
+
   fi
 
   eval "prompt=\"$format\""
 
-  echo "$prompt" | sed -e 's#^[[:space:]]*-*##g' -e 's#--*#-#g' -e 's#-*[[:space:]]*$##' -e 's#-'${rvm_gemset_separator:-"@"}'#'${rvm_gemset_separator:-"@"}'#'
+  echo "$prompt" \
+    | sed -e 's#^[[:space:]]*-*##g' \
+          -e 's#--*#-#g' \
+          -e 's#-*[[:space:]]*$##' \
+          -e 's#-'${rvm_gemset_separator:-"@"}'#'${rvm_gemset_separator:-"@"}'#'
+
 
 else
+
   while [[ $# -gt 0 ]] ; do
+
     token="$1" ; shift
+
     case "$token" in
+
       s|system) echo "system" ;;
+
     esac
+
   done
+
 fi
 
 exit 0

data/binscripts/rvmsudo

@@ -19,8 +19,6 @@ if [[ -n "${GEM_PATH:-""}" ]] ; then
   prefix="GEM_PATH='$GEM_PATH' $prefix"
 fi
 
-command="$prefix /usr/bin/env $@"
-
-eval sudo $command
+eval "sudo /usr/bin/env $prefix $@"
 
 exit $?

data/config/db

@@ -26,11 +26,13 @@ rubygems_version=1.3.7
 rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
 rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
 rubygems_1.3.7_url=http://rubyforge.org/frs/download.php/70696
-rbx_version=1.0.1
+rbx_version=1.1.0
 rbx_1.0.0_patch_level=20100514
 rbx_1.0.1_patch_level=20100603
+rbx_1.1.0_patch_level=20100923
 rbx_url=http://asset.rubini.us
 rubinius_repo_url=git://github.com/evanphx/rubinius.git
+http://rubini.us/download/latest
 ree_version=1.8.7
 ree_configure_flags=--dont-install-useful-gems
 ree_1.8.6_patch_level=20090610
@@ -39,7 +41,7 @@ ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
 ree_1.8.7_url=http://rubyforge.org/frs/download.php/71096
 ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
 ree_1.8.7_patch_level=2010.02
-jruby_version=1.5.2
+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

data/config/known

@@ -20,11 +20,13 @@ jruby-1.2.0
 jruby-1.3.1
 jruby-1.4.0
 jruby-1.5.1
-jruby[-1.5.2]
+jruby-1.5.2
+jruby[-1.5.3]
 jruby-head
 
 # Rubinius
-rbx[-1.0.1]
+rbx-1.0.1
+rbx[-1.1.0]
 rbx-head
 
 # Ruby Enterprise Edition

data/config/md5

@@ -3,6 +3,7 @@ rubinius-1.0.0-rc4-20100331.tar.gz=c631131cc9542c548b4fc3791d8aa6b2
 rubinius-1.0.0-rc5-20100510.tar.gz=d4fbb5b01aaeee3948cbe1cd38236524
 rubinius-1.0.0-20100514.tar.gz=b05f4e791d3712c5a50b3d210dac6eb0
 rubinius-1.0.1-20100603.tar.gz=eb185703c7ae0c0210e8dcb7f783ee8e
+rubinius-1.1.0-20100923.tar.gz=e2ae16238b201de09975abe19da09ea9
 ruby-1.8.5-p115.tar.gz=20ca6cc87eb077296806412feaac0356
 ruby-1.8.5-p231.tar.gz=e900cf225d55414bffe878f00a85807c
 ruby-1.8.6-p286.tar.gz=797ea136fe43e4286c9362ee4516674e
@@ -69,6 +70,7 @@ jruby-bin-1.5.0.RC3.tar.gz=9c2758600de903b8ca07cb1341f4f1b3
 jruby-bin-1.5.0.tar.gz=ee2b4e326e8b87858e5dd0c8e94102e6
 jruby-bin-1.5.1.tar.gz=0196dcfb17354f12253eaddc1166a0ee
 jruby-bin-1.5.2.tar.gz=d239deb9a108a6abbfbd6cb79cf8255b
+jruby-bin-1.5.3.tar.gz=ccb0b2dbc300d8dd4ad1bd4da48b8320
 libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
 ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
 openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3

data/contrib/install-system-wide

@@ -91,8 +91,8 @@ while [[ $# -gt 0 ]] ; do
       set -o verbose
       ;;
     --version|--revision)
-      if [[ -n "${1:-""}" ]] ; then
-        revision="$1"
+      if [[ -n "${2:-""}" ]] ; then
+        revision="$2"
         shift
       else
         usage

data/contrib/r

@@ -7,22 +7,38 @@ r() {
   local action args
 
   action="$1" ; shift
+
   args="$@"
 
   case "$action" in
+
     c)      action=console   ;;
+
     db)     action=dbconsole ;;
+
     g)      action=generate  ;;
+
     h|help) action="-h"      ;;
+
   esac
 
   if [[ -s config.ru ]] ; then
+
     ruby ./script/rails $args
+
   else
+
     if [[ -s ./script/$action ]] ; then
+
       ruby ./script/$action $args
+
     else
+
       printf "ERROR: Missing script ./script/$action !!!"
+
     fi
+
   fi
+
+  return 0
 }

data/install

@@ -1,10 +1,13 @@
 #!/usr/bin/env bash
 
 set -o errtrace
+set -o errexit
+
 export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
 
 if [[ -z "$rvm_selfcontained" ]]; then
-  if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+  if [[ "root" = "$(whoami)" \
+    || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
     export rvm_selfcontained=0
   else
     export rvm_selfcontained=1
@@ -15,34 +18,49 @@ unset rvm_auto_flag
 
 install_source_path="$(dirname "$0" | sed 's#\/scripts$##')"
 
-if [[ -d "$install_source_path/scripts" ]] && [[ -s "$install_source_path/scripts/utility" ]] ; then
+if [[ -d "$install_source_path/scripts" \
+  && -s "$install_source_path/scripts/utility" ]] ; then
   builtin cd "$install_source_path"
 fi
 
 source scripts/version
 source scripts/utility
 
-usage() {
+usage()
+{
   printf "
   Usage:
+
     ${0} [options]
 
   options:
+
     --auto    : Automatically update shell profile files.
+
     --prefix  : Installation prefix directory.
+
     --help    : Display help/usage (this) message
+
     --version : display rvm package version
+
   "
 }
 
-check_rubyopt_conditions() {
+check_rubyopt_conditions()
+{
   if [[ -n "${RUBYOPT:-""}" ]]; then
-    printf "\n\nWARNING: You have RUBYOPT set in your current environment. This may interfere with normal rvm"
-    printf "\n operation. If errors show up, please try unsetting RUBYOPT first.\n"
+    printf "
+
+WARNING: You have RUBYOPT set in your current environment.
+This may cause rubies to not work as you expect them to as it is not supported
+by all of them If errors show up, please try unsetting RUBYOPT first.
+
+"
   fi
 }
 
-andand_return_instructions() {
+andand_return_instructions()
+{
   printf "
   This means that if you see something like:
 
@@ -63,7 +81,8 @@ EOF - This marks the end of the .bashrc file
 "
 }
 
-installation_complete() {
+installation_complete()
+{
   printf "
   You must now complete the install by loading RVM in new shells.
 
@@ -91,7 +110,8 @@ installation_complete() {
   \n"
 }
 
-andand_return_warning() {
+andand_return_warning()
+{
   printf "
   WARNING:  you have a 'return' statement in your ~/.bashrc
               This could cause some features of RVM to not work.
@@ -104,7 +124,8 @@ andand_return_warning() {
   \n"
 }
 
-thank_you() {
+thank_you()
+{
   printf "
 ${name:-"$(whoami)"},
 
@@ -135,7 +156,8 @@ or opening a new shell
 "
 }
 
-upgrade_notes() {
+upgrade_notes()
+{
   printf "
 
 Upgrade Notes
@@ -187,14 +209,23 @@ fi
 
 source scripts/initialize
 
-if grep -q 'scripts/rvm' "$HOME"/.bash* 2>/dev/null || grep -q 'scripts/rvm' "$HOME"/.zsh* 2>/dev/null; then
+if grep -q 'scripts/rvm' "$HOME"/.bash* 2>/dev/null \
+  || grep -q 'scripts/rvm' "$HOME"/.zsh* 2>/dev/null ; then
+
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
+
     export upgrade_flag=1
+
   else
+
     export upgrade_flag=0
+
   fi
+
 else
+
   export upgrade_flag=0
+
 fi
 
 __rvm_initialize
@@ -237,7 +268,17 @@ else
 
 fi
 
-directories=( "${rvm_archives_path:-"$rvm_path/archives"}" "${rvm_src_path:-"$rvm_path/src"}" "${rvm_log_path:-"$rvm_path/log"}" "$rvm_bin_path" "${rvm_gems_path:-"$rvm_path/gems"}" "${rvm_rubies_path:-"$rvm_path/rubies"}" "$rvm_path/config" "${rvm_tmp_path:-"$rvm_path/tmp"}" "$rvm_path/bin" )
+directories=(
+  "${rvm_archives_path:-"$rvm_path/archives"}"
+  "${rvm_src_path:-"$rvm_path/src"}"
+  "${rvm_log_path:-"$rvm_path/log"}"
+  "$rvm_bin_path"
+  "${rvm_gems_path:-"$rvm_path/gems"}"
+  "${rvm_rubies_path:-"$rvm_path/rubies"}"
+  "$rvm_path/config"
+  "${rvm_tmp_path:-"$rvm_path/tmp"}"
+  "$rvm_path/bin"
+  )
 
 for directory in "${directories[@]}" ; do
 
@@ -277,7 +318,8 @@ for dir_name in config scripts examples lib hooks help patches; do
 done
 
 if [[ ! -s "$rvm_path/config/user" ]] ; then
-  echo '# Users settings file, overrides db file settings and persists across installs.' >> "$rvm_path/config/user"
+  echo '# User settings, overrides db settings and persists across installs.' \
+    >> "$rvm_path/config/user"
 fi
 
 scripts=(monitor match log install color db fetch log set package)
@@ -321,9 +363,12 @@ if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
 
         if ! grep -q '.profile' "$rcfile" ; then
 
-          echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
+          echo "    Adding profile sourcing line to $rcfile."
 
-          printf "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> "$rcfile"
+          printf "
+# rvm-install added line:
+[[ -s \$HOME/.profile ]] && source \$HOME/.profile
+" >> "$rcfile"
 
         fi
 
@@ -331,9 +376,12 @@ if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
 
       if ! grep -q "scripts\/rvm" "$rcfile" ; then
 
-        echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
+        echo "    Adding rvm loading line to $rcfile."
 
-        printf "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> "$rcfile"
+        printf "
+# rvm-install added:
+[[ -s \"$rvm_path/.rvm/scripts/rvm\" ]] && . \"$rvm_path/.rvm/scripts/rvm\"
+" >> "$rcfile"
 
       fi
 
@@ -352,9 +400,10 @@ if [[ -d gemsets/ ]] ; then
 
   fi
 
-  for gemset_file in $(builtin cd gemsets ; find \. -iname '*.gems' | sed 's/^\.\///') ; do
+  for gemset_file in $(find "$PWD/gemsets" -iname '*.gems' | sed 's/^\.\///') ; do
 
-    destination="$rvm_path/gemsets/$gemset_file"
+    cwd="${PWD//\//\\/}\/gemsets\/"
+    destination="$rvm_path/gemsets/${gemset_file/$cwd}"
 
     destination_path="$(dirname "$destination")"
 
@@ -362,7 +411,7 @@ if [[ -d gemsets/ ]] ; then
 
       mkdir -p "$destination_path"
 
-      cp "gemsets/$gemset_file" "$destination"
+      cp "$gemset_file" "$destination"
 
     fi
 
@@ -404,7 +453,8 @@ fi
 #
 mkdir -p "${rvm_rubies_path:-"$rvm_path/rubies"}/"
 
-for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
+for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* \
+  $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
 
   if [[ -d "$ruby" ]] ; then
 
@@ -416,7 +466,8 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
 
       if [[ -s "$new_path/bin/$file" ]] ; then
 
-        sed -e '1,1s=.*=#!'"${new_path}/bin/ruby=" "${new_path}/bin/${file}" > "${new_path}/bin/${file}.new"
+        sed -e '1,1s=.*=#!'"${new_path}/bin/ruby=" "${new_path}/bin/${file}" \
+          > "${new_path}/bin/${file}.new"
 
         mv -f "$new_path/bin/$file.new" "$new_path/bin/$file"
 
@@ -481,7 +532,8 @@ done
 # Move from legacy defaults to the new, alias based system.
 if [[ -s "$rvm_path/config/default" ]]; then
 
-  original_version="$(basename "$(grep GEM_HOME "$rvm_path/config/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator:-"@"}#")")"
+  original_version="$(basename "$(grep GEM_HOME "$rvm_path/config/default" \
+    | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator:-"@"}#")")"
 
   if [[ -n "$original_version" ]]; then
 
@@ -505,19 +557,24 @@ mkdir -p "${rvm_bin_path:-"$rvm_path/bin"}"
 files=(rvm rvmsudo rvm-shell rvm-auto-ruby)
 for file in "${files[@]}" ; do
 
-  [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] && chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
+  if [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] ; then
+
+    chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
+
+  fi
 
 done
 
 printf "\n    Copying manpages into place."
 
-files=($(builtin cd "$install_source_path/man" ; find . -maxdepth 1 -mindepth 1 -type f -print))
+files=($(builtin cd "$install_source_path/man" ; \
+  find . -maxdepth 1 -mindepth 1 -type f -print))
 
 for file in "${files[@]//.\/}" ; do
 
-  rm -rf "$rvm_man_path/$man_file"
+  rm -rf "$rvm_man_path/$file"
 
-  cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
+  cp -R "$install_source_path/man/$file" "$rvm_man_path/"
 
 done
 
@@ -537,7 +594,7 @@ if [[ ${#files[@]} -gt 0 ]] ; then
 fi
 
 if [[ $upgrade_flag -eq 0 ]] ; then
-  chmod +x ./script/notes # Sometimes things don't clone properly :/
+  chmod +x ./scripts/notes # Sometimes things don't clone properly :/
   ./scripts/notes
 fi
 
@@ -549,8 +606,6 @@ if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
 
   check_rubyopt_conditions
 
-  regenerate_wrappers
-
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 
 else