rvm 1.0.4 → 1.0.5

data/scripts/default

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+source "$rvm_scripts_path/base"
+
+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() {
+  printf "
+
+  Usage:
+
+    rvm default [ruby] [environment_id]
+
+  Action:
+
+    {import,export,create,copy,empty,delete,name,dir,list,gemdir,install,pristine,clear,use,update,globalcache}
+
+  Description:
+
+    Commands for working with and manipulating gemsets within RVM.
+
+  Examples:
+    rvm default                # *uses* the default ruby
+    rvm default 1.9.2          # Sets the 'global' default to 1.9.2
+    rvm default list 1.9.2     # displays the environment_id for the current 1.9.2 default
+    rvm default 1.9.2 1.9.2-p0 # sets the default for 'rvm 1.9.2' to p0
+    rvm default clear 1.9.2    # clears the set default for 1.9.2
+    rvm default clear          # removes the current global default
+
+"
+}
+
+default_list() {
+  :
+}
+
+default_clear() {
+  :
+}
+
+
+args=($*)
+action="${args[0]}"
+args=${args[@]:1}
+
+if [[ "list" = "$action" ]] ; then
+  default_list
+
+elif [[ "clear" = "$action" ]] ; then
+  default_clear
+
+elif [[ "help" = "$action" ]] ; then
+  usage ; exit 0
+
+else
+  usage ; exit 1
+fi
+
+exit $?

data/scripts/docs

@@ -36,24 +36,26 @@ open_docs() {
 
 generate_ri() {
   # Generate ri docs
-  __rvm_pushpop "$rvm_src_path/$rvm_docs_ruby_string/"
-  "$rvm_scripts_path"/log "info" "Generating ri documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
-  "$rvm_scripts_path"/log "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )"
-  rdoc -a --ri --ri-site > /dev/null 2>> $rvm_log_path/$rvm_docs_ruby_string/docs.error.log
-  __rvm_pushpop
+  (
+    builtin cd "$rvm_src_path/$rvm_docs_ruby_string/"
+    "$rvm_scripts_path"/log "info" "Generating ri documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
+    "$rvm_scripts_path"/log "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )"
+    rdoc -a --ri --ri-site > /dev/null 2>> $rvm_log_path/$rvm_docs_ruby_string/docs.error.log
+  )
 }
 
 generate_rdoc() {
-  __rvm_pushpop "$rvm_src_path/$rvm_docs_ruby_string/"
-  \rm -rf "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/"
-  "$rvm_scripts_path"/log "info" "Generating rdoc documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
-  "$rvm_scripts_path"/log "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )"
-  if gem list | \grep -q ^hanna ; then
-    hanna -o "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type" --inline-source --line-numbers --fmt=html > /dev/null 2>> "$rvm_log_path/$rvm_docs_ruby_string/docs.error.log"
-  else
-    rdoc -a -o "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type" > /dev/null 2>> "$rvm_log_path/$rvm_docs_ruby_string/docs.error.log"
-  fi
-  __rvm_pushpop
+  (
+    builtin cd "$rvm_src_path/$rvm_docs_ruby_string/"
+    \rm -rf "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/"
+    "$rvm_scripts_path"/log "info" "Generating rdoc documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
+    "$rvm_scripts_path"/log "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )"
+    if gem list | \grep -q ^hanna ; then
+      hanna -o "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type" --inline-source --line-numbers --fmt=html > /dev/null 2>> "$rvm_log_path/$rvm_docs_ruby_string/docs.error.log"
+    else
+      rdoc -a -o "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type" > /dev/null 2>> "$rvm_log_path/$rvm_docs_ruby_string/docs.error.log"
+    fi
+  )
 }
 
 args=($*)

data/scripts/env

@@ -1,14 +1,16 @@
 #!/usr/bin/env bash
 
-if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
-
-# Recursive loops, oh my!
-unset rvm_default_flag
+unset rvm_default_flag # Recursive loops, oh my!
 
 source "$rvm_scripts_path/base"
 
 usage() {
-  printf "Usage: rvm env [ruby_string] [--path]\n"
+  printf "
+  Usage:
+
+    rvm env [ruby_string] [--path]
+
+"
 }
 
 args=($*)

data/scripts/fetch

@@ -8,7 +8,7 @@ result=0
 trap 'cleanup_download' 1 2 3 15
 
 cleanup_download() {
-  [[ -f "$archive" ]] && \rm -rf "$archive"
+  [[ -f "$archive" ]] && rm -rf "$archive"
 }
 
 record_md5() {
@@ -45,22 +45,22 @@ else
   archive=$(basename "$url")
 fi
 
-if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Fetching $archive" ; fi
+if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_scripts_path/log" "debug" "Fetching $archive" ; fi
 
 # Check first if we have the correct archive
 archive_md5="$($rvm_scripts_path/db "$rvm_config_path/md5" "$archive" | head -n1)"
 if [[ -e "$archive" ]] && [[ ! -z "$archive_md5" ]] ; then
-  if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Found archive and its md5, testing correctness" ; fi
+  if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_scripts_path/log" "debug" "Found archive and its md5, testing correctness" ; fi
   if ! "$rvm_scripts_path"/md5 "${rvm_archives_path}/${archive}" "$archive_md5" ; then
-    if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Archive is bad, downloading" ; fi
+    if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_scripts_path/log" "debug" "Archive is bad, downloading" ; fi
     download=1
   else
-    if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Archive is good, not downloading" ; fi
+    if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_scripts_path/log" "debug" "Archive is good, not downloading" ; fi
     download=0
     result=0
   fi ; unset archive_md5
 else
-  if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "No archive or no MD5, downloading" ; fi
+  if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_scripts_path/log" "debug" "No archive or no MD5, downloading" ; fi
   download=1
 fi
 
@@ -68,7 +68,7 @@ fi
 http_url="$(echo $url | sed -e 's/ftp:/http:/' -e 's/git:/http:/')"
 
 if [[ $download -gt 0 ]] ; then
-  \rm -f $archive
+  rm -f $archive
   eval $fetch_command "$url"
   result=$?
   if [[ $result -gt 0 ]] ; then
@@ -79,11 +79,11 @@ if [[ $download -gt 0 ]] ; then
       try_http=1
     elif [[ $result -eq 18 ]] ; then
       "$rvm_scripts_path/log" "error" "Partial file. Only a part of the file was transferred. Removing partial and re-trying."
-      \rm -f "$archive"
+      rm -f "$archive"
       retry=1
     elif [[ $result -eq 33 ]] ; then
-      if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Server does not support 'range' command, removing '$archive'" ; fi
-      \rm -f "$archive"
+      if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_scripts_path/log" "debug" "Server does not support 'range' command, removing '$archive'" ; fi
+      rm -f "$archive"
       retry=1
     else
       "$rvm_scripts_path/log" "error" "There was an error, please check $rvm_ruby_log_path/*.error.log. Next we'll try to fetch via http."

data/scripts/gemsets

@@ -199,35 +199,44 @@ gemset_empty() {
 
 # Migrate gemsets from ruby X to ruby Y
 gemset_copy() {
-  local source_ruby="${gems_args/ */}"
-  local destination_ruby="${gems_args/* /}"
+  local source_ruby="${args[1]:-""}"
+  local destination_ruby="${args[2]:-""}"
 
   if [[ -z "$destination_ruby" || -z "$source_ruby" ]] ; then
     "$rvm_scripts_path/log" "error" "Source and destination must be specified: 'rvm gemset copy X Y'"
     return 1
   fi
 
+  # TODO: Account for more possibilities:
+  #   rvm gemset copy 1.9.2 @gemsetb        # From 1.9.2 default to current ruby, 1.9.2 exists.
+  #   rvm gemset copy @gemseta @gemsetb     # Current ruby, gemseta exists.
+  #   rvm gemset copy gemseta gemsetb       # Currenty Ruby, gemseta exists.
+  #   rvm gemset copy gemseta 1.8.7@gemsetb # Currenty Ruby@gemseta, current ruby@gemseta exists.
+
   local source_path="$(rvm_silence_logging=1 rvm "$source_ruby" gem env gemdir)"
   local destination_path="$(rvm_silence_logging=1 rvm "$destination_ruby" gem env gemdir)"
 
-  if [[ -z "$source_path" ]]; then
-    "$rvm_scripts_path/log" "error" "Unable to expand ruby '$source_ruby'"
+  if [[ -z "$source_path" || ! -d "$source_path" ]]; then
+    "$rvm_scripts_path/log" "error" "Unable to expand '$source_ruby' or directory does not exist."
     return 1
   fi
 
   if [[ -z "$destination_path" ]]; then
-    "$rvm_scripts_path/log" "error" "Unable to expand ruby '$destination_ruby'"
+    "$rvm_scripts_path/log" "error" "Unable to expand '$destination_ruby'"
     return 1
   fi
 
   if [[ -d "$source_path" ]] ; then
-    [[ ! -d "$destination_path" ]] && mkdir -p "$destination_path"
+
     "$rvm_scripts_path/log" "info" "Copying gemset from $source_ruby to $destination_ruby"
+
     for dir in bin doc gems specifications cache ; do
       mkdir -p "$destination_path/$dir"
       cp -Rf "$source_path/$dir" "$destination_path/"
     done
+
     "$rvm_scripts_path/log" "info" "Making gemset for $destination_ruby pristine."
+
     __rvm_run_with_env "gemset.pristine" "$destination_ruby" "rvm gemset pristine"
   else
     "$rvm_scripts_path/log" "error" "Gems directory does not exist for $source_path ($source_path)"
@@ -236,7 +245,7 @@ gemset_copy() {
 }
 
 gemset_export() {
-  rvm_file_name="${rvm_file_name:-$gems_args}"
+  rvm_file_name="${rvm_file_name:-${gems_args// }}"
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     export GEM_HOME="$rvm_ruby_gem_home"
@@ -503,7 +512,7 @@ args=($*)
 action="${args[0]}"
 gems_args="$(echo ${args[@]:1}) " # Strip trailing / leading / extra spacing.
 
-export rvm_gemset_name="${args[1]}" # For wherever used.
+export rvm_gemset_name="${args[1]:-""}" # For wherever used.
 rvm_sticky_flag=1
 
 if [[ "import" = "$action" ]] || [[ "load" = "$action" ]] ; then

data/scripts/hook

@@ -5,7 +5,7 @@ declare rvm_hook=${rvm_hook:-""}
 
 if [[ -n "$rvm_hook" ]] ; then
   if [[ -s "$rvm_hooks_path/$rvm_hook" ]] ; then
-    if [[ $rvm_verbose_flag -eq 1 ]] || [[ "$rvm_debug_flag" -eq 1 ]] ; then
+    if [[ ${rvm_verbose_flag:-0} -gt 0 || ${rvm_debug_flag:-0} -gt 0 ]] ; then
       "$rvm_scripts_path/log" "info" "running hook $rvm_hook"
     fi
     source "$rvm_hooks_path/$rvm_hook"

data/scripts/info

@@ -5,12 +5,14 @@ if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 source "$rvm_scripts_path/base"
 source "$rvm_scripts_path/version"
 
-rvm_ruby_gem_home="${rvm_ruby_gem_home:-$GEM_HOME}"
+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
 
+rvm_info=""
+
 version_for() {
   local binary=$1
   if command -v "$binary" >/dev/null ; then
@@ -21,84 +23,101 @@ version_for() {
 }
 
 info_system() {
-  rvm_info="$rvm_info\n  system:\n    uname:       \"$(uname -a)\""
-  rvm_info="$rvm_info\n    bash:        \"$(command -v bash) => $(version_for bash)\""
-  rvm_info="$rvm_info\n    zsh:         \"$(command -v zsh) => $(version_for zsh)\""
-  rvm_info="$rvm_info\n"
+  rvm_info="
+  system:
+    uname:       \"$(uname -a)\"
+    bash:        \"$(command -v bash) => $(version_for bash)\"
+    zsh:         \"$(command -v zsh) => $(version_for zsh)\"
+"
 }
 
 info_rvm() {
-  rvm_info="$rvm_info\n  rvm:"
-  rvm_info="$rvm_info\n    version:      \"$(__rvm_version | \tr "\n" ' ' | __rvm_strip)\""
-  rvm_info="$rvm_info\n"
+  rvm_info="
+  rvm:
+    version:      \"$(__rvm_version | \tr "\n" ' ' | __rvm_strip)\"
+"
+
 }
 
 info_ruby() {
   [[ "$(__rvm_environment_identifier)" == "system" ]] && return
   ruby=$(command -v ruby)
   if [[ $? -eq 0 ]] && [[ -x "$ruby" ]] ; then full_version="$($ruby -v)" ; fi
-  rvm_info="$rvm_info\n  ruby:"
-  rvm_info="$rvm_info\n    interpreter:  \"$(printf "${full_version}" | awk '{print $1}')\""
-  rvm_info="$rvm_info\n    version:      \"$(printf "${full_version}" | awk '{print $2}')\""
-  rvm_info="$rvm_info\n    date:         \"$(printf "${full_version}" | sed 's/^.*(\([0-9]\{4\}\(-[0-9][0-9]\)\{2\}\).*$/\1/')\""
-  rvm_info="$rvm_info\n    platform:     \"$(printf "${full_version}" | sed 's/^.*\[//' | sed 's/\].*$//')\""
-  rvm_info="$rvm_info\n    patchlevel:   \"$(printf "${full_version}" | sed 's/^.*(//' | sed 's/).*$//')\""
-  rvm_info="$rvm_info\n    full_version: \"${full_version}\""
-  rvm_info="$rvm_info\n"
+  rvm_info="
+  ruby:
+    interpreter:  \"$(printf "${full_version}" | awk '{print $1}')\"
+    version:      \"$(printf "${full_version}" | awk '{print $2}')\"
+    date:         \"$(printf "${full_version}" | sed 's/^.*(\([0-9]\{4\}\(-[0-9][0-9]\)\{2\}\).*$/\1/')\"
+    platform:     \"$(printf "${full_version}" | sed 's/^.*\[//' | sed 's/\].*$//')\"
+    patchlevel:   \"$(printf "${full_version}" | sed 's/^.*(//' | sed 's/).*$//')\"
+    full_version: \"${full_version}\"
+"
+
 }
 
 info_homes() {
-  rvm_info="$rvm_info\n  homes:"
-  rvm_info="$rvm_info\n    gem:          \"${GEM_HOME:-"not set"}\""
-  rvm_info="$rvm_info\n    ruby:         \"${MY_RUBY_HOME:-"not set"}\""
-  rvm_info="$rvm_info\n"
+  rvm_info="
+  homes:
+    gem:          \"${GEM_HOME:-"not set"}\"
+    ruby:         \"${MY_RUBY_HOME:-"not set"}\"
+"
 }
 
 info_binaries() {
-  rvm_info="$rvm_info\n  binaries:"
-  rvm_info="$rvm_info\n    ruby:         \"$(command -v ruby)\""
-  rvm_info="$rvm_info\n    irb:          \"$(command -v irb)\""
-  rvm_info="$rvm_info\n    gem:          \"$(command -v gem)\""
-  rvm_info="$rvm_info\n    rake:         \"$(command -v rake)\""
-  rvm_info="$rvm_info\n"
+  rvm_info="
+  binaries:
+    ruby:         \"$(command -v ruby)\"
+    irb:          \"$(command -v irb)\"
+    gem:          \"$(command -v gem)\"
+    rake:         \"$(command -v rake)\"
+"
 }
 
 info_environment() {
-  rvm_info="$rvm_info\n  environment:"
-  rvm_info="$rvm_info\n    PATH:         \"$PATH\""
-  rvm_info="$rvm_info\n    GEM_HOME:     \"$GEM_HOME\""
-  rvm_info="$rvm_info\n    GEM_PATH:     \"$GEM_PATH\""
-  rvm_info="$rvm_info\n    BUNDLE_PATH:  \"$BUNDLE_PATH\""
-  rvm_info="$rvm_info\n    MY_RUBY_HOME: \"$MY_RUBY_HOME\""
-  rvm_info="$rvm_info\n    IRBRC:        \"$IRBRC\""
-  rvm_info="$rvm_info\n    RUBYOPT:      \"$RUBYOPT\""
-  rvm_info="$rvm_info\n    gemset:       \"$(printf "$GEM_HOME" | awk -F${rvm_gemset_separator:-'@'} '{print $2}')\"\n"
-  if [[ ! -z "$MAGLEV_HOME" ]] ; then
+  rvm_info="
+  environment:
+    PATH:         \"${PATH:-""}\"
+    GEM_HOME:     \"${GEM_HOME:-""}\"
+    GEM_PATH:     \"${GEM_PATH:-""}\"
+    BUNDLE_PATH:  \"${BUNDLE_PATH:-""}\"
+    MY_RUBY_HOME: \"${MY_RUBY_HOME:-""}\"
+    IRBRC:        \"${IRBRC:-""}\"
+    RUBYOPT:      \"${RUBYOPT:-""}\"
+    gemset:       \"$(printf "${GEM_HOME:-""}" | awk -F${rvm_gemset_separator:-'@'} '{print $2}')\"\n
+"
+
+  if [[ -n "${MAGLEV_HOME:-""}" ]] ; then
     rvm_info="$rvm_info\n  MAGLEV_HOME: \"$MAGLEV_HOME\""
   fi
+
   rvm_info="$rvm_info\n"
 }
 
 info_debug() {
-  rvm_info=$(__rvm_version)
-  rvm_info="$rvm_info\n$("$rvm_scripts_path/info" "$rvm_ruby_string" "" )"
-  rvm_info="$rvm_info\nPATH:\n$(printf "$PATH" | awk -F":" '{print $1":"$2":"$3":"$4":"$5}' )"
-  rvm_info="$rvm_info\nuname -a: $(uname -a)"
-  rvm_info="$rvm_info\npermissions: $(\ls -la $rvm_path{,/rubies})"
+  rvm_info="
+
+$(__rvm_version)
+  $("$rvm_scripts_path/info" "$rvm_ruby_string" "" )
+  PATH:\n$(printf "$PATH" | awk -F":" '{print $1":"$2":"$3":"$4":"$5}' )
+  uname -a: $(uname -a)
+  permissions: $(\ls -la $rvm_path{,/rubies})
+"
 
   if [[ "Darwin" = "$(uname)" ]] ; then
-    rvm_info="$rvm_info\nuname -r: $(uname -r)"
-    rvm_info="$rvm_info\nuname -m: $(uname -m)"
-    rvm_info="$rvm_info\nsw_vers: $(sw_vers | \tr "\n" ',')"
-    rvm_info="$rvm_info\nARCHFLAGS: $ARCHFLAGS"
-    rvm_info="$rvm_info\nLDFLAGS: $LDFLAGS"
-    rvm_info="$rvm_info\nCFLAGS: $CFLAGS"
-    rvm_info="$rvm_info\n/Developer/SDKs/*:$(/usr/bin/basename -a /Developer/SDKs/* | \tr "\n" ',')"
+    rvm_info="$rvm_info
+  uname -r: $(uname -r)
+  uname -m: $(uname -m)
+  sw_vers: $(sw_vers | \tr "\n" ',')
+  ARCHFLAGS: ${ARCHFLAGS:-""}
+  LDFLAGS: ${LDFLAGS:-""}
+  CFLAGS: ${CFLAGS:-""}
+  /Developer/SDKs/*:$(/usr/bin/basename -a /Developer/SDKs/* | \tr "\n" ',')
+"
   fi
 
-  for file_name in $(echo $rc_files) ; do
+  for file_name in "$HOME/.bashrc" "$HOME/.bash_profile" "$HOME/.zshenv" ; do
     if [[ -s "$file_name" ]] ; then
-      rvm_info="$rvm_info\n$( "$file_name:\n$(\grep 'rvm' $file_name 2>/dev/null)" )"
+      rvm_info="$rvm_info\n$file_name:\n$(\grep 'rvm' $file_name 2>/dev/null || true)"
     fi
   done
 
@@ -114,12 +133,12 @@ info_debug() {
     fi
   done
 
-  rvm_info="$rvm_info\ngem sources:\n$(gem sources | awk '/gems/')"
+  rvm_info="$rvm_info\ngem sources:\n$(gem sources | awk '/gems/')\n\n"
 }
 
 info_sections() {
   for section in $(printf "${sections//,/ }") ; do
-    unset rvm_info ; "info_${section}" ; printf "$rvm_info"
+    rvm_info="" ; "info_${section}" ; printf "$rvm_info"
   done
 }
 
@@ -137,12 +156,12 @@ fi
 if [[ -z "${sections// /}" ]] ; then sections="$all_sections" ; fi
 
 if [[ -z "$ruby_strings" ]] ; then
-  printf "$(__rvm_environment_identifier):\n"
+  printf "\n$(__rvm_environment_identifier):\n"
   info_sections
 else
   for ruby_string in $(printf ${ruby_strings//,/ }) ; do
     __rvm_become "$ruby_string"
-    printf "$(__rvm_environment_identifier):\n"
+    printf "\n$(__rvm_environment_identifier):\n"
     info_sections
   done
 fi