rvm 1.0.9 → 1.0.10

data/scripts/repair

@@ -3,10 +3,14 @@
 source "$rvm_path/scripts/base"
 
 usage() {
-  echo "Usage: rvm repair {symlinks,environments,archives,all}" >&2
+  echo "Usage: rvm repair {wrappers,symlinks,environments,archives,all}" >&2
   return 1
 }
 
+repair_wrappers() {
+  __rvm_regenerate_wrappers
+}
+
 # Removes stale symlinks in $rvm_bin_path, likely
 # related to wrappers.
 repair_symlinks() {
@@ -90,6 +94,8 @@ repair_all() {
 
   repair_environments
 
+  repair_wrappers
+
   "$rvm_path/scripts/log" "info" \
     "symlinks, archives and environments have been repaired."
 
@@ -106,11 +112,12 @@ if [[ -z "$action" ]]; then
 fi
 
 case "$action" in
-  all)          repair_all ;;
-  symlinks)     repair_symlinks ;;
+  all)          repair_all          ;;
+  symlinks)     repair_symlinks     ;;
   environments) repair_environments ;;
-  archives)     repair_archives;;
-  *)            usage ;;
+  archives)     repair_archives     ;;
+  wrappers)     repair_wrappers     ;;
+  *)            usage               ;;
 esac
 
 exit $?

data/scripts/rvm

@@ -4,38 +4,61 @@
 # http://rvm.beginrescueend.com
 # http://github.com/wayneeseguin/rvm
 
-if [[ ${rvm_loaded_flag:-0} -eq 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
+grep -q '^rvm ()' < <( declare -f ) # Is RVM is a shell function?
 
-  unset rvm_reload_flag
+if [[ $? -gt 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
+
+  if [[ ${rvm_ignore_rvmrc:-0} -eq 0 ]]; then
+
+    for rvmrc in /etc/rvmrc "$HOME/.rvmrc" ; do
 
-  if [[ -z "$rvm_ignore_rvmrc" ]]; then
-    for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
       if [[ -f "$rvmrc" ]] ; then
+
         if \grep -q '^\s*rvm .*$' $rvmrc ; then
+
           printf "\nError: $rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
+
           return 1
+
         else
+
           source "$rvmrc"
+
         fi
+
       fi
+
     done
+
   fi
 
   # Set the default sandboxed value.
   if [[ -z "$rvm_selfcontained" ]]; then
-    if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+
+    if [[ "root" = "$(whoami)" || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+
       rvm_selfcontained=0
+
     else
+
       rvm_selfcontained=1
+
     fi
+
   fi
 
   if [[ -z "$rvm_prefix" ]] ; then
+
     if [[ "$rvm_selfcontained" = "0" ]] ; then
+
       rvm_prefix="/usr/local/"
+
     else
+
       rvm_prefix="$HOME/."
+
     fi
+
   fi
 
   # Fix rvm_prefix changes.
@@ -92,8 +115,6 @@ if [[ ${rvm_loaded_flag:-0} -eq 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
     printf "\n\$rvm_path is not set. rvm cannot load."
   fi
 
-  unset rvm_prefix_needs_trailing_slash rvm_bin_path rvm_man_path rvm_rc_files rvm_gems_path rvm_gems_cache_path rvm_selfcontained rvm_interactive_flag rvm_gems_path rvm_project_rvmrc_default rvm_gemset_separator
-
-  rvm_loaded_flag=1
+  unset rvm_prefix_needs_trailing_slash rvm_bin_path rvm_man_path rvm_rc_files rvm_gems_path rvm_gems_cache_path rvm_interactive_flag rvm_gems_path rvm_project_rvmrc_default rvm_gemset_separator
 
 fi

data/scripts/rvm-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/selector

@@ -18,6 +18,10 @@ __rvm_select() {
 
   rvm_archive_extension="tar.gz"
 
+  if [[ -z "${rvm_ruby_interpreter:-""}" ]] ; then
+    rvm_ruby_interpreter="${rvm_ruby_string//-*/}"
+  fi
+
   case "$rvm_ruby_interpreter" in
     macruby)
       if [[ "Darwin" = "$(uname)" ]] ; then
@@ -168,7 +172,7 @@ __rvm_select() {
 
     ruby)
       if [[ -z "${rvm_ruby_version:-""}" && ${rvm_head_flag:-0} -eq 0 ]]; then
-        "$rvm_path/scripts/log" "fail" "Unknown ruby version: $rvm_ruby_version"
+        "$rvm_path/scripts/log" "fail" "Ruby version was not specified!"
 
       else
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "ruby_repo_url")"}"
@@ -276,20 +280,26 @@ __rvm_use() {
     fi
 
     # Check binaries, remove under the condition they're symlinks.
-    if [[ "$rvm_selfcontained" = "0" ]] ; then
+    if [[ ${rvm_selfcontained:-1} -eq 0 ]] ; then
 
       for binary in ruby gem irb ri rdoc rake erb testrb ; do
 
         full_binary_path="${rvm_bin_path:-"$rvm_path/bin"}/$binary"
 
         [[ -L "$full_binary_path" ]] && \rm -f "$full_binary_path"
+
       done
+
     fi
 
     if [[ ${rvm_verbose_flag:-0} -gt 0 ]] ; then
       "$rvm_path/scripts/log" "info" "Now using system ruby."
     fi
 
+    __rvm_remove_rvm_from_path
+
+    new_path="$PATH:${rvm_bin_path:-"$rvm_path/bin"}"
+
     export rvm_ruby_string="system"
 
   else
@@ -338,56 +348,59 @@ __rvm_use() {
     builtin hash -r
   fi
 
-  if [[ ${rvm_rvmrc_flag:-0} -eq 1 ]]   ; then __rvm_set_rvmrc ; fi
+  if [[ "$rvm_ruby_string" != "system" ]] ; then
 
-  local environment_id="$(__rvm_environment_identifier)"
+    if [[ ${rvm_rvmrc_flag:-0} -eq 1 ]]   ; then __rvm_set_rvmrc ; fi
 
-  if [[ ${rvm_default_flag:-0} -eq 1 && "default" != "${rvm_ruby_interpreter:-""}" ]] ; then
+    local environment_id="$(__rvm_environment_identifier)"
 
-    if [[ ${rvm_selfcontained:-""} -eq 0 ]] ; then
-      # Sets up the default wrappers.
-      "$rvm_path/scripts/wrapper" "$rvm_ruby_string" --no-prefix
-    else
-      "$rvm_path/scripts/wrapper" "$rvm_ruby_string" "default"
-    fi
+    if [[ ${rvm_default_flag:-0} -eq 1 && "default" != "${rvm_ruby_interpreter:-""}" ]] ; then
 
-    if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
-      "$rvm_path/scripts/alias" delete default &> /dev/null
-      \find "${rvm_bin_path:-"$rvm_path/bin"}" -name 'default_*' -maxdepth 0 -delete
-      \rm -f "$rvm_path/config/default"
-      \rm -f "$rvm_path/environments/default"
-      \rm -rf "$rvm_path/wrappers/default"
+      if [[ ${rvm_selfcontained:-""} -eq 0 ]] ; then
+        # Sets up the default wrappers.
+        "$rvm_path/scripts/wrapper" "$rvm_ruby_string" --no-prefix
+      else
+        "$rvm_path/scripts/wrapper" "$rvm_ruby_string" "default"
+      fi
 
-    else
-      RUBY_VERSION="$("$rvm_ruby_home/bin/ruby" -v | sed 's#^\(.*\) (.*$#\1#')"
-      export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
-      "$rvm_path/scripts/alias" delete default &> /dev/null
-      "$rvm_path/scripts/alias" create default "$environment_id" >& /dev/null
-      \ln -nfs "$rvm_path/environments/$environment_id" "$rvm_path/environments/default"
-      \ln -nfs "$rvm_path/wrappers/$environment_id" "$rvm_path/wrappers/default"
+      if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
+        "$rvm_path/scripts/alias" delete default &> /dev/null
+        \find "${rvm_bin_path:-"$rvm_path/bin"}" -name 'default_*' -maxdepth 0 -delete
+        \rm -f "$rvm_path/config/default"
+        \rm -f "$rvm_path/environments/default"
+        \rm -rf "$rvm_path/wrappers/default"
+
+      else
+        RUBY_VERSION="$("$rvm_ruby_home/bin/ruby" -v | sed 's#^\(.*\) (.*$#\1#')"
+        export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
+        "$rvm_path/scripts/alias" delete default &> /dev/null
+        "$rvm_path/scripts/alias" create default "$environment_id" >& /dev/null
+        \ln -nfs "$rvm_path/environments/$environment_id" "$rvm_path/environments/default"
+        \ln -nfs "$rvm_path/wrappers/$environment_id" "$rvm_path/wrappers/default"
+      fi
     fi
-  fi
 
-  rvm_default_flag=0
+    rvm_default_flag=0
 
-  if [[ -n "${rvm_wrapper_name:-""}" ]] ; then
-    "$rvm_path/scripts/wrapper" "$environment_id" "$rvm_wrapper_name" > /dev/null 2>&1
-    rvm_wrapper_name=""
-  fi
+    if [[ -n "${rvm_wrapper_name:-""}" ]] ; then
+      "$rvm_path/scripts/wrapper" "$environment_id" "$rvm_wrapper_name" > /dev/null 2>&1
+      rvm_wrapper_name=""
+    fi
 
-  if [[ -n "${rvm_ruby_alias:-""}" ]]; then
-    "$rvm_path/scripts/log" "info" "Attempting to alias $environment_id to $rvm_ruby_alias"
-    "$rvm_path/scripts/alias" delete "$rvm_ruby_alias" > /dev/null 2>&1
-    rvm_alias_expanded=1 "$rvm_path/scripts/alias" create "$rvm_ruby_alias" "$environment_id" > /dev/null 2>&1
-    ruby_alias="" ; rvm_ruby_alias=""
-  fi
+    if [[ -n "${rvm_ruby_alias:-""}" ]]; then
+      "$rvm_path/scripts/log" "info" "Attempting to alias $environment_id to $rvm_ruby_alias"
+      "$rvm_path/scripts/alias" delete "$rvm_ruby_alias" > /dev/null 2>&1
+      rvm_alias_expanded=1 "$rvm_path/scripts/alias" create "$rvm_ruby_alias" "$environment_id" > /dev/null 2>&1
+      ruby_alias="" ; rvm_ruby_alias=""
+    fi
 
-  if [[ "maglev" = "${rvm_ruby_interpreter:-""}" ]] ; then
-    export MAGLEV_HOME="$rvm_ruby_home"
-    export GEMSTONE_GLOBAL_DIR=$MAGLEV_HOME
-    if [[ -x "$MAGLEV_HOME/gemstone/bin/gslist" ]] ; then
-      "$MAGLEV_HOME/gemstone/bin/gslist" -clv > /dev/null 2>&1 ; result=$?
-      if [[ $result -eq 1 ]] ; then "$rvm_ruby_home/bin/maglev" start ; fi
+    if [[ "maglev" = "${rvm_ruby_interpreter:-""}" ]] ; then
+      export MAGLEV_HOME="$rvm_ruby_home"
+      export GEMSTONE_GLOBAL_DIR=$MAGLEV_HOME
+      if [[ -x "$MAGLEV_HOME/gemstone/bin/gslist" ]] ; then
+        "$MAGLEV_HOME/gemstone/bin/gslist" -clv > /dev/null 2>&1 ; result=$?
+        if [[ $result -eq 1 ]] ; then "$rvm_ruby_home/bin/maglev" start ; fi
+      fi
     fi
   fi
 
@@ -422,20 +435,27 @@ __rvm_ruby_string() {
   fi
 
   # Alias'd rubies
-  if [[ ${rvm_expanding_aliases:-0} -eq 0 && -n ${rvm_ruby_string:-""} ]]; 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"
 
     elif [[ "$rvm_ruby_string" = default ]]; then
+
       # Default is not a known value. Instead, we need to therefore set it to system.
       rvm_ruby_string="system"
+
     fi
+
   fi
 
   ruby_string=${rvm_ruby_string/${rvm_gemset_separator:-"@"}*/}
 
   __rvm_unset_ruby_variables
 
+  rvm_ruby_string=${rvm_ruby_string:-""}
+
   strings=($(echo ${ruby_string//-/ }))
 
   if [[ ${#strings[@]} -eq 0 ]] ; then

data/scripts/set

@@ -5,6 +5,7 @@ source "$rvm_path/scripts/base"
 __rvm_attempt_single_exec() {
   # Return if we have multiple rubies. or we're not running exec.
   if [[ "$action" = "exec" && ${#rvm_ruby_strings[@]} -lt 2 ]]; then
+
     __rvm_become "$rvm_ruby_strings"
 
     eval "exec ${args[@]}"
@@ -15,14 +16,16 @@ __rvm_attempt_single_exec() {
 
 # Perform an action using one of a selected ruby's specified binaries.
 __rvm_ruby_do() {
+
   # Return on invalid rubies.
   __rvm_become "$current_set_ruby" || return 1
 
   if [[ "$action" = "exec" ]]; then
     # Exec is a special case.
-    rvm_command="$args"
+    rvm_command="${args[@]}"
 
   else
+
     binary="$(echo $action | sed 's#do$##')"
 
     if [[ -x "$rvm_ruby_home/bin/$binary" ]] ; then
@@ -66,22 +69,22 @@ __rvm_ruby_do() {
     # TODO: the else case below should be run if $args =~ /\.rb$/
     if [[ "ruby" = "$(basename $binary)" && "$rvm_benchmark_flag" -ne 1 ]] ; then
 
-      if "$rvm_path/scripts/match" "$args" "\.rb$" ; then
+      if "$rvm_path/scripts/match" "${args[@]}" "\.rb$" ; then
 
         if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
 
-        if ! "$rvm_path/scripts/match" "$args" "$prefix" ; then
+        if ! "$rvm_path/scripts/match" "${args[@]}" "$prefix" ; then
 
-          args="$prefix $args"
+          args=($prefix ${args[@]})
 
         fi
       fi
 
-      rvm_command="$(printf "$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path $args")"
+      rvm_command="$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path ${args[@]}"
 
     else
 
-      rvm_command="$(printf "$binary $rvm_ruby_mode $args")"
+      rvm_command="$binary $rvm_ruby_mode ${args[@]}"
 
     fi
 
@@ -89,11 +92,15 @@ __rvm_ruby_do() {
 
   if [[ -n "$rvm_json_flag" || -n "$rvm_yaml_flag" || -n "$rvm_summary_flag" ]] ; then
 
-    mkdir -p ./log/$rvm_ruby_string/
+    if [[ ! -d "./log/$rvm_ruby_string/" ]] ; then
+      mkdir -p "./log/$rvm_ruby_string/"
+    fi
 
     touch ./log/$rvm_ruby_string/$action.log ./log/$rvm_ruby_string/$action.error.log
 
-    eval "$rvm_command" >> ./log/$rvm_ruby_string/$action.log 2>> ./log/$rvm_ruby_string/$action.error.log
+    eval "$rvm_command" \
+      >> ./log/$rvm_ruby_string/$action.log \
+      2>> ./log/$rvm_ruby_string/$action.error.log
 
   else
     if [[ ${rvm_verbose_flag:-0} -gt 0 ]] ; then
@@ -106,7 +113,8 @@ __rvm_ruby_do() {
 
       fi
 
-      "$rvm_path/scripts/log" "info" "$current_env: $(ruby -v $rvm_ruby_mode | \tr "\n" ' ')\n"
+      "$rvm_path/scripts/log" "info" \
+        "$current_env: $(ruby -v $rvm_ruby_mode | \tr "\n" ' ')\n"
 
       unset current_env
     fi
@@ -115,6 +123,7 @@ __rvm_ruby_do() {
   result=$?
 
   string=$(basename $rvm_ruby_gem_home)
+
   if [[ $result -eq 0 ]]; then
 
     eval "successes=(${successes[*]} $string)"
@@ -164,6 +173,7 @@ __rvm_summary() {
 
 # Output the summary in a yaml format.
 __rvm_yaml() {
+
   export successes errors statuses
 
   yaml="totals:\n  rubies: ${#rubies[*]}\n  successes: ${#successes[*]}\n  errors: ${#errors[*]}\nsuccesses:"
@@ -201,6 +211,9 @@ __rvm_yaml() {
 
 # Output the summary in a json format.
 __rvm_json() {
+
+  local index array_start
+
   json="{
 \"totals\": { \"rubies\": ${#rubies[*]}, \"successes\": ${#successes[*]}, \"errors\": ${#errors[*]} },
 \"successful\": [$(echo \"${successes[*]}\" | sed 's# #", "#g' | sed 's#\"\"##')],
@@ -223,11 +236,13 @@ __rvm_json() {
     if (( $index + 1 < $total + $array_start )) ; then json="$json,  " ; fi
 
   done
-  unset index array_start
 
   json="$json\n  }\n}"
 
-  mkdir -p log
+  if [[ ! -d log ]] ; then
+    mkdir -p log
+  fi
+
   printf "$json" | tee -a log/summary.json
 
   return ${#errors[*]}
@@ -239,8 +254,9 @@ __rvm_json() {
 rubies=() ; successes=() ; errors=() ; statuses=()
 
 args=($*)
-action="${args[0]}"
-args=${args[@]:1}
+action="${args[$__array_start]}"
+args[$__array_start]=""
+args=(${args[@]})
 
 if [[ -z "$action" ]] ; then