rvm 1.0.8 → 1.0.9

data/scripts/manage

@@ -15,8 +15,6 @@ __rvm_check_for_clang() {
 
 # Checks for bison, returns zero iff it is found
 __rvm_check_for_bison() {
-  local result
-
   if [[ ${rvm_head_flag:-0} -gt 0 ]]; then
     command -v bison > /dev/null
     result=$?
@@ -26,7 +24,7 @@ __rvm_check_for_bison() {
     fi
   fi
 
-  return $result
+  return ${result:-0}
 }
 
 # Emits a number of patches to STDOUT, each on a new name
@@ -59,7 +57,7 @@ __rvm_current_patch_names() {
 
 __rvm_apply_patches() {
 
-  local result patches patch_name patch_level_separator patch_fuzziness patch_level source_directory full_patch_path
+  local patches patch_name patch_level_separator patch_fuzziness patch_level source_directory full_patch_path
 
   result=0
   patch_level_separator="%"
@@ -107,12 +105,12 @@ __rvm_apply_patches() {
     done
   )
 
-  return $result
+  return ${result:-0}
 }
 
 __rvm_install_source() {
 
-  local result directory configure_parameters db_configure_flags
+  local directory configure_parameters db_configure_flags
 
   [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] && __rvm_select
 
@@ -259,23 +257,23 @@ __rvm_install_source() {
   export BUNDLE_PATH="$rvm_ruby_gem_home"
 
   __rvm_rubygems_setup
+  result=$?
 
   __rvm_bin_script
 
   __rvm_run "chmod.bin" "chmod +x $rvm_ruby_home/bin/*"
 
   __rvm_post_install
+  result=$?
 
   "$rvm_path/scripts/log" "info" \
     "Install of $rvm_ruby_string - #complete "
 
-  return 0
+  return ${result:-0}
 }
 
 __rvm_install_ruby() {
 
-  local result
-
   if [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] ; then __rvm_select ; fi
 
   if [[ -n "${RUBYOPT:-""}" ]] ; then ruby_options="$RUBYOPT" ; fi
@@ -726,7 +724,7 @@ RubyWrapper
 
         "$rvm_path/scripts/log" "info" "Copying across included gems"
 
-        cp -R "$rvm_ruby_home/lib/ruby/gems/1.8/" "$GEM_HOME/"
+        cp -R "$rvm_ruby_home/lib/ruby/gems/1.8/" "$rvm_ruby_gem_home/"
       fi
     ;;
 
@@ -1121,12 +1119,10 @@ RubyWrapper
     export RUBYOPT
   fi
 
-  return $result
+  return ${result:-0}
 }
 
 __rvm_fetch_from_github() {
-  local result
-
   rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
   if [[ ! -d "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string/.git" ]] ; then
@@ -1157,11 +1153,10 @@ __rvm_fetch_from_github() {
 
   builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
 
-  return $?
+  return ${result:-0}
 }
 
 __rvm_fetch_ruby() {
-  local result
 
   [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] && __rvm_select
 
@@ -1242,7 +1237,7 @@ __rvm_fetch_ruby() {
           fi
           ;;
         tar.bz2)
-          __rvm_run "extract" "bunzip2 < \"${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C /tmp/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
+          __rvm_run "extract" "bunzip2 < '${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file.$rvm_archive_extension' | tar xf - -C /tmp/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
@@ -1318,7 +1313,8 @@ __rvm_fetch_ruby() {
 
         rvm_ruby_repo_http_url="${rvm_ruby_repo_url//git:/http:/}"
 
-        "$rvm_path/scripts/log" "info" "Cloning from $rvm_ruby_repo_url, this may take a while depending on your connection..."
+        "$rvm_path/scripts/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_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string"
         result=$?
@@ -1386,7 +1382,9 @@ __rvm_fetch_ruby() {
       else
         rm -rf "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string"
 
-        __rvm_run "svn.checkout" "svn checkout -q ${rvm_rev/-r/-r } $rvm_ruby_url ${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string" "Downloading source from ${rvm_ruby_url}."
+        __rvm_run "svn.checkout" \
+          "svn checkout -q ${rvm_rev/-r/-r } $rvm_ruby_url ${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string" \
+          "Downloading source from ${rvm_ruby_url}."
       fi
       result=$?
 
@@ -1403,39 +1401,57 @@ __rvm_fetch_ruby() {
 
     cp -R "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
   fi
+
+  return ${result:-0}
 }
 
 __rvm_check_default() {
 
-  local default_ruby_interpreter="$(rvm alias show default 2>/dev/null | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}')"
+  local default_ruby_interpreter current_ruby_interpreter
 
-  local current_ruby_interpreter="$(echo "$rvm_ruby_string" | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}')"
+  default_ruby_interpreter="$(rvm alias show default 2>/dev/null | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}')"
+
+  current_ruby_interpreter="$(echo "$rvm_ruby_string" | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}')"
 
   if [[ -n "$current_ruby_interpreter" && "$current_ruby_interpreter" = "$default_ruby_interpreter" ]]; then
+
     __rvm_run_with_env 'default.restore' 'system' 'rvm use system --default' 'Removing default ruby interpreter'
+
   fi
+
+  return $?
 }
 
 __rvm_uninstall_ruby() {
 
+  local dir
+
   if [[ ${rvm_ruby_selected_flag} -eq 0 ]] ; then __rvm_select ; fi
 
   if [[ -n "${rvm_ruby_string:-""}" ]] ; then
 
     for dir in "$rvm_path/rubies" ; do
+
       if [[ -d "$dir/$rvm_ruby_string" ]] ; then
+
         "$rvm_path/scripts/log" "info" "Removing $dir/$rvm_ruby_string..."
 
         rm -rf $dir/$rvm_ruby_string
+
       else
+
         "$rvm_path/scripts/log" "info" \
           "$dir/$rvm_ruby_string has already been removed."
+
       fi
 
       if [[ -e "${rvm_bin_path:-"$rvm_path/bin"}/$rvm_ruby_string" ]] ; then
+
         rm -f "${rvm_bin_path:-"$rvm_path/bin"}/$rvm_ruby_string"
+
       fi
-    done ; unset dir
+
+    done
 
     __rvm_remove_install_record "$rvm_ruby_string"
 
@@ -1444,8 +1460,10 @@ __rvm_uninstall_ruby() {
     __rvm_check_default
 
   else
+
     "$rvm_path/scripts/log" "fail" \
       "Cannot uninstall unknown package '$rvm_ruby_string'"
+
   fi
 
   unset rvm_uninstall_flag
@@ -1454,6 +1472,9 @@ __rvm_uninstall_ruby() {
 }
 
 __rvm_remove_ruby() {
+
+  local dir
+
   if [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] ; then __rvm_select ; fi
 
   if [[ -n "${rvm_ruby_string:-""}" ]] ; then
@@ -1461,20 +1482,26 @@ __rvm_remove_ruby() {
     for dir in ${rvm_src_path:-"$rvm_path/src"} $rvm_path/rubies ; do
 
       if [[ -d $dir/$rvm_ruby_string ]] ; then
+
         "$rvm_path/scripts/log" "info" "Removing $dir/$rvm_ruby_string..."
-        rm -rf $dir/$rvm_ruby_string
+
+        rm -rf "$dir/$rvm_ruby_string"
 
       else
+
         "$rvm_path/scripts/log" "info" "it seems that $dir/$rvm_ruby_string is already non existent."
+
       fi
 
       if [[ -e "${rvm_bin_path:-"$rvm_path/bin"}/$rvm_ruby_string" ]] ; then
+
         rm -f "${rvm_bin_path:-"$rvm_path/bin"}/$rvm_ruby_string"
+
       fi
 
       __rvm_check_default
 
-    done ; unset dir
+    done
 
     __rvm_remove_install_record "$rvm_ruby_string"
     __rvm_remove_gemsets
@@ -1483,9 +1510,19 @@ __rvm_remove_ruby() {
     __rvm_remove_wrappers
     __rvm_remove_environments
     __rvm_remove_binaries
+
   else
-    "$rvm_path/scripts/log" "fail" "Cannot remove unknown package '$rvm_ruby_string'"
-  fi ; unset rvm_remove_flag
+
+    "$rvm_path/scripts/log" "fail" \
+      "Cannot remove unknown package '$rvm_ruby_string'"
+
+    return 1
+
+  fi
+
+  unset rvm_remove_flag
+
+  return 0
 }
 
 __rvm_remove_gemsets() {
@@ -1585,7 +1622,7 @@ __rvm_post_install() {
     fi
 
     "$rvm_path/scripts/log" "info" \
-      "$rvm_ruby_string adjusting #shebangs for ($binaries)."
+      "$rvm_ruby_string - adjusting #shebangs for ($binaries)."
 
     for binary in "${binaries[@]}" ; do
 
@@ -1612,7 +1649,9 @@ __rvm_post_install() {
   fi
 
   # Import the initial gemsets.
-  __rvm_run_with_env "gemsets.initial" "$rvm_ruby_string" "'$rvm_path/scripts/gemsets' initial" "$rvm_ruby_string - #importing default gemsets ($rvm_path/gemsets/)"
+  __rvm_run_with_env "gemsets.initial" "$rvm_ruby_string" \
+    "'$rvm_path/scripts/gemsets' initial" \
+    "$rvm_ruby_string - #importing default gemsets ($rvm_path/gemsets/)"
 
   __rvm_irbrc
 
@@ -1644,9 +1683,9 @@ __rvm_generate_default_docs() {
 
 __rvm_rubygems_setup() {
 
-  local result home path dir directory_name version_number ruby_lib_gem_path
+  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/')" || -n "$(echo "$rvm_ruby_interpreter" | awk '/^mput/')" ]] ; then
     install=0
 
   elif [[ "$rvm_ruby_string" = "ruby-head" ]] ; then
@@ -1708,13 +1747,16 @@ __rvm_rubygems_setup() {
 
     # Hands off rubygems for rbx & jruby
     if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
-      "$rvm_path/scripts/log" "debug" "Skipping rubygems update for $rvm_ruby_version"
+      "$rvm_path/scripts/log" "debug" \
+        "Skipping rubygems update for $rvm_ruby_version"
     fi
 
     ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/jruby"
 
   else
-    "$rvm_path/scripts/log" "info" "$rvm_ruby_string - #rubygems installing to $rvm_ruby_string"
+
+    "$rvm_path/scripts/log" "info" \
+      "$rvm_ruby_string - #rubygems installing to $rvm_ruby_string"
 
     rvm_rubygems_version="$(__rvm_db "${rvm_ruby_interpreter}_rubygems_version")"
     rvm_rubygems_version="${rvm_rubygems_version:-"$(__rvm_db "rubygems_version")"}"
@@ -1751,8 +1793,9 @@ __rvm_rubygems_setup() {
     builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name"
 
     __rvm_run "rubygems.install" \
-      "GEM_PATH="$rvm_ruby_gem_path:$rvm_ruby_global_gems_path" GEM_HOME=$rvm_ruby_gem_home BUNDLE_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby ${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name/setup.rb"
+      "GEM_PATH='$rvm_ruby_gem_path:$rvm_ruby_global_gems_path' GEM_HOME='$rvm_ruby_gem_home' BUNDLE_PATH='$rvm_ruby_gem_home' $rvm_ruby_home/bin/ruby ${rvm_src_path:-"$rvm_path/src"}/$rvm_gem_package_name/setup.rb"
     result=$?
+
     if [[ $result -gt 0 ]] ; then
       "$rvm_path/scripts/log" "warning" \
         "$rvm_ruby_string - #warning Installation of rubygems $rvm_ruby_package_name did not complete successfully."
@@ -1788,7 +1831,7 @@ __rvm_rubygems_setup() {
     __rvm_inject_ruby_shebang "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string/bin/rake"
   fi
 
-  return $result
+  return ${result:-0}
 }
 
 __rvm_inject_ruby_shebang() {
@@ -1810,13 +1853,13 @@ __rvm_inject_gem_env() {
 
   __rvm_actual_file $1
 
-  if [[ -f "$actual_file" ]] ; then
+  if [[ -s "$actual_file" ]] ; then
 
-    if [[ -n "$(head -n 1 $actual_file | awk '/[j]*ruby/')" ]] ; then
+    if [[ -n "$(head -n 1 "$actual_file" | awk '/[j]*ruby/')" ]] ; then
 
       string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_ruby_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_ruby_gem_path'\nENV['PATH']='$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:' + ENV['PATH']\nENV['BUNDLE_PATH']=ENV['BUNDLE_PATH'] || '$rvm_ruby_gem_home'\n"
 
-    elif [[ -n "$(head -n 1 $actual_file | awk '/bash/')" ]] ; then
+    elif [[ -n "$(head -n 1 "$actual_file" | awk '/bash/')" ]] ; then
 
       string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_home:$rvm_ruby_global_gems_path'}\nPATH=$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:\$PATH\nBUNDLE_PATH=\${BUNDLE_PATH:-'$rvm_ruby_gem_home'}\n"
 
@@ -1830,11 +1873,13 @@ __rvm_inject_gem_env() {
 
     fi
   fi
+
+  return 0
 }
 
 __rvm_actual_file() {
 
-  if [[ -L $1 ]] ; then          # If the file is a symlink,
+  if [[ -L "$1" ]] ; then # If the file is a symlink,
 
     actual_file="$(readlink $1)" # read the link target so we can preserve it.
 
@@ -1844,6 +1889,7 @@ __rvm_actual_file() {
 
   fi
 
+  return 0
 }
 
 __rvm_manage_rubies() {

data/scripts/package

@@ -12,7 +12,6 @@ library="${args[1]:-""}"
 args="$(echo ${args[@]:2})"
 
 install_package() {
-  local result
 
   __rvm_db "${package}_url" "package_url"
 
@@ -72,7 +71,7 @@ install_package() {
   )
   result=$?
 
-  return $result
+  return ${result:-0}
 }
 
 readline() {

data/scripts/repair

@@ -70,7 +70,7 @@ repair_archives() {
 
     if [[ -n "$stored_md5sum" ]] ; then
 
-      if [[ ! "$rvm_path/scripts/md5" "${rvm_archives_path:-"$rvm_path/archives"}/$archive_file" "$stored_md5sum" ]] ; then
+      if ! "$rvm_path/scripts/md5" "${rvm_archives_path:-"$rvm_path/archives"}/$archive_file" "$stored_md5sum" ; then
 
         "$rvm_path/scripts/log" "info" "Removing archive for '$archive_file' - Incorrect md5 checksum."
 

data/scripts/rvm

@@ -5,6 +5,7 @@
 # http://github.com/wayneeseguin/rvm
 
 if [[ ${rvm_loaded_flag:-0} -eq 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
+
   unset rvm_reload_flag
 
   if [[ -z "$rvm_ignore_rvmrc" ]]; then
@@ -68,8 +69,6 @@ if [[ ${rvm_loaded_flag:-0} -eq 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
       fi
     done
 
-    rvm_loaded_flag=1
-
     rvm_version="$(awk '/:/{printf $NF"."}' "$rvm_path/lib/VERSION.yml")"
 
     export rvm_version="${rvm_version/%.}"
@@ -94,5 +93,7 @@ if [[ ${rvm_loaded_flag:-0} -eq 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
   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
-fi
 
+  rvm_loaded_flag=1
+
+fi

data/scripts/selector

@@ -243,7 +243,7 @@ __rvm_select() {
       \mkdir -p "${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string"
     fi
 
-    export rvm_head_flag $(env | awk -F= -v ORS=' ' '/^rvm_/{print $1}')
+    export 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
 
   else
     rvm_ruby_interpreter="${rvm_ruby_interpreter:-system}"
@@ -253,7 +253,8 @@ __rvm_select() {
 __rvm_use() {
   local new_path binary full_binary_path rvm_ruby_gem_home
 
-  if [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] ; then __rvm_select "$@" ; fi
+  #if [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] ; then __rvm_select "$@" ; fi
+  __rvm_select "$@"
 
   if [[ -z "${rvm_ruby_interpreter:-""}" ]] ; then rvm_ruby_interpreter="system" ; fi
 

data/scripts/set

@@ -24,30 +24,45 @@ __rvm_ruby_do() {
 
   else
     binary="$(echo $action | sed 's#do$##')"
+
     if [[ -x "$rvm_ruby_home/bin/$binary" ]] ; then
+
       binary="$rvm_ruby_home/bin/$binary"
 
+
     elif [[ -x "$rvm_ruby_global_gems_path/bin/$binary" ]] ; then
+
       binary="$rvm_ruby_global_gems_path/bin/$binary"
 
     elif [[ -x "$rvm_ruby_gem_home/bin/$binary" ]] ; then
+
       binary="$rvm_ruby_gem_home/bin/$binary"
 
     elif [[ "system" = "$rvm_ruby_string" ]] && [[ -x "$(command -v $binary)" ]] ; then
+
       binary="$(basename $(command -v $binary) 2>/dev/null)"
 
     else
-      "$rvm_path/scripts/log" "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
+
+      "$rvm_path/scripts/log" "warn" \
+        "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
+
       __rvm_unset_ruby_variables
+
       return 1
+
     fi
 
     if [[ ! -z "$rvm_ruby_mode" ]] ; then
+
       rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_mode}"
+
       rvm_ruby_mode="--$(echo "$rvm_ruby_mode" | sed 's/^m//')"
+
     fi
 
     load_path="$(dirname $(command -v $binary) 2>/dev/null):$rvm_ruby_load_path"
+
     # TODO: the else case below should be run if $args =~ /\.rb$/
     if [[ "ruby" = "$(basename $binary)" && "$rvm_benchmark_flag" -ne 1 ]] ; then
 
@@ -56,27 +71,43 @@ __rvm_ruby_do() {
         if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
 
         if ! "$rvm_path/scripts/match" "$args" "$prefix" ; then
+
           args="$prefix $args"
+
         fi
       fi
-      rvm_command="$(echo "$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path $args")"
+
+      rvm_command="$(printf "$binary $rvm_ruby_mode $rvm_ruby_require -I$load_path $args")"
+
     else
-      rvm_command="$(echo "$binary $rvm_ruby_mode $args")"
+
+      rvm_command="$(printf "$binary $rvm_ruby_mode $args")"
+
     fi
+
   fi
 
-  if [[ ! -z "$rvm_json_flag" ]] || [[ ! -z "$rvm_yaml_flag" ]] || [[ ! -z "$rvm_summary_flag" ]] ; then
-    \mkdir -p ./log/$rvm_ruby_string/
-    \touch ./log/$rvm_ruby_string/$action.log ./log/$rvm_ruby_string/$action.error.log
+  if [[ -n "$rvm_json_flag" || -n "$rvm_yaml_flag" || -n "$rvm_summary_flag" ]] ; then
+
+    mkdir -p ./log/$rvm_ruby_string/
+
+    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
 
   else
     if [[ ${rvm_verbose_flag:-0} -gt 0 ]] ; then
+
       current_env="$(__rvm_environment_identifier)"
+
       if [[ "$current_env" != "$current_set_ruby" ]]; then
+
         current_env="$current_set_ruby ($current_env)"
+
       fi
+
       "$rvm_path/scripts/log" "info" "$current_env: $(ruby -v $rvm_ruby_mode | \tr "\n" ' ')\n"
+
       unset current_env
     fi
     eval "$rvm_command"
@@ -85,52 +116,84 @@ __rvm_ruby_do() {
 
   string=$(basename $rvm_ruby_gem_home)
   if [[ $result -eq 0 ]]; then
+
     eval "successes=(${successes[*]} $string)"
+
   else
+
     eval "errors=(${errors[*]} $string)"
+
   fi
 
   eval "rubies=(${rubies[*]} $string)"
+
   eval "statuses=(${statuses[*]} $result)"
 
   unset string
+
   __rvm_unset_ruby_variables
 }
 
 # Output the summary in a human readable format.
 __rvm_summary() {
   export successes errors statuses
+
   summary="\nSummary:\n\n"
+
   if [[ ${#successes[*]} -gt 0 ]] ; then
+
     summary="$summary \033[0;32m${#successes[*]} successful: $(echo "${successes[*]}" | sed 's# #, #g')\033[0m\n"
+
   fi
+
   if [[ ${#errors[*]} -gt 0 ]] ; then
+
     summary="$summary \033[0;31m${#errors[*]} errors: $(echo "${errors[*]}" | sed 's# #, #g')\033[0m\n"
+
   fi
+
   total=${#rubies[*]}
+
   if [[ -n "${ZSH_VERSION:-""}" ]] ; then array_start=1 ; else array_start=0 ; fi
 
   printf "$summary" | tee -a log/summary.log
+
   return ${#errors[*]}
+
 }
 
 # 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:"
+
   for var in ${successes[*]} ; do yaml="$yaml\n  - $var" ; done
+
   yaml="$yaml\nerrors:"
+
   for var in ${errors[*]} ; do yaml="$yaml\n  - $var" ; done
+
   yaml="$yaml\nrubies:"
+
   total=${#rubies[*]}
+
   if [[ -n "${ZSH_VERSION:-""}" ]] ; then array_start=1 ; else array_start=0 ; fi
+
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
+
     if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
+
       "$rvm_path/scripts/log" "debug" "${rubies[$index]}: ${statuses[$index]}"
+
     fi
+
     yaml="$yaml\n  \"${rubies[$index]}\": ${statuses[$index]}"
+
   done ; unset index array_start
+
   \mkdir -p log
+
   printf "$yaml" | tee -a log/summary.yaml
 
   return ${#errors[*]}
@@ -148,12 +211,20 @@ __rvm_json() {
   if [[ -n "${ZSH_VERSION:-""}" ]] ; then array_start=1 ; else array_start=0 ; fi
 
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
+
     if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
+
       "$rvm_path/scripts/log" "debug" "${rubies[$index]}: ${statuses[$index]}"
+
     fi
+
     json="$json\n    {\"${rubies[$index]}\": ${statuses[$index]}}"
+
     if (( $index + 1 < $total + $array_start )) ; then json="$json,  " ; fi
-  done ; unset index array_start
+
+  done
+  unset index array_start
+
   json="$json\n  }\n}"
 
   mkdir -p log
@@ -172,16 +243,26 @@ action="${args[0]}"
 args=${args[@]:1}
 
 if [[ -z "$action" ]] ; then
-  "$rvm_path/scripts/log" "error" "Action must be specified."
+
+  "$rvm_path/scripts/log" "error" \
+    "Action must be specified."
+
   exit 1
+
 fi
 
 if [[ "$action" == "ruby" ]] && echo "$args" | \grep -q  "^'--[^[:space:]]*'$" ; then
-  "$rvm_path/scripts/log" "warn" "You called rvm ruby with the arguments $args which look like use options."
-  "$rvm_path/scripts/log" "warn" "Please note that 'rvm ruby' invokes set operations instead."
+
+  "$rvm_path/scripts/log" "warn" \
+    "You called rvm ruby with the arguments $args which look like use options."
+
+  "$rvm_path/scripts/log" "warn" \
+    "Please note that 'rvm ruby' invokes set operations instead."
+
 fi
 
 rvm_ruby_strings=$(__rvm_expand_ruby_string "$rvm_ruby_strings")
+
 rvm_ruby_strings=(${rvm_ruby_strings//default}) # No quotes here is intentional.
 
 # Check for a single ruby && exec if present.
@@ -192,7 +273,9 @@ for current_set_ruby in ${rvm_ruby_strings[@]} ; do
 done
 
 if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
+
 if [[ ! -z "$rvm_yaml_flag" ]]    ; then __rvm_yaml    ; fi
+
 if [[ ! -z "$rvm_json_flag" ]]    ; then __rvm_json    ; fi
 
 rvm_hook="after_do" ; source "$rvm_path/scripts/hook"