rvm 1.0.5 → 1.0.6

data/scripts/completion

@@ -11,10 +11,10 @@ __rvm_subcommand()
 {
   local word subcommand c=1
 
-  while [ $c -lt $COMP_CWORD ]; do
+  while [[ $c -lt $COMP_CWORD ]] ; do
     word="${COMP_WORDS[c]}"
     for subcommand in $1; do
-      if [ "$subcommand" = "$word" ]; then
+      if [[ "$subcommand" = "$word" ]]; then
         echo "$subcommand"
         return
       fi
@@ -111,10 +111,11 @@ _rvm_use ()
 
 _rvm_gemset ()
 {
-  local subcommands="use create"
-  local subcommand="$(__rvm_subcommand "$subcommands")"
+  local subcommand subcommands
+  subcommands="use create"
+  subcommand="$(__rvm_subcommand "$subcommands")"
 
-  if [ -z "$subcommand" ]; then
+  if [[ -z "$subcommand" ]]; then
     __rvm_comp "$subcommands"
     return
   fi

data/scripts/disk-usage

@@ -15,11 +15,12 @@ disk_usage_for_directory() {
 }
 
 disk_usage() {
-  eval "local current_path=\"\$rvm_${2}_path\""
+  local current_path
+  eval "current_path=\"\$rvm_${2}_path\""
   if [[ -n "$current_path" && -d "$current_path" && "$current_path" != "/" ]]; then
     echo "$1 Usage: $(disk_usage_for_directory "$current_path")"
   fi
-  unset current_path
+  return 0
 }
 
 all_disk_usage() {

data/scripts/environment-convertor

@@ -8,13 +8,19 @@ unset GREP_OPTIONS
 source "$rvm_scripts_path/base"
 
 convert_path_to_fish() {
-  local path_part="$1"
-  local parts="$(echo "$path_part" | sed -e 's#:\$PATH##' -e "s#:#\" \"#g" -e "s#^export \\([^[:space:]]*\\)=##")"
-  echo "for path_part in $parts"
-  echo '  if test -d $path_part'
-  echo '    set PATH $path_parth $PATH'
-  echo '  end'
-  echo 'end'
+  local parts path_parts
+
+  path_part="$1"
+  parts="$(echo "$path_part" | sed -e 's#:\$PATH##' -e "s#:#\" \"#g" -e "s#^export \\([^[:space:]]*\\)=##")"
+
+  printf "\
+for path_part in $parts
+  if test -d $path_part
+    set PATH $path_parth $PATH
+  end
+end
+"
+  return 0
 }
 
 convert_unset_to_fish() {

data/scripts/gemsets

@@ -26,7 +26,9 @@ usage() {
 gemset_update() {
   if [[ -z "$rvm_ruby_strings" ]]; then
     "$rvm_scripts_path/log" "info" "Running gem update for all rubies and gemsets."
-    rvm_ruby_strings="$(ls "$rvm_gems_path" | grep -v '^\(doc\|cache\|@\|system\)' | \tr '\n' ',')"
+
+    rvm_ruby_strings="$(builtin cd "$rvm_gems_path" ; find * -type d -maxdepth 0 -print 2>/dev/null | grep -v '^\(doc\|cache\|@\|system\)' | \tr '\n' ',')"
+    rvm_ruby_strings="${rvm_ruby_strings/%,}"
   else
     "$rvm_scripts_path/log" "info" "Running gem update for the specified rubies."
   fi
@@ -49,7 +51,7 @@ gemset_globalcache() {
     return "$globalcache_enabled"
   elif [[ "$1" == "disable" ]]; then
     "$rvm_scripts_path/log" "info" "Removing the global cache (note: this will empty the caches)"
-    for directory_name in $(ls "$rvm_gems_path"); do
+    for directory_name in $(builtin cd "$rvm_gems_path" ; find * -type d -maxdepth 0 -print); do
       current_cache_path="$rvm_gems_path/$directory_name/cache"
       if [[ -L "$current_cache_path" && "$(readlink "$current_cache_path")" == "$rvm_gems_cache_path" ]]; then
         "$rvm_scripts_path/log" "info" "Reverting the gem cache for $directory_name to an empty directory."
@@ -61,7 +63,7 @@ gemset_globalcache() {
   elif [[ "$1" == "enable" ]]; then
     "$rvm_scripts_path/log" "info" "Enabling global cache for gems."
     mkdir -p "$rvm_gems_cache_path"
-    for directory_name in $(ls "$rvm_gems_path"); do
+    for directory_name in $(builtin cd "$rvm_gems_path" ; find * -type d -maxdepth 0 -print); do
       current_cache_path="$rvm_gems_path/$directory_name/cache"
       if [[ -d "$current_cache_path" && ! -L "$current_cache_path" ]]; then
         "$rvm_scripts_path/log" "info" "Moving the gem cache for $directory_name to the global cache."
@@ -306,7 +308,8 @@ gemset_import() {
 
   if [[ -s "$rvm_file_name" ]] ; then
     echo "Importing  $rvm_file_name file..."
-    rvm_ruby_gem_list=$(ls "$rvm_ruby_gem_home/specifications/" 2> /dev/null | sed 's#.gems.*$##' 2> /dev/null)
+
+    rvm_ruby_gem_list=$(builtin cd "$rvm_ruby_gem_home/specifications/" ; find * -type f -maxdepth 0 -print 2> /dev/null | sed -e 's#.gems.*$##' 2> /dev/null)
 
     while read -r line
     do # Keep this on 2nd line :(
@@ -367,31 +370,43 @@ gem_install() {
   else
     if [[ -s "$gem" ]] ; then
       cache_file="$gem"
+
     elif [[ -s "$(__rvm_current_gemcache_dir)/${gem_file_name}" ]] ; then
       cache_file="$(__rvm_current_gemcache_dir)/${gem_file_name}"
+
     else
-      cache_file="${cache_file:-$(ls "$(__rvm_current_gemcache_dir)/${gem_file_name}" 2> /dev/null | sort | head -n1)}"
+      cache_file="${cache_file:-$(builtin cd "$(__rvm_current_gemcache_dir)/${gem_file_name}" ; find * -type f -maxdepth 0 -print 2> /dev/null | sort | head -n1)}"
     fi
 
     if [[ ! -s "$cache_file" ]] ; then
+
       if [[ -s "$gem_file_name" ]] ; then
         gem="$gem_file_name"
+
       elif [[ -z "${gem_version// /}" ]] ; then
         gem="${gem_name// /}"
+
       else
         gem="${gem_name// /} -v $gem_version"
       fi
     else # cached
+
       gem_file_name="$(basename "$cache_file")"
+
       gem_string="$(echo "$gem_file_name" | sed 's#\.gem$##')"
 
       if [[ -z "$rvm_force_flag" ]] && [[ -s "${rvm_ruby_gem_home}/specifications/$(basename $gem_file_name)spec" ]] ; then
         unset gem # already installed, not forcing reinstall.
+
         "$rvm_scripts_path/log" "info" "$gem_name $gem_version exists, skipping (--force to re-install)"
+
       else
         if [[ -s "$(__rvm_current_gemcache_dir)/$(basename $gem_file_name)" ]] ; then
+
           mkdir -p "$rvm_tmp_path/$$/"
+
           mv "$(__rvm_current_gemcache_dir)/$gem_file_name" "$rvm_tmp_path/$$/$gem_file_name"
+
           gem="$rvm_tmp_path/$$/$gem_file_name -f -l"
         else
           gem="$cache_file"

data/scripts/help

@@ -11,13 +11,13 @@ args="$(echo ${args[@]:2}) " # Strip trailing / leading / extra spacing.
 
 if [[ ! -z "$command" ]] && [[ -s "${rvm_help_path}/${command}" ]] ; then
   if [[ ! -z "$action" ]] && [[ -s "${rvm_help_path}/${command}/${action}" ]] ; then
-    "${PAGER:-less}" "${rvm_help_path}/${command}/${action}"
+    less "${rvm_help_path}/${command}/${action}"
   else
-    "${PAGER:-less}" "${rvm_help_path}/${command}"
+    less "${rvm_help_path}/${command}"
   fi
 else
-  "${PAGER:-less}" "${rvm_path:-$HOME/.rvm}/README"
-  "$rvm_scripts_path/log" "info" "Commands available with 'rvm help':\n\n    $(builtin cd "${rvm_help_path}" ; \ls | \tr "\n" ' ')"
+  less "${rvm_path:-$HOME/.rvm}/README"
+  "$rvm_scripts_path/log" "info" "Commands available with 'rvm help':\n\n    $(builtin cd "${rvm_help_path}" ; find * -type f -maxdepth 0 -print | \tr "\n" ' ')"
 fi
 
 "$rvm_scripts_path/log" "info" "For additional information please visit RVM's documentation website:\n\n    http://rvm.beginrescueend.com/"

data/scripts/info

@@ -14,12 +14,15 @@ fi
 rvm_info=""
 
 version_for() {
-  local binary=$1
+  local binary=${1:-""}
+
   if command -v "$binary" >/dev/null ; then
     $binary --version | head -n1
   else
     echo "not installed"
   fi
+
+  return 0
 }
 
 info_system() {

data/scripts/install

@@ -383,7 +383,8 @@ for file in rvm rvmsudo rvm-shell rvm-auto-ruby ; do
   [[ -s "$rvm_bin_path/$file" ]] && chmod +x "$rvm_bin_path/$file"
 done; unset file
 printf "\n    Copying manpages into place."
-for man_file in $(ls "$install_source_path/man"); do
+
+for man_file in $(builtin cd "$install_source_path/man" ; find * -type f -maxdepth 0 -print); do
   rm -rf "$rvm_man_path/$man_file"
   cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
 done

data/scripts/list

@@ -3,61 +3,103 @@
 rvm_pretty_print=${rvm_pretty_print:-0}
 
 rvm_base_except="selector"
+
 source "$rvm_scripts_path/base"
 
+usage() {
+  printf "
+  Usage:
+
+    rvm list [action]
+
+  Actions:
+
+  {help,known,gemsets,default [string],rubies,strings,known_strings}
+
+"
+  return 0
+}
+
 list_gemsets() {
+  local all_rubies version versions ruby_version_name current_ruby selected system_ruby system_version string binary
+
   if [[ "${1:-""}" = "strings" ]]; then
     list_gemset_strings
     return 0
   fi
-  echo
 
   current_ruby="$(__rvm_environment_identifier)"
-  local all_rubies="$(list_strings)"
 
-  printf "rvm gemsets\n"
-  for version in $(ls "$rvm_gems_path/" 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
+  all_rubies="$(list_strings)"
+
+  printf "\nrvm gemsets\n"
+
+  versions=($(builtin cd "$rvm_gems_path/" ; find * -type d -maxdepth 0 -print 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}'))
+  for version in "${versions[@]}" ; do
+
     ruby_version_name="$(echo "$version" | awk -F"$rvm_gemset_separator" '{print $1}')"
 
     [[ "$all_rubies" != *"$ruby_version_name"* ]] && continue
 
     if echo "$version" | grep -q '^jruby-' ; then
       string="[ $("$rvm_rubies_path/$ruby_version_name/bin/ruby" -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
+
     elif [[ -n "$(echo "$version" | awk '/^maglev-|^macruby-/')" ]] ; then
       string="[ x86_64 ]"
+
     else
       string="[ $(file "$rvm_rubies_path/$ruby_version_name/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
-    fi ; unset ruby_version_name
+    fi
+
     printf "\n"
+
     if [[ "$version" = "$current_ruby" ]]; then
       printf "=> "
     else
       printf "   "
     fi
-    if [[ $rvm_pretty_print -eq 1 ]] ; then
+
+    if [[ ${rvm_pretty_print:-0} -eq 1 ]] ; then
+
       printf "$(tput setaf 2)$version$(tput sgr0) $string"
     else
       printf "$version $string"
     fi
-  done ; unset version
 
-  if [[ -f "$rvm_config_path/default" ]] && [[ -s "$rvm_config_path/default" ]] ; then
+  done
+
+  if [[ -f "$rvm_config_path/default" && -s "$rvm_config_path/default" ]] ; then
+
     version=$(grep 'MY_RUBY_HOME' "$rvm_config_path/default" | head -n1 | awk -F"'" '{print $2}' | xargs basename --)
-    if [[ ! -z "$version" ]] ; then
+
+    if [[ -n "$version" ]] ; then
+
       printf "\n\nDefault Ruby (for new shells)\n"
+
       string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
-      if [[ $rvm_pretty_print -eq 1 ]] ; then
+
+      if [[ ${rvm_pretty_print:-0} -eq 1 ]] ; then
+
         printf "\n  $(tput setaf 2)$version$(tput sgr0) $string"
       else
         printf "\n  $version $string"
       fi
-    fi ; unset version
-  fi ; unset current_ruby version selected system_ruby system_version string binary
+
+    fi
+
+  fi
+
   printf "\n\n"
+
+  return 0
 }
 
 list_default() {
+
+  local version string
+
   if [[ "${args[0]:-""}" = "string" ]] ; then
+
     "$rvm_scripts_path/alias" show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename --
 
   else
@@ -65,12 +107,14 @@ list_default() {
 
       version=$("$rvm_scripts_path/alias" show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename --)
 
-      if [[ ! -z "$version" ]] ; then
+      if [[ -n "$version" ]] ; then
+
         printf "\n\nDefault Ruby (for new shells)\n"
 
         string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
 
-        if [[ $rvm_pretty_print -eq 1 ]] ; then
+        if [[ ${rvm_pretty_print:-0} -eq 1 ]] ; then
+
           printf "\n   $(tput setaf 2)$version$(tput sgr0) $string\n"
         else
           printf "\n   $version $string\n"
@@ -78,97 +122,165 @@ list_default() {
       fi ; unset version
     fi
   fi
+
+  return 0
 }
 
 list_ruby_svn_tags() {
+  local prefix tag
+
   while read -r tag
   do
     prefix="$(echo ${tag/\//} | sed 's#^v1_##' | awk -F'_' '{print "(ruby-)1."$1"."$2}' | sed 's#p$##')"
+
     echo "${prefix}-t${tag/\//}"
-    unset prefix tag
+
   done < <(svn list http://svn.ruby-lang.org/repos/ruby/tags/ | awk '/^v1_[8|9]/')
+
+  return 0
 }
 
 # Query for valid rvm ruby strings
 # This is meant to be used with scripting.
 list_strings() {
-  ls "$rvm_rubies_path"
+  (
+  cd "$rvm_rubies_path"
+
+  find * -type d -maxdepth 0
+  )
+
+  return $?
 }
 
 # This is meant to be used with scripting.
 list_gemset_strings() {
-  local all_rubies="$(list_strings)"
-  for gemset in $(ls "$rvm_gems_path/" 2>/dev/null | xargs -n1 basename -- | \grep -v '^\(@\|doc$\|cache$\|system$\)' | sort); do
-    local ruby_name="$(echo "$gemset" | awk -F$rvm_gemset_separator '{print $1}')"
+  local all_rubies ruby_name gemset gemsets
+
+  all_rubies="$(list_strings)"
+
+  gemsets=($(builtin cd "$rvm_gems_path" ; find * -type d -maxdepth 0 2>/dev/null | xargs -n1 basename -- | \grep -v '^\(@\|doc$\|cache$\|system$\)' | sort))
+
+  for gemset in "${gemsets[@]}" ; do
+
+    ruby_name="${gemset//${rvm_gemset_separator}*}"
+
     [[ "$all_rubies" != *"$ruby_name"* ]] && continue
+
     echo "$gemset"
   done
+
+  return 0
 }
 
 # This is meant to be used with scripting.
 list_known_strings() {
+
   sed -e 's/#.*$//g' -e 's/(//g' -e 's/)//g' < "$rvm_config_path/known" | sort -r | uniq
+
+  return $?
 }
 
 list_known() {
+
   if [[ "${1:-""}" = "strings" ]]; then
+
     list_known_strings
+
     return 0
   fi
 
-  if [[ "$rvm_interactive_flag" != "1" ]] ; then
+  if [[ ${rvm_interactive_flag:-0} -eq 0 ]] ; then
+
     cat "$rvm_config_path/known"
+
   else
-    ${PAGER:-less} "$rvm_config_path/known"
+
+    less "$rvm_config_path/known"
+
   fi
+
+  return $?
 }
 
 
 list_rubies_strings() {
-  find "$rvm_rubies_path/" -type d -maxdepth 1 | tail -n+2 | xargs -n1 basename -- |  __rvm_strip
+  ( builtin cd "$rvm_rubies_path" ; find -type d -maxdepth 0 | tail -n+2 | xargs -n1 basename -- |  __rvm_strip )
+  return $?
 }
 
 list_rubies() {
+
+  local current_ruby rubies version selected system_ruby system_version string binary
+
   if [[ "${1:-""}" = "strings" ]]; then list_rubies_strings ; return 0 ; fi
 
   current_ruby="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
 
   printf "\nrvm rubies\n"
-  for version in $(ls "$rvm_rubies_path/" 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
+
+  rubies=($(builtin cd "$rvm_rubies_path/" ; find * -type d -maxdepth 0 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}'))
+
+  for version in "${rubies[@]}" ; do
+
+    [[ ! -x "$rvm_rubies_path/$version/bin/ruby" ]] && continue
+
+    (
     if echo "$version" | grep -q '^jruby-' ; then
+
       string="[ $("$rvm_rubies_path/$version/bin/ruby" -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
+
     elif [[ ! -z "$(echo "$version" | awk '/^maglev-|^macruby-/')" ]] ; then
+
       string="[ x86_64 ]"
+
     else
+
       string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
     fi
+
     printf "\n"
+
     if [[ "$version" = "$current_ruby" ]]; then
       printf "=> "
     else
       printf "   "
     fi
+
     # TODO: Only use tput for interactive terminal sessions.
-    if [[ $rvm_pretty_print -eq 1 ]] ; then
+    if [[ ${rvm_pretty_print:-0} -eq 1 ]] ; then
+
       printf "$(tput setaf 2)$version$(tput sgr0) $string"
     else
       printf "$version $string"
     fi
-  done ; unset version
+    )&
+
+  done ; wait
 
   if [[ -f "$rvm_config_path/default" ]] && [[ -s "$rvm_config_path/default" ]] ; then
+
     version=$(grep 'MY_RUBY_HOME' "$rvm_config_path/default" | head -n 1 | awk -F"'" '{print $2}' | xargs basename --)
-    if [[ ! -z "$version" ]] ; then
+
+    if [[ -n "$version" ]] ; then
+
       printf "\n\nDefault Ruby (for new shells)\n"
+
       string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
-      if [[ $rvm_pretty_print -eq 1 ]] ; then
+
+      if [[ ${rvm_pretty_print:-0} -eq 1 ]] ; then
+
         printf "\n  $(tput setaf 2)$version$(tput sgr0) $string"
       else
         printf "\n  $version $string"
       fi
-    fi ; unset version
-  fi ; unset current_ruby version selected system_ruby system_version string binary
+
+    fi
+
+  fi
+
   printf "\n\n"
+
+  return 0
 }
 
 # List all rvm installed rubies, default ruby and system ruby.
@@ -178,28 +290,18 @@ args=($*)
 action="${args[0]:-""}"
 args=${args[@]:1} # Strip trailing / leading / extra spacing.
 
-if [[ "known" = "$action" ]] ; then
-  list_known
-elif [[ "known_strings" = "$action" ]] ; then
-  list_known_strings
-elif [[ "gemsets" = "$action" ]] ; then
-  list_gemsets "$@"
-elif [[ "default" = "$action" ]] ; then
-  list_default
-elif [[ -z "$action" ]] || [[ "rubies" = "$action" ]] ; then
-  list_rubies "$@"
-elif [[ "strings" = "$action" ]] ; then
-  list_strings
-elif [[ "ruby_svn_tags" = "$action" ]] ; then
-  list_ruby_svn_tags
-else # help
-  printf "
-  Usage:
-
-    rvm list {known,gemsets,default [string],rubies,strings,known_strings}
+if [[ -z "$action" ]] ; then list_rubies ; exit 0 ; fi
 
-"
-  false
-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     ;;
+esac
 
 exit $?