rvm 1.0.5 → 1.0.6

data/binscripts/rvm

@@ -1,11 +1,14 @@
 #!/usr/bin/env bash
 
-rvm_ignore_rvmrc=${rvm_ignore_rvmrc:-0}
-if [[ $rvm_ignore_rvmrc -eq 0 ]]; then
+if [[ ${rvm_ignore_rvmrc:-0} -eq 0 ]]; 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"
+      if grep -q '^\s*rvm .*$' "$rvmrc" ; then
+        printf "\n  Error:
+    $rvmrc is for rvm settings only.
+    rvm CLI may NOT be called from within $rvmrc.
+    Skipping the loading of $rvmrc
+"
         exit 1
       else
         source "$rvmrc"
@@ -14,11 +17,8 @@ if [[ $rvm_ignore_rvmrc -eq 0 ]]; then
   done
 fi
 
-[[ -z "$rvm_prefix" ]] && unset rvm_prefix
-[[ -z "$rvm_path" ]]   && unset rvm_path
-
 # Setup default sandbox value. See scripts/rvm for origin.
-if [[ -z "$rvm_selfcontained" ]]; then
+if [[ ${rvm_selfcontained:-0} -eq 0 ]]; then
   if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
     rvm_selfcontained=0
   else
@@ -26,8 +26,8 @@ if [[ -z "$rvm_selfcontained" ]]; then
   fi
 fi
 
-if [[ -z "$rvm_prefix" ]] ; then
-  if [[ "$rvm_selfcontained" = "0" ]] ; then
+if [[ -z "${rvm_prefix:-""}" ]] ; then
+  if [[ ${rvm_selfcontained:-0} -eq 0 ]] ; then
     rvm_prefix="/usr/local/"
   else
     rvm_prefix="$HOME/."
@@ -35,19 +35,17 @@ if [[ -z "$rvm_prefix" ]] ; then
 fi
 
 # Fix rvm_prefix changes.
-echo "$rvm_prefix" | \grep -vq '\(\/\|\.\)$' && [[ -d "$rvm_prefix/rvm/scripts" ]]
+echo "$rvm_prefix" | grep -vq '\(\/\|\.\)$' && [[ -d "$rvm_prefix/rvm/scripts" ]]
 rvm_prefix_needs_trailing_slash="$?"
 if [[ "$rvm_prefix" = "/usr/local" || "$rvm_prefix_needs_trailing_slash" = "0" ]]; then
   rvm_prefix="$rvm_prefix/"
 fi
-unset rvm_prefix_needs_trailing_slash
 
-if [[ -z "$rvm_path" ]] ; then
+if [[ -z "${rvm_path:-""}" ]] ; then
   rvm_path="${rvm_prefix}rvm"
 fi
-rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 
-source "$rvm_scripts_path/rvm"
+source "$rvm_path/scripts/rvm"
 
 unset rvm_interactive_flag
 

data/binscripts/rvm-prompt

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 add(){
-  token="$1"
+  token=${1:-""}
   eval "${token}_flag=1" ; shift
-  if [[ ! -z "$format" ]] ; then
+  if [[ -n "$format" ]] ; then
     format="${format}-\$${token}"
   else
     format="\$${token}"
@@ -11,8 +11,10 @@ add(){
 }
 
 rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
+
 ruby=$(command -v ruby)
-if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
+
+if [[ -n "$ruby" && -n "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
   unset format
   while [[ $# -gt 0 ]] ; do
     token="$1" ; shift
@@ -44,27 +46,29 @@ if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; the
     exit 0
   fi
 
-  if [[ -n "$interpreter_flag" ]] || [[ ! -z "$unicode_flag" ]] ; then
+  if [[ ${interpreter_flag:-0} -gt 0 || -n "$unicode_flag" ]] ; then
     interpreter="${ruby_string/-*/}"
   fi
 
-  if [[ -n "$version_flag" ]] || [[ ! -z "$unicode_flag" ]] ; then
+  if [[ ${version_flag:-0} -gt 0 || -n "$unicode_flag" ]] ; then
     version="${ruby_string%-*}" ; version="${version#*-}"
   fi
 
-  if [[ -n "$patchlevel_flag" ]] ; then
+  if [[ ${patchlevel_flag:-0} -gt 0 ]] ; then
     patchlevel="${ruby_string##*-}"
   fi
 
-  if [[ -n "$architecture_flag" ]] ; then
+  if [[ ${architecture_flag:-0} -gt 0 ]] ; then
     architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
   fi
 
-  if [[ -n "$gemset_flag" && "$GEM_HOME" =~ ${rvm_gemset_separator} ]] ; then
-    gemset="${rvm_gemset_separator}${GEM_HOME/*${rvm_gemset_separator}/}"
+  if [[ ${gemset_flag:-0} -gt 0 ]] ; then
+    case "${GEM_HOME:-""}" in
+      *${rvm_gemset_separator}*) gemset="${rvm_gemset_separator}${GEM_HOME/*${rvm_gemset_separator}/}" ;;
+    esac
   fi
 
-  if [[ -n "$unicode_flag" ]] ; then
+  if [[ ${unicode_flag:-0} -gt 0 ]] ; then
     case "$interpreter" in
       jruby)    unicode="☯" ;;
       rbx)      unicode="☃" ;;
@@ -75,7 +79,7 @@ if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; the
       mput)     unicode="⎈" ;;
       system)   unicode="➆" ;;
       ruby)
-        case "$version" in
+        case ${version:-""} in
           1.8.6)  unicode="❻"  ;;
           1.8.7)  unicode="❼"  ;;
           1.9.1)  unicode="❶"  ;;
@@ -90,15 +94,15 @@ if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; the
     fi
   fi
 
-  command="prompt=\"$format\""
-  eval "$command"
+  eval "prompt=\"$format\""
+
   echo "$prompt" | sed -e 's#^[[:space:]]*-*##g' -e 's#--*#-#g' -e 's#-*[[:space:]]*$##' -e 's#-'${rvm_gemset_separator}'#'${rvm_gemset_separator}'#'
 
 else
   while [[ $# -gt 0 ]] ; do
     token="$1" ; shift
     case "$token" in
-      s|system)      echo "system"     ;;
+      s|system) echo "system" ;;
     esac
   done
 fi

data/binscripts/rvm-shell

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
 __rvm_shell_lookup_script() {
-  local relative_scripts_dir="$(dirname -- "$(dirname -- "$0")")/scripts"
+  local relative_scripts_dir
+  relative_scripts_dir="$(dirname -- "$(dirname -- "$0")")/scripts"
   for directory in "$rvm_scripts_path" "$HOME/.rvm/scripts" "/usr/local/rvm/scripts" "$relative_scripts_dir"; do
     if [[ -d "$directory" && -s "$directory/rvm" ]]; then
       echo "$directory/rvm"

data/contrib/gemset_snapshot

@@ -1,14 +1,25 @@
 #!/usr/bin/env bash
 
-echo "Snapshotting the current environment gem list into snapshot.gems"
+printf "\nBeginning snapshot of the current environment gem list into snapshot.gems\n"
+
 file_name="snapshot.gems"
-echo '# system snapshot gemset file' > snapshot.gems
-for gem in $(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | \tr ' ' ';') ; do
+
+gems=($(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | \tr ' ' ';'))
+
+for gem in "${gems[@]}" ; do
+
   name="$(echo $gem | awk -F';' '{print $1}')"
-  versions="$(echo $gem | awk -F';' '{print $2}' | sed 's#,# #g')"
-  for version in $versions ; do
+
+  versions=($(echo $gem | awk -F';' '{print $2}' | sed 's#,# #g'))
+
+  for version in "${versions[@]}" ; do
+
     echo "$name -v$version" >> "$file_name"
+
   done ; unset version versions
+
 done ; unset file_name
 
+printf "\nCompleted snapshot of the current environment gem list into snapshot.gems\n"
+
 exit $?

data/contrib/install-system-wide

@@ -1,25 +1,84 @@
 #!/usr/bin/env bash
 
+usage() {
+  printf "
+
+  Usage:
+
+    rvm-install-system-wide [options]
+
+  Options:
+
+    --trace      - Run turn on bash xtrace while the script runs.
+    --debug      - Turn on bash verbose while the script runs.
+    --version X  - Install RVM version X
+    --revision X - Install RVM revision X (sha1)
+    --help       - Display this usage text.
+
+"
+return 0
+}
+
 __rvm_system_wide_permissions() {
   [[ -z "$1" ]] && return 1
+
   chown -R root:"$rvm_group_name" "$1"
+
   chmod -R g+w "$1"
-  [[ -d "$1" ]] && find "$1" -type d -print0 | xargs -n1 -0 chmod g+s
+
+  if [[ -d "$1" ]] ; then
+    find "$1" -type d -print0 | xargs -n1 -0 chmod g+s
+  fi
+
+  return 0
 }
 
 # Require root to install it.
 if [[ "$(whoami)" != "root" ]]; then
   echo "Please rerun this installer as root." >&2
   exit 1
+
 # Check for the presence of git.
-elif ! command -v git >/dev/null 2>&1 ; then
+elif [[ -z "$(command -v git)" ]] ; then
   echo "Please ensure git is installed and available in PATH to continue." >&2
   exit 1
+
 elif [[ "$(uname)" != "Linux" ]]; then
   echo "The rvm system wide installer is currently Linux only." >&2
   exit 1
 fi
 
+while [[ $# -gt 0 ]] ; do
+  case $1 in
+    --trace)
+      rvm_trace_flag=1
+      set -o xtrace
+      ;;
+    --debug)
+      rvm_trace_flag=1
+      set -o verbose
+      ;;
+    --version|--revision)
+      if [[ -n "${1:-""}" ]] ; then
+        revision="$1"
+        shift
+      else
+        usage
+        exit 1
+      fi
+      ;;
+    --help)
+      usage
+      exit 0
+      ;;
+    *)
+      usage
+      exit 1
+    ;;
+  esac
+  shift
+done
+
 # Load the rvm config.
 rvm_ignore_rvmrc=${rvm_ignore_rvmrc:-0}
 if [[ $rvm_ignore_rvmrc -eq 0 ]]; then
@@ -41,18 +100,23 @@ echo "Adding $(whoami) the '$rvm_group_name'"
 usermod -a -G "$rvm_group_name" "$(whoami)"
 
 echo "Creating the destination dir and making sure the permissions are correct"
-\mkdir -p "$rvm_path"
+mkdir -p "$rvm_path"
 __rvm_system_wide_permissions "$rvm_path"
 
-\mkdir -p "$rvm_path/src/"
+mkdir -p "$rvm_path/src/"
 builtin cd "$rvm_path/src"
 
-\rm -rf ./rvm/
+rm -rf ./rvm/
 
 git clone --depth 1 git://github.com/wayneeseguin/rvm.git || git clone http://github.com/wayneeseguin/rvm.git
 
 builtin cd rvm
 
+if [[ "${revision:-""}" ]]; then
+  echo "Checking out revision $revision"
+  git checkout $revision
+fi
+
 echo "Running the install script."
 bash ./scripts/install "$@"
 
@@ -65,8 +129,8 @@ for dir in bin share/man; do
 done; unset dir
 
 echo "Generating system wide rvmrc"
-\rm -f /etc/rvmrc
-\touch /etc/rvmrc
+rm -f /etc/rvmrc
+touch /etc/rvmrc
 cat > /etc/rvmrc <<END_OF_RVMRC
 # Setup default configuration for rvm.
 # If an rvm install exists in the home directory, don't load this.'
@@ -78,8 +142,8 @@ fi
 END_OF_RVMRC
 
 echo "Generating $rvm_parent_dir/lib/rvm to load rvm"
-\rm -f "$rvm_parent_dir/lib/rvm"
-\touch "$rvm_parent_dir/lib/rvm"
+rm -f "$rvm_parent_dir/lib/rvm"
+touch "$rvm_parent_dir/lib/rvm"
 cat > "$rvm_parent_dir/lib/rvm" <<END_OF_RVM_SH
 # Automatically source rvm
 if [[ -s "\$HOME/.rvm/scripts/rvm" ]]; then

data/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/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 5
+:patch: 6

data/lib/rvm/environment/tools.rb

@@ -22,7 +22,7 @@ module RVM
       names = {}
       value = rvm(:tools, :strings, *rubies)
       if value.successful?
-        parts = value.stdout.split("\n").map { |l| l.split }
+        parts = value.stdout.split
         rubies.each_with_index do |key, index|
           names[key] = normalize(parts[index])
         end

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   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-07}
+  s.date = %q{2010-09-10}
   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/cli

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-__rvm_usage() { ${PAGER:-less} "${rvm_path:-$HOME/.rvm}/README" ; }
+__rvm_usage() { \less "${rvm_path:-$HOME/.rvm}/README" ; }
 
 __rvm_run_script() {
   local rvm_script_name="${1:-"$rvm_action"}"
@@ -230,13 +230,18 @@ __rvm_parse_args() {
               unset rvm_ruby_interpreter
 
             else
-              if [[ "ruby rbx jruby macruby ree rubinius maglev mput shyouhei ironruby" =~ $next_token ]] ; then
-                rvm_ruby_strings=$next_token
-                rvm_ruby_interpreter=$next_token
-                if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
-              else
-                unset rvm_ruby_interpreter rvm_ruby_strings
-              fi
+              case "$next_token" in
+
+                ruby|rbx|jruby|macruby|ree|rubinius|maglev|mput|shyouhei|ironruby)
+                  rvm_ruby_strings=$next_token
+                  rvm_ruby_interpreter=$next_token
+                  if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
+                ;;
+
+                *)
+                  unset rvm_ruby_interpreter rvm_ruby_strings
+                ;;
+              esac
             fi
           fi
         fi
@@ -248,7 +253,7 @@ __rvm_parse_args() {
 
       specs|tests)
         rvm_action="rake"
-        rvm_ruby_args="$(echo "$rvm_token" | sed -e 's/s$//')"
+        rvm_ruby_args="${rvm_token/%ss/s}"
       ;;
 
       -v|--version)
@@ -409,19 +414,24 @@ __rvm_parse_args() {
 
       --trace|--debug)
         local option=""
+
         rvm_debug_flag=1
 
         for option in verbose errexit noclobber nounset ; do
           set -o $option
         done
+
         if [[ -z "${ZSH_VERSION:-""}" ]] ; then
           set -o errtrace
           set -o pipefail
         fi
 
         if [[ "$rvm_token" = "--trace" ]] ; then
+
           rvm_trace_flag=1
+
           set -o xtrace
+
           if [[ -z "${ZSH_VERSION:-""}" ]] ; then
             export PS4='+${BASH_SOURCE} : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() : }'
           fi
@@ -476,7 +486,7 @@ __rvm_parse_args() {
 
       -C|--configure)
         if [[ ! -z "$next_token" ]] ; then
-          rvm_ruby_configure_flags="$(echo $next_token | sed -e 's#,--# --#g')"
+          rvm_configure_flags="${next_token//,--/ --}"
           if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
 
         else
@@ -485,10 +495,10 @@ __rvm_parse_args() {
         fi
       ;;
 
-      --with-*)    rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token" ;;
-      --without-*) rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token" ;;
-      --enable-*)  rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token" ;;
-      --disable-*) rvm_ruby_configure_flags="$rvm_ruby_configure_flags $rvm_token" ;;
+      --with-*)    rvm_configure_flags="${rvm_configure_flags:-""} $rvm_token" ;;
+      --without-*) rvm_configure_flags="${rvm_configure_flags:-""} $rvm_token" ;;
+      --enable-*)  rvm_configure_flags="${rvm_configure_flags:-""} $rvm_token" ;;
+      --disable-*) rvm_configure_flags="${rvm_configure_flags:-""} $rvm_token" ;;
 
       -I|--include)
         if [[ -z "$next_token" ]] ; then
@@ -591,6 +601,7 @@ __rvm_parse_args() {
 }
 
 rvm() {
+
   local next_token
 
   __rvm_setup
@@ -604,23 +615,27 @@ rvm() {
   fi
 
   # Check that this is the current version.
-  disk_version=$(tail -n 3 < "${rvm_path:-$HOME/.rvm}/lib/VERSION.yml" | sed -e 's/^.*: //g' | \tr "\n" '.' | sed -e 's/\.$//')
+  disk_version="$(awk '/:/{printf $NF"."}' "$rvm_path/lib/VERSION.yml")"
+  disk_version="${disk_version/%.}"
 
   if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
 
-  if [[ "${rvm_version}" != "${disk_version}" ]] && [[ "reload" != "$next_token" ]]; then
+  if [[ "${rvm_version}" != "${disk_version}" && "reload" != "$next_token" ]]; then
     printf "\nA RVM version ${disk_version} is installed yet ${rvm_version} is loaded.\n Please do one of the following:\n  * 'rvm reload'\n  * open a new shell\n  * source your shell init scripts"
     return 1
   fi
 
   __rvm_cleanse_variables
+
   __rvm_load_rvmrc
+
   __rvm_initialize
+
   __rvm_parse_args "$@"
 
   rvm_action="${rvm_action:-usage}"
 
-  export BUNDLE_PATH GEM_HOME GEM_PATH rvm_ruby_string rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_ruby_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd rvm_clang_flag rvm_install_arguments rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_patches_path rvm_patches_path rvm_patchsets_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_ruby_aliases rvm_quiet_flag rvm_silent_flag
+  export BUNDLE_PATH GEM_HOME GEM_PATH rvm_ruby_string rvm_action rvm_bin_flag rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_file_name rvm_gemset_name rvm_head_flag rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_make_flags rvm_proxy rvm_remove_flag rvm_ruby_args rvm_configure_flags rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_name rvm_ruby_version rvm_system_flag rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_patch_names rvm_patch_original_pwd rvm_clang_flag rvm_install_arguments rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_patches_path rvm_patches_path rvm_patchsets_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_ruby_aliases rvm_quiet_flag rvm_silent_flag
 
   result=0