rvm 0.1.39 → 0.1.40

data/scripts/help

@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
-
-source $rvm_scripts_path/initialize
-
-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
+rvm_base_except="selector"
+source "$rvm_scripts_path/base"
 
 rvm_help_path="${rvm_help_path:-"$rvm_path/help"}"
 

data/scripts/info

@@ -1,11 +1,8 @@
 #!/usr/bin/env bash
 
-source $rvm_scripts_path/initialize
-source $rvm_scripts_path/utility
-source $rvm_scripts_path/selector
-source $rvm_scripts_path/version
+source "$rvm_scripts_path/base"
+source "$rvm_scripts_path/version"
 
-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
@@ -45,8 +42,8 @@ info_ruby() {
 
 info_homes() {
   rvm_info="$rvm_info\n  homes:"
-  rvm_info="$rvm_info\n    gem:          \"${GEM_HOME:-'not set'}\""
-  rvm_info="$rvm_info\n    ruby:         \"${MY_RUBY_HOME:-'not set'}\""
+  rvm_info="$rvm_info\n    gem:          \"${GEM_HOME:-"not set"}\""
+  rvm_info="$rvm_info\n    ruby:         \"${MY_RUBY_HOME:-"not set"}\""
   rvm_info="$rvm_info\n"
 }
 

data/scripts/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/scripts/list

@@ -8,6 +8,47 @@ list_strings() {
   echo $(\ls $rvm_rubies_path)
 }
 
+list_gemsets() {
+  echo
+  ruby=$(command -v ruby) ; current_ruby=""
+  if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo $ruby | awk '/rvm/')" ]] ; then
+    current_ruby="$(echo $ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
+  fi
+
+  printf "rvm gemsets\n"
+  for version in $(\ls $rvm_gems_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
+    ruby_version_name="$(echo "$version" | awk -F"$rvm_gemset_separator" '{print $1}')"
+    if [[ -n "$(echo $version | awk '/^jruby-/')" ]] ; then
+      string="[ $($rvm_rubies_path/$ruby_version_name/bin/ruby -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
+    elif [[ -n "$(echo $version | awk '/^maglev-|^macruby-/')" ]] ; then
+      string="[ x86_64 ]"
+    else
+      string="[ $(file $rvm_rubies_path/$ruby_version_name/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+    fi
+    unset ruby_version_name
+    printf "\n"
+    if [[ "$version" = "$current_ruby" ]]; then
+      printf "=> "
+    else
+      printf "   "
+    fi
+    printf "$(tput setaf 2)$version$(tput sgr0) $string"
+  done ; unset version
+
+  if [[ -f "$rvm_config_path/default" ]] && [[ -s $rvm_config_path/default ]] ; then
+    version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n 1 | awk -F"'" '{print $2}' | xargs basename)
+    if [[ ! -z "$version" ]] ; then
+      printf "\n\nDefault Ruby (for new shells)\n"
+      string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+      printf "\n  $(tput setaf 2)$version$(tput sgr0) $string"
+    fi ; unset version
+  fi
+  printf "\n"
+
+  unset current_ruby version selected system_ruby system_version string binary
+  echo
+}
+
 list_default() {
   strings="$(echo $rvm_ruby_args | awk '{print $2}')"
   if [[ "$strings" = "string" ]] ; then
@@ -51,7 +92,7 @@ list_rubies() {
   printf "rvm rubies\n"
   for version in $(\ls $rvm_rubies_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
     if [[ ! -z "$(echo $version | awk '/^jruby-/')" ]] ; then
-      string="[ $($rvm_rubies_path/$version/bin/ruby -v | awk '{print $NF}') ]"
+      string="[ $($rvm_rubies_path/$version/bin/ruby -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
     elif [[ ! -z "$(echo $version | awk '/^maglev-|^macruby-/')" ]] ; then
       string="[ x86_64 ]"
     else
@@ -87,6 +128,8 @@ action="$(echo "$1" | awk '{print $1}')"
 
 if [[ "known" = "$action" ]] ; then
   list_known
+elif [[ "gemsets" = "$action" ]] ; then
+  list_gemsets
 elif [[ "default" = "$action" ]] ; then
   list_default
 elif [[ -z "$action" ]] || [[ "rubies" = "$action" ]] ; then
@@ -96,7 +139,7 @@ elif [[ "strings" = "$action" ]] ; then
 elif [[ "ruby_svn_tags" = "$action" ]] ; then
   list_ruby_svn_tags
 else # help
-  printf "\nUsage:  rvm list {known,default,rubies,strings}"
+  printf "\nUsage:  rvm list {known,gemsets,default,rubies,strings}"
 fi
 
 exit $?

data/scripts/manage

@@ -3,13 +3,7 @@
 original_ruby_version=$rvm_ruby_version
 original_ruby_string=$rvm_ruby_string
 
-source $rvm_scripts_path/initialize
-source $rvm_scripts_path/utility
-source $rvm_scripts_path/selector
-
-trap "rm -rf ${rvm_tmp_path}/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
-
-if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+source "$rvm_scripts_path/base"
 
 # Checks for bison, returns zero iff it is found
 __rvm_check_for_bison() {
@@ -258,13 +252,11 @@ RubyWrapper
 
     rbx|rubinius)
       $rvm_scripts_path/log "info" "Installing pre-requisites"
-      # prereqs, 1.8.6+ + rake. Yes this could all be one line... not pushing our luck.
-      original_string="$rvm_ruby_string"
-      export rvm_install_on_use_flag=1 ; $rvm_bin_path/rvm 1.8.7 --install # This should install if missing.
+
+      # Ensure we have a 1.8.7 compatible ruby installed.
+      __rvm_ensure_has_18_compat_ruby || return 1
       # TODO: use 'rvm gems load' here:
       unset CFLAGS LDFLAGS ARCHFLAGS # Important.
-      __rvm_unset_ruby_variables ; rvm_ruby_string="$original_string" ; __rvm_select
-      unset original_string
 
       unset BUNDLE_PATH GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
@@ -296,7 +288,7 @@ RubyWrapper
 
       __rvm_db "${rvm_ruby_interpreter}_configure_flags" "db_configure_flags"
 
-      export ruby="$rvm_bin_path/ruby-1.8.7-p$(__rvm_db "ruby_1.8.7_patch_level")"
+      export ruby="$rvm_bin_path/$(__rvm_18_compat_ruby)"
 
       rvm_ruby_configure_flags="${rvm_ruby_configure_flags:-"--skip-system"}"
       rvm_ruby_configure="$ruby configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_ruby_configure_flags" ; message="Configuring rbx"
@@ -325,12 +317,18 @@ RubyWrapper
       unset ruby
 
       # Symlink rubinius wrappers
-      ln -fs "$rvm_ruby_home/bin/rbx" "$rvm_ruby_home/bin/irb"
       ln -fs "$rvm_ruby_home/bin/rbx" "$rvm_ruby_home/bin/ruby"
-      # Install a wrapper around gem.
+
+      # Install IRB Wrapper on Rubinius.
+      file_name="$rvm_ruby_home/bin/irb"
+      rm -f "$file_name"
+      printf '#!/usr/bin/env bash\n' > "$file_name"
+      printf "exec '$rvm_ruby_home/bin/rbx' 'irb' \"\$@\"\n" >> "$file_name" 
+      [[ -f "$file_name" ]] && chmod +x "$file_name"
+
+      # Install Gem Wrapper on Rubinius.
       file_name="$rvm_ruby_home/bin/gem"
       cp -f "$rvm_ruby_home/lib/bin/gem.rb" "$file_name"
-
       __rvm_inject_ruby_shebang "$file_name"
       [[ -f "$file_name" ]] && chmod +x "$file_name"
       unset file_name
@@ -399,7 +397,7 @@ RubyWrapper
     ;;
 
     maglev)
-      export rvm_install_on_use_flag=1 ; $rvm_bin_path/rvm 1.8.7 --install # This should install if missing.
+      __rvm_ensure_has_18_compat_ruby
 
       $rvm_scripts_path/log "info" "Running MagLev prereqs checking script."
       $rvm_scripts_path/maglev
@@ -469,17 +467,21 @@ RubyWrapper
       fi
 
       #ln -fs "$rvm_ruby_home/$(echo $rvm_gemstone_package_file | awk -F'.' '{print $1}')" "$rvm_ruby_home/gemstone"
+      
+      compatible_ruby="$(__rvm_18_compat_ruby)"
 
       if [[ ! -e ${rvm_ruby_home}/etc/conf.d/maglev.conf ]] ; then
         $rvm_scripts_path/log "info" "Creating default 'maglev' repository."
-        $rvm_bin_path/rvm 1.8.7 rake "stone:create[maglev]" >/dev/null 2>&1
+        $rvm_bin_path/rvm "$(compatible_ruby)" rake "stone:create[maglev]" >/dev/null 2>&1
       fi
 
       $rvm_scripts_path/log "info" "Generating maglev HTML documentation"
-      $rvm_bin_path/rvm 1.8.7 rake rdoc >/dev/null 2>&1
+      $rvm_bin_path/rvm "$(compatible_ruby)" rake rdoc >/dev/null 2>&1
 
       $rvm_scripts_path/log "info" "Generating smalltalk FFI."
-      $rvm_bin_path/rvm 1.8.7 rake stwrappers >/dev/null 2>&1
+      $rvm_bin_path/rvm "$(compatible_ruby)" rake stwrappers >/dev/null 2>&1
+
+      unset compatible_ruby
 
       # TODO: Figure out if anything needs to be done with rubygems.
       #__rvm_rubygems_setup
@@ -508,15 +510,20 @@ RubyWrapper
             return 1
           fi
 
+          __rvm_ensure_has_18_compat_ruby
+
           __rvm_fetch_ruby
           if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
           builtin cd $rvm_ruby_src_path
 
-          $rvm_bin_path/rvm 1.8.7 -S gem install pathname2 --no-rdoc --no-ri
+          compatible_ruby="$(__rvm_18_compat_ruby)"
+
+          $rvm_bin_path/rvm "$(compatible_ruby)" -S gem install pathname2 --no-rdoc --no-ri
 
           # MONO_LIB=/Library/Frameworks/Mono.framework/Versions/current/lib/
-          rvm_ruby_make="$rvm_bin_path/rvm 1.8.7 -S rake MERLIN_ROOT=\"$rvm_ruby_src_path/Merlin/Main\" compile mono=1 configuration=release --trace"
+          rvm_ruby_make="$rvm_bin_path/rvm $(compatible_ruby) -S rake MERLIN_ROOT=\"$rvm_ruby_src_path/Merlin/Main\" compile mono=1 configuration=release --trace"
           __rvm_run "rake" "$rvm_ruby_make" "Building IronRuby..."
+          unset compatible_ruby
           if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
           rm -rf $rvm_ruby_home/*
@@ -834,15 +841,16 @@ __rvm_remove_ruby() {
     __rvm_remove_aliases
     __rvm_remove_wrappers
     __rvm_remove_environments
+    __rvm_remove_binaries
   else
     $rvm_scripts_path/log "fail" "Cannot remove unknown package '$rvm_ruby_string'"
   fi ; unset rvm_remove_flag
 }
 
 __rvm_remove_gemsets() {
-  $rvm_scripts_path/log "info" "Removing $rvm_ruby_string gemsets..."
   if [[ ! -z "$rvm_gems_flag" ]] ; then
-    gemsets="$rvm_gems_path/$rvm_ruby_string $(ls -d "${rvm_gems_path}"/* | awk '/'$rvm_ruby_string'@/')"
+    $rvm_scripts_path/log "info" "Removing $rvm_ruby_string gemsets..."
+    gemsets="$rvm_gems_path/$rvm_ruby_string $(\ls -d "${rvm_gems_path}"/* | awk '/'$rvm_ruby_string'@/')"
     for gemset in $gemsets ; do
       if [[ -d "$gemset" ]] ; then
         rm -rf "$gemset"
@@ -853,36 +861,48 @@ __rvm_remove_gemsets() {
 
 __rvm_remove_wrappers() {
   $rvm_scripts_path/log "info" "Removing $rvm_ruby_string wrappers..."
-  wrappers="$rvm_wrappers_path/$rvm_ruby_string $(ls -d "$rvm_wrappers_path"/* | awk '/'$rvm_ruby_string'@/')"
+  wrappers="$rvm_wrappers_path/$rvm_ruby_string $(\ls -d "$rvm_wrappers_path"/* 2>/dev/null | awk '/'$rvm_ruby_string'@/')"
   for wrapper in $wrappers ; do
     rm -rf "$wrapper"
   done ; unset wrapper wrappers
 }
+
 __rvm_remove_environments() {
   $rvm_scripts_path/log "info" "Removing $rvm_ruby_string environments..."
-  environments="$rvm_environments_path/$rvm_ruby_string $(ls -d "$rvm_environments_path"/* | awk '/'$rvm_ruby_string'@/')"
+  environments="$rvm_environments_path/$rvm_ruby_string $(\ls -d "$rvm_environments_path"/* | awk '/'$rvm_ruby_string'@/')"
   for environment in $environments ; do
     rm -rf "$environment"
   done ; unset environment environments
 }
+
 __rvm_remove_aliases() {
   $rvm_scripts_path/log "info" "Removing $rvm_ruby_string aliases..."
-  aliases=$(awk '/'$rvm_ruby_string'/' $rvm_config_path/alias)
+  aliases=$(awk '/'$rvm_ruby_string'/' $rvm_config_path/alias | sed 's/=.*//')
   for alias_name in $aliases ; do
     # Remove from alias key-value store
-    $rvm_scripts_path/db $rvm_config_path/alias $alias_name delete
-    # Remove the place holding symlink
-    rm -f $rvm_rubies_path/$alias_name
+    $rvm_scripts_path/alias delete "$alias_name" >/dev/null 2>&1
   done ; unset alias_name aliases
 }
 
 __rvm_remove_archives() {
-  $rvm_scripts_path/log "info" "Removing $rvm_ruby_string archives..."
   if [[ ! -z "$rvm_archive_flag" ]] ; then
+    $rvm_scripts_path/log "info" "Removing $rvm_ruby_string archives..."
     rm -f $rvm_archives_path/${rvm_ruby_package_file}.${rvm_archive_extension}
   fi
 }
 
+__rvm_remove_binaries() {
+  $rvm_scripts_path/log "info" "Removing $rvm_ruby_string binaries..."
+  # Iterate over all binaries and check for symlinked wrappers etc.
+  for binary_name in $(\ls "$rvm_bin_path"); do
+    full_binary_path="$rvm_bin_path/$binary_name"
+    if [[ -L "$full_binary_path" ]] && $rvm_scripts_path/match "$(readlink "$full_binary_path")" "$rvm_ruby_string"; then
+      rm -f "$full_binary_path"
+    fi
+    unset full_binary_path
+  done; unset binary_name
+}
+
 __rvm_post_install() {
   if [[ "$rvm_ruby_interpreter" != "jruby" ]] ; then
     binaries="${binaries:-"gem irb erb ri rdoc testrb rake"}"
@@ -952,7 +972,20 @@ __rvm_rubygems_setup() {
 
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
-    ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/${rvm_release_version}.$rvm_major_version"
+
+    directory_name="$rvm_ruby_home/lib/ruby/gems"
+    version_number="${rvm_release_version}.${rvm_major_version}"
+    if [[ "$version_number" == "." ]]; then
+      version_number="$(\ls "$directory_name" | grep '^[[:digit:]].[[:digit:]]\(.[[:digit:]]\)\?' | head -n1)"
+      if [[ -n "$version_number" ]]; then
+        ruby_lib_gem_path="${directory_name}/${version_number}"
+      else
+        ruby_lib_gem_path=""
+      fi
+    else
+      ruby_lib_gem_path="${directory_name}/${version_number}"
+    fi
+    unset directory_name version_number
   elif [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^rbx|jruby/')" ]] ; then
     # Hands off rubygems for rbx & jruby
     if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Skipping rubygems update for $rvm_ruby_version" ; fi
@@ -964,7 +997,6 @@ __rvm_rubygems_setup() {
     rvm_rubygems_url=$(__rvm_db "rubygems_${rvm_rubygems_version}_url")
     rvm_gem_package_name="rubygems-$rvm_rubygems_version"
     rvm_gem_url="$rvm_rubygems_url/$rvm_gem_package_name.tgz"
-
     # Sanity check... If setup.rb is missing from the rubygems source path,
     # something went wrong. Cleanup, aisle 3!
     if [[ ! -f "$rvm_src_path/$rvm_gem_package_name/setup.rb" ]]; then
@@ -1000,14 +1032,12 @@ __rvm_rubygems_setup() {
     fi
   fi
 
-  # Add ruby's gem path to ruby's lib direcotry.
-  mkdir -p $(dirname $ruby_lib_gem_path)
-
-  if [[ -d "$ruby_lib_gem_path" ]] ; then rm -rf "$ruby_lib_gem_path" ; fi
-
-  ln -nfs "$rvm_ruby_gem_home" "$ruby_lib_gem_path"
-
-  unset ruby_lib_gem_path
+  if [[ -n "$ruby_lib_gem_path" ]]; then
+    # Add ruby's gem path to ruby's lib direcotry.
+    mkdir -p $(dirname $ruby_lib_gem_path)
+    if [[ -d "$ruby_lib_gem_path" ]] ; then rm -rf "$ruby_lib_gem_path" ; fi
+    ln -nfs "$rvm_ruby_gem_home" "$ruby_lib_gem_path"
+  fi; unset ruby_lib_gem_path
 
   if [[ -s "$rvm_ruby_src_path/bin/rdoc" ]] ; then
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/rdoc"
@@ -1054,13 +1084,13 @@ __rvm_actual_file() {
 }
 
 __rvm_manage_rubies() {
-  rubies=() ; successes=() ; errors=() ; statuses=()
-
   unset rvm_gemset_name rvm_ruby_selected_flag
 
   rvm_ruby_gem_home=$(echo $rvm_ruby_gem_home | awk -F${rvm_gemset_separator} '{print $1}')
   rvm_ruby_string=$(echo $rvm_ruby_string | awk -F${rvm_gemset_separator} '{print $1}')
 
+  local manage_result=0
+
   if [[ ! -z "$rubies_string" ]] ;then
     for rvm_ruby_string in $(echo $rubies_string | tr ',' ' ') ; do
       eval "__rvm_${rvm_action}_ruby"
@@ -1081,9 +1111,9 @@ __rvm_manage_rubies() {
     fi
   fi
 
-  if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
-  if [[ ! -z "$rvm_yaml_flag" ]]    ; then __rvm_yaml    ; fi
-  if [[ ! -z "$rvm_json_flag" ]]    ; then __rvm_json    ; fi
+  # TODO: This should return the exit status of the command that got called.
+  return $manage_result
+
 }
 
 rvm_action="$1" ; rubies_string="$2"

data/scripts/monitor

@@ -1,16 +1,12 @@
 #!/usr/bin/env bash
 
-if [[ -z "$rvm_trace_flag" ]] ; then set +x ; else set -x ; fi
-
 original_ruby_strings=$rvm_ruby_strings
 original_ruby_string=$rvm_ruby_string
 
-source $rvm_scripts_path/rvm
+source "$rvm_scripts_path/base"
 
 rvm_monitor_sleep="${rvm_monitor_sleep:-2}"
 
-trap "rm -f $rvm_tmp_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
-
 timestamp() {
   if [[ "Darwin" = "$(uname)" ]] ; then
     echo $(stat -f "%m" $1)

data/scripts/notes

@@ -46,7 +46,7 @@ if [[ "Linux" = "$system" ]] ; then
 
   elif [[ ! -z "$rvm_yum_binary" ]] ; then
     printf "\n    $item For MRI/ree (if you wish to use it) you will need:"
-    printf "\n       $ yum install -y gcc-c++ patch readline readline-devel zlib zlib-devel"
+    printf "\n       $ yum install -y gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel libffi-devel"
     printf "\n       $ yum install -y iconv-devel # NOTE: For centos 5.4 final iconv-devel might not be available :("
 
     printf "\n    $item For JRuby (if you wish to use it) you will need:"

data/scripts/package

@@ -1,26 +1,8 @@
 #!/usr/bin/env bash
+rvm_base_except="selector"
+source "$rvm_scripts_path/base"
 
-#
-# ruby dependency packages:
-#
-
-for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
-  if [[ -f "$rvmrc" ]] ; then
-    if grep -q '^\s*rvm .*$' $rvmrc ; then
-      $rvm_scripts_path/log "error" "$rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
-      return 1
-    else
-      source "$rvmrc"
-    fi
-  fi
-done
-
-source $rvm_scripts_path/initialize
-source $rvm_scripts_path/utility
-__rvm_load_rvmrc
-
-trap "rm -f $rvm_tmp_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
-if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+# Tools to make managing ruby dependencies inside of rvm easier.
 
 action="$(echo "$*" | awk '{print $1}')"
 library="$(echo "$*" | awk '{print $2}')"
@@ -28,6 +10,8 @@ args=$(echo "$*" | awk '{$1="" ; $2="" ; print}' | sed -e 's/^[[:space:]]*//' -e
 
 install_package() {
 
+  __rvm_db "${package}_url" "package_url"
+
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
 
   __rvm_pushpop $rvm_src_path
@@ -60,13 +44,14 @@ install_package() {
     __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_usr_path"
   fi
 
-  __rvm_pushpop
+  touch "$rvm_config_path/packages"
+  $rvm_scripts_path/db "$rvm_config_path/packages" "${package}" "${version}"
 
+  __rvm_pushpop
 }
 
 readline() {
   package="readline" ; archive_format="tar.gz"
-  package_url="ftp://ftp.gnu.org/gnu/readline"
   for version in 5.2 6.0 ; do
     configure_flags="--disable-dependency-tracking --disable-static --enable-shared"
     install_package
@@ -75,19 +60,16 @@ readline() {
 
 iconv() {
   package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
-  package_url="http://ftp.gnu.org/pub/gnu/libiconv"
   install_package
 }
 
 curl() {
   package="curl" ; version=7.19.7 ; archive_format="tar.gz"
-  package_url="http://curl.haxx.se/download"
   install_package
 }
 
 openssl() {
   package="openssl" ; version="0.9.8n" ; archive_format="tar.gz"
-  package_url="http://www.openssl.org/source"
   if [[ "Darwin" = "$(uname)" ]] ; then
     if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
       export openssl_os="os/compiler darwin64-x86_64-cc"
@@ -106,39 +88,32 @@ openssl() {
 
 zlib() {
   package="zlib" ; version="1.2.5" ; archive_format="tar.gz"
-  package_url="http://www.zlib.net"
   install_package
 }
 
 autoconf() {
-  package_url="ftp.gnu.org/gnu/autoconf"
   package="autoconf" ; version="2.65" ; archive_format="tar.gz"
-
   prefix_path="${rvm_bin_path:-"${rvm_path:-"$HOME/.rvm"}"}"
   install_package
 }
 
 ncurses() {
-  package_url="http://ftp.gnu.org/pub/gnu/ncurses"
   package="ncurses" ; version="5.7" ; archive_format="tar.gz"
   configure_flags="--with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs"
   install_package
 }
 
 pkgconfig() {
-  package_url="http://pkgconfig.freedesktop.org/releases"
   package="pkg-config" ; version="0.23" archive_format="tar.gz"
   install_package
 }
 
 gettext() {
-  package_url="ftp://ftp.gnu.org/pub/gnu/gettext"
   package="gettext" ; version="0.17" ; archive_format="tar.gz"
   install_package
 }
 
 libxml2() {
-  package_url="ftp://xmlsoft.org/libxml2/"
   package="libxml2" ; version="2.7.3" ; archive_format="tar.gz"
   if [[ "Darwin" = "$(uname)" ]] ; then
     configure="./configure --prefix=${rvm_usr_path} --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
@@ -149,7 +124,6 @@ libxml2() {
 
 glib() {
   package="glib" ; version="2.23.1" ; archive_format="tar.gz"
-  package_url="http://ftp.gnome.org/pub/gnome/sources/glib/2.23"
   configure="CC=\"cc -L$rvm_usr_path/lib\" ./configure --prefix=$rvm_usr_path"
 
   install_package
@@ -162,17 +136,17 @@ mono() {
 
   __rvm_mono_env
   package="mono" ; version="2.6.1" ; archive_format="tar.bz2"
-  packge_url="http://ftp.novell.com/pub/mono/sources/mono/"
-
   install_package
 }
 
 llvm() {
+  package="llvm" ; version="89156"
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
   __rvm_pushpop $rvm_src_path
   if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
+    __rvm_db "${package}_url" "package_url"
     rm -rf "$rvm_src_path/llvm"
-    svn co -r 89156 https://llvm.org/svn/llvm-project/llvm/trunk llvm
+    svn co -r "$version" "$package_url" llvm
     builtin cd "$rvm_src_path/llvm"
     ./configure --enable-bindings=none
     UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make -j2