rvm 1.0.9 → 1.0.10

data/scripts/hook

@@ -1,14 +1,23 @@
 #!/usr/bin/env bash
 
 declare rvm_verbose_flag=${rvm_verbose_flag:-0}
+
 declare rvm_hook=${rvm_hook:-""}
 
 if [[ -n "$rvm_hook" ]] ; then
+
   if [[ -s "$rvm_path/hooks/$rvm_hook" ]] ; then
+
     if [[ ${rvm_verbose_flag:-0} -gt 0 || ${rvm_debug_flag:-0} -gt 0 ]] ; then
+
       "$rvm_path/scripts/log" "info" "running hook $rvm_hook"
+
     fi
+
     source "$rvm_path/hooks/$rvm_hook"
+
   fi
+
 fi
+
 unset rvm_hook

data/scripts/info

@@ -3,15 +3,8 @@
 if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
 source "$rvm_path/scripts/base"
-source "$rvm_path/scripts/version"
-
-rvm_ruby_gem_home="${rvm_ruby_gem_home:-${GEM_HOME:-""}}"
 
-if [[ ! -d "$rvm_ruby_gem_home" ]] && command -v gem > /dev/null 2>&1; then
-  rvm_ruby_gem_home="$(gem env home)"
-fi
-
-rvm_info=""
+source "$rvm_path/scripts/version"
 
 version_for() {
   local binary=${1:-""}
@@ -119,35 +112,62 @@ $(__rvm_version)
   fi
 
   for file_name in "$HOME/.bashrc" "$HOME/.bash_profile" "$HOME/.zshenv" ; do
+
     if [[ -s "$file_name" ]] ; then
+
       rvm_info="$rvm_info\n$file_name:\n$(\grep 'rvm' $file_name 2>/dev/null || true)"
+
     fi
+
   done
 
   if [[ "$rvm_selfcontained" = "0" ]] ; then
+
     debug_files="$rvm_path/config/alias $rvm_path/config/system $rvm_path/config/db /etc/rvmrc /etc/gemrc"
+
   else
+
     debug_files="$rvm_path/config/alias $rvm_path/config/system $rvm_path/config/db $HOME/.rvmrc $HOME/.gemrc"
+
   fi
 
   for file_name in $(echo $debug_files); do
+
     if [[ -f "$file_name" ]] && [[ -s "$file_name" ]] ; then
+
       rvm_info="$rvm_info\n$file_name \(filtered\):\n$(awk '!/assword|_key/' < $file_name)\n"
+
     fi
+
   done
 
   rvm_info="$rvm_info\ngem sources:\n$(gem sources | awk '/gems/')\n\n"
 }
 
 info_sections() {
+
   for section in $(printf "${sections//,/ }") ; do
+
     rvm_info="" ; "info_${section}" ; printf "$rvm_info"
+
   done
+
 }
 
+rvm_ruby_gem_home="${rvm_ruby_gem_home:-${GEM_HOME:-""}}"
+
+if [[ ! -d "$rvm_ruby_gem_home" ]] && command -v gem > /dev/null 2>&1; then
+  rvm_ruby_gem_home="$(gem env home)"
+fi
+
+rvm_info=""
+
 args=($*)
-ruby_strings="${args[0]// /}"
-args="$(echo ${args[@]:1}) " # Strip trailing / leading / extra spacing.
+
+ruby_strings="${args[$__array_start]// /}"
+args[$__array_start]=""
+args=(${args[@]})
+
 sections="${args// /}"
 all_sections="system rvm ruby homes binaries environment"
 
@@ -158,7 +178,9 @@ if "$rvm_path/scripts/match" "$all_sections debug" "${ruby_strings/,*/}" ; then
 
 fi
 
-if [[ -z "${sections// /}" ]] ; then sections="$all_sections" ; fi
+if [[ -z "${sections// /}" ]] ; then
+  sections="$all_sections"
+fi
 
 if [[ -z "$ruby_strings" ]] ; then
 

data/scripts/install

@@ -40,6 +40,15 @@ check_rubyopt_conditions() {
   fi
 }
 
+# Regenerates a users wrappers as part of the update.
+regenerate_wrappers() {
+  printf "\n"
+  if command -v __rvm_regenerate_wrappers >/dev/null; then
+    __rvm_regenerate_wrappers
+  fi
+  printf "\n"
+}
+
 andand_return_instructions() {
   printf "
   This means that if you see something like:
@@ -493,6 +502,15 @@ for file in rvm rvmsudo rvm-shell rvm-auto-ruby ; do
 
 done
 
+# Cleanup any .swp files that might have appeared.
+files=($( find "$rvm_path/" -mindepth 1 -maxdepth 2 -iname '*.swp' -type f ))
+
+for file in "${files[@]}" ; do
+
+  [[ -f "$file" ]] && rm -f "$file"
+
+done
+
 printf "\n    Copying manpages into place."
 
 files=($(builtin cd "$install_source_path/man" ; find . -maxdepth 1 -mindepth 1 -type f -print))
@@ -514,6 +532,8 @@ if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
   upgrade_notes
 
   check_rubyopt_conditions
+  
+  regenerate_wrappers
 
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 

data/scripts/irbrc.rb

@@ -3,18 +3,41 @@
 
 # Turn on completion.
 begin
-require "readline"
+  require "readline"
+
+  require "irb/completion" rescue nil
+
+  # Turn on history saving.
+  # require "irb/ext/save-history"
+  # IRB.conf[:HISTORY_FILE] = File.join(ENV["HOME"], ".irb-history")
+
+  # Use an alternate way to on history saving until save-history is fixed.
+  #
+  #   bug:   http://redmine.ruby-lang.org/issues/show/1556
+  #   patch: http://pastie.org/513500
+  #
+  # This technique was adopted from /etc/irbrc on OS X.
+  histfile = File.expand_path(".irb-history", ENV["HOME"])
+
+  if File.exists?(histfile)
+    lines = IO.readlines(histfile).collect { |line| line.chomp }
+    Readline::HISTORY.push(*lines)
+  end
+
+  Kernel::at_exit do
+    maxhistsize = 100
+    histfile = File::expand_path(".irb-history", ENV["HOME"])
+    lines = Readline::HISTORY.to_a.reverse.uniq.reverse
+    lines = lines[-maxhistsize, maxhistsize] if lines.compact.length > maxhistsize
+    File::open(histfile, "w+") { |io| io.puts lines.join("\n") }
+  end
+
 rescue
   puts "Readline was unable to be required, if you need completion or history install readline then reinstall the ruby.\nYou may follow 'rvm notes' for dependencies and/or read the docs page http://rvm.beginrescueend.com/packages/readline/ . Be sure you 'rvm remove X ; rvm install X' to re-compile your ruby with readline support after obtaining the readline libraries."
 end
-require "irb/completion" rescue nil
-
-# Turn on history saving.
-require "irb/ext/save-history"
-IRB.conf[:HISTORY_FILE] = File.join(ENV["HOME"], ".irb-history")
 
 # Calculate the ruby string.
-rvm_ruby_string = ENV["rvm_ruby_string"] || "#{RUBY_ENGINE rescue 'ruby'}-#{RUBY_VERSION}-#{(RUBY_PATCHLEVEL) ? "p#{RUBY_PATCHLEVEL}" : "r#{RUBY_REVISION}"}"
+rvm_ruby_string = ENV["rvm_ruby_string"] || `rvm tools identifier`.strip.split("@", 2)[0]
 
 # Set up the prompt to be RVM specific.
 @prompt = {
@@ -37,3 +60,4 @@ rescue LoadError => load_error
 rescue => exception
   puts "Error : 'load #{ENV["HOME"]}/.irbrc' : #{exception.message}"
 end
+

data/scripts/list

@@ -293,18 +293,19 @@ args=($*)
 action="${args[0]:-""}"
 args=${args[@]:1} # Strip trailing / leading / extra spacing.
 
+
 if [[ -z "$action" ]] ; then list_rubies ; exit 0 ; fi
 
 case "$action" in
-  known)         list_known         ;;
-  known_strings) list_known_strings ;;
-  gemsets)       list_gemsets "$@"  ;;
-  default)       list_default       ;;
-  rubies)        list_rubies "$@"   ;;
-  strings)       list_strings       ;;
-  ruby_svn_tags) list_ruby_svn_tags ;;
-  help)          usage              ;;
-  *)             usage ; exit 1     ;;
+  known)         list_known           ;;
+  known_strings) list_known_strings   ;;
+  gemsets)       list_gemsets "$args" ;;
+  default)       list_default         ;;
+  rubies)        list_rubies "$args"  ;;
+  strings)       list_strings         ;;
+  ruby_svn_tags) list_ruby_svn_tags   ;;
+  help)          usage                ;;
+  *)             usage ; exit 1       ;;
 esac
 
 exit $?

data/scripts/log

@@ -7,7 +7,7 @@ if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
 if [[ ! -z "$2" ]] ; then level=$1 ; shift ; else level="info" ; fi
 
-message="${1//%/%%}"
+message="${1//\%/%%}"
 
 if [[ ${rvm_pretty_print_flag:-0} -eq 0 ]] ; then
 

data/scripts/manage

@@ -373,7 +373,7 @@ export GEM_PATH="$rvm_ruby_gem_path"
 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 "$macruby_path/mac$binary_name" "$prefix" "\$@"
+exec "$macruby_path/mac$binary_name" "\$@"
 RubyWrapper
 )
 
@@ -575,7 +575,7 @@ RubyWrapper
 
       rvm_configure_flags="${rvm_configure_flags:-"--skip-system"}"
 
-      rvm_ruby_configure="${rvm_bin_path:-"$rvm_path/bin"}/$ruby configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_configure_flags" ; message="Configuring rbx"
+      rvm_ruby_configure="$rvm_path/wrappers/$ruby/ruby ./configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_configure_flags" ; message="Configuring rbx"
 
       if [[ "$rvm_llvm_flag" = "0" ]] ; then
         rvm_ruby_configure="$rvm_ruby_configure --disable-llvm"
@@ -666,7 +666,11 @@ RubyWrapper
       builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
       if [[ ${rvm_head_flag:-0} -eq 1 ]] ; then
+
+        __rvm_apply_patches
+
         __rvm_run "ant.dist" "ant dist" "$rvm_ruby_string - #ant dist"
+
       fi
 
       mkdir -p "$rvm_ruby_home/bin/"

data/scripts/match

@@ -2,5 +2,5 @@
 
 if [[ -z "${1:-""}" ]] || [[ -z "${2:-""}" ]] ; then exit 1 ; fi
 
-if [[ -n "$(echo "${1}" |  awk "/${2}/")" ]] ; then exit 0 ; else exit 1 ; fi
+if [[ -n "$(echo "${1}" |  awk "/${2//\//\/}/")" ]] ; then exit 0 ; else exit 1 ; fi
 

data/scripts/package

@@ -5,12 +5,6 @@ if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 rvm_base_except="selector"
 source "$rvm_path/scripts/base"
 
-# Tools to make managing ruby dependencies inside of rvm easier.
-args=($*)
-action="${args[0]:-""}"
-library="${args[1]:-""}"
-args="$(echo ${args[@]:2})"
-
 install_package() {
 
   __rvm_db "${package}_url" "package_url"
@@ -18,56 +12,81 @@ install_package() {
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
 
   (
-    builtin cd "${rvm_src_path:-"$rvm_path/src"}"
+    builtin cd "$src_path"
 
-    "$rvm_path/scripts/log" "info" "Fetching $package-$version.$archive_format to ${rvm_archives_path:-"$rvm_path/archives"}"
+    "$rvm_path/scripts/log" "info" \
+      "Fetching $package-$version.$archive_format to $archives_path"
 
-    if [[ "$archive_format" = "tar.gz" ]] || [[ "$archive_format" = "tgz" ]] ; then
-      "$rvm_path/scripts/fetch" \
-        "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+    case "$archive_format" in
 
-      __rvm_run "$package/extract" \
-        "tar zxf ${rvm_archives_path:-"$rvm_path/archives"}/$package-$version.$archive_format -C ${rvm_src_path:-"$rvm_path/src"}" "Extracting $package-$version.$archive_format to ${rvm_src_path:-"$rvm_path/src"}"
+      tar.gz|tgz)
 
-    elif [[ "$archive_format" = "tar.bz2" ]] ; then
-      "$rvm_path/scripts/fetch" \
-        "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+        "$rvm_path/scripts/fetch" \
+          "$package_url/$package-$version.$archive_format" \
+          || (result=$? && return $result)
 
-      __rvm_run "$package/extract" \
-        "tar jxf ${rvm_archives_path:-"$rvm_path/archives"}/$package-$version.$archive_format -C ${rvm_src_path:-"$rvm_path/src"}" "Extracting $package-$version.$archive_format to ${rvm_src_path:-"$rvm_path/src"}"
+        __rvm_run "$package/extract" \
+          "tar zxf $archives_path/$package-$version.$archive_format -C $src_path" \
+          "Extracting $package-$version.$archive_format to $src_path"
+        ;;
 
-    elif [[ "$archive_format" = "zip" ]] ; then
-      "$rvm_path/scripts/fetch" \
-        "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+      tar.bz2)
 
-      __rvm_run "$package/extract" \
-        "unzip -q -o ${rvm_archives_path:-"$rvm_path/archives"}/$package-$version.$archive_format -d ${rvm_src_path:-"$rvm_path/src"}/$package-$version" "Extracting $package-$version.$archive_format to ${rvm_src_path:-"$rvm_path/src"}"
+        "$rvm_path/scripts/fetch" \
+          "$package_url/$package-$version.$archive_format" \
+          || (result=$? && return $result)
 
-    else
-      printf "\nUnrecognized archive format '$archive_format'" ; return 1
-    fi
+        __rvm_run "$package/extract" \
+          "tar jxf $archives_path/$package-$version.$archive_format -C $src_path" \
+          "Extracting $package-$version.$archive_format to $src_path"
+
+        ;;
+
+      zip)
+
+        "$rvm_path/scripts/fetch" \
+          "$package_url/$package-$version.$archive_format" \
+          || (result=$? && return $result)
+
+        __rvm_run "$package/extract" \
+          "unzip -q -o $archives_path/$package-$version.$archive_format -d $src_path/$package-$version" \
+          "Extracting $package-$version.$archive_format to $src_path"
+        ;;
 
-    builtin cd "${rvm_src_path:-"$rvm_path/src"}/$package-$version"
+      *)
+        printf "\nUnrecognized archive format '$archive_format'" ; return 1
+
+    esac
+
+    builtin cd "$src_path/$package-$version"
 
     __rvm_run "$package/configure" \
-      "${configure:-"./configure --prefix=${prefix_path:-"${rvm_usr_path:-"$rvm_path/usr"}"}"} $configure_flags" "Configuring $package in ${rvm_src_path:-"$rvm_path/src"}/$package-$version."
+      "${configure:-"./configure --prefix=${prefix_path:-"$usr_path"}"} $configure_flags" \
+      "Configuring $package in $src_path/$package-$version."
 
     unset configure_flags
 
     if [[ "$action" = "uninstall" ]] ; then
+
       __rvm_run "$package/make.uninstall" \
-        "/usr/bin/make uninstall" "Uninstalling $package from ${rvm_usr_path:-"$rvm_path/usr"}"
+        "/usr/bin/make uninstall" \
+        "Uninstalling $package from $usr_path"
 
     else
+
       __rvm_run "$package/make" \
-        "/usr/bin/make $rvm_make_flags" "Compiling $package in ${rvm_src_path:-"$rvm_path/src"}/$package-$version."
+        "/usr/bin/make $rvm_make_flags" \
+        "Compiling $package in $src_path/$package-$version."
 
       __rvm_run "$package/make.install" \
-        "/usr/bin/make install" "Installing $package to ${rvm_usr_path:-"$rvm_path/usr"}"
+        "/usr/bin/make install" \
+        "Installing $package to $usr_path"
+
     fi
 
     touch "$rvm_path/config/packages"
-    "$rvm_path/scripts/db" "$rvm_path/config/packages" "${package}" "${version}"
+    "$rvm_path/scripts/db" \
+      "$rvm_path/config/packages" "${package}" "${version}"
   )
   result=$?
 
@@ -136,7 +155,7 @@ openssl() {
   else
     configure_command="./config"
   fi
-  configure="$configure_command $openssl_os -I${rvm_usr_path:-"$rvm_path/usr"}/include -L${rvm_usr_path:-"$rvm_path/usr"}/lib --prefix=${rvm_usr_path:-"$rvm_path/usr"} zlib no-asm no-krb5 shared"
+  configure="$configure_command $openssl_os -I$usr_path/include -L$usr_path/lib --prefix=$usr_path zlib no-asm no-krb5 shared"
   install_package
 }
 
@@ -147,7 +166,7 @@ zlib() {
 
 autoconf() {
   package="autoconf" ; version="2.65" ; archive_format="tar.gz"
-  prefix_path="${rvm_usr_path:-"$rvm_path/usr"}"
+  prefix_path="$usr_path"
   install_package
 }
 
@@ -170,7 +189,7 @@ gettext() {
 libxml2() {
   package="libxml2" ; version="2.7.3" ; archive_format="tar.gz"
   if [[ "Darwin" = "$(uname)" ]] ; then
-    configure="./configure --prefix=${rvm_usr_path:-"$rvm_path/usr"} --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
+    configure="./configure --prefix=$usr_path --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
   fi
   install_package
   unset prefix_path
@@ -180,7 +199,7 @@ glib() {
   pkgconfig
   gettext
   package="glib" ; version="2.23.1" ; archive_format="tar.gz"
-  configure="CC=\"cc -L${rvm_usr_path:-"$rvm_path/usr"}/lib -I${rvm_usr_path:-"$rvm_path/usr"}/include\" PKG_CONFIG=\"${rvm_usr_path:-"$rvm_path/usr"}/bin/pkg-config\" ./configure --prefix=${rvm_usr_path:-"$rvm_path/usr"}"
+  configure="CC=\"cc -L$usr_path/lib -I$usr_path/include\" PKG_CONFIG=\"$usr_path/bin/pkg-config\" ./configure --prefix=$usr_path"
 
   install_package
 }
@@ -197,12 +216,12 @@ llvm() {
   package="llvm" ; version="89156"
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
   (
-    builtin cd ${rvm_src_path:-"$rvm_path/src"}
-    if [[ ! -d "${rvm_src_path:-"$rvm_path/src"}/llvm/.svn" ]] ; then
+    builtin cd $src_path
+    if [[ ! -d "$src_path/llvm/.svn" ]] ; then
       __rvm_db "${package}_url" "package_url"
-      \rm -rf "${rvm_src_path:-"$rvm_path/src"}/llvm"
+      \rm -rf "$src_path/llvm"
       svn co -r "$version" "$package_url" llvm
-      builtin cd "${rvm_src_path:-"$rvm_path/src"}/llvm"
+      builtin cd "$src_path/llvm"
       ./configure --enable-bindings=none
       UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make -j2
       sudo env UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make install
@@ -210,6 +229,16 @@ llvm() {
   )
 }
 
+# Tools to make managing ruby dependencies inside of rvm easier.
+args=($*)
+action="${args[0]:-""}"
+library="${args[1]:-""}"
+args="$(echo ${args[@]:2})"
+
+archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
+src_path="${rvm_src_path:-"$rvm_path/src"}"
+usr_path="${rvm_usr_path:-"$rvm_path/usr"}"
+
 if [[ -n "$library" ]] ; then
 
   case $library in