rvm 0.1.39 → 0.1.40

data/config/db

@@ -1,4 +1,6 @@
+#General
 niceness=0
+# Rubies
 interpreter=ruby
 ruby_version=1.8.7
 ruby_configure_flags=--enable-shared
@@ -44,10 +46,24 @@ 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://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg
-maglev_version=23577
+maglev_version=23673
 maglev_url=http://glass-downloads.gemstone.com/maglev
 maglev_repo_url=git://github.com/MagLev/maglev.git
 shyouhei_repo_url=git://github.com/shyouhei/ruby.git
 ironruby_version=1.0
 ironruby_repo_url=git://github.com/ironruby/ironruby.git
 ironruby_1.0_url=http://rubyforge.org/frs/download.php/70179/
+# Packages
+readline_url=ftp://ftp.gnu.org/gnu/readline
+iconv_url=http://ftp.gnu.org/pub/gnu/libiconv
+curl_url=http://curl.haxx.se/download
+openssl_url=http://www.openssl.org/source
+zlib_url=http://www.zlib.net
+autoconf_url=ftp.gnu.org/gnu/autoconf
+ncurses_url=http://ftp.gnu.org/pub/gnu/ncurses
+pkgconfig_url=http://pkgconfig.freedesktop.org/releases
+gettext_url=ftp://ftp.gnu.org/pub/gnu/gettext
+libxml2_url=ftp://xmlsoft.org/libxml2/
+glib_url=http://ftp.gnome.org/pub/gnome/sources/glib/2.23
+mono_url=http://ftp.novell.com/pub/mono/sources/mono/
+llvm_url=https://llvm.org/svn/llvm-project/llvm/trunk

data/config/known

@@ -29,7 +29,7 @@ ree-1.8.6-head
 ree-1.8.7-head
 
 # MagLev
-maglev(-23577)
+maglev(-23673)
 maglev-head
 
 # Shyouhei head, the default mput

data/config/md5

@@ -45,7 +45,7 @@ zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
 curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
 pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
 ironruby-1.0.zip=7a92888837b3507355ed391dbfc0ab83
-GemStone-23577.Darwin-i386.tar.gz=dd6a758a3f7a3f89bbc2c660d6251d76
-GemStone-23577.Linux-x86_64.tar.gz=d72f05f5b54655262b9268beef3093ae
-MagLev-23577.Darwin-i386.tar.gz=13decfc60cc4489876f246d24a108257
-MagLev-23577.Linux-x86_64.tar.gz=664fb4c82bb878118e0b9b150c49c06a
+GemStone-23673.Darwin-i386.tar.gz=651ae34c80e45467f43f06fc63b5de65
+GemStone-23673.Linux-x86_64.tar.gz=2989946a575ca59c5b7591c0f3d256aa
+MagLev-23673.Darwin-i386.tar.gz=50ad4e1e4c9b3f8d2156f812beb9a7ed
+MagLev-23673.Linux-x86_64.tar.gz=8a63271554de58412eb0e5668072ef70

data/install

@@ -23,6 +23,13 @@ usage() {
   "
 }
 
+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"
+  fi
+}
+
 spinner_counter=0
 spinner() {
   array=('/' '-' '\\' '|' '/' '-' '\\' '|')
@@ -282,12 +289,14 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n  * 1.8.7 default patchlevel is p174, override ~/.rvm/config/db in ~/.rvm/config/user"
   printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
   printf "\n$(tput sgr0)\n"
+  check_rubyopt_conditions
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else
   if [[ "root" != "$(whoami)" ]] ; then
     printf "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
     printf "\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:"
     printf "\n     [[ -s \$HOME/.rvm/scripts/rvm ]] && source \$HOME/.rvm/scripts/rvm"
+    printf "\n   Please note that this must only occur once - so, you only need to add it the first time you install rvm."
     printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
     printf "\n   This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
     printf "\n   if [[ ! -z "$PS1" ]] ; then"
@@ -309,6 +318,7 @@ else
     printf "\nEven if you use zsh you should still adjust the .bashrc as above."
     printf "\nIf you have any questions about this please visit #rvm on irc.freenode.net.\n"
   fi
+  check_rubyopt_conditions
   printf "\nInstallation of RVM to $rvm_path/ is complete.\n\n"
 fi
 

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 39
+:patch: 40

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.39"
+  s.version = "0.1.40"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-06-18}
+  s.date = %q{2010-06-22}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -69,7 +69,9 @@ Gem::Specification.new do |s|
      "scripts/alias",
      "scripts/aliases",
      "scripts/array",
+     "scripts/base",
      "scripts/cd",
+     "scripts/cleanup",
      "scripts/cli",
      "scripts/color",
      "scripts/completion",

data/scripts/alias

@@ -2,15 +2,11 @@
 
 unset rvm_default_flag rvm_wrapper_name 
 
-if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
-
-trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
-
-source $rvm_scripts_path/initialize
-source $rvm_scripts_path/utility
-source $rvm_scripts_path/selector
+source $rvm_scripts_path/base
 
 alias_conflicts_with_ruby() {
+  # If default exists, we should return true.
+  [[ "$1" == "default" && ! -L "$rvm_rubies_path/default" ]] && return 1
   # Open for suggestions to a better way of doing this...
   alias_check_result="$(
     . $rvm_scripts_path/initialize
@@ -93,7 +89,7 @@ alias_list() {
     if [[ -L "$item" ]] ; then
       echo "$(basename $item) => $($rvm_scripts_path/db "$rvm_config_path/alias" "$(basename "$item")")"
     fi
-  done
+  done; unset item
 }
 
 action="$1"

data/scripts/base

@@ -0,0 +1,14 @@
+# Base is a collection general files + commonely included
+# setup functions.
+
+# Load the general scripts.
+# Use rvm_base_except="" to override the except.
+for script_name in initialize utility selector; do
+  if echo "$rvm_base_except" | grep -vq "$script_name" ; then
+    source $rvm_scripts_path/$script_name
+  fi
+done; unset script_name rvm_base_except
+
+# Setup hooks etc.
+__rvm_inherit_trace_flag
+__rvm_cleanup_temp_on_exit

data/scripts/cd

@@ -8,18 +8,30 @@ if [[ "$rvm_project_rvmrc" -ne 0 ]] ; then
     local cwd ; cwd=$(pwd)
     while : ; do
       if [[ -z "$cwd" ]] || [[ "$HOME" = "$cwd" ]] || [[ "/" = "$cwd" ]] ; then
-        if [[ "$rvm_project_rvmrc_default" -eq 1 ]] ; then
-          rvm default 1>/dev/null 2>&1
+        if [[ ! -z "$rvm_rvmrc_cwd" ]] ; then
+          if [[ -z "$rvm_previous_environment" ]] ; then
+            rvm default 1>/dev/null 2>&1
+          else
+            rvm "$rvm_previous_environment"  1>/dev/null 2>&1
+          fi 
+          unset rvm_rvmrc_cwd rvm_previous_environment
         fi
         break
       else
         if [[ -f "$cwd/.rvmrc" ]] ; then
-          source "$cwd/.rvmrc"
+          if [[ "$rvm_rvmrc_cwd" != "$cwd" ]] ; then
+            if [[ -z "$rvm_previous_environment" ]] ; then
+              rvm_previous_environment="$(__rvm_environment_identifier)"
+            fi
+            rvm_rvmrc_cwd="$cwd"
+            source "$cwd/.rvmrc"
+          fi
           break
         else
           cwd=$(dirname "$cwd")
         fi
       fi
     done
+    
   }
 fi

data/scripts/cleanup

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+rvm_base_except="selector"
+source "$rvm_scripts_path/base"
+
+usage() {
+  printf "Usage: 'rvm cleanup {all,archives,repos,sources,logs}'\n"
+  printf "       Cleans up the directory tree for the specified item.\n"
+  exit 1
+}
+
+cleanup() {
+  for cleanup_type in $1; do
+    eval "current_path=\"\$rvm_${cleanup_type}_path\""
+    if [[ -n "$current_path" && -d "$current_path" && "$current_path" != "/" ]]; then
+      $rvm_scripts_path/log "info" "Cleaning up rvm directory '$current_path'"
+      rm -rf "$current_path"/* >/dev/null 2>&1
+    fi
+  done; unset cleanup_type current_path
+}
+
+# Exit when there is no argument.
+[[ -z "$1" ]] && usage
+
+case "$1" in
+  all)      cleanup "archives repo src log" ;;
+  archives) cleanup "archives" ;;
+  repos)    cleanup "repo" ;;
+  sources)  cleanup "src" ;;
+  logs)     cleanup "log" ;;
+  *)        usage ;;
+esac

data/scripts/cli

@@ -121,8 +121,8 @@ __rvm_parse_args() {
         rvm_parse_break=1
       ;;
 
-      exec)
-        rvm_action="exec";
+      exec|cleanup)
+        rvm_action="$rvm_token"
         rvm_ruby_args="$(__rvm_quote_args "$@")"
         rvm_parse_break=1
       ;;
@@ -441,7 +441,7 @@ rvm() {
   # Check that this is the current version.
   disk_version=$(cat "${rvm_path:-$HOME/.rvm}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')
   if [[ "${rvm_version}" != "${disk_version}" ]] && [[ "reload" != "$1" ]]; then
-    printf "\nA newer version of rvm has been installed ($disk_version) than is loaded ($rvm_version), please do one of the following:\n  * 'rvm reload'\n  * open a new shell\n  * source your shell init scripts"
+    printf "\nA RVM version ${disk_version} is installed yet ${rvm_version} is loaded.\n Please do one of the following:\n  * 'rvm reload'\n  * open a new shell\n  * source your shell init scripts"
     return 1
   fi
 
@@ -514,6 +514,11 @@ rvm() {
       unset old_rvm_ruby_string
     ;;
 
+    cleanup)
+      eval "$rvm_scripts_path/cleanup $rvm_ruby_args"
+      result=$?
+    ;;
+
     gemset)
       #if $rvm_scripts_path/match $rvm_ruby_args use ; then
       if [[ "$rvm_use_flag" -eq 1 ]] ; then

data/scripts/db

@@ -25,10 +25,10 @@ if [[ -z "$key" ]] ; then
 else
   value="$*"
   if [[ "unset" = "$value" ]] || [[ "delete" = "$value" ]] ; then
-    sed -i.tmp "s#^$key=.*\$##" $database_file
+    sed -i.tmp -e "s#^$key=.*\$##" -e '/^$/d' $database_file
   else
     if [[ -z "$value" ]] ; then # get
-      awk -F= '/^'"$key"'=/' $database_file | sed "s#^$key=##"
+      awk -F= '/^'"$key"'=/' $database_file | sed -e "s#^$key=##" -e '/^$/d'
     else # set
       if [[ -z "$(awk -F= "/^'"$key"'=/{print $2}" $database_file)" ]] ; then # append
         echo "$key=$value" >> $database_file

data/scripts/docs

@@ -1,11 +1,6 @@
 #!/usr/bin/env bash
-
-if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
-
-trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
-
-source $rvm_scripts_path/initialize
-source $rvm_scripts_path/utility
+rvm_base_except="selector"
+source "$rvm_scripts_path/base"
 
 rvm_docs_ruby_string="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
 if [[ "$rvm_docs_ruby_string" = "system" || -z "$rvm_docs_ruby_string" ]]; then

data/scripts/env

@@ -3,13 +3,7 @@
 # Recursive loops, oh my!
 unset rvm_default_flag
 
-source $rvm_scripts_path/initialize
-source $rvm_scripts_path/utility
-source $rvm_scripts_path/selector
-
-if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
-
-trap "if [[ -d $rvm_tmp_path/ ]] && [[ -s $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
+source "$rvm_scripts_path/base"
 
 usage() {
   printf "Usage: rvm env [ruby_string] [--path]\n"

data/scripts/fetch

@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
 
-if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
-
-trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
+rvm_base_except="selector"
+source "$rvm_scripts_path/base"
 
 record_md5() {
   if [[ "Darwin" = "$(uname)" ]] || [[ "FreeBSD" = "$(uname)" ]]; then

data/scripts/gemsets

@@ -1,14 +1,61 @@
 #!/usr/bin/env bash
 
-source $rvm_scripts_path/utility
-source $rvm_scripts_path/selector
+source "$rvm_scripts_path/base"
 
-if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 rvm_ruby_gem_home="${rvm_ruby_gem_home:-$GEM_HOME}"
-
 if [[ ! -d "$rvm_ruby_gem_home" ]] && command -v gem > /dev/null 2>&1; then rvm_ruby_gem_home="$(gem env home)" ; fi
 
-trap "if [[ -d $rvm_tmp_path/ ]] && [[ -s $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
+usage() {
+  printf "Usage: 'rvm gemset action'\n"
+  printf "       where action is one of: {import,export,create,copy,empty,delete,name,dir,list,gemdir,install,pristine,clear,use,update,globalcache}\n"
+  printf "\n"
+  printf "       Tools for working with and manipulating gemsets within rvm.\n"
+  exit 1
+}
+
+gemset_update() {
+  if [[ -z "$rvm_ruby_strings" ]]; then
+    $rvm_scripts_path/log "info" "Running gem update for all rubies and gemsets."
+    rvm_ruby_strings="$(\ls "$rvm_gems_path" | grep -v '^\(doc\|cache\|@\|system\)' | tr '\n' ',')"
+  else
+    $rvm_scripts_path/log "info" "Running gem update for the specified rubies."
+  fi
+  export rvm_ruby_strings
+  $rvm_scripts_path/set "gem" "update"
+  return $?
+}
+
+gemset_globalcache() {
+  if [[ "$1" == "disable" ]]; then
+    $rvm_scripts_path/log "info" "Removing the global cache (note: this will empty the caches)"
+    for directory_name in $(\ls "$rvm_gems_path"); do
+      current_cache_path="$rvm_gems_path/$directory_name/cache"
+      if [[ -L "$current_cache_path" && "$(readlink "$current_cache_path")" == "$rvm_gems_cache_path" ]]; then
+        $rvm_scripts_path/log "info" "Reverting the gem cache for $directory_name to an empty directory."
+        rm -f "$current_cache_path" 2>/dev/null
+        mkdir -p "$current_cache_path" 2>/dev/null
+      fi
+    done; unset full_directory_path directory_name
+    $rvm_scripts_path/db "$rvm_config_path/user" "use_gemset_globalcache" "delete"
+  elif [[ "$1" == "enable" ]]; then
+    $rvm_scripts_path/log "info" "Enabling global cache for gems."
+    mkdir -p "$rvm_gems_cache_path"
+    for directory_name in $(\ls "$rvm_gems_path"); do
+      current_cache_path="$rvm_gems_path/$directory_name/cache"
+      if [[ -d "$current_cache_path" && ! -L "$current_cache_path" ]]; then
+        $rvm_scripts_path/log "info" "Moving the gem cache for $directory_name to the global cache."
+        mv "$current_cache_path/"*.gem "$rvm_gems_cache_path/" 2>/dev/null
+        rm -rf "$current_cache_path"
+        ln -nfs "$rvm_gems_cache_path" "$current_cache_path"
+      fi
+    done; unset full_directory_path directory_name
+    $rvm_scripts_path/db "$rvm_config_path/user" "use_gemset_globalcache" "true"
+  else
+    printf "Usage: 'rvm gemset globalcache {enable,disable}\n"
+    printf "        Enable / Disable the use of a global gem cachedir.\n"
+    return 1
+  fi
+}
 
 gemset_name() {
   gemset_dir |  awk -F${rvm_gemset_separator} '{print $2}'
@@ -23,6 +70,14 @@ gemset_create() {
   for gemset in $(echo $gems_args) ; do
     gem_home="${rvm_ruby_gem_prefix}${rvm_gemset_separator}${gems_args/ /}"
     mkdir -p $gem_home
+    # When the globalcache is enabled, we need to ensure we setup the cache directory correctly.
+    if __rvm_using_gemset_globalcache; then
+      if [[ -d "$gem_home/cache" && ! -L "$gem_home/cache" ]]; then
+        mv "$gem_home/cache"/*.gem "$rvm_gems_cache_path/" 2>/dev/null
+        rm -rf "$gem_home/cache"
+      fi
+      ln -nfs "$rvm_gems_cache_path" "$gem_home/cache"
+    fi
     $rvm_scripts_path/log "info" "Gemset '$gemset' created."
   done ; unset gem_home
 }
@@ -176,7 +231,7 @@ gemset_import() {
     return 1
   fi
 
-  mkdir -p "$rvm_gems_path/cache" # Ensure the base cache dir is initialized.
+  mkdir -p "$rvm_gems_cache_path" # Ensure the base cache dir is initialized.
 
   if [[ -s "$rvm_file_name" ]] ; then
     echo "Importing  $rvm_file_name file..."
@@ -237,10 +292,10 @@ gem_install() {
   else
     if [[ -s "$gem" ]] ; then
       cache_file="$gem"
-    elif [[ -s "$rvm_ruby_gem_home/cache/${gem_file_name}" ]] ; then
-      cache_file="$rvm_ruby_gem_home/cache/${gem_file_name}"
+    elif [[ -s "$(__rvm_current_gemcache_dir)/${gem_file_name}" ]] ; then
+      cache_file="$(__rvm_current_gemcache_dir)/${gem_file_name}"
     else
-      cache_file="${cache_file:-$(\ls ${rvm_ruby_gem_home}/cache/${gem_file_name} 2> /dev/null | sort | head -n1)}"
+      cache_file="${cache_file:-$(\ls "$(__rvm_current_gemcache_dir)/${gem_file_name}" 2> /dev/null | sort | head -n1)}"
     fi
 
     if [[ ! -s "$cache_file" ]] ; then
@@ -259,9 +314,9 @@ gem_install() {
         unset gem # already installed, not forcing reinstall.
         $rvm_scripts_path/log "info" "$gem_name $gem_version exists, skipping (--force to re-install)"
       else
-        if [[ -s "$rvm_ruby_gem_home/cache/$(basename $gem_file_name)" ]] ; then
+        if [[ -s "$(__rvm_current_gemcache_dir)/$(basename $gem_file_name)" ]] ; then
           mkdir -p "$rvm_tmp_path/$$/"
-          mv "$rvm_ruby_gem_home/cache/$gem_file_name" "$rvm_tmp_path/$$/$gem_file_name"
+          mv "$(__rvm_current_gemcache_dir)/$gem_file_name" "$rvm_tmp_path/$$/$gem_file_name"
           gem="$rvm_tmp_path/$$/$gem_file_name -f -l"
         else
           gem="$cache_file"
@@ -276,7 +331,6 @@ gem_install() {
     if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
 
     if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ "$rvm_ruby_gem_home" != "$rvm_gems_path" ]] ; then
-      #command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home/bin:$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}global/bin' BUNDLE_PATH='${rvm_ruby_gem_home}' ${gem_prefix} gem install --ignore-dependencies $gems_args $rvm_gem_options $gem_postfix $vars"
       command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home/bin:$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}global/bin' BUNDLE_PATH='${rvm_ruby_gem_home}' ${gem_prefix} gem install $gems_args $rvm_gem_options $gem_postfix $vars"
     else
       #--ignore-dependencies
@@ -405,11 +459,15 @@ elif [[ "initial" = "$action" ]] ; then
   gemset_initial
 elif [[ "prune" = "$action" ]] ; then
   gemset_prune
+elif [[ "update" = "$action" ]]; then
+  gemset_update
+elif [[ "globalcache" = "$action" ]]; then
+  gemset_globalcache $2
 elif [[ "clear" = "$action" ]] ; then
   $rvm_scripts_path/log "info" "gemset cleared."
   exit 0
 else
-  $rvm_scripts_path/log "error" "Unrecognized gemset action '$action'.\n\nValid gems actions are: {import,export,create,copy,empty,delete,name,dir,list,gemdir,install,pristine,clear}"
+  usage
 fi
 
 exit $?