rvm 0.1.36 → 0.1.37

data/config/db

@@ -1,6 +1,7 @@
 niceness=0
 interpreter=ruby
 ruby_version=1.8.7
+ruby_configure_flags=--enable-shared
 ruby_patchlevel=174
 ruby_configure=--enable-shared
 ruby_repo_url=http://svn.ruby-lang.org/repos/ruby
@@ -27,6 +28,7 @@ rbx_version=1.0.0
 rbx_1.0.0_patch_level=20100514
 rbx_url=http://asset.rubini.us
 ree_version=1.8.7
+ree_configure_flags=--dont-install-useful-gems
 ree_1.8.6_patch_level=20090610
 ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677
 ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git

data/config/known

@@ -1,3 +1,4 @@
+# MRI Rubies
 (ruby-)1.8.6(-p399)
 (ruby-)1.8.6-head
 (ruby-)1.8.7(-p174)
@@ -5,11 +6,12 @@
 (ruby-)1.9.1(-p243)
 (ruby-)1.9.1(-p376)
 (ruby-)1.9.1-head
+(ruby-)1.9.2-preview1
 (ruby-)1.9.2-preview3
 (ruby-)1.9.2-head
 ruby-head
 
-# Jruby
+# JRuby
 jruby-1.2.0
 jruby-1.3.1
 jruby-1.4.0
@@ -37,7 +39,7 @@ mput(-head)
 macruby(-nightly) # the default macruby
 macruby-head      # Build from the macruby git repository
 
-# Not working yet
+# IronRuby -- Not implemented yet.
 ironruby-0.9.3
 ironruby-1.0-rc2
 ironruby-head

data/gemsets/default.gems

@@ -1 +1,2 @@
 rake
+rdoc

data/gemsets/global.gems

@@ -0,0 +1,2 @@
+rake
+rdoc

data/install

@@ -166,6 +166,21 @@ if [[ ! -z "$rvm_auto_flag" ]] ; then
   fi
 fi
 
+#
+# Initial Interpreter Gemsets.
+#
+spinner
+mkdir -p "$rvm_gemsets_path"
+for gemset_file in $(cd $install_source_path/gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
+  source_path="$install_source_path/gemsets"
+  destination="$rvm_gemsets_path/$gemset_file"
+  destination_path="$(dirname "$destination")"
+  if [[ ! -s "$destination" ]] ; then
+    mkdir -p "$destination_path"
+    cp "$source_path/$gemset_file" "$destination"
+  fi
+done ; unset destination destination_path source_path
+
 #
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
 #

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 36
+:patch: 37

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.36"
+  s.version = "0.1.37"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-05-31}
+  s.date = %q{2010-06-02}
   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

@@ -277,6 +277,7 @@ __rvm_parse_args() {
         rvm_action=${rvm_action:-use}
         rvm_ruby_interpreter="$rvm_token"
         rvm_ruby_string="$rvm_token"
+        rvm_ruby_strings="$rvm_token"
       ;;
 
       help)

data/scripts/db

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

data/scripts/gemsets

@@ -10,15 +10,15 @@ if [[ ! -d "$rvm_ruby_gem_home" ]] && command -v gem > /dev/null 2>&1; then rvm_
 
 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() {
-   __rvm_gemset_dir |  awk -F${rvm_gemset_separator} '{print $2}'
+gemset_name() {
+  gemset_dir |  awk -F${rvm_gemset_separator} '{print $2}'
 }
 
-__rvm_gemset_dir() {
+gemset_dir() {
   echo "$rvm_ruby_gem_home"
 }
 
-__rvm_gemset_create() {
+gemset_create() {
   rvm_ruby_gem_prefix=$(echo $rvm_ruby_gem_home | sed 's/'${rvm_gemset_separator}'.*$//')
   for gemset in $(echo $gems_args) ; do
     gem_home="${rvm_ruby_gem_prefix}${rvm_gemset_separator}${gems_args/ /}"
@@ -27,7 +27,7 @@ __rvm_gemset_create() {
   done ; unset gem_home
 }
 
-__rvm_gemset_list() {
+gemset_list() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   $rvm_scripts_path/log "info" "gemsets : for $rvm_ruby_string (found in $rvm_gems_path/)"
@@ -43,7 +43,7 @@ __rvm_gemset_list() {
   fi
 }
 
-__rvm_gemset_delete() {
+gemset_delete() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
   if [[ ! -z "$rvm_gemset_name" ]] ; then
     gemdir="$rvm_gems_path/$rvm_ruby_string${rvm_gemset_separator}$rvm_gemset_name"
@@ -67,7 +67,7 @@ __rvm_gemset_delete() {
   fi
 }
 
-__rvm_gemset_empty() {
+gemset_empty() {
   if [[ -z "$rvm_ruby_gem_home" ]] ; then __rvm_select ; fi
   gemdir="$rvm_ruby_gem_home"
   if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
@@ -87,7 +87,7 @@ __rvm_gemset_empty() {
 }
 
 # Migrate gemsets from ruby X to ruby Y
-__rvm_gemset_copy() {
+gemset_copy() {
   source_ruby="$(echo $gems_args | awk '{print $1}')"
   destination_ruby="$(echo $gems_args | awk '{print $2}')"
   if [[ -z "$source_ruby" ]] ; then
@@ -115,7 +115,7 @@ __rvm_gemset_copy() {
   unset source_ruby destination_ruby source_path destination_path
 }
 
-__rvm_gemset_export() {
+gemset_export() {
   rvm_file_name="${rvm_file_name:-$gems_args}"
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
@@ -149,7 +149,7 @@ __rvm_gemset_export() {
   done ; unset file_name
 }
 
-__rvm_gemset_import() {
+gemset_import() {
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
@@ -185,7 +185,7 @@ __rvm_gemset_import() {
     while read -r line
     do # Keep this on 2nd line :(
       if [[ ! -z "$(echo $line | sed 's/\s//g')" ]] ; then
-        gems_args="$line" ; __rvm_gem_install
+        gems_args="$line" ; gem_install
       fi
     done < <(awk '/^[^#]+/{print}' "${rvm_file_name}")
   else
@@ -225,7 +225,7 @@ __rvm_parse_gems_args() {
 }
 
 # Install a gem
-__rvm_gem_install() {
+gem_install() {
   # First we parse the gem args to pick apart the pieces.
 
   __rvm_parse_gems_args
@@ -295,7 +295,7 @@ __rvm_gem_install() {
 }
 
 # Output the user's current gem directory.
-__rvm_gemset_info() {
+gemset_info() {
   if [[ "$rvm_user_flag" -eq 1 ]] ; then
     echo $(rvm system ; gem env | grep "\- $HOME" | awk '{print $NF}')
   elif [[ "$rvm_system_flag" -eq 1 ]] ; then
@@ -309,10 +309,74 @@ __rvm_gemset_info() {
   fi
 }
 
-__rvm_gem_pristine() {
+gemset_prune() {
+  temporary_cache_path="$GEM_HOME/temporary-cache"
+  live_cache_path="$GEM_HOME/cache"
+  mkdir -p "$temporary_cache_path"
+  $rvm_scripts_path/log "info" "Moving active gems into temporary cache..."
+  while read -r used_gem; do
+    gem_name="$(echo "$used_gem" | sed -e 's/ .*//')"
+    versions="$(echo "$used_gem" | sed -e 's/.* (//' -e 's/)//' | tr ', ' ' ')"
+    for version in $versions; do
+      cached_gem_name="${gem_name}-${version}.gem"
+      cached_file_path="${live_cache_path}/${cached_gem_name}"
+      if [[ -f "$cached_file_path" ]]; then
+        mv "$cached_file_path" "${temporary_cache_path}/${cached_gem_name}"
+      fi
+    done
+  done < <(gem list --versions)
+  $rvm_scripts_path/log "info" "Removing live cache and restoring temporary cache..."
+  # Switch the cache back.
+  rm -rf "$live_cache_path"
+  mv "$temporary_cache_path" "$live_cache_path"
+}
+
+gem_pristine() {
   gem pristine --all
 }
 
+# Loads the default gemsets for the current interpreter and gemset.
+gemset_initial() {
+  $rvm_scripts_path/log "info" "Importing initial gemsets for $(__rvm_environment_identifier)."
+  mkdir -p "$rvm_gemsets_path/$(echo "$rvm_ruby_string" | tr '-' '/')" 2>/dev/null
+  for gemsets_path in "$rvm_gemsets_path" "$rvm_gemsets_path/$rvm_ruby_interpreter" "$rvm_gemsets_path/$rvm_ruby_interpreter/$rvm_ruby_version" "$rvm_gemsets_path/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_ruby_patch_level" ; do
+    if [[ ! -z "$rvm_gemset_name" ]] ; then
+      if [[ -s "${gemsets_path}/${rvm_gemset_name}.gems" ]] ; then
+        printf $(rvm gemset import "${gemsets_path}/${rvm_gemset_name}.gems") > /dev/null
+      fi
+    else
+      if [[ -d "$gemsets_path" ]] && [[ -s "${gemsets_path}/default.gems" ]] ; then
+        printf $(rvm gemset import "$gemsets_path/default.gems") > /dev/null
+      fi
+      if [[ -d "$gemsets_path" ]] && [[ -s "${gemsets_path}/global.gems" ]] ; then
+        printf $(rvm use "$rvm_ruby_string@global" --create ; rvm gemset import "${gemsets_path}/global.gems") > /dev/null
+      fi
+    fi
+  done
+  $rvm_scripts_path/log "info" "Installation of gems for $(__rvm_environment_identifier) is complete."
+
+  # Original code, which swapped out the environments on the fly.
+  #post_install_gems="rdoc rake"
+  #for rvm_gem_name in $(echo $post_install_gems); do
+  #  home="$GEM_HOME" ; path="$GEM_PATH" # Save
+  #  for dir in $rvm_ruby_global_gems_path $rvm_ruby_gem_home ; do
+  #    GEM_HOME="$dir" ; GEM_PATH="$dir" ; BUNDLE_PATH="$dir"
+  #    export GEM_HOME GEM_PATH BUNDLE_PATH
+  #    __rvm_run "gems.install" "$rvm_ruby_home/bin/gem install --no-rdoc --no-ri $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name to $dir"
+
+  #    if [[ -x $rvm_ruby_gem_home/bin/$rvm_gem_name ]] ; then
+  #      if [[ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ]] && [[ ! -x $rvm_ruby_home/bin/$rvm_gem_name ]] ; then
+  #        ln -nfs $rvm_ruby_gem_home/bin/$rvm_gem_name $rvm_ruby_home/bin/$rvm_gem_name
+  #      fi
+  #      __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$rvm_gem_name"
+  #      __rvm_inject_gem_env "$rvm_ruby_home/bin/$rvm_gem_name"
+  #    fi
+  #  done ; unset home path dir
+  #  GEM_HOME="$home" ; GEM_PATH="$path" ; BUNDLE_PATH="$home"
+  #  export GEM_HOME GEM_PATH BUNDLE_PATH
+  #done ; unset rvm_gem_name post_install_gems
+}
+
 unset GEM_PATH
 
 if ! command -v gem > /dev/null ; then
@@ -325,29 +389,33 @@ gems_args=$(echo "$*" | awk '{$1="" ; print}' | sed -e 's/^[[:space:]]*//' -e 's
 export rvm_gemset_name
 
 if [[ "import" = "$action" ]] || [[ "load" = "$action" ]] ; then
-  __rvm_gemset_import
+  gemset_import
 elif [[ "export" = "$action" ]] || [[ "dump" = "$action" ]] ; then
-  __rvm_gemset_export
+  gemset_export
 elif [[ "create" = "$action" ]] ; then
-  __rvm_gemset_create
+  gemset_create
 elif [[ "copy" = "$action" ]] ; then
-  __rvm_gemset_copy
+  gemset_copy
 elif [[ "empty" = "$action" ]] ; then
-  __rvm_gemset_empty
+  gemset_empty
 elif [[ "delete" = "$action" ]] ; then
-  __rvm_gemset_delete
+  gemset_delete
 elif [[ "name" = "$action" ]] || [[ "string" = "$action" ]]; then
-  __rvm_gemset_name
+  gemset_name
 elif [[ "dir" = "$action" ]] ; then
-  __rvm_gemset_dir
+  gemset_dir
 elif [[ "list" = "$action" ]] ; then
-  __rvm_gemset_list
+  gemset_list
 elif [[ "gemdir" = "$action" ]] || [[ "gempath" = "$action" ]] || [[ "gemhome" = "$action" ]] || [[ "home" = "$action" ]] || [[ "path" = "$action" ]] || [[ "version" = "$action" ]] ; then
-  __rvm_gemset_info
+  gemset_info
 elif [[ "install" = "$action" ]] ; then
-  __rvm_gem_install $*
+  gem_install $*
 elif [[ "pristine" = "$action" ]] ; then
-  __rvm_gem_pristine $*
+  gem_pristine $*
+elif [[ "initial" = "$action" ]] ; then
+  gemset_initial
+elif [[ "prune" = "$action" ]] ; then
+  gemset_prune
 elif [[ "clear" = "$action" ]] ; then
   $rvm_scripts_path/log "info" "gemset cleared."
   exit 0

data/scripts/initialize

@@ -13,6 +13,7 @@ rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-0}"
 
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
+rvm_repo_path="${rvm_repo_path:-"$rvm_path/repos"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 rvm_docs_path="${rvm_docs_path:-"$rvm_path/docs"}"
 rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
@@ -28,5 +29,5 @@ rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_usr_path="${rvm_usr_path:-"$rvm_path/usr"}"
 rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
 
-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 rvm_gems_cache_path rvm_gemset_separator
+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 rvm_gems_cache_path rvm_gemset_separator rvm_gemsets_path rvm_repo_path
 

data/scripts/install

@@ -166,6 +166,21 @@ if [[ ! -z "$rvm_auto_flag" ]] ; then
   fi
 fi
 
+#
+# Initial Interpreter Gemsets.
+#
+spinner
+mkdir -p "$rvm_gemsets_path"
+for gemset_file in $(cd $install_source_path/gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
+  source_path="$install_source_path/gemsets"
+  destination="$rvm_gemsets_path/$gemset_file"
+  destination_path="$(dirname "$destination")"
+  if [[ ! -s "$destination" ]] ; then
+    mkdir -p "$destination_path"
+    cp "$source_path/$gemset_file" "$destination"
+  fi
+done ; unset destination destination_path source_path
+
 #
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
 #

data/scripts/manage

@@ -49,33 +49,17 @@ __rvm_install_source() {
     fi
   fi
 
-  #if [[ "1.8.5" = "$rvm_ruby_version" ]] ; then
-  #  # How to install ruby 1.8.5... "sneaky sneaky, sir"
-  #  src_dir="ruby-1.8.7-p$(__rvm_db "ruby_1.8.7_patch_level")"
-  #  if [[ ! -d "$HOME/.rvm/src/$src_dir/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p248 > /dev/null ; fi
-  #  cp ~/.rvm/src/$src_dir/ext/openssl/extconf.rb ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
-  #  cp ~/.rvm/src/$src_dir/ext/openssl/openssl_missing.* ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
-  #  cp ~/.rvm/src/$src_dir/ext/openssl/ossl_hmac.c ~/.rvm/src/ruby-1.8.5-p231/ext/openssl/
-  #  src_dir="ruby-1.8.6-p$(__rvm_db "ruby_1.8.6_patch_level")"
-  #  if [[ ! -d "$HOME/.rvm/src/$src_dir/ext/openssl/" ]] ; then $rvm_path/bin/rvm fetch 1.8.6-p383 > /dev/null ; fi
-  #  cp ~/.rvm/src/$src_dir/ext/readline/* ~/.rvm/src/ruby-1.8.5-p231/ext/readline/
-  #  unset src_dir
-  #fi
-
-  #
-  #if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
-  #  (($rvm_debug_flag)) && $rvm_scripts_path/log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
-  #el
   if [[ ! -z "$rvm_ruby_configure" ]] ; then
     __rvm_run "configure" "$rvm_ruby_configure"
     result=$? ; if [[ "$result" -gt 0 ]] ; then
       $rvm_scripts_path/log "error" "There has been an error while configuring. Aborting the installation." ; __rvm_pushpop ; return $result
     fi
   elif [[ -s ./configure ]] ; then
-    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_string, this may take a while depending on your cpu(s)..."
+    __rvm_db "${rvm_ruby_interpreter}_configure_flags" "db_configure_flags"
+    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_string, this may take a while depending on your cpu(s)..."
     result=$? ; if [[ "$result" -gt 0 ]] ; then
       $rvm_scripts_path/log "error" "There has been an error while running configure. Aborting the installation." ; __rvm_pushpop ; return $result
-    fi ; unset configure_parameters
+    fi ; unset configure_parameters db_configure_flags
   else
     $rvm_scripts_path/log "error" "Skipping configure step, 'configure' does not exist, did autoconf not run successfully?"
   fi
@@ -167,7 +151,7 @@ __rvm_install_ruby() {
 
         binaries=(erb gem irb rake rdoc ri ruby testrb)
         for binary_name in ${binaries[@]}; do
-          # if [[ $binary_name != "gem" ]] ; then prefix="-S" ; fi
+          # TODO: This should be generated via an external script.
           ruby_wrapper=$(cat <<RubyWrapper
 #!/usr/bin/env bash
 
@@ -180,11 +164,10 @@ exec $macruby_path/mac$binary_name $prefix "\$@"
 RubyWrapper
 )
 
-          for file_name in "$rvm_ruby_home/bin/$binary_name" "$rvm_bin_path/$binary_name-$rvm_ruby_string" ; do
-            rm -f $file_name
-            echo "$ruby_wrapper" > $file_name
-            if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
-          done
+          file_name="$rvm_ruby_home/bin/$binary_name"
+          rm -f $file_name
+          echo "$ruby_wrapper" > $file_name
+          if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
           if [[ "$binary_name" = "ruby" ]] ; then
             echo "$ruby_wrapper" > $rvm_bin_path/$rvm_ruby_string
           fi
@@ -230,7 +213,9 @@ RubyWrapper
           rvm_ree_options="${rvm_ree_options} --no-tcmalloc"
         fi
 
-        __rvm_run "install" "./installer -a $rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options --dont-install-useful-gems $rvm_ruby_configure_flags" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
+        __rvm_db "${rvm_ruby_interpreter}_configure_flags" "db_configure_flags"
+
+        __rvm_run "install" "./installer -a $rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options $db_configure_flags $rvm_ruby_configure_flags" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
           result=$? ; if [[ "$result" -gt 0 ]] ; then
             $rvm_scripts_path/log "error" "There has been an error while trying to run the ree installer. Aborting the installation." ; __rvm_pushpop ; return $result
           fi
@@ -238,21 +223,14 @@ RubyWrapper
         chmod +x $rvm_ruby_home/bin/*
 
         __rvm_rubygems_setup
-
-        for rvm_gem_name in rdoc rake ; do
-          __rvm_run "gems" "$rvm_ruby_home/bin/gem install $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name"
-        done
-        __rvm_inject_ruby_shebang "$rvm_ruby_gem_home/bin/rake"
-        __rvm_inject_gem_env "$rvm_ruby_gem_home/bin/rake"
-
         __rvm_irbrc
         __rvm_bin_script
         __rvm_post_install
         __rvm_pushpop
       else
-        __rvm_db "ree_${rvm_ruby_version}_repo_url" "rvm_url"
+        __rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_repo_url" "rvm_url"
         if [[ -z "$rvm_url" ]] ; then
-          $rvm_scripts_path/log "fail" "rvm does not know the rvm repo url for 'ree_${rvm_ruby_version}'"
+          $rvm_scripts_path/log "fail" "rvm does not know the rvm repo url for '${rvm_ruby_interpreter}_${rvm_ruby_version}'"
           result=1
         else
           rvm_ruby_repo_url=$rvm_url
@@ -292,9 +270,11 @@ RubyWrapper
       else
         __rvm_db "rubinius_repo_url" "rvm_ruby_repo_url"
         #rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version"
-        if [[ ! -d "$rvm_ruby_src_path" ]] || [[ ! -d "$rvm_ruby_src_path/.git" ]] ; then
-          rm -rf "$rvm_ruby_src_path" ; builtin cd "$rvm_home"
-          __rvm_run "rbx.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path" "Cloning $rvm_ruby_repo_url"
+        if [[ ! -d "$rvm_ruby_repo_path" ]] || [[ ! -d "$rvm_ruby_repo_path/.git" ]] ; then
+          rm -rf "$rvm_ruby_repo_path" "$rvm_ruby_src_path"
+          builtin cd "$rvm_home"
+          __rvm_run "rbx.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_repo_path" "Cloning $rvm_ruby_repo_url"
+          __rvm_run "rbx.copy" "cp -R \"$rvm_ruby_repo_path\" \"$rvm_ruby_src_path\"" "Copying from repo to source..."
           builtin cd "$rvm_ruby_src_path"
         else
           builtin cd "$rvm_ruby_src_path"
@@ -305,13 +285,12 @@ RubyWrapper
         fi
       fi
 
-      #if [[ ! -x "$rvm_ruby_distclean" ]] ; then
-      #  __rvm_run "rake.distclean" "\$(rvm 1.8.7 ; rake distclean --trace)" "Running distclean."
-      #fi
-
       builtin cd "$rvm_ruby_src_path" ; chmod +x ./configure
+
+      __rvm_db "${rvm_ruby_interpreter}_configure_flags" "db_configure_flags"
+
       rvm_ruby_configure_flags="${rvm_ruby_configure_flags:-"--skip-system"}"
-      rvm_ruby_configure="ruby configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags" ; message="Configuring rbx"
+      rvm_ruby_configure="ruby configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_ruby_configure_flags" ; message="Configuring rbx"
       if [[ "$rvm_llvm_flag" = "0" ]] ; then
         rvm_ruby_configure="$rvm_ruby_configure --disable-llvm"
       else
@@ -334,23 +313,17 @@ RubyWrapper
         $rvm_scripts_path/log "error" "There has been an error while running '$rvm_ruby_configure'. Aborting the installation." ; __rvm_pushpop ; return $result
       fi
 
-      binaries="ruby irb" # Trick to work in more shells :)
-      for binary_name in $(echo $binaries) ; do
-        ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary_name
-      done ; unset binary_name binaries
-
-      for binary_name in "gem" ; do
-        if [[ $binary_name != "gem" ]] ; then prefix="-S " ; else unset prefix; fi
-
-        ruby_wrapper=$(printf "#!/usr/bin/env bash\nexec $rvm_ruby_home/bin/rbx $prefix$binary_name \"\$@\"")
-        for file_name in "$rvm_ruby_home/bin/$binary_name" "$rvm_bin_path/$binary_name-$rvm_ruby_string"  ; do
-          rm -f $file_name
-          echo "$ruby_wrapper" > $file_name
-          if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
-        done
-
-        unset file_name binaries ruby_wrapper binary_name files prefix
-      done ; unset binary_name
+      # 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.
+      file_name="$rvm_ruby_home/bin/gem"
+      if [[ ! -f "$file_name" ]]; then
+        echo "#!/usr/bin/env bash" > "$file_name"
+        echo "exec $rvm_ruby_home/bin/rbx gem \"\$@\"" >> "$file_name"
+        [[ -f "$file_name" ]] && chmod +x "$file_name"
+      fi
+      unset file_name
 
       binaries="erb ri rdoc"
       __rvm_post_install
@@ -578,36 +551,6 @@ RubyWrapper
       ln -fs $rvm_ruby_home/bin/ir $rvm_ruby_home/bin/ruby
 
       __rvm_run "gems.install" "PATH=$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:$PATH GEM_HOME=$rvm_ruby_gem_home GEM_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/gem install --no-rdoc --no-ri rake $rvm_gem_options" "Installing $rvm_gem_name to $dir"
-
-      binaries=() # Don't wrap any longer.
-      for binary_name in ${binaries[@]} ; do
-        binary_path=""
-        if [[ "ruby" != "$binary_name" ]] ; then
-          binary_path="$rvm_ruby_home/bin/i$binary_name"
-        fi
-        ruby_wrapper=$(cat <<RubyWrapper
-#!/bin/bash
-
-export GEM_HOME="$rvm_ruby_gem_home"
-export GEM_PATH="$rvm_ruby_gem_path"
-export BUNDLE_PATH="$rvm_ruby_gem_home"
-export MY_RUBY_HOME="$rvm_ruby_home"
-export PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:\$PATH"
-
-exec mono $rvm_ruby_home/bin/ir.exe $binary_path "\$@"
-RubyWrapper
-)
-        files="$rvm_ruby_home/bin/$binary_name $rvm_bin_path/$binary_name-$rvm_ruby_string"
-        for file_name in $(echo $files)  ; do
-          rm -f $file_name
-          echo "$ruby_wrapper" > $file_name
-          if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
-        done
-        if [[ "$binary_name" = "ruby" ]] ; then
-          echo "$ruby_wrapper" > $rvm_bin_path/$rvm_ruby_string
-        fi
-        unset file_name ruby_wrapper binary_name binary_path files prefix
-      done
     ;;
 
     mput|shyouhei)
@@ -621,8 +564,9 @@ RubyWrapper
       builtin cd $rvm_src_path
 
       if [[ ! -d "$rvm_ruby_src_path" ]] || [[ ! -d "$rvm_ruby_src_path/.git" ]] ; then
-        rm -rf $rvm_ruby_src_path
-        __rvm_run "mput.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path" "Cloning $rvm_ruby_repo_url"
+        rm -rf $rvm_ruby_src_path $rvm_ruby_repo_path
+        __rvm_run "mput.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_repo_path" "Cloning $rvm_ruby_repo_url"
+        __rvm_run "mput.copy" "cp -R \"$rvm_ruby_repo_path\" \"$rvm_ruby_src_path\"" "Copying from repo to source..."
         builtin cd $rvm_ruby_src_path
       else
         builtin cd $rvm_ruby_src_path
@@ -695,6 +639,10 @@ RubyWrapper
 
   esac
 
+  
+  # Import the initial gemsets.
+  (source $rvm_scripts_path/rvm; rvm use "$rvm_ruby_string"; $rvm_scripts_path/gemsets initial)
+
   rvm_hook="after_install" ; source $rvm_scripts_path/hook
 
   if [[ ! -z "$ruby_options" ]] ; then RUBYOPT=$ruby_options ; export RUBYOPT ; fi
@@ -743,9 +691,10 @@ __rvm_fetch_ruby() {
       $rvm_scripts_path/log "info" "$rvm_ruby_src_path has already been extracted." ; __rvm_pushpop ; return 0
     fi
   else
+    mkdir -p "$rvm_repo_path"
     if [[ ! -z "$(echo $rvm_url | awk '/^git/')" ]] ; then
-      if [[ -d "$rvm_ruby_src_path/.git" ]] ; then
-        builtin cd $rvm_ruby_src_path
+      if [[ -d "$rvm_ruby_repo_path/.git" ]] ; then
+        builtin cd $rvm_ruby_repo_path
         if [[ -z "$rvm_ruby_revision" ]] ; then
           $rvm_scripts_path/log "info" "Pulling from $rvm_ruby_repo_url, this may take a while depending on your connection..."
           git pull origin master
@@ -764,7 +713,7 @@ __rvm_fetch_ruby() {
         fi
       else
         $rvm_scripts_path/log "info" "Cloning from $rvm_ruby_repo_url, this may take a while depending on your connection..."
-        git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path
+        git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_repo_path
         result=$? ; if [[ "$result" -gt 0 ]] ; then
           $rvm_scripts_path/log "error" "There has been an error while trying to fetch the repository. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
@@ -792,8 +741,8 @@ __rvm_fetch_ruby() {
         rvm_rev="-$rvm_ruby_revision"
       fi
 
-      if [[ -d "$rvm_ruby_src_path/.svn" ]] ; then
-        builtin cd $rvm_ruby_src_path
+      if [[ -d "$rvm_ruby_repo_path/.svn" ]] ; then
+        builtin cd $rvm_ruby_repo_path
         $rvm_scripts_path/log "info" "Updating ruby from $rvm_url"
         __rvm_run "svn.switch" "svn switch $rvm_url"
         __rvm_run "svn.update" "svn update"
@@ -802,14 +751,16 @@ __rvm_fetch_ruby() {
           __rvm_run "svn.checkout" "svn update -q ${rvm_rev/-r/-r }"
         fi
       else
-        rm -rf $rvm_ruby_src_path
-        __rvm_run "svn.checkout" "svn checkout -q ${rvm_rev/-r/-r } $rvm_url $rvm_ruby_src_path" "Downloading source from ${rvm_url}."
+        rm -rf $rvm_ruby_repo_path
+        __rvm_run "svn.checkout" "svn checkout -q ${rvm_rev/-r/-r } $rvm_url $rvm_ruby_repo_path" "Downloading source from ${rvm_url}."
       fi
       result=$? ; if [[ "$result" -gt 0 ]] ; then
         $rvm_scripts_path/log "error" "There has been an error while trying to fetch / update the source. Aborting the installation." ; __rvm_pushpop ; return $result
       fi
 
     fi
+    $rvm_scripts_path/log "info" "Copying from repo to src path..."
+    cp -r "$rvm_ruby_repo_path" "$rvm_ruby_src_path"
   fi
 }
 
@@ -886,32 +837,7 @@ __rvm_post_install() {
     done ; unset binary binaries
   fi
 
-  # TODO: Merge this vvv into the default gemset loading.
-  post_install_gems="rdoc rake"
-  $rvm_scripts_path/log "info" "Installing gems for $rvm_ruby_string ($post_install_gems)."
-  for rvm_gem_name in $(echo $post_install_gems); do
-    home="$GEM_HOME" ; path="$GEM_PATH" # Save
-    for dir in $rvm_ruby_global_gems_path $rvm_ruby_gem_home ; do
-      GEM_HOME="$dir" ; GEM_PATH="$dir" ; BUNDLE_PATH="$dir"
-      export GEM_HOME GEM_PATH BUNDLE_PATH
-      __rvm_run "gems.install" "$rvm_ruby_home/bin/gem install --no-rdoc --no-ri $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name to $dir"
-
-      if [[ -x $rvm_ruby_gem_home/bin/$rvm_gem_name ]] ; then
-        if [[ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ]] && [[ ! -x $rvm_ruby_home/bin/$rvm_gem_name ]] ; then
-          ln -nfs $rvm_ruby_gem_home/bin/$rvm_gem_name $rvm_ruby_home/bin/$rvm_gem_name
-        fi
-        __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$rvm_gem_name"
-        __rvm_inject_gem_env "$rvm_ruby_home/bin/$rvm_gem_name"
-      fi
-    done ; unset home path dir
-    GEM_HOME="$home" ; GEM_PATH="$path" ; BUNDLE_PATH="$home"
-    export GEM_HOME GEM_PATH BUNDLE_PATH
-  done ; unset rvm_gem_name post_install_gems
-  $rvm_scripts_path/log "info" "Installation of gems for $rvm_ruby_string is complete."
-
   __rvm_irbrc
-  __rvm_load_gemsets
-
   __rvm_generate_default_docs
 }
 
@@ -922,33 +848,6 @@ __rvm_generate_default_docs() {
   fi
 }
 
-__rvm_load_gemsets() {
-  # Gemset for every interpreter's global gems
-  if [[ -s "$rvm_gemsets_path/global.gems" ]] ; then
-    dir=$rvm_ruby_global_gems_path
-    GEM_HOME="$dir" ; GEM_PATH="$dir" ; BUNDLE_PATH="$dir" ; export GEM_HOME GEM_PATH BUNDLE_PATH
-
-    $rvm_scripts_path/gemsets "import" "$rvm_gemsets_path/global.gems"
-
-    GEM_HOME="$home" ; GEM_PATH="$path" ; BUNDLE_PATH="$home" ; export GEM_HOME GEM_PATH BUNDLE_PATH
-  fi ; unset home path dir
-
-  # gemset for any installed ruby.
-  if [[ -s "$rvm_gemsets_path/default.gems" ]] ; then
-    $rvm_scripts_path/gemsets "import" "$rvm_gemsets_path/default.gems"
-  fi
-
-  # gemset for any installation of a given interpreter.
-  if [[ -s "$rvm_gemsets_path/$rvm_ruby_interpreter.gems" ]] ; then
-    $rvm_scripts_path/gemsets "import" "$rvm_gemsets_path/$rvm_ruby_interpreter.gems"
-  fi
-
-  # gemset for a specific match of the ruby string.
-  if [[ -s "$rvm_gemsets_path/$rvm_ruby_string.gems" ]] ; then
-    $rvm_scripts_path/gemsets "import" "$rvm_gemsets_path/$rvm_ruby_string.gems"
-  fi
-}
-
 __rvm_rubygems_setup() {
   if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.9/')" ]] || [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^mput/')" ]] ; then
     install=0

data/scripts/rvm-install

@@ -166,6 +166,21 @@ if [[ ! -z "$rvm_auto_flag" ]] ; then
   fi
 fi
 
+#
+# Initial Interpreter Gemsets.
+#
+spinner
+mkdir -p "$rvm_gemsets_path"
+for gemset_file in $(cd $install_source_path/gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
+  source_path="$install_source_path/gemsets"
+  destination="$rvm_gemsets_path/$gemset_file"
+  destination_path="$(dirname "$destination")"
+  if [[ ! -s "$destination" ]] ; then
+    mkdir -p "$destination_path"
+    cp "$source_path/$gemset_file" "$destination"
+  fi
+done ; unset destination destination_path source_path
+
 #
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
 #

data/scripts/selector

@@ -202,6 +202,7 @@ __rvm_select() {
     rvm_ruby_package_name="${rvm_ruby_package_name:-$rvm_ruby_string}"
     rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_string"
     rvm_ruby_log_path="$rvm_log_path/$rvm_ruby_string"
+    rvm_ruby_repo_path="$rvm_repo_path/$rvm_ruby_string"
     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"
@@ -321,7 +322,7 @@ __rvm_use() {
   fi
 
   if [[ ! -z "$rvm_rvmrc_flag" ]]   ; then __rvm_set_rvmrc ; fi
-  # Export ruby string and gem set me for extrnal scripts to take advantage of them.
+  # Export ruby string and gem set me for extrenal scripts to take advantage of them.
   if [[ ! -z "$rvm_ruby_string" ]]  ; then export rvm_ruby_string  ; fi
   if [[ ! -z "$rvm_gemset_name" ]]  ; then export rvm_gemset_name ; fi
   if [[ ! -z "$new_path" ]]         ; then export PATH="$new_path" ; unset new_path ; fi

data/scripts/set

@@ -60,7 +60,7 @@ __rvm_ruby_do() {
     eval "$rvm_command" >> ./log/$rvm_ruby_string/$action.log 2>> ./log/$rvm_ruby_string/$action.error.log
   else
     if [[ "$rvm_verbose_flag" != "0" ]] ; then
-      $rvm_scripts_path/log "info" "$rvm_ruby_string: $($rvm_ruby_home/bin/ruby -v $rvm_ruby_mode | tr "\n" ' ')\n"
+      $rvm_scripts_path/log "info" "$rvm_ruby_string: $(ruby -v $rvm_ruby_mode | tr "\n" ' ')\n"
     fi
     eval "$rvm_command"
   fi

data/scripts/update

@@ -166,6 +166,21 @@ if [[ ! -z "$rvm_auto_flag" ]] ; then
   fi
 fi
 
+#
+# Initial Interpreter Gemsets.
+#
+spinner
+mkdir -p "$rvm_gemsets_path"
+for gemset_file in $(cd $install_source_path/gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
+  source_path="$install_source_path/gemsets"
+  destination="$rvm_gemsets_path/$gemset_file"
+  destination_path="$(dirname "$destination")"
+  if [[ ! -s "$destination" ]] ; then
+    mkdir -p "$destination_path"
+    cp "$source_path/$gemset_file" "$destination"
+  fi
+done ; unset destination destination_path source_path
+
 #
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
 #

data/scripts/utility

@@ -43,7 +43,7 @@ __rvm_db() {
     if [[ -z $variable ]] ; then
       echo $value
     else
-      eval "$variable=$value"
+      eval "$variable='$value'"
     fi
   fi
   unset key value variable
@@ -120,7 +120,7 @@ __rvm_cleanup_variables() {
 
 # Unset ruby-specific variables
 __rvm_unset_ruby_variables() {
-  unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_release_version rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_gem_path rvm_ruby_name rvm_ruby_alias rvm_ruby_strings
+  unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_release_version rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_gem_path rvm_ruby_name rvm_ruby_alias rvm_ruby_strings rvm_ruby_repo_path
 }
 
 __rvm_set_rvmrc() {
@@ -167,7 +167,6 @@ __rvm_benchmark() {
   $rvm_scripts_path/set $rvm_action $rvm_ruby_args
 }
 
-
 # Loop over the currently installed rubies and refresh their binscripts.
 __rvm_bin_scripts() {
   for rvm_ruby_binary in $rvm_rubies_path/*/bin/ruby ; do
@@ -182,25 +181,7 @@ __rvm_bin_scripts() {
 # Write the bin/ wrapper script for currently selected ruby.
 # TODO: Adjust binscript to be able to handle all rubies not just the standard interpreteres.
 __rvm_bin_script() {
-
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
-
-ruby_wrapper=$(cat <<RubyWrapper
-#!/usr/bin/env bash
-
-export GEM_HOME="$rvm_ruby_gem_home"
-export GEM_PATH="$rvm_ruby_gem_path"
-export BUNDLE_PATH="$rvm_ruby_gem_home"
-export MY_RUBY_HOME="$rvm_ruby_home"
-export PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:$rvm_bin_path:\$PATH"
-
-exec "$rvm_ruby_binary" "\$@"
-RubyWrapper
-)
-  rm -f $rvm_bin_path/$rvm_ruby_package_name
-  echo "$ruby_wrapper" > $rvm_bin_path/$rvm_ruby_package_name
-  unset ruby_wrapper
-  chmod +x $rvm_bin_path/$rvm_ruby_package_name
+  $rvm_scripts_path/wrapper "$rvm_ruby_string"
 }
 
 # Reset any rvm gathered information about the system and its state.
@@ -273,7 +254,7 @@ __rvm_initialize() {
     PATH=$rvm_bin_path:$PATH ; export PATH
   fi
 
-  mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gems_path $rvm_tmp_path
+  mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gems_path $rvm_tmp_path $rvm_repo_path
 }
 
 # Update rubygems or binscripts based on CLI selection.

data/scripts/wrapper

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-# Recursive loops, oh my!
 unset rvm_default_flag
 
 source $rvm_scripts_path/initialize
@@ -11,56 +10,90 @@ 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
 
+full_binary_name() {
+  echo "$binary_name" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//'
+}
+
 wrap() {
   mkdir -p "$(dirname "$file_name")"
+  rm -f "$file_name"
   printf "#!/usr/bin/env sh\n" > "$file_name"
-  printf ". \"${rvm_environments_path}/${environment_identifier}\"\n" >> "$file_name"
+  printf "source \"${rvm_environments_path}/${environment_identifier}\"\n" >> "$file_name"
   printf "exec $binary_name \"\$@\"\n" >> "$file_name"
+
   if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
 }
 
+symlink_binary() {
+  # Generate the default wrapper with the given binary name.
+  [[ ! -f "$file_name" ]] && wrap_binary
+  # Then symlink it into place.
+  ln -fs "$file_name" "${rvm_bin_path}/${prefix}_${binary_name}"
+}
+
+wrap_binary() {
+  # Iff the command is found in the path.
+  if command -v $binary_name > /dev/null; then
+    wrap
+  else
+    $rvm_scripts_path/log "error" "Binary '$binary_name' not found in path."
+  fi
+}
+
 usage() {
   printf "Usage: 'rvm wrapper [ruby_string] [wrapper_prefix] [binary[ binary[ ...]]]'\n"
   printf "        Where binary defaults to ruby, gem, rake, irb, rdoc, ri, testrb\n"
   printf "        For more information, see 'rvm help wrapper'\n"
 }
 
-args="$*"
-ruby_string="$(echo "$args" | awk '{print $1}')"
-prefix="$(echo "$args" | awk '{print $2}')"
-binaries=$(echo "$args" | awk '{$1="" ; $2=""; print}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+# Empty ruby string: show usage and exit.
+if [[ -z "$1" ]]; then
+  usage
+  exit 1
+fi
+
+ruby_string="$1"; shift
+
+prefix="$1"
+if [[ -n "$1" ]]; then shift; fi
 
-if [[ -z "$ruby_string" ]]; then
-  usage ; exit 1
+binaries="$(echo "$@" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
+
+if [[ 'system' == '$ruby_string' ]]; then
+  $rvm_scripts_path/log "error" "Wrapper can't be called with system rubies - sorry!"
+  exit 1
 fi
 
+# Default the list of binaries to those we use regularily.
 if [[ -z "$binaries" ]] ; then
-  # TODO: Extract out into a rvm_ variable.
   binaries="ruby gem irb ri rdoc rake erb testrb"
 fi
 
+# Use the correct ruby.
 rvm_ruby_string="${ruby_string}"
-__rvm_select &>/dev/null
-__rvm_use &> /dev/null
+__rvm_select > /dev/null 2>&1
+__rvm_use    > /dev/null 2>&1
+
+__rvm_ensure_has_enviroment_files
 
 environment_identifier="$(__rvm_environment_identifier)"
 
-for binary_name in $(echo $binaries); do
+# For each binary, we want to generate the wrapper / symlink
+# it to the existing wrapper if needed.
+for binary_name in $binaries; do
+  file_name="${rvm_wrappers_path}/${environment_identifier}/${binary_name}"
   if [[ -z "$prefix" ]] ; then
-    file_name="${rvm_wrappers_path}/${environment_identifier}/${binary_name}"
-  else
-    file_name="${rvm_bin_path}/${prefix}_${binary_name}"
-  fi
-
-  if command -v $binary_name > /dev/null; then
-    wrap
+    wrap_binary
+    # Symlink it into place.
+    if [[ "$binary_name" == "ruby" ]]; then
+      ln -sf "$file_name" "$rvm_bin_path/$environment_identifier"
+    else
+      ln -sf "$file_name" "$rvm_bin_path/$binary_name-$environment_identifier"
+    fi
   else
-    $rvm_scripts_path/log "error" "Binary '$binary_name' not found in path."
+    symlink_binary
   fi
   unset file_name
 done
 
-unset rvm_ruby_string args ruby_string prefix binaries environment_identifier
-__rvm_unset_ruby_variables
-
 exit $?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 81
   prerelease: false
   segments: 
   - 0
   - 1
-  - 36
-  version: 0.1.36
+  - 37
+  version: 0.1.37
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 -04:00
+date: 2010-06-02 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []