rvm 1.0.7 → 1.0.8

data/binscripts/rvm-auto-ruby

@@ -2,18 +2,23 @@
 
 if [[ -n "$rvm_path" && -s "$rvm_path/scripts/rvm" ]]; then
   source "$rvm_path/scripts/rvm"
+
 elif [[ -s "/usr/local/lib/rvm" ]]; then
   source "/usr/local/lib/rvm"
+
 elif [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
   source "$HOME/.rvm/scripts/rvm"
+
 elif [[ -s "/usr/local/rvm/scripts/rvm" ]]; then
   source "/usr/local/rvm/scripts/rvm"
+
 else
   echo "Unable to detect rvm, please manually set the rvm_path env variable." >&2
   exit 1
 fi
 
-[[ -s "$rvm_environments_path/default" ]] && source "$rvm_environments_path/default"
+[[ -s "$rvm_path/environments/default" ]] && source "$rvm_path/environments/default"
+
 rvm rvmrc load > /dev/null 2>&1
 
 exec ruby "$@"

data/binscripts/rvmsudo

@@ -1,10 +1,26 @@
 #!/usr/bin/env bash
 
+case "$1" in
+  --trace)   set -o xtrace  ; shift ;;
+  --verbose) set -o verbose ; shift ;;
+esac
+
 prefix="PATH='$PATH'"
-if [[ -n "${BUNDLE_PATH:-""}" ]] ; then prefix="BUNDLE_PATH='$BUNDLE_PATH' $prefix" ; fi
-if [[ -n "${GEM_HOME:-""}" ]]    ; then prefix="GEM_HOME='$GEM_HOME' $prefix" ; fi
-if [[ -n "${GEM_PATH:-""}" ]]    ; then prefix="GEM_PATH='$GEM_PATH' $prefix" ; fi
 
-eval "sudo" "/usr/bin/env $prefix $@"
-# rvm_env_prefix="PATH='$PATH'"
-# exec sudo -E /usr/bin/env "$rvm_env_prefix" "$@"
+if [[ -n "${BUNDLE_PATH:-""}" ]] ; then
+  prefix="BUNDLE_PATH='$BUNDLE_PATH' $prefix"
+fi
+
+if [[ -n "${GEM_HOME:-""}" ]] ; then
+  prefix="GEM_HOME='$GEM_HOME' $prefix"
+fi
+
+if [[ -n "${GEM_PATH:-""}" ]] ; then
+  prefix="GEM_PATH='$GEM_PATH' $prefix"
+fi
+
+command="$prefix /usr/bin/env $@"
+
+eval sudo $command
+
+exit $?

data/config/db

@@ -46,7 +46,7 @@ macruby_version=0.6
 macruby_url=http://www.macruby.org/files
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg
-maglev_version=24067
+maglev_version=24209
 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

data/config/known

@@ -34,7 +34,7 @@ ree-1.8.6-head
 ree-1.8.7-head
 
 # MagLev
-maglev[-24067]
+maglev[-24209]
 maglev-head
 
 # Shyouhei head, the default mput

data/config/md5

@@ -78,7 +78,7 @@ zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
 curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
 pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
 ironruby-1.0.zip=7a92888837b3507355ed391dbfc0ab83
-GemStone-24067.Darwin-i386.tar.gz=89bdf43e357202266dc8e342f2050855
-GemStone-24067.Linux-x86_64.tar.gz=91a8d99b46e934c5988bc7dd64e7a030
-MagLev-24067.Darwin-i386.tar.gz=76f0c47c0f64ae90f90573aa1280368f
-MagLev-24067.Linux-x86_64.tar.gz=e2a838720a7dc2417ffe98681c3b4a09
+GemStone-24209.Darwin-i386.tar.gz=be17189f4a4a65622d8c3b8261091575
+GemStone-24209.Linux-x86_64.tar.gz=bab53507337aafc0f118b4eb097831e0
+MagLev-24209.Darwin-i386.tar.gz=93fd5b2d31e9a19dc49065ec8755a87f
+MagLev-24209.Linux-x86_64.tar.gz=ecb1c6a94e5b272d7595e6aee673c668

data/examples/rvmrc

@@ -30,10 +30,6 @@
 #   interpreter/version%gemset
 #export rvm_gems_path="$rvm_path/gems"
 
-# Hooks Path
-#   This is where rvm rubs custom hook files from.
-#export rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
-
 # Temp Path
 #   This is where rvm stores all of its temporary files.
 #export rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"

data/install

@@ -194,9 +194,6 @@ question="\n<?>"
 cwd="$PWD"
 
 source_path="${source_path:-$cwd}"
-rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
-rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
-rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 
 if [[ "$rvm_selfcontained" = "0" ]] ; then
   rvm_bin_path="${rvm_bin_path:-"${rvm_prefix}bin"}"
@@ -209,9 +206,6 @@ else
 fi
 
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
-rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
-rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
-rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 
 printf "
@@ -230,7 +224,9 @@ else
 
 fi
 
-for directory in "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_path" "$rvm_gems_path" "$rvm_rubies_path" "$rvm_config_path" "$rvm_hooks_path" "$rvm_tmp_path" ; do
+directories=( "${rvm_archives_path:-"$rvm_path/archives"}" "${rvm_src_path:-"$rvm_path/src"}" "${rvm_log_path:-"$rvm_path/log"}" "$rvm_bin_path" "${rvm_gems_path:-"$rvm_path/gems"}" "${rvm_rubies_path:-"$rvm_path/rubies"}" "$rvm_path/config" "${rvm_tmp_path:-"$rvm_path/tmp"}" )
+
+for directory in "${directories[@]}" ; do
 
   if [[ ! -d "$directory" ]] ; then
 
@@ -240,7 +236,9 @@ for directory in "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_
 
 done
 
-for file in README LICENCE ; do
+files=(README LICENCE)
+
+for file in "${files[@]}"; do
 
   cp -f "$source_path/$file" "$rvm_path/"
 
@@ -265,8 +263,8 @@ for dir_name in config scripts examples lib hooks help patches; do
 
 done
 
-if [[ ! -s "$rvm_config_path/user" ]] ; then
-  echo '# Users settings file, overrides db file settings and persists across installs.' >> "$rvm_config_path/user"
+if [[ ! -s "$rvm_path/config/user" ]] ; then
+  echo '# Users settings file, overrides db file settings and persists across installs.' >> "$rvm_path/config/user"
 fi
 
 scripts=(monitor match log install color db fetch log set package)
@@ -281,15 +279,17 @@ done
 # Bin Scripts
 #
 # Cleanse and purge...
-for file in rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby ; do
+files=(rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby)
+
+for file in "${files[@]}" ; do
 
   rm -f "$rvm_bin_path/$file"
 
-  cp -f "$source_path/binscripts/$file" $rvm_bin_path/
+  cp -f "$source_path/binscripts/$file" "${rvm_bin_path:-"$rvm_path/bin"}/"
 
 done
 
-chmod +x "$rvm_bin_path"/* # TODO: this is quite suboptimal.
+chmod +x "${rvm_bin_path:-"$rvm_path/bin"}"/* # TODO: this is quite suboptimal.
 
 #
 # RC Files
@@ -389,17 +389,15 @@ fi
 #
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
 #
-rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
-
-mkdir -p "$rvm_rubies_path/"
+mkdir -p "${rvm_rubies_path:-"$rvm_path/rubies"}/"
 
 for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
 
   if [[ -d "$ruby" ]] ; then
 
-    mv "$ruby" "$rvm_rubies_path/"
+    mv "$ruby" "${rvm_rubies_path:-"$rvm_path/rubies"}/"
 
-    new_path="$rvm_rubies_path/$(basename $ruby)"
+    new_path="${rvm_rubies_path:-"$rvm_path/rubies"}/$(basename $ruby)"
 
     for file in gem rake ; do
 
@@ -468,9 +466,9 @@ for gemset in "$rvm_path"/gems/*\@ ; do
 done
 
 # Move from legacy defaults to the new, alias based system.
-if [[ -s "$rvm_config_path/default" ]]; then
+if [[ -s "$rvm_path/config/default" ]]; then
 
-  original_version="$(basename "$(grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator:-"@"}#")")"
+  original_version="$(basename "$(grep GEM_HOME "$rvm_path/config/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator:-"@"}#")")"
 
   if [[ -n "$original_version" ]]; then
 
@@ -478,7 +476,7 @@ if [[ -s "$rvm_config_path/default" ]]; then
 
   fi ; unset original_version
 
-  rm -rf "$rvm_config_path/default"
+  rm -rf "$rvm_path/config/default"
 
 fi
 
@@ -487,11 +485,11 @@ fi
 #
 printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
 
-mkdir -p "$rvm_bin_path"
+mkdir -p "${rvm_bin_path:-"$rvm_path/bin"}"
 
 for file in rvm rvmsudo rvm-shell rvm-auto-ruby ; do
 
-  [[ -s "$rvm_bin_path/$file" ]] && chmod +x "$rvm_bin_path/$file"
+  [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] && chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
 
 done
 

data/lib/VERSION.yml

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

data/rvm.gemspec

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

@@ -23,7 +23,7 @@ usage() {
 
 alias_conflicts_with_ruby() {
   # If default exists, we should return true.
-  [[ "$1" == "default" && ! -L "$rvm_rubies_path/default" ]] && return 1
+  [[ "$1" == "default" && ! -L "$rvm_path/rubies/default" ]] && return 1
   # Open for suggestions to a better way of doing this...
   alias_check_result="$(
     \. \"$rvm_path/scripts/initialize\"
@@ -52,7 +52,7 @@ alias_show() {
     return
   fi
 
-  expanded_alias_name="$("$rvm_path/scripts"/db "$rvm_config_path/alias" "$alias_name")"
+  expanded_alias_name="$("$rvm_path/scripts"/db "$rvm_path/config/alias" "$alias_name")"
 
   if [[ -z "$expanded_alias_name" ]]; then
     "$rvm_path/scripts"/log "error" "\nUnknown alias name: '$alias_name'\n"
@@ -70,11 +70,11 @@ alias_show() {
 alias_delete() {
   echo "Deleting alias: $alias_name"
 
-  for link in "$rvm_rubies_path/$alias_name" ; do
+  for link in "$rvm_path/rubies/$alias_name" ; do
     if [[ -L "$link" ]] ; then rm -f $link ; fi
   done
 
-  "$rvm_path/scripts"/db "$rvm_config_path/alias" "$alias_name" "delete"
+  "$rvm_path/scripts"/db "$rvm_path/config/alias" "$alias_name" "delete"
 }
 
 alias_create() {
@@ -107,15 +107,15 @@ alias_create() {
       fi
       final_environment_identifier="$(__rvm_environment_identifier)"
       "$rvm_path/scripts"/log "info" "Creating alias $alias_name for $final_environment_identifier."
-      ln -nfs "$rvm_rubies_path/$rvm_ruby_string" "$rvm_rubies_path/$alias_name"
+      ln -nfs "$rvm_path/rubies/$rvm_ruby_string" "$rvm_path/rubies/$alias_name"
       "$rvm_path/scripts"/log "info" "Recording alias $alias_name for $final_environment_identifier."
-      "$rvm_path/scripts"/db "$rvm_config_path/alias" "$alias_name" "$final_environment_identifier"
+      "$rvm_path/scripts"/db "$rvm_path/config/alias" "$alias_name" "$final_environment_identifier"
     else
-      if [[ -d "$rvm_rubies_path/$alias_name" ]] ; then
-        "$rvm_path/scripts"/log "error" "\n$rvm_rubies_path/$alias_name is taken and is *not* able to be an alias name.\n"
+      if [[ -d "$rvm_path/rubies/$alias_name" ]] ; then
+        "$rvm_path/scripts"/log "error" "\n$rvm_path/rubies/$alias_name is taken and is *not* able to be an alias name.\n"
         result=1
       else
-        "$rvm_path/scripts"/log "error" "\n$rvm_rubies_path/$alias_name is already aliased.\n"
+        "$rvm_path/scripts"/log "error" "\n$rvm_path/rubies/$alias_name is already aliased.\n"
         result=1
       fi
     fi
@@ -123,11 +123,19 @@ alias_create() {
 }
 
 alias_list() {
-  for item in $rvm_rubies_path/* ; do
+
+  local item
+
+  for item in "$rvm_path/rubies/"* ; do
+
     if [[ -L "$item" ]] ; then
-      echo "$(basename "$item") => $("$rvm_path/scripts"/db "$rvm_config_path/alias" "$(basename "$item")")"
+
+      echo "$(basename "$item") => $("$rvm_path/scripts"/db "$rvm_path/config/alias" "$(basename "$item")")"
+
     fi
-  done; unset item
+
+  done
+
 }
 
 args=($*)
@@ -137,7 +145,7 @@ rvm_environment_identifier="${args[2]:-""}"
 args="$(echo ${args[@]:3}) " # Strip trailing / leading / extra spacing.
 result=0
 
-if [[ ! -f "$rvm_config_path/alias" ]] ; then touch "$rvm_config_path/alias" ; fi
+if [[ ! -f "$rvm_path/config/alias" ]] ; then touch "$rvm_path/config/alias" ; fi
 
 if printf "$alias_name" | grep -q "${rvm_gemset_separator:-"@"}" ; then
   gemset_name="${alias_name/*${rvm_gemset_separator:-"@"}/}"
@@ -147,7 +155,7 @@ else
 fi
 
 if [[ ! -z "$alias_name" ]] ; then
-  rvm_alias="$("$rvm_path/scripts/db" "$rvm_config_path/alias" "$alias_name")"
+  rvm_alias="$("$rvm_path/scripts/db" "$rvm_path/config/alias" "$alias_name")"
 fi
 
 if [[ "$action" = "delete" ]] ; then

data/scripts/base

@@ -25,5 +25,11 @@ if [[ ${rvm_trace_flag:-0} -gt 0 ]]; then
   set -o xtrace
 fi
 
+if [[ -n "${ZSH_VERSION:-""}" ]] ; then
+  __array_start=1
+else
+  __array_start=0
+fi
+
 # Cleanup tmp on exit.
 trap "__rvm_cleanup_temp_for '$$'" 0 1 2 3 15

data/scripts/cd

@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 
 # Source a .rvmrc file in a directory after changing to it, if it exists.
-# To disable this fature, set rvm_project_rvmrc=0 in $HOME/.rvmrc
-rvm_project_rvmrc=${rvm_project_rvmrc:-1}
-if [[ $rvm_project_rvmrc -ne 0 ]] ; then
+# To disable this fature, set export rvm_project_rvmrc=0 in $HOME/.rvmrc
+if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
   if [[ -n "${ZSH_VERSION:-""}" ]] ; then
     autoload is-at-least
     if is-at-least 4.3.4 >/dev/null 2>&1; then
@@ -12,7 +11,7 @@ if [[ $rvm_project_rvmrc -ne 0 ]] ; then
     else
       cd() {
         builtin cd "$@"
-        result=$?
+        local result=$?
         __rvm_project_rvmrc
         return $result
       }
@@ -20,7 +19,7 @@ if [[ $rvm_project_rvmrc -ne 0 ]] ; then
   else
     cd() {
       builtin cd "$@"
-        result=$?
+      local result=$?
       __rvm_project_rvmrc
       return $result
     }

data/scripts/cli

@@ -4,11 +4,14 @@ __rvm_usage() { \less "${rvm_path:-$HOME/.rvm}/README" ; }
 
 __rvm_run_script() {
   local rvm_script_name="${1:-"$rvm_action"}"
+
   eval "$rvm_path/scripts/$rvm_script_name $rvm_ruby_args"
+
   return $?
 }
 
 __rvm_parse_args() {
+
   # TODO:
   #       Make this more robust '__rvm_history' so that it stores *unique* rvm commands.
   #       Otherwise this file gets big rather fast.
@@ -17,13 +20,15 @@ __rvm_parse_args() {
   if echo "$@" | \grep -q 'trace' ; then echo "$@" ; __rvm_version ; fi
 
   rvm_action="${rvm_action:-""}"
-  export rvm_ruby_string="${rvm_ruby_string:-""}"
 
-  local rvm_parse_break=0
-  local rvm_error_message=""
+  export rvm_ruby_string
+
+  rvm_parse_break=0
 
   while [[ -n "$next_token" ]] ; do
+
     rvm_token="$next_token"
+
     if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
 
     case "$rvm_token" in
@@ -126,8 +131,7 @@ __rvm_parse_args() {
           fi
 
         else
-          rvm_gemset_name="${rvm_gemset_name:-""}"
-          if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then __rvm_ruby_string ;  fi
+          if [[ "${rvm_ruby_string:-""}" != "${rvm_gemset_name:-""}" ]] ; then __rvm_ruby_string ;  fi
           rvm_ruby_args="$next_token $@"
         fi
 
@@ -395,7 +399,7 @@ __rvm_parse_args() {
       --trace|--debug)
         local option=""
 
-        rvm_debug_flag=1
+        export rvm_debug_flag=1
 
         for option in verbose noclobber nounset ; do
           set -o $option
@@ -409,7 +413,7 @@ __rvm_parse_args() {
 
         if [[ "$rvm_token" = "--trace" ]] ; then
 
-          rvm_trace_flag=1
+          export rvm_trace_flag=1
 
           set -o xtrace
 
@@ -547,7 +551,7 @@ __rvm_parse_args() {
             rvm_ruby_strings="$rvm_token"
             rvm_action="${rvm_action:-use}"
 
-          elif [[ -L "$rvm_rubies_path/$rvm_token" ]] ; then # Alias
+          elif [[ -L "$rvm_path/rubies/$rvm_token" ]] ; then # Alias
             rvm_ruby_string=$rvm_token
             rvm_ruby_strings="$rvm_token"
             rvm_action="${rvm_action:-use}"
@@ -575,6 +579,8 @@ __rvm_parse_args() {
     if [[ ${rvm_parse_break:-0} -eq 1 || -n "${rvm_error_message:-""}" ]] ; then break ; fi
   done
 
+  export rvm_head_flag $(env | awk -F= -v ORS=' ' '/^rvm_/{print $1}')
+
   # Empty args list.
   while [[ $# -gt 0 ]] ; do shift ; done
 
@@ -586,7 +592,7 @@ __rvm_parse_args() {
 
 rvm() {
 
-  local next_token result
+  local result
 
   __rvm_setup
 
@@ -596,7 +602,7 @@ rvm() {
 
   if [[ -z "${ZSH_VERSION:-""}" ]] ; then
 
-    trap '\rm -rf "$rvm_tmp_path/$$" >/dev/null 2>&1' 0 1 2 3 15
+    trap '\rm -rf "${rvm_tmp_path:-"$rvm_path/tmp"}/$$" >/dev/null 2>&1' 0 1 2 3 15
 
   fi
 
@@ -624,10 +630,10 @@ rvm() {
 
   rvm_action="${rvm_action:-usage}"
 
-  export BUNDLE_PATH GEM_HOME GEM_PATH rvm_ruby_string rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd rvm_clang_flag rvm_install_arguments rvm_path rvm_rubies_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_ruby_aliases rvm_quiet_flag rvm_silent_flag rvm_pretty_print_flag
-
   result=0
 
+  export BUNDLE_PATH GEM_HOME GEM_PATH $(env | awk -F= -v ORS=' ' '/^rvm_/{print $1}')
+
   case "$rvm_action" in
     use)             __rvm_use        ;;
     srcdir)          __rvm_source_dir ;;
@@ -668,10 +674,12 @@ rvm() {
       old_rvm_ruby_string=$rvm_ruby_string
       unset rvm_ruby_string
       export rvm_ruby_strings
-      "$rvm_path/scripts/set" "$rvm_action" $rvm_ruby_args
-      result=$?
+
+      "$rvm_path/scripts/set" "$rvm_action" $rvm_ruby_args ; result=$?
+
       # Restore the state pre-sets.
       [[ -n "$old_rvm_ruby_string" ]] && rvm_ruby_string=$old_rvm_ruby_string
+
       unset old_rvm_ruby_string
     ;;