rvm 0.1.5 → 0.1.6

data/config/db

@@ -18,7 +18,7 @@ ruby_1.9.1_patch_level=378
 ruby_1.9.2_patch_level=preview1
 ruby_1.8.5_patch_level=231
 ruby_1.8.6_patch_level=383
-ruby_1.8.7_patch_level=248
+ruby_1.8.7_patch_level=249
 jruby_version=1.4.0
 jruby_repo_url=git://github.com/jruby/jruby.git
 jruby_url=http://jruby.kenai.com/downloads

data/config/md5

@@ -8,6 +8,7 @@ ruby-1.8.6-p383.tar.gz=4f49544d4a4d0d34e9d86c41e853db2e
 ruby-1.8.7-p160.tar.gz=945398f97e2de6dd8ab6df68d10bb1a1
 ruby-1.8.7-p174.tar.gz=18dcdfef761a745ac7da45b61776afa5
 ruby-1.8.7-p248.tar.gz=60a65374689ac8b90be54ca9c61c48e3
+ruby-1.8.7-p249.tar.gz=d7db7763cffad279952eb7e9bbfc221c
 ruby-1.9.1-p129.tar.gz=c71f413514ee6341c627be2957023a5c
 ruby-1.9.1-p243.tar.gz=515bfd965814e718c0943abf3dde5494
 ruby-1.9.1-p376.tar.gz=ebb20550a11e7f1a2fbd6fdec2a3e0a3

data/install

@@ -65,7 +65,7 @@ rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
-rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
+rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
@@ -74,7 +74,7 @@ rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
 rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
 
-mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gem_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path $rvm_symlink_path
+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 $rvm_gems_path/cache $rvm_gems_path/doc
 
 for file in README LICENCE ; do
   cp -f "$source_path/$file" "$rvm_path/"

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 5
+:patch: 6

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-02-03}
+  s.date = %q{2010-02-04}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/cli

@@ -263,7 +263,7 @@ __rvm_parse_args() {
 
       --install)            export rvm_install_on_use_flag=1           ;;
       -h|--help|usage|help) rvm_action=help                     ;;
-      -G|--gems)            rvm_gem_path="$1"          ; shift  ;;
+      -G|--gems)            rvm_gems_path="$1"          ; shift  ;;
       --source)             rvm_src_path="$1"          ; shift  ;;
       --archives)           rvm_archives_path="$1"     ; shift  ;;
       --make)               rvm_ruby_make="$1"         ; shift  ;;

data/scripts/completion

@@ -74,7 +74,7 @@ _rvm ()
       ;;
 
       --install)         rvm_install_on_use_flag=1         ;;
-      -G|--gems)         rvm_gem_path="$1"         ; shift ;;
+      -G|--gems)         rvm_gems_path="$1"         ; shift ;;
       --source)          rvm_src_path="$1"         ; shift ;;
       --archives)        rvm_archives_path="$1"    ; shift ;;
       --make)            rvm_ruby_make="$1"        ; shift ;;

data/scripts/gems

@@ -25,25 +25,25 @@ __rvm_gems_dir() {
 __rvm_gems_list() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
-  $rvm_scripts_path/log "info" "gems(ets) : for $rvm_ruby_string (found in $rvm_gem_path/)"
+  $rvm_scripts_path/log "info" "gems(ets) : for $rvm_ruby_string (found in $rvm_gems_path/)"
 
-  if [[ ! -z "$rvm_gem_path" ]] ; then
+  if [[ ! -z "$rvm_gems_path" ]] ; then
     if [[ ! -z $rvm_ruby_string ]] ; then
-      for gemdir in $rvm_gem_path/${rvm_ruby_string}%* ; do
+      for gemdir in $rvm_gems_path/${rvm_ruby_string}%* ; do
         echo "$gemdir" | awk -F'%' '{print $2}'
       done
     else
       $rvm_scripts_path/log "error" "\$rvm_ruby_string is not set!"
     fi
   else
-    $rvm_scripts_path/log "error" "\$rvm_gem_path is not set!"
+    $rvm_scripts_path/log "error" "\$rvm_gems_path is not set!"
   fi
 }
 
 __rvm_gems_delete() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
   if [[ ! -z "$rvm_gem_set_name" ]] ; then
-    gemdir="$rvm_gem_path/$rvm_ruby_string%$rvm_gem_set_name"
+    gemdir="$rvm_gems_path/$rvm_ruby_string%$rvm_gem_set_name"
     if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
         rm -rf  "$gemdir"
     elif [[ -d "$gemdir" ]] ; then
@@ -122,7 +122,7 @@ __rvm_gems_load() {
     return 1
   fi
 
-  mkdir -p "$rvm_gem_path/cache" # Ensure the base cache dir is initialized.
+  mkdir -p "$rvm_gems_path/cache" # Ensure the base cache dir is initialized.
 
   if [[ -f "$rvm_file_name" ]] ; then
     echo "Loading $rvm_file_name file..."
@@ -182,14 +182,14 @@ __rvm_gem_install() {
   else
     if [[ -f "$gem" ]] ; then
       cache_file="$gem"
-    elif [[ -f "$rvm_gem_path/cache/${gem_file_name}" ]] ; then
-      cache_file="$rvm_gem_path/cache/${gem_file_name}"
+    elif [[ -f "$rvm_gems_path/cache/${gem_file_name}" ]] ; then
+      cache_file="$rvm_gems_path/cache/${gem_file_name}"
     else
-      cache_file="${cache_file:-$(\ls ${rvm_gem_path}/*/*/cache/${gem_file_name}* 2> /dev/null | sort | head -n1)}"
+      cache_file="${cache_file:-$(\ls ${rvm_gems_path}/*/*/cache/${gem_file_name}* 2> /dev/null | sort | head -n1)}"
       if [[ ! -z "$cache_file" ]] && [[ -f "$cache_file" ]] ; then
-        if [[ "$(dirname $cache_file)" != "$rvm_gem_path/cache/" ]] ; then
-          cp "$cache_file" "$rvm_gem_path/cache/"
-          cache_file="$rvm_gem_path/cache/$(basename $cache_file)"
+        if [[ "$(dirname $cache_file)" != "$rvm_gems_path/cache/" ]] ; then
+          cp "$cache_file" "$rvm_gems_path/cache/"
+          cache_file="$rvm_gems_path/cache/$(basename $cache_file)"
         fi
       fi
     fi
@@ -209,7 +209,7 @@ __rvm_gem_install() {
       # TODO: Switch this to use match
       if [[ ! -z "$(echo "$rvm_ruby_gem_list" | awk "/${gem_name/ /} \(.*$gem_version/{print}")" ]] ; then
         if [[ ! -z "$rvm_force_flag" ]] ; then
-          gem="$rvm_gem_path/cache/$gem_file_name" # install as a named local gem
+          gem="$rvm_gems_path/cache/$gem_file_name" # install as a named local gem
         fi
       else
         gem="$cache_file"
@@ -221,7 +221,7 @@ __rvm_gem_install() {
     # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line.
     if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
 
-    if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ "$rvm_ruby_gem_home" != "$rvm_gem_path" ]] ; then
+    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_path' $gem_prefix gem install $rvm_gem_options $gem $gem_postfix $vars"
     else
       command="$gem_prefix gem install $rvm_gem_options -q $gem $gem_postfix $vars"

data/scripts/initialize

@@ -15,7 +15,7 @@ rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
-rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
+rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
@@ -23,5 +23,5 @@ rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
 rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
 
-export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gem_path rvm_config_path rvm_tmp_path rvm_hooks_path
+export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path
 

data/scripts/install

@@ -65,7 +65,7 @@ rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
-rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
+rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
@@ -74,7 +74,7 @@ rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
 rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
 
-mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gem_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path $rvm_symlink_path
+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 $rvm_gems_path/cache $rvm_gems_path/doc
 
 for file in README LICENCE ; do
   cp -f "$source_path/$file" "$rvm_path/"

data/scripts/manage

@@ -765,7 +765,7 @@ __rvm_uninstall_ruby() {
         rm -f $rvm_bin_path/$rvm_ruby_string
       fi
     done ; unset dir
-    rm -rf $rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version*/
+    rm -rf $rvm_gems_path/$rvm_ruby_interpreter/$rvm_ruby_version*/
   else
     $rvm_scripts_path/log "fail" "Cannot uninstall unknown package '$rvm_ruby_string'"
   fi ; unset rvm_uninstall_flag

data/scripts/rvm-install

@@ -65,7 +65,7 @@ rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
-rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
+rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
@@ -74,7 +74,7 @@ rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
 rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
 
-mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gem_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path $rvm_symlink_path
+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 $rvm_gems_path/cache $rvm_gems_path/doc
 
 for file in README LICENCE ; do
   cp -f "$source_path/$file" "$rvm_path/"

data/scripts/selector

@@ -198,7 +198,7 @@ __rvm_select() {
     rvm_ruby_src_path="$rvm_src_path/$rvm_ruby_string"
     rvm_ruby_binary="$rvm_ruby_home/bin/ruby"
     rvm_ruby_irbrc="$rvm_ruby_home/.irbrc"
-    rvm_ruby_gem_home="${rvm_gem_path}/${rvm_ruby_string}"
+    rvm_ruby_gem_home="${rvm_gems_path}/${rvm_ruby_string}"
 
     if [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
       export MAGLEV_HOME="$rvm_ruby_home"
@@ -213,7 +213,7 @@ __rvm_select() {
 
     mkdir -p $rvm_ruby_log_path
 
-    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_configure_flags rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string
+    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_configure_flags rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gems_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string
   else
     rvm_ruby_interpreter="${rvm_ruby_interpreter:-system}"
   fi

data/scripts/update

@@ -65,7 +65,7 @@ rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
-rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
+rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
@@ -74,7 +74,7 @@ rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
 rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
 
-mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gem_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path $rvm_symlink_path
+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 $rvm_gems_path/cache $rvm_gems_path/doc
 
 for file in README LICENCE ; do
   cp -f "$source_path/$file" "$rvm_path/"

data/scripts/utility

@@ -384,7 +384,7 @@ __rvm_initialize() {
     PATH=$rvm_bin_path:$PATH ; export PATH
   fi
 
-  mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $rvm_tmp_path
+  mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gems_path $rvm_tmp_path
 }
 
 # Update rubygems or binscripts based on CLI selection.
@@ -720,7 +720,7 @@ __rvm_make_flags() {
 __rvm_gems_select() {
   if [[ -z "$(which gem 2>/dev/null)" ]] ; then return 0 ; fi
 
-  rvm_ruby_global_gems_path="$rvm_gem_path/$rvm_ruby_string%global"
+  rvm_ruby_global_gems_path="$rvm_gems_path/$rvm_ruby_string%global"
 
   if [[ -z "$rvm_gem_set_name" ]] ; then
     # No longer defaulting to 'sticky' gem sets.
@@ -735,10 +735,10 @@ __rvm_gems_select() {
     fi
 
     if [[ ! -z "$rvm_gem_set_name" ]] && ! $rvm_scripts_path/match "$rvm_gem_set_name" "^[0-9]\.[0-9]" ; then
-      rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_string%$rvm_gem_set_name"
+      rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gem_set_name"
     else
       if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ ! -z "$rvm_ruby_version" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
-        rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_string"
+        rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
       elif [[ -z "$GEM_HOME" ]]  && [[ ! -z "$(which gem 2>/dev/null)" ]] ; then
         rvm_ruby_gem_home=$(gem env gemdir)
       elif [[ ! -z "$GEM_HOME" ]] ; then
@@ -749,20 +749,22 @@ __rvm_gems_select() {
     fi
     if [[ -z "$rvm_gem_set_name" ]] ; then unset rvm_gem_set_name ; fi
   else
-    rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_string%$rvm_gem_set_name"
+    rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string%$rvm_gem_set_name"
   fi
   rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
 
+  # TODO: Remove next line after a few releases.
+  mkdir -p $rvm_gems_path/cache $rvm_gems_path/doc
   # Careful not to nuke system gems cache.
   if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ ! -z "$(echo $rvm_ruby_gem_home | awk '/rvm/')" ]] ; then
     # Global gems cache
     mkdir -p "$rvm_ruby_gem_home"
     if [[ ! -L "$rvm_ruby_gem_home/cache" ]] ; then
       for file in "$rvm_ruby_gem_home"/cache/* ; do
-        mv $file "$rvm_gem_path/cache/" > /dev/null 2>&1
+        mv $file "$rvm_gems_path/cache/" > /dev/null 2>&1
       done
       rm -rf "$rvm_ruby_gem_home/cache"
-      ln -nfs "$rvm_gem_path/cache" "$rvm_ruby_gem_home/cache"
+      ln -nfs "$rvm_gems_path/cache" "$rvm_ruby_gem_home/cache"
     fi
   fi
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -05:00
+date: 2010-02-04 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []