rvm 0.1.23 → 0.1.24

data/README

@@ -18,6 +18,7 @@ Action
   debug     - show environment & configuration information for *current* ruby
 
   install   - install one or many ruby versions
+              See also: http://rvm.beginrescueend.com/rubies/installing/
   uninstall - uninstall one or many ruby versions, leaves their sources
   remove    - uninstall one or many ruby versions and remove their sources
 
@@ -35,7 +36,7 @@ Action
 
   fetch     - Performs an archive / src fetch only of the selected ruby.
   list      - show currently installed rubies, interactive output.
-              http://rvm.beginrescueend.com/listing/
+              http://rvm.beginrescueend.com/rubies/list/
   package   - Install a dependency package {readline,iconv,zlib,openssl}
               http://rvm.beginrescueend.com/packages/
   notes     - Display notes, with operating system specifics.
@@ -52,6 +53,7 @@ Implementation
   mput      - shyouhei(mput)'s github repository
   system    - use the system ruby (eg. pre-rvm state)
   default   - use rvm set default ruby and system if it hasn't been set.
+              http://rvm.beginrescueend.com/rubies/default/
 
 Flags
 
@@ -60,8 +62,6 @@ Flags
   --default     - with ruby select, sets a default ruby for new shells.
   --debug       - Toggle debug mode on for very verbose output.
   --force       - Force install, removes old install & source before install.
-  --dump        - Used with gemset to dump the current ruby's gemset.
-  --load        - Used with gemset to load a specified gemset file
   --summary     - Used with rubydo to print out a summary of the commands run.
   --jit         - Used with rubinius install to build with JIT
   --latest      - with gemset --dump skips version strings for latest gem.
@@ -73,8 +73,6 @@ Options
   -v|--version    - Emit rvm version loaded for current shell
   -h|--help       - Emit this output and exit
   -l|--level      - patch level to use with rvm use / install
-     --tag        - subersion tag to use
-     --rev        - repository revision # to use or 'head' for
 
      --prefix     - path for all rvm files (~/.rvm/), with trailing slash!
      --bin        - path for binaries to be placed (~/.rvm/bin/)
@@ -86,11 +84,7 @@ Options
   -C|--configure  - custom configure options, comma separated
                     default: --enable-shared=true
   --reconfigure   - Force installer to re-run configure if already run
-  --make          - custom make command
-  --make-install  - custom make install command
   --nice          - process niceness (for slow computers, default 0)
-  -m|--gem-set    - use a named gem set, instead of the default set.
-  --rm-gem-set    - Remove a named gem set
   --ree-options   - Options passed directly to ree's './installer' on the command line.
 
 Resources:

data/binscripts/rvm-prompt

@@ -20,6 +20,8 @@ if [[ ! -z "$(which ruby 2>/dev/null | awk '/rvm/{print}')" ]] ; then
       p|patchlevel)   add "patchlevel"   ;;
       r|revision)     add "revision"     ;;
       a|architecture) add "architecture" ;;
+      g|gemset)       add "gemset"       ;;
+      u|unicode)      unicode_flag=1     ;;
       *) echo "Unrecognized command line option '$token' for $0" ; exit 1 ;;
     esac
   done
@@ -28,26 +30,60 @@ if [[ ! -z "$(which ruby 2>/dev/null | awk '/rvm/{print}')" ]] ; then
     add "interpreter"
     add "version"
     add "patchlevel"
+    add "gemset"
   fi
 
   ruby_string=$(dirname "$(which ruby 2>/dev/null)" | xargs dirname | xargs basename)
+
   if [[ ! -z "$interpreter_flag" ]] ; then
     interpreter="$(echo $ruby_string | awk -F'-' '{print $1}')"
   fi
+
   if [[ ! -z "$version_flag" ]] ; then
     version="$(echo $ruby_string | awk -F'-' '{print $2}')"
   fi
+
   if [[ ! -z "$patchlevel_flag" ]] ; then
     patchlevel=$(echo $ruby_string | awk -F'-' '{print $3}')
   fi
+
   if [[ ! -z "$architecture_flag" ]] ; then
     architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
   fi
 
-  command="prompt=\"$format\""
-  eval "$command"
-  echo "${prompt/-]/]}"
+  if [[ ! -z "$gemset_flag" ]] ; then
+    gemset="$(gem env gemdir | awk -F% '{print $2}')"
+    if [[ ! -z "$gemset" ]] ; then gemset="%$gemset" ; fi
+  fi
+
+  if [[ ! -z "$unicode_flag" ]] ; 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 
+    # TODO: Architecture
+    # TODO: gemset
+    echo $unicode
+  else
+    command="prompt=\"$format\""
+    eval "$command"
+    echo "$prompt" | sed 's#-\s*$##' | sed 's#-%#%#'
+  fi
 fi
 
 exit 0
-

data/config/db

@@ -8,8 +8,8 @@ rubygems_version=1.3.6
 rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
 rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
 rbx_version=1.0.0
-rbx_patch_level=rc2
-rbx_url=http://asset.rubini.us/rubinius-1.0.0-rc2-20100104.tar.gz
+rbx_patch_level=rc3
+rbx_url=http://asset.rubini.us/rubinius-1.0.0-rc3-20100216.tar.gz
 ree_version=1.8.7
 ree_1.8.6_patch_level=20090610
 ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677
@@ -29,7 +29,7 @@ macruby_version=0.5
 macruby_url=http://www.macruby.org/files
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://macruby.icoretech.org/latest/macruby_nightly-latest.pkg
-maglev_version=22949
+maglev_version=23082
 maglev_url=http://glass-downloads.gemstone.com/maglev
 maglev_repo_url=git://github.com/MagLev/maglev.git
 rubinius_repo_url=git://github.com/evanphx/rubinius.git

data/config/md5

@@ -64,3 +64,7 @@ curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
 pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
 rubygems-1.3.6.tgz=789ca8e9ad1d4d3fe5f0534fcc038a0d
 ironruby-ironruby-c912e86.tar.gz=80708c23577ff9bf557f63f0f716fe26
+GemStone-23082.Darwin-i386.tar.gz=aa5f1768e5bad2bb687913c575f9cff6
+GemStone-23082.Linux-x86_64.tar.gz=7b7fd0df5d1deacf7aa12ccc9a94a33f
+MagLev-23082.Darwin-i386.tar.gz=d9027e7b7c8220573b1d3d588712ffc4
+MagLev-23082.Linux-x86_64.tar.gz=d63c4c94a2eaf19b051182e974413fef

data/install

@@ -140,7 +140,7 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
     new_path="$rvm_rubies_path/$(basename $ruby)"
     for file in gem rake ; do
       if [[ -s "$new_path/bin/$file" ]] ; then
-        sed -i -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
+        sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
         rm -f "$new_path/bin/$file.orig"
         chmod +x "$new_path/bin/$file"
       fi

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 23
+:patch: 24

data/rvm.gemspec

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

data/scripts/cli

@@ -195,15 +195,8 @@ __rvm_parse_args() {
         fi
       ;;
 
-      -t|--tag)
-        rvm_ruby_tag="$1";
-        rvm_action="${rvm_action:-use}"
-        shift
-      ;;
-
       # For use with --patch
       --patch-name) export rvm_ruby_patch_name="$1" ; shift ;;
-
       -h|--patch)
         if [[ -z "$rvm_ruby_patch" ]] ; then
           export rvm_ruby_patch="$1"
@@ -214,23 +207,30 @@ __rvm_parse_args() {
       ;;
 
       --head)
-        if [[ -z "$rvm_ruby_string" ]] ; then export rvm_ruby_string="head"; else export rvm_ruby_string="${rvm_ruby_string}-head" ; fi
-        rvm_ruby_revision="head"
+        #if [[ -z "$rvm_ruby_string" ]] ; then export rvm_ruby_string="head"; else export rvm_ruby_string="${rvm_ruby_string}-head" ; fi
+        #rvm_action="${rvm_action:-use}"
+        #rvm_ruby_revision="head"
         export rvm_head_flag=1
-        rvm_action="${rvm_action:-use}"
       ;;
 
-      --rev|--revision)
-        rvm_ruby_revision="$1";
-        rvm_action="${rvm_action:-use}"
-        shift
-      ;;
-
-      -b|--branch)
-        rvm_ruby_branch="$1";
-        rvm_action="${rvm_action:-use}"
-        shift
-      ;;
+      #
+      # Legacy items, replaced with ruby strings.
+      #
+      #-t|--tag)
+      #  rvm_ruby_tag="$1";
+      #  rvm_action="${rvm_action:-use}"
+      #  shift
+      #;;
+      #--rev|--revision)
+      #  rvm_ruby_revision="$1";
+      #  rvm_action="${rvm_action:-use}"
+      #  shift
+      #;;
+      #-b|--branch)
+      #  rvm_ruby_branch="$1";
+      #  rvm_action="${rvm_action:-use}"
+      #  shift
+      #;;
 
       --bin)
         if [[ "update" = "$rvm_action" ]] ; then
@@ -311,7 +311,7 @@ __rvm_parse_args() {
       --disable-llvm|--disable-jit) export rvm_llvm_flag=0      ;;
       --enable-llvm|--enable-jit)   export rvm_llvm_flag=1      ;;
 
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--passenger|--editor|--sticky)
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--passenger|--editor|--sticky|--create|--rvmrc)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
         if [[ "--debug" = "$rvm_token" ]] ; then export rvm_debug_flag ; fi
       ;;

data/scripts/gemsets

@@ -3,11 +3,6 @@
 source $rvm_scripts_path/utility
 source $rvm_scripts_path/selector
 
-color_green=$($rvm_scripts_path/color "green")
-color_red=$($rvm_scripts_path/color "red")
-color_yellow=$($rvm_scripts_path/color "yellow")
-color_none=$($rvm_scripts_path/color "none")
-
 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" ]] && which gem &> /dev/null ; then rvm_ruby_gem_home="$(gem env home)" ; fi
@@ -15,7 +10,7 @@ if [[ ! -d "$rvm_ruby_gem_home" ]] && which gem &> /dev/null ; then rvm_ruby_gem
 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_gemset_name() {
-  echo "$(gem env gemdir)" | awk -F'%' '{print $2}'
+   __rvm_gemset_gemdir |  awk -F'%' '{print $2}'
 }
 
 __rvm_gemset_dir() {
@@ -236,7 +231,7 @@ __rvm_gem_install() {
   # Now we determine if a .gem cache file is already installed
   if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/$(basename $gem_file_name)spec" ]] ; then
     unset gem
-    $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$yellow exists, skipping (--force to re-install)"
+    $rvm_scripts_path/log "info" "$gem_name $gem_version exists, skipping (--force to re-install)"
   else
     if [[ -s "$gem" ]] ; then
       cache_file="$gem"
@@ -260,7 +255,7 @@ __rvm_gem_install() {
 
       if [[ -z "$rvm_force_flag" ]] && [[ -s "${rvm_ruby_gem_home}/specifications/$(basename $gem_file_name)spec" ]] ; then
         unset gem # already installed, not forcing reinstall.
-        $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$yellow exists, skipping (--force to re-install)"
+        $rvm_scripts_path/log "info" "$gem_name $gem_version exists, skipping (--force to re-install)"
       else
         if [[ -s "$rvm_gems_path/cache/$(basename $gem_file_name)" ]] ; then
           mkdir -p "$rvm_tmp_path/$$/"
@@ -333,7 +328,7 @@ elif [[ "empty" = "$action" ]] ; then
   __rvm_gemset_empty
 elif [[ "delete" = "$action" ]] ; then
   __rvm_gemset_delete
-elif [[ "name" = "$action" ]] ; then
+elif [[ "name" = "$action" ]] || [[ "string" = "$action" ]]; then
   __rvm_gemset_name
 elif [[ "dir" = "$action" ]] ; then
   __rvm_gemset_dir

data/scripts/initialize

@@ -15,15 +15,8 @@ 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"}"
-
-if [[ "root" = "$(whoami)" ]] ; then
-  rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
-  rvm_gems_cache_path="${rvm_gems_cache_path:-"$rvm_gems_path/cache"}"
-else
-  rvm_gems_path="${rvm_gems_path:-"$HOME/.rvm/gems"}"
-  rvm_gems_cache_path="${rvm_gems_cache_path:-"$HOME/.gem/cache"}"
-fi
-
+rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
+rvm_gems_cache_path="${rvm_gems_cache_path:-"$rvm_gems_path/cache"}"
 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"}"

data/scripts/install

@@ -140,7 +140,7 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
     new_path="$rvm_rubies_path/$(basename $ruby)"
     for file in gem rake ; do
       if [[ -s "$new_path/bin/$file" ]] ; then
-        sed -i -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
+        sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
         rm -f "$new_path/bin/$file.orig"
         chmod +x "$new_path/bin/$file"
       fi

data/scripts/log

@@ -6,22 +6,22 @@ if [[ ! -z "$2" ]] ; then level=$1 ; shift ; else level="info" ; fi
 
 message=$1
 
-if [[ -z "$rvm_interactive" ]] ; then
+if [[ -z "$rvm_interactive" ]] || [[ -z "$TERM" ]] ; then
   case "$level" in
-    debug) shift ; echo -e "\n$(tput setaf 5)<d>$(tput sgr0) $message $(tput setaf 5)</d> $(tput sgr0) \n"     ;;
-    info)  shift ; echo -e "\n$(tput setaf 2)<i>$(tput sgr0) $message $(tput setaf 2)</i> $(tput sgr0) \n"     ;;
-    warn)  shift ; echo -e "\n$(tput setaf 3)<w>$(tput sgr0) $message $(tput setaf 3)</w> $(tput sgr0) \n"     ;;
-    error) shift ; echo -e "\n$(tput setaf 1)<e>$(tput sgr0) $message $(tput setaf 1)</e> $(tput sgr0) \n" >&2 ;;
-    fail)  shift ; echo -e "\n$(tput setaf 1)<f>$(tput sgr0) $message $(tput setaf 1)</f> $(tput sgr0) \n" >&2 ;;
+    debug) shift ; echo -e "<d>$message </d>"     ;;
+    info)  shift ; echo -e "<i>$message </i>"     ;;
+    warn)  shift ; echo -e "<w>$message </w>"     ;;
+    error) shift ; echo -e "<e>$message </e>" >&2 ;;
+    fail)  shift ; echo -e "<f>$message </f>" >&2 ;;
     *) echo -e "$message"
   esac
 else
   case "$level" in
-    debug) shift ; echo -e "\n$(tput setaf 5)$message$(tput sgr0)\n"     ;;
-    info)  shift ; echo -e "\n$(tput setaf 2)$message$(tput sgr0)\n"     ;;
-    warn)  shift ; echo -e "\n$(tput setaf 3)$message$(tput sgr0)\n"     ;;
-    error) shift ; echo -e "\n$(tput setaf 1)$message$(tput sgr0)\n" >&2 ;;
-    fail)  shift ; echo -e "\n$(tput setaf 1)$message$(tput sgr0)\n" >&2 ;;
+    debug) shift ; echo -e "$(tput setaf 5)$message$(tput sgr0)"     ;;
+    info)  shift ; echo -e "$(tput setaf 2)$message$(tput sgr0)"     ;;
+    warn)  shift ; echo -e "$(tput setaf 3)$message$(tput sgr0)"     ;;
+    error) shift ; echo -e "$(tput setaf 1)$message$(tput sgr0)" >&2 ;;
+    fail)  shift ; echo -e "$(tput setaf 1)$message$(tput sgr0)" >&2 ;;
     *) echo -e "$message"
   esac
 fi

data/scripts/manage

@@ -127,7 +127,7 @@ __rvm_install_ruby() {
             $rvm_scripts_path/log "error" "There has been an error while trying to install from source. Aborting the installation." ; return $result
           fi
         elif [[ "nightly" = "$rvm_ruby_version" ]] ; then
-          macruby_path="/usr/local/bin"
+          macruby_path="/Library/Frameworks/MacRuby.framework/Versions/0.6/usr/bin"
           # TODO: Separated nightly from head.
           $rvm_scripts_path/log "info" "Retrieving the latest nightly macruby build..."
           $rvm_scripts_path/fetch "$rvm_url"
@@ -138,9 +138,9 @@ __rvm_install_ruby() {
           __rvm_run "macruby/extract" "sudo /usr/sbin/installer -pkg '$rvm_archives_path/macruby_nightly.pkg' -target '/'"
           mkdir -p "$rvm_ruby_home/bin"
         else
-          macruby_path="/usr/local/bin"
+          macruby_path="/Library/Frameworks/MacRuby.framework/Versions/0.5/usr/bin"
           # TODO: Separated nightly from head.
-          $rvm_scripts_path/log "info" "Retrieving the latest nightly macruby build..."
+          $rvm_scripts_path/log "info" "Retrieving MacRuby 0.5 ..."
           $rvm_scripts_path/fetch "$rvm_url"
           result=$? ; if [[ "$result" -gt 0 ]] ; then
             $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
@@ -871,6 +871,8 @@ __rvm_rubygems_setup() {
     install=1
   fi
 
+  __rvm_use
+
   if [[ "$install" -eq 0 ]] ; then
     # 1.9.X has it's own built-in gem command
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
@@ -938,6 +940,10 @@ __rvm_rubygems_setup() {
   ln -nfs "$rvm_ruby_gem_home" "$ruby_lib_gem_path"
   unset ruby_lib_gem_path
 
+  if [[ -s "$rvm_ruby_src_path/bin/rake" ]] ; then
+    __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/rake"
+  fi
+
   return $result
 }
 
@@ -945,7 +951,8 @@ __rvm_inject_ruby_shebang() {
   __rvm_actual_file $1
 
   if [[ -f "$actual_file" ]] ; then
-    sed -i -e '1,1s=.*=#!'"$rvm_ruby_home/bin/ruby=" $actual_file
+    #sed -i.orig -e '1,1s=.*=#!'"$rvm_ruby_home/bin/ruby=" $actual_file
+    sed -e '1,1s=.*=#!'"/usr/bin/env ruby=" $actual_file > $actual+file.orig
     rm -f $actual_file.orig ; chmod +x "$actual_file"
   fi ; unset actual_file
 }

data/scripts/package

@@ -86,7 +86,7 @@ openssl() {
 }
 
 zlib() {
-  package="zlib" ; version="1.2.3" ; archive_format="tar.gz"
+  package="zlib" ; version="1.2.4" ; archive_format="tar.gz"
   package_url="http://www.zlib.net"
   install_package
 }
@@ -144,12 +144,13 @@ llvm() {
   __rvm_pushpop
 }
 
-if [[ ! -z "$library" ]] && is_a_function  ${library} ; then
-  ${library}
-else
-  if [[ ! -z "$library" ]] ; then
+if [[ ! -z "$library" ]] ; then
+  if [[ " readline iconv curl openssl zlib ncurses pkgconfig gettext glib mono llvm " =~ "$library" ]] ; then
+    ${library}
+  else
     $rvm_scripts_path/log "error" "Package '${library}' is unknown."
   fi
+else
   $rvm_scripts_path/log "info" "Usage: 'rvm package {install,uninstall} {openssl,zlib,readline,iconv,ncurses}'"
   exit 1
 fi

data/scripts/rvm-install

@@ -140,7 +140,7 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
     new_path="$rvm_rubies_path/$(basename $ruby)"
     for file in gem rake ; do
       if [[ -s "$new_path/bin/$file" ]] ; then
-        sed -i -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
+        sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
         rm -f "$new_path/bin/$file.orig"
         chmod +x "$new_path/bin/$file"
       fi

data/scripts/selector

@@ -73,7 +73,7 @@ __rvm_select() {
         rvm_ruby_package_file="${rvm_ruby_interpreter}-bin-${rvm_ruby_version}"
         rvm_ruby_package_name="${rvm_ruby_interpreter}-${rvm_ruby_version}"
         rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
-        rvm_url="http://jruby.kenai.com/downloads/${rvm_ruby_version}/${rvm_ruby_package_file}.tar.gz"
+        rvm_url="http://jruby.org.s3.amazonaws.com/downloads/${rvm_ruby_version}/${rvm_ruby_package_file}.tar.gz"
       fi
       alias jruby_ng="jruby --ng"
       alias jruby_ng_server="jruby --ng-server"
@@ -295,7 +295,7 @@ __rvm_use() {
     fi
 
     if [[ ! -z "$rvm_verbose_flag" ]] ; then
-      $rvm_scripts_path/log "info" "Now using $(echo $rvm_ruby_string | tr '-' ' ')"
+      $rvm_scripts_path/log "info" "Using $(basename $GEM_HOME | tr '-' ' ' | sed 's/%/ with gemset /')"
     fi
 
     new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"

data/scripts/update

@@ -140,7 +140,7 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
     new_path="$rvm_rubies_path/$(basename $ruby)"
     for file in gem rake ; do
       if [[ -s "$new_path/bin/$file" ]] ; then
-        sed -i -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
+        sed -i.orig -e '1,1s=.*=#!'"$new_path/bin/ruby=" "$new_path/bin/$file"
         rm -f "$new_path/bin/$file.orig"
         chmod +x "$new_path/bin/$file"
       fi

data/scripts/utility

@@ -183,7 +183,7 @@ __rvm_cleanup_variables() {
 
   if [[ "$rvm_sticky_flag" = "1" ]] ; then export rvm_gemset_name ; else unset rvm_gemset_name  ; fi
 
-  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_ruby_patch rvm_sticky_flag
+  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_ruby_patch rvm_sticky_flagrvm_rvmrc_flag
 }
 
 # Unset ruby-specific variables
@@ -193,13 +193,20 @@ __rvm_unset_ruby_variables() {
 
 __rvm_set_rvmrc() {
   if [[ "$HOME" != "$(pwd)" ]] ; then
+    if [[ "$rvm_create_flag" -eq 1 ]] ; then flags="--create " ; fi
+    if [[ "$rvm_verbose_flag" -eq 1 ]] ; then flags="use " ; fi
+
     if [[ -s .rvmrc ]] ; then
       mv .rvmrc .rvmrc.$(date +%m.%d.%Y-%H:%M:%S)
+      $rvm_scripts_path/log "warning" ".rvmrc is not empty, moving aside to preserve."
     fi
-    echo "rvm use $(basename $rvm_ruby_gem_home)" > .rvmrc
+
+    echo "rvm $flags $(basename $rvm_ruby_gem_home)" > .rvmrc
+    unset flags
   else
-    echo -e "Not setting a project specific rvmrc file, currently in the HOME directory."
+    $rvm_scripts_path/log "error" ".rvmrc cannot be set in your home directory. \n The home .rvmrc is for global rvm settings only."
   fi
+
 }
 __rvm_load_rvmrc() {
   if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
@@ -403,11 +410,11 @@ __rvm_list_known() {
     echo "${prefix}-t${tag/\//}"
     unset prefix tag
   done < <(svn list http://svn.ruby-lang.org/repos/ruby/tags/ | awk '/^v1_[8|9]/')
-  echo -e "(ruby-)1.8.6(-p383)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p248)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1(-p376)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1"
+  echo -e "(ruby-)1.8.6(-p399)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p248)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1(-p376)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1\nruby-head\n"
   echo -e "jruby-1.2.0\njruby-1.3.1\njruby(-1.4.0) # the default\njruby-head"
   echo -e "rbx(-prc1) # default\nrbx-head"
   echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
-  echo -e "maglev(-22949)\nmaglev-head"
+  echo -e "maglev(-23082)\nmaglev-head"
   echo -e "mput(-head) # shyouhei head, the default mput"
   echo -e "ironruby-0.9.3\nironruby-1.0-rc2\nironruby-head"
   if [[ "Darwin" = "$(uname)" ]] ; then
@@ -666,28 +673,6 @@ __rvm_gemset_select() {
 
   rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
 
-  # TODO: Remove next section after a several releases.
-  # Migrate original rvm global gem cache directory to $HOME/.gem/cache
-  if [[ "$(whoami)" != "root" ]] ; then
-    if [[ -d "$rvm_path/gems/cache" ]] && [[ ! -L "$rvm_path/gems/cache" ]] ; then
-      if [[ ! -z "$(ls -A "$rvm_path"/gems/cache/)" ]] ; then
-        mv $rvm_path/gems/cache/* $HOME/.gem/cache/
-      fi
-      rmdir $rvm_path/gems/cache
-    fi
-
-    # Some sanity checking.
-    if [[ ! -d "$rvm_gems_cache_path" ]] ; then
-      mkdir -p $rvm_gems_cache_path
-    fi
-    if [[ "$rvm_gems_cache_path"  != "$rvm_gems_path/cache" ]] ; then
-      rm -f "$rvm_gems_path/cache"
-      ln -nfs "$rvm_gems_cache_path" "$rvm_gems_path/cache"
-    fi
-  fi
-  chmod u+w "$rvm_gems_cache_path"
-  # /TODO
-
   # Careful not to nuke system gems cache.
   if [[ ! -z "$rvm_ruby_gem_home" ]] && [[ ! -z "$(echo $rvm_ruby_gem_home | awk '/rvm/')" ]] ; then
     # Ensure that the ruby gem home exists.
@@ -713,7 +698,7 @@ __rvm_gemset_select() {
 __rvm_gemset_use() {
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
-      if [[ "$rvm_gemset_create_on_use_flag" -eq 1 ]] ; then
+      if [[ "$rvm_gemset_create_on_use_flag" -eq 1 ]] || [[ "$rvm_create_flag" -eq 1 ]]; then
         $rvm_scripts_path/gemsets create $rvm_gemset_name
       else
         $rvm_scripts_path/log "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
@@ -724,12 +709,14 @@ __rvm_gemset_use() {
     if [[ "$rvm_interactive" -eq 1 ]] || [[ "$rvm_verbose_flag" -eq 1 ]] ; then
       $rvm_scripts_path/log "info" "Now using gemset '${rvm_gemset_name:-default}'"
     fi
+
     rvm_ruby_gem_home="$(echo $GEM_HOME | sed 's/%.*$//')%$rvm_gemset_name"
     GEM_HOME="$rvm_ruby_gem_home"
     BUNDLE_PATH="$rvm_ruby_gem_home"
     GEM_PATH="$rvm_ruby_gem_home/bin:$(echo $GEM_HOME | sed 's/%.*$//')%global/bin"
     export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
-    __rvm_use
+
+    __rvm_use # Now ensure the selection takes effect for the environment.
   fi
   return 0
 }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 23
-  version: 0.1.23
+  - 24
+  version: 0.1.24
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 -05:00
+date: 2010-03-21 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []