rvm 1.1.0 → 1.1.1

data/README

@@ -116,7 +116,6 @@ Implementation
   macruby   - MacRuby, insanely fast, can make real apps (Mac OS X Only).
   maglev    - GemStone Ruby, awesome persistent ruby object store.
   ironruby  - IronRuby, NOT supported yet. Looking for volunteers to help.
-  mput      - shyouhei(mput)'s github repository, popular in Japan :)
   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/

data/binscripts/rvm-prompt

@@ -148,8 +148,6 @@ if [[ -n "$ruby" && -n "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
 
       ironruby) unicode="♭" ;;
 
-      mput)     unicode="⎈" ;;
-
       system)   unicode="➆" ;;
 
       ruby)

data/config/db

@@ -52,7 +52,6 @@ macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-lates
 maglev_version=24566
 maglev_url=http://glass-downloads.gemstone.com/maglev
 maglev_repo_url=git://github.com/MagLev/maglev.git
-shyouhei_repo_url=git://github.com/shyouhei/ruby.git
 ironruby_version=1.0
 ironruby_repo_url=git://github.com/ironruby/ironruby.git
 ironruby_1.0_url=http://rubyforge.org/frs/download.php/70179/

data/config/known

@@ -41,9 +41,6 @@ ree-1.8.7-head
 maglev[-24566]
 maglev-head
 
-# Shyouhei head, the default mput
-mput[-head]
-
 # Mac OS X Snow Leopard Only
 macruby-0.6
 macruby-[0.7.1] # the default macruby

data/install

@@ -206,13 +206,24 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if [[ -z "${rvm_prefix:-""}" ]] ; then
-  __rvm_load_rvmrc
-  if [[ "$rvm_selfcontained" = "0" ]] ; then
-    rvm_prefix="${rvm_prefix:-"/usr/local/"}"
+if [[ -z "${rvm_prefix:-""}"  ]] ; then
+
+  if [[ "$USER" = "root" ]] ; then
+
+    source /etc/rvmrc
+
+    if [[ ${rvm_selfcontained:-0} -eq 0 ]] ; then
+      rvm_prefix="${rvm_prefix:-"/usr/local/"}"
+    else
+      rvm_prefix="${rvm_prefix:-"$HOME/."}"
+    fi
+
   else
+
     rvm_prefix="${rvm_prefix:-"$HOME/."}"
+
   fi
+
 fi
 
 if [[ -z "${rvm_path:-""}" ]] ; then
@@ -464,7 +475,7 @@ fi
 #
 mkdir -p "${rvm_rubies_path:-"$rvm_path/rubies"}/"
 
-for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* \
+for ruby in $rvm_path/ruby-* $rvm_path/jruby-* \
   $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
 
   if [[ -d "$ruby" ]] ; then
@@ -495,6 +506,18 @@ done
 # End of rubies migration.
 #
 
+if [[ -d "$rvm_path/environments" ]] ; then
+  #
+  # Remove BUNDLE_PATH from environment files
+  #
+  environments=($( find "$rvm_path/environments" -maxdepth 1 -mindepth 1 -type f ))
+  for file in "${environments[@]}" ; do
+    if grep 'BUNDLE_PATH' "$file" > /dev/null ; then
+      grep -v 'BUNDLE_PATH' "$file" > "$file.new"
+      mv "$file.new" "$file"
+    fi
+  done
+fi
 #
 # Migrate old gemset directories to new gemset pattern.
 #

data/lib/VERSION.yml

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

data/lib/rvm/install_command_dumper.rb

@@ -21,7 +21,7 @@ def normalize_argument(arg)
 end
 
 def arguments_for_install
-  if ruby?(:ruby, :mput, :ree)
+  if ruby?(:ruby, :ree)
     begin
       require 'rbconfig'
       require 'shellwords'

data/man/man1/rvm.1

@@ -358,11 +358,6 @@ GemStone Ruby, awesome persistent ruby object store\&.
 IronRuby, NOT supported yet\&. Looking for volunteers to help\&.
 .RE
 .PP
-\fBmput\fR
-.RS 4
-shyouhei(mput)\'s github repository, popular in Japan :)
-.RE
-.PP
 \fBsystem\fR
 .RS 4
 Use the system ruby (eg\&. pre\-rvm state)\&.

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-11-17}
+  s.date = %q{2010-11-24}
   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/base

@@ -28,12 +28,25 @@ unset script_name rvm_base_except
   #fi
 
 if [[ ${rvm_trace_flag:-0} -gt 0 ]]; then
+
   export rvm_trace_flag=1
+
   set -o xtrace
 
   if [[ -z "${ZSH_VERSION:-""}" ]] ; then
+
     export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
+
   fi
+
+  echo "In script '$0'"
+
+elif [[ ${rvm_debug_flag:-0} > 0 ]] ; then
+
+  rvm_debug_flag=0
+
+  echo "In script '$0'"
+
 fi
 
 if [[ -n "${ZSH_VERSION:-""}" ]] ; then
@@ -44,6 +57,5 @@ fi
 
 export GEM_HOME GEM_PATH rvm_action rvm_alias_expanded rvm_archflags rvm_archive_extension rvm_bin_flag rvm_bin_path rvm_clang_flag rvm_configure_flags rvm_debug_flag rvm_default_flag rvm_delete_flag rvm_docs_type rvm_dump_environment_flag rvm_error_message rvm_expanding_aliases rvm_file_name rvm_gemdir_flag rvm_gemset_name rvm_gemstone_package_file rvm_gemstone_url rvm_head_flag rvm_hook rvm_install_arguments rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_loaded_flag rvm_make_flags rvm_niceness rvm_nightly_flag rvm_only_path_flag rvm_parse_break rvm_patch_names rvm_patch_original_pwd rvm_pretty_print_flag rvm_prior_cc rvm_proxy rvm_quiet_flag rvm_ree_options rvm_reload_flag rvm_remove_flag rvm_ruby_alias rvm_ruby_aliases rvm_ruby_args rvm_ruby_binary rvm_ruby_bits rvm_ruby_configure rvm_ruby_file rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_global_gems_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_load_path rvm_ruby_major_version rvm_ruby_make rvm_ruby_make_install rvm_ruby_minor_version rvm_ruby_mode rvm_ruby_name rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_patch rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_require rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_sha rvm_ruby_string rvm_ruby_strings rvm_ruby_tag rvm_ruby_url rvm_ruby_user_tag rvm_ruby_version rvm_script_name rvm_sdk rvm_silent_flag rvm_sticky_flag rvm_system_flag rvm_token rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_wrapper_name
 
-
 # Cleanup tmp on exit.
 trap "__rvm_cleanup_temp_for '$$'" 0 1 2 3 15

data/scripts/cd

@@ -6,12 +6,20 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
 
   if [[ -n "${ZSH_VERSION:-""}" ]] ; then
 
+    __rvm_after_cd() {
+
+      rvm_hook="after_cd"
+
+      source "$rvm_path/scripts/hook"
+
+    }
+
     autoload is-at-least
 
     if is-at-least 4.3.4 >/dev/null 2>&1; then
 
       # On zsh, use chpwd_functions
-      chpwd_functions=( "${chpwd_functions[@]}" __rvm_project_rvmrc )
+      chpwd_functions=( "${chpwd_functions[@]}" __rvm_project_rvmrc __rvm_after_cd )
 
     else
 
@@ -23,7 +31,7 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
 
         __rvm_project_rvmrc
 
-        rvm_hook="after_cd" ; source "$rvm_path/scripts/hook"
+        __rvm_after_cd
 
         return $result
       }

data/scripts/cli

@@ -68,7 +68,7 @@ __rvm_parse_args()
       ;;
 
       # Can likely remove this due to the *) case
-      jruby*|ree*|macruby*|rbx*|rubinius*|mput*|shyouhei*|ironruby*|default*|maglev*|all)
+      jruby*|ree*|macruby*|rbx*|rubinius*|ironruby*|default*|maglev*|all)
         if [[ "rubinius" = "$rvm_token" ]] ; then rvm_token="rbx"; fi
         rvm_ruby_interpreter="$rvm_token"
         rvm_ruby_string="$rvm_token"
@@ -241,7 +241,7 @@ __rvm_parse_args()
             else
               case "$next_token" in
 
-                ruby|rbx|jruby|macruby|ree|rubinius|maglev|mput|shyouhei|ironruby)
+                ruby|rbx|jruby|macruby|ree|rubinius|maglev|ironruby)
                   rvm_ruby_strings=$next_token
                   rvm_ruby_interpreter=$next_token
                   if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi

data/scripts/docs

@@ -67,9 +67,9 @@ generate_ri()
 
     "$rvm_path/scripts/log" "info" "Generating ri documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
 
-    "$rvm_path/scripts/log" "info" "( Errors will be logged to ${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.error.log )"
+    "$rvm_path/scripts/log" "info" "( Errors will be logged to ${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.log )"
 
-    rdoc -a --ri --ri-site > /dev/null 2>> ${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.error.log
+    rdoc -a --ri --ri-site > /dev/null 2>> ${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.log
   )
 }
 
@@ -82,15 +82,15 @@ generate_rdoc()
 
     "$rvm_path/scripts/log" "info" "Generating rdoc documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
 
-    "$rvm_path/scripts/log" "info" "( Errors will be logged to ${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.error.log )"
+    "$rvm_path/scripts/log" "info" "( Errors will be logged to ${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.log )"
 
     if gem list | \grep -q ^hanna ; then
 
-      hanna -o "${rvm_docs_path:-"$rvm_path/docs"}/$rvm_docs_ruby_string/$rvm_docs_type" --inline-source --line-numbers --fmt=html > /dev/null 2>> "${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.error.log"
+      hanna -o "${rvm_docs_path:-"$rvm_path/docs"}/$rvm_docs_ruby_string/$rvm_docs_type" --inline-source --line-numbers --fmt=html > /dev/null 2>> "${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.log"
 
     else
 
-      rdoc -a -o "${rvm_docs_path:-"$rvm_path/docs"}/$rvm_docs_ruby_string/$rvm_docs_type" > /dev/null 2>> "${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.error.log"
+      rdoc -a -o "${rvm_docs_path:-"$rvm_path/docs"}/$rvm_docs_ruby_string/$rvm_docs_type" > /dev/null 2>> "${rvm_log_path:-"$rvm_path/log"}/$rvm_docs_ruby_string/docs.log"
 
     fi
   )

data/scripts/fetch

@@ -178,7 +178,7 @@ if [[ $download -gt 0 ]] ; then
     else
 
       "$rvm_path/scripts/log" "error" \
-        "There was an error, please check ${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/*.error.log. Next we'll try to fetch via http."
+        "There was an error, please check ${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/*.log. Next we'll try to fetch via http."
 
       try_http=1
 
@@ -191,7 +191,7 @@ if [[ $download -gt 0 ]] ; then
       if [[ $result -gt 0 ]] ; then
 
         "$rvm_path/scripts/log" "error" \
-          "There was an error, please check ${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/*.error.log"
+          "There was an error, please check ${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/*.log"
 
       else
 
@@ -208,7 +208,7 @@ if [[ $download -gt 0 ]] ; then
       if [[ $result -gt 0 ]] ; then
 
         "$rvm_path/scripts/log" "error" \
-          "There was an error, please check ${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/*.error.log"
+          "There was an error, please check ${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/*.log"
 
       else
 

data/scripts/gemsets

@@ -598,10 +598,14 @@ gemset_import()
 
   if [[ -s "$rvm_file_name" ]] ; then
 
-    echo "Importing  $rvm_file_name file..."
+    printf "\nInstalling gems listed in $rvm_file_name file...\n\n"
 
-    rvm_ruby_gem_list=$(builtin cd "$rvm_ruby_gem_home/specifications/" ; find . -maxdepth 1 -mindepth 1 -type f -print 2> /dev/null | sed -e 's#.gems.*$##' 2> /dev/null)
-    rvm_ruby_gem_list="${rvm_ruby_gem_list//.\/}"
+    rvm_ruby_gem_list=$(
+      builtin cd "$rvm_ruby_gem_home/specifications/" ;
+      find . -maxdepth 1 -mindepth 1 -type f -print 2> /dev/null | \
+        sed -e 's#.gems.*$##' -e 's#^./##g' 2> /dev/null
+    )
+    # rvm_ruby_gem_list="${rvm_ruby_gem_list//.\/}"
 
     while read -r line
     do # Keep this on 2nd line :(
@@ -612,6 +616,8 @@ gemset_import()
 
     done < <(awk '/^[^#]+/{print}' "${rvm_file_name}")
 
+    printf "\nProcessing of $rvm_file_name is complete.\n\n"
+
   else
     "$rvm_path/scripts/log" "error" \
       "${rvm_file_name} does not exist to import from."
@@ -675,8 +681,7 @@ gem_install()
   if [[ ${rvm_force_flag:-0} -eq 0 && -f "${rvm_ruby_gem_home}/specifications/$(basename "$gem_file_name")spec" ]] ; then
     gem=""
 
-    "$rvm_path/scripts/log" "info" \
-      "$gem_name $gem_version exists, skipping (--force to re-install)"
+    "$rvm_path/scripts/log" "info" "$gem_name $gem_version is already installed."
 
   else
     if [[ -s "$gem" ]] ; then
@@ -739,7 +744,6 @@ gem_install()
 
     else
 
-      #--ignore-dependencies
       command="$gem_prefix gem install --ignore-dependencies $gems_args $rvm_gem_options -q $gem $gem_postfix $vars"
 
     fi
@@ -753,12 +757,12 @@ gem_install()
     if [[ $result -eq 0 ]] ; then
 
       "$rvm_path/scripts/log" "info" \
-        "$gem_name $gem_version installed ( output logged to: $rvm_path/log/$rvm_ruby_string/gem.install.log )"
+        "$gem_name $gem_version installed."
 
     else
 
       "$rvm_path/scripts/log" "error" \
-        "$gem_name $gem_version failed to install ( output logged to: $rvm_path/log/$rvm_ruby_string/gem.install.error.log )"
+        "$gem_name $gem_version failed to install ( output logged to: $rvm_path/log/$rvm_ruby_string/gem.install.log )"
 
     fi
   fi
@@ -770,19 +774,25 @@ gem_install()
 gemset_info()
 {
   if [[ ${rvm_user_flag:-0} -eq 1 ]] ; then
+
     echo $(rvm system ; gem env | grep "\- $HOME" | awk '{print $NF}')
 
   elif [[ ${rvm_system_flag:-0} -eq 1 ]] ; then
+
     echo $(rvm system ; gem env $action system)
 
   elif [[ -n "${rvm_ruby_string:-""}" ]] ; then
+
     echo $(rvm "$rvm_ruby_string" ; gem env $action)
 
   elif [[ -n "${GEM_HOME:-""}" ]] ; then
+
     echo "$GEM_HOME"
 
   else
+
     gem env $action
+
   fi
 
   return $?

data/scripts/install

@@ -206,13 +206,24 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if [[ -z "${rvm_prefix:-""}" ]] ; then
-  __rvm_load_rvmrc
-  if [[ "$rvm_selfcontained" = "0" ]] ; then
-    rvm_prefix="${rvm_prefix:-"/usr/local/"}"
+if [[ -z "${rvm_prefix:-""}"  ]] ; then
+
+  if [[ "$USER" = "root" ]] ; then
+
+    source /etc/rvmrc
+
+    if [[ ${rvm_selfcontained:-0} -eq 0 ]] ; then
+      rvm_prefix="${rvm_prefix:-"/usr/local/"}"
+    else
+      rvm_prefix="${rvm_prefix:-"$HOME/."}"
+    fi
+
   else
+
     rvm_prefix="${rvm_prefix:-"$HOME/."}"
+
   fi
+
 fi
 
 if [[ -z "${rvm_path:-""}" ]] ; then
@@ -464,7 +475,7 @@ fi
 #
 mkdir -p "${rvm_rubies_path:-"$rvm_path/rubies"}/"
 
-for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* \
+for ruby in $rvm_path/ruby-* $rvm_path/jruby-* \
   $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
 
   if [[ -d "$ruby" ]] ; then
@@ -495,6 +506,18 @@ done
 # End of rubies migration.
 #
 
+if [[ -d "$rvm_path/environments" ]] ; then
+  #
+  # Remove BUNDLE_PATH from environment files
+  #
+  environments=($( find "$rvm_path/environments" -maxdepth 1 -mindepth 1 -type f ))
+  for file in "${environments[@]}" ; do
+    if grep 'BUNDLE_PATH' "$file" > /dev/null ; then
+      grep -v 'BUNDLE_PATH' "$file" > "$file.new"
+      mv "$file.new" "$file"
+    fi
+  done
+fi
 #
 # Migrate old gemset directories to new gemset pattern.
 #

data/scripts/irbrc.rb

@@ -48,6 +48,7 @@ rvm_ruby_string = ENV["rvm_ruby_string"] || `rvm tools identifier`.strip.split("
   :RETURN => " => %s \n",
   :AUTO_INDENT => true
 }
+IRB.conf[:PROMPT] ||= {}
 IRB.conf[:PROMPT][:RVM] = @prompt
 IRB.conf[:PROMPT_MODE] = :RVM
 

data/scripts/manage

@@ -993,15 +993,13 @@ RubyWrapper
 
         unzip -o  -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" \
           "${rvm_archives_path:-"$rvm_path/archives"}/${rvm_ruby_package_file}" >> \
-          "${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/extract.log" 2>> \
-          "${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/extract.error.log"
+          "${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/extract.log" 2>&1
         result=$?
 
         if [[ "$result" -gt 1 ]] ; then
 
           "$rvm_path/scripts/log" "error" \
-            "There has been an error while trying to extract $rvm_ruby_package_file. \
-            \nHalting the installation."
+            "There has been an error while trying to extract $rvm_ruby_package_file.\n${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/extract.log might have more details.\nHalting the installation."
           return $result
 
         fi
@@ -1043,123 +1041,6 @@ RubyWrapper
         "Installing $rvm_gem_name to $dir"
     ;;
 
-    mput|shyouhei)
-
-      if [[ ${rvm_make_flags_flag:-0} -eq 1 ]] ; then __rvm_make_flags ; fi
-
-      unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
-
-      __rvm_remove_rvm_from_path
-
-      __rvm_conditionally_add_bin_path ; export PATH
-
-      builtin hash -r
-
-      rvm_ruby_home="$rvm_path/rubies/$rvm_ruby_interpreter-$rvm_ruby_version"
-
-      __rvm_fetch_from_github "mput" "trunk"
-
-      __rvm_apply_patches ; result=$?
-
-      if [[ "$result" -gt 0 ]] ; then
-        "$rvm_path/scripts/log" "error" \
-          "There has been an error while trying to apply patches to mput. \
-          \nHalting the installation."
-        return $result
-      fi
-
-      if [[ ! -s "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/configure" ]] ; then
-
-        if command -v autoconf &> /dev/null ; then
-
-          __rvm_run "autoconf" "autoconf" "Running autoconf"
-
-        else
-          "$rvm_path/scripts/log" "fail" \
-            "rvm expects autoconf to install this ruby interpreter, autoconf was not found in PATH. \
-            \nHalting installation."
-          return $result
-        fi
-      fi
-
-      if [[ -s ./Makefile && -z "$rvm_reconfigure_flag" ]] ; then
-
-        if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
-          "$rvm_path/scripts/log" "debug" \
-            "Skipping configure step, Makefile exists so configure must have already been run."
-        fi
-
-      elif [[ -n "$rvm_ruby_configure" ]] ; then
-
-        __rvm_run "configure" "$rvm_ruby_configure"
-        result=$?
-
-        if [[ "$result" -gt 0 ]] ; then
-          "$rvm_path/scripts/log" "error" \
-            "There has been an error while trying to configure the source. \
-            \nHalting the installation."
-          return $result
-        fi
-
-      elif [[ -s ./configure ]] ; then
-        local configure_command="./configure --prefix=$rvm_ruby_home $rvm_configure_flags"
-
-        __rvm_run "configure" "" \
-          "Configuring $rvm_ruby_string using $rvm_configure_flags, this may take a while depending on your cpu(s)..."
-        result=$?
-
-        if [[ "$result" -gt 0 ]] ; then
-        "$rvm_path/scripts/log" "error" \
-          "There has been an error while trying to configure the source.\
-          \nHalting the installation."
-        return $result
-      fi
-
-    else
-      "$rvm_path/scripts/log" "error" \
-        "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
-    fi
-
-      rvm_ruby_make=${rvm_ruby_make:-"make"}
-
-      __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" \
-        "Compiling $rvm_ruby_string, this may take a while depending on your cpu(s)..."
-      result=$?
-
-      if [[ "$result" -gt 0 ]] ; then
-        "$rvm_path/scripts/log" "error" \
-          "There has been an error while trying to run make.\
-          \nHalting the installation."
-        return $result
-      fi
-
-      rvm_ruby_make_install=${rvm_ruby_make_install:-"make install"}
-
-      __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string"
-      result=$?
-
-      if [[ "$result" -gt 0 ]] ; then
-        "$rvm_path/scripts/log" "error" \
-          "There has been an error while trying to run make install. \
-          \nHalting the installation."
-        return $result
-      fi
-
-      "$rvm_path/scripts/log" "info" \
-        "Installation of $rvm_ruby_string is complete."
-
-      export GEM_HOME="$rvm_ruby_gem_home"
-      export GEM_PATH="$rvm_ruby_gem_path"
-
-      __rvm_rubygems_setup
-
-      __rvm_bin_script
-
-      __rvm_run "chmod.bin" "chmod +x $rvm_ruby_home/bin/*"
-
-      __rvm_post_install
-    ;;
-
     ruby)
 
       __rvm_check_for_bison # && Run like hell...
@@ -1223,6 +1104,8 @@ __rvm_fetch_from_github()
     __rvm_run "$1.repo" "git pull origin $branch" "Pulling from origin $branch"
   fi
 
+  rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
+
   __rvm_run "$1.copy" "\\cp -R \"${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string\" \"${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string\"" "Copying from repo to source..."
 
   builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
@@ -1826,8 +1709,7 @@ __rvm_rubygems_setup()
 {
   local home path dir directory_name version_number ruby_lib_gem_path
 
-  if [[ -n "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" \
-    || -n "$(echo "$rvm_ruby_interpreter" | awk '/^mput/')" ]] ; then
+  if [[ -n "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" ]] ; then
     install=0
 
   elif [[ "$rvm_ruby_string" = "ruby-head" ]] ; then
@@ -2053,8 +1935,13 @@ __rvm_manage_rubies()
   # Given list of ruby strings.
   if [[ -n "${rubies_string:-""}" ]] ;then
 
-    for rvm_ruby_string in "${rubies_string//,/ }" ; do
-      current_manage_ruby_string="$rvm_ruby_string"
+    rubies=(${rubies_string//,/ })
+
+    for rvm_ruby_string in "${rubies[@]}" ; do
+
+      current_ruby_string="$rvm_ruby_string"
+
+      rvm_hook="before_install" ; source "$rvm_path/scripts/hook"
 
       eval "__rvm_${action}_ruby"
       result="$?"
@@ -2064,12 +1951,15 @@ __rvm_manage_rubies()
       fi
 
       if [[ "$result" = 0 && "$action" = "install" ]] ; then
-        __rvm_record_install "$current_manage_ruby_string"
+        __rvm_record_install "$current_ruby_string"
       fi
 
-      unset current_manage_ruby_string
+      unset current_ruby_string
 
       __rvm_unset_ruby_variables
+
+      rvm_hook="after_install" ; source "$rvm_path/scripts/hook"
+
     done
 
   else # all

data/scripts/notes

@@ -41,9 +41,10 @@ dependencies:
   jruby: aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk
 
 # For Ruby (MRI & ree)  you should install the following OS dependencies:
-  ruby: aptitude install build-essential bison openssl libreadline5 libreadline5-dev curl git zlib1g zlib1g-dev libssl-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev
+  ruby: aptitude install build-essential bison openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev autoconf
 
-  ruby-head: git subversion autoconf
+# In addition to ruby: dependencies,
+  ruby-head: subversion
 
 # For IronRuby (if you wish to use it) you will need:
   ironruby: aptitude install curl mono-2.0-devel
@@ -57,7 +58,7 @@ dependencies:
 
   # For MRI based rubies you will need:
   ruby: # TODO: tell Wayne what goes here if you use Gentoo :)
-  ruby-head: # TODO: tell Wayne what goes here if you use Gentoo :)
+  ruby-head: dev/readline dev/zlib dev/libxml2 dev/openssl dev/iconv # TODO: tell Wayne what goes here if you use Gentoo :)
 
   # For JRuby (if you wish to use it) you will need:
   jruby: emerge dev-java/sun-jdk dev-java/sun-jre-bin
@@ -73,8 +74,8 @@ dependencies:
   rvm: bash curl git
 
   # For Ruby (MRI & Ree) you should install the following OS dependencies:
-  ruby: pacman -Sy --noconfirm patch curl bison zlib readline libxml2 git make
-  ruby-head: pacman -Sy --noconfirm subversion autoconf diffutils patch bison make
+  ruby: pacman -Sy --noconfirm patch curl bison zlib readline libxml2 git autoconf diffutils patch bison make
+  ruby-head: pacman -Sy --noconfirm subversion
 
   # For JRuby (if you wish to use it) you will need:
   jruby: pacman -Sy --noconfirm jdk jre curl

data/scripts/rubygems

@@ -12,7 +12,7 @@ rubygems_setup()
 
   unset RUBYOPT
 
-  if [[ ! -z "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" ]] || [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^mput/')" ]] ; then
+  if [[ -n "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" ]] ; then
     install=0
   elif [[ "$rvm_ruby_string" = "ruby-head" ]] ; then
     install=0

data/scripts/rvm-install

@@ -206,13 +206,24 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if [[ -z "${rvm_prefix:-""}" ]] ; then
-  __rvm_load_rvmrc
-  if [[ "$rvm_selfcontained" = "0" ]] ; then
-    rvm_prefix="${rvm_prefix:-"/usr/local/"}"
+if [[ -z "${rvm_prefix:-""}"  ]] ; then
+
+  if [[ "$USER" = "root" ]] ; then
+
+    source /etc/rvmrc
+
+    if [[ ${rvm_selfcontained:-0} -eq 0 ]] ; then
+      rvm_prefix="${rvm_prefix:-"/usr/local/"}"
+    else
+      rvm_prefix="${rvm_prefix:-"$HOME/."}"
+    fi
+
   else
+
     rvm_prefix="${rvm_prefix:-"$HOME/."}"
+
   fi
+
 fi
 
 if [[ -z "${rvm_path:-""}" ]] ; then
@@ -464,7 +475,7 @@ fi
 #
 mkdir -p "${rvm_rubies_path:-"$rvm_path/rubies"}/"
 
-for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* \
+for ruby in $rvm_path/ruby-* $rvm_path/jruby-* \
   $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
 
   if [[ -d "$ruby" ]] ; then
@@ -495,6 +506,18 @@ done
 # End of rubies migration.
 #
 
+if [[ -d "$rvm_path/environments" ]] ; then
+  #
+  # Remove BUNDLE_PATH from environment files
+  #
+  environments=($( find "$rvm_path/environments" -maxdepth 1 -mindepth 1 -type f ))
+  for file in "${environments[@]}" ; do
+    if grep 'BUNDLE_PATH' "$file" > /dev/null ; then
+      grep -v 'BUNDLE_PATH' "$file" > "$file.new"
+      mv "$file.new" "$file"
+    fi
+  done
+fi
 #
 # Migrate old gemset directories to new gemset pattern.
 #

data/scripts/selector

@@ -162,16 +162,6 @@ __rvm_select()
       fi
     ;;
 
-    mput|shyouhei)
-      rvm_ruby_interpreter="mput"
-      rvm_ruby_version="head"
-      rvm_ruby_string=$(echo $rvm_ruby_string | sed -e 's/shyouhei/mput/g')
-      rvm_ruby_patch_level=""
-      rvm_ruby_repo_url=${rvm_mput_repo_url:-"$(__rvm_db "shyouhei_repo_url")"}
-      rvm_ruby_url=$rvm_ruby_repo_url
-      rvm_ruby_configure="" ; rvm_ruby_make="" ; rvm_ruby_make_install=""
-    ;;
-
     ruby)
       if [[ -z "${rvm_ruby_version:-""}" && ${rvm_head_flag:-0} -eq 0 ]]; then
         "$rvm_path/scripts/log" "fail" "Ruby version was not specified!"
@@ -307,6 +297,7 @@ __rvm_use()
     export rvm_ruby_string="system"
 
   else
+    unset BUNDLE_PATH # Ensure that BUNDLE_PATH is not set!
     GEM_HOME="$rvm_ruby_gem_home"
     GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
     MY_RUBY_HOME="$rvm_ruby_home"
@@ -430,13 +421,13 @@ __rvm_ruby_string()
 
   rvm_expanding_aliases=${rvm_expanding_aliases:-0}
 
-  rvm_ruby_version=${rvm_ruby_version:-""}
-  rvm_gemset_name=${rvm_gemset_name:-""}
-  rvm_ruby_interpreter=${rvm_ruby_interpreter:-""}
-  rvm_ruby_version=${rvm_ruby_version:-""}
-  rvm_ruby_patch_level=${rvm_ruby_patch_level:-""}
-  rvm_ruby_revision=${rvm_ruby_revision:-""}
-  rvm_ruby_tag=${rvm_ruby_tag:-""}
+  rvm_ruby_version="${rvm_ruby_version:-""}"
+  rvm_gemset_name="${rvm_gemset_name:-""}"
+  rvm_ruby_interpreter="${rvm_ruby_interpreter:-""}"
+  rvm_ruby_version="${rvm_ruby_version:-""}"
+  rvm_ruby_patch_level="${rvm_ruby_patch_level:-""}"
+  rvm_ruby_revision="${rvm_ruby_revision:-""}"
+  rvm_ruby_tag="${rvm_ruby_tag:-""}"
 
   if echo "$rvm_ruby_string" | \grep -q "${rvm_gemset_separator:-"@"}" ; then
     rvm_gemset_name="${rvm_ruby_string/*${rvm_gemset_separator:-"@"}/}"
@@ -444,8 +435,8 @@ __rvm_ruby_string()
   fi
 
   # Alias'd rubies
-  if [[ ${rvm_expanding_aliases:-0} -eq 0 && -n ${rvm_ruby_string:-""}
-    && $rvm_ruby_string != "system" ]] ; then
+  if [[ ${rvm_expanding_aliases:-0} -eq 0 && -n "${rvm_ruby_string:-""}"
+    && "$rvm_ruby_string" != "system" ]] ; then
     if expanded_alias_name="$("$rvm_path/scripts/alias" show "$rvm_ruby_string" 2>/dev/null)" \
       && [[ -n "$expanded_alias_name" ]] ; then
       rvm_ruby_string="$expanded_alias_name"
@@ -461,22 +452,22 @@ __rvm_ruby_string()
   fi
 
   # Stash the ruby string.
-  ruby_string=${rvm_ruby_string:-""}
-  gemset_name=${rvm_gemset_name:-""}
-  repo_url=${rvm_ruby_repo_url:-""}
-  branch_name=${rvm_ruby_repo_branch:-""}
+  ruby_string="${rvm_ruby_string:-""}"
+  gemset_name="${rvm_gemset_name:-""}"
+  repo_url="${rvm_ruby_repo_url:-""}"
+  branch_name="${rvm_ruby_repo_branch:-""}"
 
   __rvm_unset_ruby_variables
 
-  rvm_ruby_repo_url=${repo_url:-""}
-  rvm_ruby_repo_branch=${branch_name:-""}
+  rvm_ruby_repo_url="${repo_url:-""}"
+  rvm_ruby_repo_branch="${branch_name:-""}"
 
   if [[ ! -z "$gemset_name" ]] ; then
     rvm_gemset_name="$gemset_name"
     rvm_sticky_flag=1 # <- not sold on this.
   fi
 
-  strings=($(echo ${ruby_string//-/ }))
+  strings=($(echo "${ruby_string//-/ }"))
 
   if [[ ${#strings[@]} -eq 0 ]] ; then
 
@@ -604,7 +595,7 @@ __rvm_ruby_string()
       rvm_ruby_name="${string/n/}"
       ;;
 
-    ruby|rbx|jruby|macruby|ree|rubinius|maglev|mput|shyouhei|ironruby)
+    ruby|rbx|jruby|macruby|ree|rubinius|maglev|ironruby)
       rvm_ruby_interpreter="$string"
       ;;
 
@@ -626,9 +617,9 @@ __rvm_ruby_string()
   fi
 
   # Unspecified version
-  rvm_ruby_version=${rvm_ruby_version:-""}
+  rvm_ruby_version="${rvm_ruby_version:-""}"
   if [[ -z "${rvm_ruby_version:-""}" && ${rvm_head_flag:-0} -eq 0 ]] ; then
-    rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "${rvm_ruby_interpreter}_version")"}
+    rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "${rvm_ruby_interpreter}_version")"}"
   fi
 
   if [[ -z "${rvm_ruby_version:-""}" ]] ; then
@@ -704,8 +695,8 @@ __rvm_gemset_select()
   command -v gem > /dev/null
   if [[ $? -gt 0 ]] ; then return 0 ; fi # Stop if no 'gem' command is available.
 
-  rvm_ruby_gem_home=${rvm_ruby_gem_home:-""}
-  rvm_gemset_name=${rvm_gemset_name:-""}
+  rvm_ruby_gem_home="${rvm_ruby_gem_home:-""}"
+  rvm_gemset_name="${rvm_gemset_name:-""}"
 
   if [[ -z "${rvm_gemset_name:-""}" ]] ; then
 
@@ -714,11 +705,11 @@ __rvm_gemset_select()
     if [[ ${rvm_sticky_flag:-0} -eq 1 ]] ; then
 
       if [[ -n "${GEM_HOME:-""}" ]] ; then
-        rvm_gemset_name=$(echo $GEM_HOME | xargs basename | awk -F${rvm_gemset_separator:-"@"} '{print $2}')
+        rvm_gemset_name="$(echo $GEM_HOME | xargs basename | awk -F${rvm_gemset_separator:-"@"} '{print $2}')"
       fi
 
       if [[ -n "${rvm_ruby_gem_home:-""}" ]] ; then
-        rvm_gemset_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F${rvm_gemset_separator:-"@"} '{print $2}')
+        rvm_gemset_name="$(echo $rvm_ruby_gem_home | xargs basename | awk -F${rvm_gemset_separator:-"@"} '{print $2}')"
       fi
     fi
 
@@ -732,7 +723,7 @@ __rvm_gemset_select()
         rvm_ruby_gem_home="${rvm_gems_path:-"$rvm_path/gems"}/$rvm_ruby_string"
 
       elif [[ -z "${GEM_HOME:-""}" && -n "$(command -v gem)" ]] ; then
-        rvm_ruby_gem_home=$(gem env gemdir)
+        rvm_ruby_gem_home="$(gem env gemdir)"
 
       elif [[ -n "${GEM_HOME:-""}" ]] ; then
         rvm_ruby_gem_home="$GEM_HOME"
@@ -742,10 +733,10 @@ __rvm_gemset_select()
       fi
     fi
   else
-    local gemset=$(echo "$rvm_ruby_gem_home" | awk -F'@' '{print $NF}')
+    local gemset="$(echo "$rvm_ruby_gem_home" | awk -F'@' '{print $NF}')"
 
     if [[ -z "${rvm_ruby_string:-""}" && -n "${GEM_HOME:-""}" && -n "${GEM_HOME/@*/}" ]] ; then
-      rvm_ruby_string=$(basename ${GEM_HOME/@*/})
+      rvm_ruby_string="$(basename ${GEM_HOME/@*/})"
     fi
 
     if [[ -n "${rvm_ruby_string:-""}" ]] ; then
@@ -864,7 +855,7 @@ __rvm_gemset_clear()
 
   rvm_ruby_global_gems_path="${rvm_ruby_gem_home}${rvm_gemset_separator:-"@"}global"
 
-  GEM_HOME=$rvm_ruby_gem_home
+  GEM_HOME="$rvm_ruby_gem_home"
 
   GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
 

data/scripts/set

@@ -21,6 +21,8 @@ __rvm_ruby_do()
   # Return on invalid rubies.
   __rvm_become "$current_set_ruby" || return 1
 
+  rvm_hook="before_do" ; source "$rvm_path/scripts/hook"
+
   if [[ "$action" = "exec" ]]; then
     # Exec is a special case.
     command="${args[@]}"
@@ -96,11 +98,9 @@ __rvm_ruby_do()
       mkdir -p "./log/$rvm_ruby_string/"
     fi
 
-    touch ./log/$rvm_ruby_string/$action.log ./log/$rvm_ruby_string/$action.error.log
+    touch "./log/$rvm_ruby_string/$action.log"
 
-    eval "$command" \
-      >> ./log/$rvm_ruby_string/$action.log \
-      2>> ./log/$rvm_ruby_string/$action.error.log
+    eval "$command" >> "./log/$rvm_ruby_string/$action.log" 2>&1
 
   else
     if [[ ${rvm_verbose_flag:-0} -gt 0 ]] ; then
@@ -140,6 +140,8 @@ __rvm_ruby_do()
 
   unset string
 
+  rvm_hook="after_do" ; source "$rvm_path/scripts/hook"
+
   __rvm_unset_ruby_variables
 }
 

data/scripts/update

@@ -206,13 +206,24 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if [[ -z "${rvm_prefix:-""}" ]] ; then
-  __rvm_load_rvmrc
-  if [[ "$rvm_selfcontained" = "0" ]] ; then
-    rvm_prefix="${rvm_prefix:-"/usr/local/"}"
+if [[ -z "${rvm_prefix:-""}"  ]] ; then
+
+  if [[ "$USER" = "root" ]] ; then
+
+    source /etc/rvmrc
+
+    if [[ ${rvm_selfcontained:-0} -eq 0 ]] ; then
+      rvm_prefix="${rvm_prefix:-"/usr/local/"}"
+    else
+      rvm_prefix="${rvm_prefix:-"$HOME/."}"
+    fi
+
   else
+
     rvm_prefix="${rvm_prefix:-"$HOME/."}"
+
   fi
+
 fi
 
 if [[ -z "${rvm_path:-""}" ]] ; then
@@ -464,7 +475,7 @@ fi
 #
 mkdir -p "${rvm_rubies_path:-"$rvm_path/rubies"}/"
 
-for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* \
+for ruby in $rvm_path/ruby-* $rvm_path/jruby-* \
   $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
 
   if [[ -d "$ruby" ]] ; then
@@ -495,6 +506,18 @@ done
 # End of rubies migration.
 #
 
+if [[ -d "$rvm_path/environments" ]] ; then
+  #
+  # Remove BUNDLE_PATH from environment files
+  #
+  environments=($( find "$rvm_path/environments" -maxdepth 1 -mindepth 1 -type f ))
+  for file in "${environments[@]}" ; do
+    if grep 'BUNDLE_PATH' "$file" > /dev/null ; then
+      grep -v 'BUNDLE_PATH' "$file" > "$file.new"
+      mv "$file.new" "$file"
+    fi
+  done
+fi
 #
 # Migrate old gemset directories to new gemset pattern.
 #

data/scripts/utility

@@ -269,25 +269,21 @@ __rvm_run()
     \mkdir -p "${log%\/*}"
   fi
 
-  \touch "$log" "${log/%.log/.error.log}" # for zsh :(
+  \touch "$log" # for zsh :(
 
-  printf "[$(date +'%Y-%m-%d %H:%M:%S')] $command\n" | \
-    \tee "$log" \
-    >> "${log/%log/error.log}"
+  printf "[$(date +'%Y-%m-%d %H:%M:%S')] $command\n" > "$log"
 
   if [[ ${rvm_niceness:-0} -gt 0 ]] ; then
     command="nice -n $rvm_niceness $command"
   fi
 
-  eval "$command" \
-    >>  "$log" \
-    2>> "${log/%log/error.log}"
+  eval "$command" >> "$log" 2>&1
 
   result=$?
 
   if [[ $result -gt 0 ]] ; then
     "$rvm_path/scripts/log" "error" \
-      "Error running '$command', please check ${log/%log/error.log}"
+      "Error running '$command', please read $log"
   fi
 
   return ${result:-0}
@@ -324,11 +320,9 @@ __rvm_run_with_env()
     \mkdir -p "$path"
   fi
 
-  \touch "$log" "${log/%.log/.error.log}" # for zsh :(
+  \touch "$log" # for zsh :(
 
-  printf "[$(date +'%Y-%m-%d %H:%M:%S')] $command # under $environment\n" \
-    | tee "${log}" \
-    >> "${log/%log/error.log}"
+  printf "[$(date +'%Y-%m-%d %H:%M:%S')] $command # under $environment\n" > "${log}"
 
   if [[ ${rvm_niceness:-0} -gt 0 ]] ; then
     command="nice -n $rvm_niceness $command"
@@ -339,17 +333,14 @@ __rvm_run_with_env()
 
     __rvm_use
 
-    eval "$command" \
-      >> "${log}" \
-      2>> "${log/%log/error.log}"
+    eval "$command" >> "${log}" 2>&1
   )
 
   result=$?
 
   if [[ $result -gt 0 ]] ; then
     "$rvm_path/scripts/log" "error" \
-      "Error running '$command' under $env_name,\
-      \nplease check ${log/%log/error.log}"
+      "Error running '$command' under $env_name,\nplease read $log"
   fi
 
   return ${result:-0}
@@ -1113,7 +1104,9 @@ __rvm_ultimate_question()
   I do not know the Ultimate Question,
   however I can help you build a more
   powerful Ruby which can compute the
-  Ultimate Question.
+  Ultimate Question:
+
+  $ rvm install rbx
 
   "
   return 0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -05:00
+date: 2010-11-24 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []