rvm 1.0.11 → 1.0.13

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 11
+:patch: 13

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.11"
+  s.version = "1.0.13"
 
   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-20}
+  s.date = %q{2010-10-03}
   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/array

@@ -3,7 +3,8 @@
 if [[ -n "${ZSH_VERSION:-""}" ]] ; then __array_start=1 ; else __array_start=0 ; fi
 
 # Usage: contains "a_string" "${an_array[@]}"
-array_contains() {
+array_contains()
+{
   local pattern="$1" ; shift
   local index list
   list=("$@")
@@ -13,14 +14,16 @@ array_contains() {
   echo -1 ; return 1
 }
 
-array_length() {
+array_length()
+{
   array=$1
   eval "length=\${#${array}[*]}"
   echo $length
   return $length
 }
 
-array_push() {
+array_push()
+{
   array=$1 ; item=$2
   # TODO: allow loop over more arguments.
   eval "index=\$((\${#${array}[*]} + $__array_start))"

data/scripts/cd

@@ -9,13 +9,18 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
     autoload is-at-least
 
     if is-at-least 4.3.4 >/dev/null 2>&1; then
+
       # On zsh, use chpwd_functions
       chpwd_functions=( "${chpwd_functions[@]}" __rvm_project_rvmrc )
+
     else
 
-      cd() {
+      cd()
+      {
         builtin cd "$@"
+
         local result=$?
+
         __rvm_project_rvmrc
 
         rvm_hook="after_cd" ; source "$rvm_path/scripts/hook"
@@ -27,9 +32,12 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
 
   else
 
-    cd() {
+    cd()
+    {
       builtin cd "$@"
+
       local result=$?
+
       __rvm_project_rvmrc
 
       rvm_hook="after_cd" ; source "$rvm_path/scripts/hook"
@@ -39,18 +47,39 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
 
     _rvm_cd_complete ()
     {
-      local cur matches
+      local directory current matches item index
+
       COMPREPLY=()
-      cur="${COMP_WORDS[COMP_CWORD]}"
 
-      matches=$(for dir in $(echo $CDPATH | tr -s ':' ' ') ; do
-        find $dir/* -type d -maxdepth 0 -exec basename {} \;
-      done | sort | uniq)
+      current="${COMP_WORDS[COMP_CWORD]}"
 
-      COMPREPLY=( $(compgen -W "${matches}" -- ${cur}) )
-    }
+      if [[ -n "$CDPATH" ]] ; then
+
+        index=${#COMPREPLY[@]}
+
+        for directory in $(echo "$CDPATH" | tr -s ':' ' ') ; do
 
-    complete -o bashdefault -o default -o dirnames -o filenames -o nospace -o plusdirs -F _rvm_cd_complete cd
+          for item in $( compgen -d "$directory/$current" ) ; do
+
+            item="${item}/"
+
+            COMPREPLY[index++]=${item#$directory/}
+
+          done
+
+        done
+
+        COMPREPLY=( $(echo ${COMPREPLY} | uniq | sort) )
+
+      else
+
+        COMPREPLY=( $(compgen -d ${current}) )
+
+      fi
+
+      complete -o filenames -o nospace -F _rvm_cd_complete cd
+
+    }
 
   fi
 

data/scripts/cleanup

@@ -2,7 +2,8 @@
 rvm_base_except="selector"
 source "$rvm_path/scripts/base"
 
-usage() {
+usage()
+{
   printf "
 
   Usage:
@@ -16,14 +17,16 @@ usage() {
 return 0
 }
 
-cleanup() {
+cleanup()
+{
   local cleanup_type current_path
 
   for cleanup_type in $1; do
 
-    eval "current_path=\"\$rvm_${cleanup_type}_path\""
+    current_path="${rvm_path}/${cleanup_type}"
 
-    if [[ -n "$current_path" && -d "$current_path" && "$current_path" != "/" ]]; then
+    if [[ -n "$current_path" && -d "$current_path" \
+      && "$current_path" != "/" ]]; then
 
       "$rvm_path/scripts/log" "info" \
         "Cleaning up rvm directory '$current_path'"
@@ -43,9 +46,9 @@ if [[ -z "${1:-""}" ]] ; then
 fi
 
 case "$1" in
-  all)      cleanup "archives repo src log" ;;
+  all)      cleanup "archives repos src log" ;;
   archives) cleanup "archives" ;;
-  repos)    cleanup "repo" ;;
+  repos)    cleanup "repos" ;;
   sources)  cleanup "src" ;;
   logs)     cleanup "log" ;;
   help)     usage ;;

data/scripts/cli

@@ -2,7 +2,8 @@
 
 __rvm_usage() { ${PAGER:-less} "${rvm_path:-$HOME/.rvm}/README" ; }
 
-__rvm_run_script() {
+__rvm_run_script()
+{
   local rvm_script_name="${1:-"$rvm_action"}"
 
   eval "$rvm_path/scripts/$rvm_script_name $rvm_ruby_args"
@@ -10,8 +11,8 @@ __rvm_run_script() {
   return $?
 }
 
-__rvm_parse_args() {
-
+__rvm_parse_args()
+{
   # TODO:
   #       Make this more robust '__rvm_history' so that it stores *unique* rvm commands.
   #       Otherwise this file gets big rather fast.
@@ -594,8 +595,8 @@ __rvm_parse_args() {
   fi
 }
 
-rvm() {
-
+rvm()
+{
   local result
 
   __rvm_setup

data/scripts/completion

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 # bash completion for Ruby Version Manager (RVM)
 
 __rvm_comp()

data/scripts/db

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-usage() {
+usage()
+{
   printf "
 
   Usage:

data/scripts/default

@@ -6,7 +6,8 @@ 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
 
-usage() {
+usage()
+{
   printf "
 
   Usage:
@@ -32,11 +33,13 @@ usage() {
 "
 }
 
-default_list() {
+default_list()
+{
   :
 }
 
-default_clear() {
+default_clear()
+{
   :
 }
 

data/scripts/disk-usage

@@ -4,26 +4,29 @@
 rvm_base_except="selector"
 source "$rvm_path/scripts/base"
 
-usage() {
+usage()
+{
   printf "Usage: 'rvm disk-usage {all,archives,repos,sources,logs,packages,rubies,gemsets}'\n"
   printf "       Lists the space rvm uses for a given item.\n"
   exit 1
 }
 
-disk_usage_for_directory() {
+disk_usage_for_directory()
+{
   du -hs "$1" | awk '{print $1}'
 }
 
-disk_usage() {
-  local current_path
-  eval "current_path=\"\$rvm_${2}_path\""
+disk_usage()
+{
+  local current_path="$rvm_path/$2"
   if [[ -n "$current_path" && -d "$current_path" && "$current_path" != "/" ]]; then
     echo "$1 Usage: $(disk_usage_for_directory "$current_path")"
   fi
   return 0
 }
 
-all_disk_usage() {
+all_disk_usage()
+{
   archives_disk_usage
   repos_disk_usage
   sources_disk_usage
@@ -34,12 +37,13 @@ all_disk_usage() {
   total_disk_usage
 }
 
-total_disk_usage() {
+total_disk_usage()
+{
   echo "Total Disk Usage: $(disk_usage_for_directory "$rvm_path")"
 }
 
 archives_disk_usage() { disk_usage "Downloaded Archives" "archives"; }
-repos_disk_usage()    { disk_usage "Repositories" "repo"; }
+repos_disk_usage()    { disk_usage "Repositories" "repos"; }
 sources_disk_usage()  { disk_usage "Extracted Source Code" "src"; }
 logs_disk_usage()     { disk_usage "Log Files" "log"; }
 packages_disk_usage() { disk_usage "Packages" "usr"; }

data/scripts/docs

@@ -22,7 +22,8 @@ if [[ ! -d "${rvm_docs_path:-"$rvm_path/docs"}" ]] ; then
 
 fi
 
-usage() {
+usage()
+{
   printf "
 
   Usage:
@@ -33,7 +34,8 @@ usage() {
   return 0
 }
 
-open_docs() {
+open_docs()
+{
   if [[ -s "${rvm_docs_path:-"$rvm_path/docs"}/$rvm_docs_ruby_string/$rvm_docs_type/index.html" ]] ; then
 
     if command -v open >/dev/null ; then
@@ -57,7 +59,8 @@ open_docs() {
   fi
 }
 
-generate_ri() {
+generate_ri()
+{
   # Generate ri docs
   (
     builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_docs_ruby_string/"
@@ -70,7 +73,8 @@ generate_ri() {
   )
 }
 
-generate_rdoc() {
+generate_rdoc()
+{
   (
     builtin cd "${rvm_src_path:-"$rvm_path/src"}/$rvm_docs_ruby_string/"
 

data/scripts/env

@@ -4,7 +4,8 @@ unset rvm_default_flag # Recursive loops, oh my!
 
 source "$rvm_path/scripts/base"
 
-usage() {
+usage()
+{
   printf "
   Usage:
 

data/scripts/environment-convertor

@@ -7,7 +7,8 @@ unset GREP_OPTIONS
 
 source "$rvm_path/scripts/base"
 
-convert_path_to_fish() {
+convert_path_to_fish()
+{
   local parts path_parts
 
   path_part="$1"
@@ -23,19 +24,23 @@ end
   return 0
 }
 
-convert_unset_to_fish() {
+convert_unset_to_fish()
+{
   sed 's#^unset #set -e #'
 }
 
-convert_exports_to_fish() {
+convert_exports_to_fish()
+{
   sed -e "s#:#' '#g" -e "s#^\\(export \\)\\{0,1\\}\\([^[:space:]]*\\)=#set -x \\2 #"
 }
 
-contents_of_environment_file() {
+contents_of_environment_file()
+{
   cat "$rvm_path/environments/$(__rvm_environment_identifier)"
 }
 
-convert_to_shell() {
+convert_to_shell()
+{
   convert_path_to_fish "$(contents_of_environment_file | \grep '^export PATH=')"
   while read -r shell_line; do
     if echo "$shell_line" | \grep -q '^unset '; then
@@ -47,7 +52,8 @@ convert_to_shell() {
   unset shell_line
 }
 
-ensure_has_shell() {
+ensure_has_shell()
+{
   for item in "path" "unset" "exports"; do
     command -v "convert_${item}_to_${1}" >/dev/null || return 1
   done; unset item

data/scripts/fetch

@@ -9,14 +9,13 @@ result=0
 # Set it to cleanup the download on interruption.
 trap 'cleanup_download' 1 2 3 15
 
-cleanup_download() {
-
+cleanup_download()
+{
   [[ -f "$archive" ]] && rm -f "$archive"
-
 }
 
-record_md5() {
-
+record_md5()
+{
   if [[ "Darwin" = "$(uname)" ]] || [[ "FreeBSD" = "$(uname)" ]]; then
 
     archive_md5="$(/sbin/md5 -q "${archive}")"

data/scripts/gemsets

@@ -6,7 +6,8 @@ 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
 
-usage() {
+usage()
+{
   printf "
   Usage:
 
@@ -23,7 +24,8 @@ usage() {
 "
 }
 
-gemset_update() {
+gemset_update()
+{
 
   if [[ -z "$rvm_ruby_strings" ]]; then
 
@@ -46,8 +48,8 @@ gemset_update() {
   return $?
 }
 
-gemset_globalcache() {
-
+gemset_globalcache()
+{
   local gc_status globalcache_enabled directories directory_name full_directory_path directory_name
 
   if [[ "$1" == "enabled" ]]; then
@@ -135,19 +137,26 @@ gemset_globalcache() {
   fi
 }
 
-gemset_name() {
+gemset_name()
+{
   gemset_dir |  awk -F${rvm_gemset_separator:-"@"} '{print $2}'
   return $?
 }
 
-gemset_dir() {
+gemset_dir()
+{
   echo "$rvm_ruby_gem_home"
   return $?
 }
 
-gemset_create() {
+gemset_create()
+{
   local gem_home gemset gemsets prefix
 
+  if [[ -n "$rvm_ruby_string" ]] ; then
+    __rvm_select
+  fi
+
   prefix=$(echo $rvm_ruby_gem_home | sed 's/'${rvm_gemset_separator:-"@"}'.*$//')
 
   gemsets=(${args[@]})
@@ -155,7 +164,14 @@ gemset_create() {
   for gemset in "${gemsets[@]}" ; do
 
     if [[ "$gemset" == *"${rvm_gemset_separator:-"@"}"* ]]; then
-      "$rvm_path/scripts/log" "error" "Can't do that, it contains a \"${rvm_gemset_separator:-"@"}\"."
+      "$rvm_path/scripts/log" "error" \
+        "Can not create gemset '$gemset', it contains a \"${rvm_gemset_separator:-"@"}\"."
+      continue
+    fi
+
+    if [[ -z "$gemset" || "$gemset" = *"${rvm_gemset_separator:-"@"}" ]] ; then
+      "$rvm_path/scripts/log" "error" \
+        "Can not create gemset '$gemset', Missing name. "
       continue
     fi
 
@@ -184,8 +200,8 @@ gemset_create() {
   return 0
 }
 
-gemset_list() {
-
+gemset_list()
+{
   if [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] ; then __rvm_select ; fi
 
   "$rvm_path/scripts/log" "info" \
@@ -213,8 +229,8 @@ gemset_list() {
   return 0
 }
 
-gemset_delete() {
-
+gemset_delete()
+{
   gemsets=(${args[@]})
 
   if [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] ; then __rvm_select ; fi
@@ -266,8 +282,8 @@ gemset_delete() {
   return 0
 }
 
-gemset_empty() {
-
+gemset_empty()
+{
   local gemdir
 
   if [[ -z "${rvm_ruby_gem_home:-""}" ]] ; then __rvm_select ; fi
@@ -305,7 +321,8 @@ gemset_empty() {
 }
 
 # Migrate gemsets from ruby X to ruby Y
-gemset_copy() {
+gemset_copy()
+{
   local source_ruby destination_ruby source_path destination_path
 
   source_ruby="${args[__array_start]:-""}"
@@ -330,12 +347,14 @@ gemset_copy() {
   destination_path="$(rvm_silence_logging=1 rvm "$destination_ruby" gem env gemdir)"
 
   if [[ -z "$source_path" || ! -d "$source_path" ]]; then
-    "$rvm_path/scripts/log" "error" "Unable to expand '$source_ruby' or directory does not exist."
+    "$rvm_path/scripts/log" "error" \
+      "Unable to expand '$source_ruby' or directory does not exist."
     return 1
   fi
 
   if [[ -z "$destination_path" ]]; then
-    "$rvm_path/scripts/log" "error" "Unable to expand '$destination_ruby'"
+    "$rvm_path/scripts/log" "error" \
+      "Unable to expand '$destination_ruby'"
     return 1
   fi
 
@@ -368,8 +387,8 @@ gemset_copy() {
   fi
 }
 
-gemset_unpack() {
-
+gemset_unpack()
+{
   local gems name directory version versions
 
   directory="${args[$__array_start]}"
@@ -411,7 +430,8 @@ gemset_unpack() {
   return 0
 }
 
-gemset_export() {
+gemset_export()
+{
   local gems name file_name version versions
 
   rvm_file_name="${rvm_file_name:-${gems_args// }}"
@@ -461,8 +481,8 @@ gemset_export() {
   return 0
 }
 
-gemset_import() {
-
+gemset_import()
+{
   unset -f gem
 
   if [[ -n "${rvm_ruby_gem_home:-""}" ]] ; then
@@ -528,8 +548,8 @@ gemset_import() {
   fi
 }
 
-__rvm_parse_gems_args() {
-
+__rvm_parse_gems_args()
+{
   gem="${gems_args/;*}" ; gem_prefix=""
 
   if echo "$gems_args" | grep -q ';' ; then
@@ -572,8 +592,8 @@ __rvm_parse_gems_args() {
 }
 
 # Install a gem
-gem_install() {
-
+gem_install()
+{
   local gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string gem_action
 
   result=0
@@ -676,7 +696,8 @@ gem_install() {
 }
 
 # Output the user's current gem directory.
-gemset_info() {
+gemset_info()
+{
   if [[ ${rvm_user_flag:-0} -eq 1 ]] ; then
     echo $(rvm system ; gem env | grep "\- $HOME" | awk '{print $NF}')
 
@@ -696,7 +717,8 @@ gemset_info() {
   return $?
 }
 
-gemset_prune() {
+gemset_prune()
+{
   local temporary_cache_path live_cache_path gemset_name version versions cached_gem_name cached_file_path
 
   temporary_cache_path="$GEM_HOME/temporary-cache"
@@ -737,7 +759,8 @@ gemset_prune() {
   return 0
 }
 
-gemset_pristine() {
+gemset_pristine()
+{
   if ( unset -f gem ; command -v gem > /dev/null ) ; then
 
     gem pristine --all
@@ -754,8 +777,8 @@ gemset_pristine() {
 }
 
 # Loads the default gemsets for the current interpreter and gemset.
-gemset_initial() {
-
+gemset_initial()
+{
   local gemsets gemset path paths
 
   rvm_gemsets_path="${rvm_gemsets_path:-"$rvm_path/gemsets"}"
@@ -763,8 +786,8 @@ gemset_initial() {
   "$rvm_path/scripts/log" "info" \
     "Importing initial gemsets for $(__rvm_environment_identifier)."
 
-  if [[ ! -d "$rvm_gemsets_path/${rvm_ruby_string//-/\/}" ]] ; then
-    mkdir -p "$rvm_gemsets_path/${rvm_ruby_string//-/\/}" 2>/dev/null
+  if [[ ! -d "$rvm_gemsets_path/${rvm_ruby_string//-//}" ]] ; then
+    mkdir -p "$rvm_gemsets_path/${rvm_ruby_string//-//}" 2>/dev/null
   fi
 
   paths=($(__rvm_ruby_string_paths_under "$rvm_gemsets_path"))