rvm 0.1.1 → 0.1.2

data/config/db

@@ -11,9 +11,9 @@ ree_version=1.8.7
 ree_1.8.6_patch_level=20090610
 ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677
 ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
-ree_1.8.7_url=http://rubyforge.org/frs/download.php/66162
+ree_1.8.7_url=http://rubyforge.org/frs/download.php/68719
 ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
-ree_1.8.7_patch_level=2009.10
+ree_1.8.7_patch_level=2010.01
 ruby_1.9.1_patch_level=378
 ruby_1.9.2_patch_level=preview1
 ruby_1.8.5_patch_level=231

data/install

@@ -67,9 +67,7 @@ rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
 rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
 
-for path in src scripts bin log archives config gem ; do
-  eval "mkdir -p '\$rvm_${path}_path/'"
-done
+mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gem_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path $rvm_symlink_path
 
 for file in README LICENCE ; do
   cp -f "$source_path/$file" "$rvm_path/"

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 1
+:patch: 2

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-01-19}
+  s.date = %q{2010-01-24}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/cli

@@ -8,7 +8,7 @@ __rvm_parse_args() {
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      fetch|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline|monitor|notes)
+      fetch|path|info|setup|version|srcdir|list|rubies|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline|monitor|notes)
         rvm_action=$rvm_token
       ;;
 
@@ -379,6 +379,7 @@ rvm() {
     use)           __rvm_use                 ; result=$?  ;;
     srcdir)        __rvm_source_dir          ; result=$?  ;;
     list)          __rvm_list                ; result=$?  ;;
+    rubies)        __rvm_rubies              ; result=$?  ;;
     version)       __rvm_version             ; result=$?  ;;
     reset)         __rvm_reset               ; result=$?  ;;
     implode)       __rvm_implode             ; result=$?  ;;

data/scripts/gems

@@ -171,6 +171,7 @@ __rvm_parse_gem_line() {
   fi
 }
 
+# Install a gem
 __rvm_gem_install() {
   __rvm_parse_gem_line $*
 
@@ -236,8 +237,8 @@ __rvm_gem_install() {
   return $result
 }
 
+# Output the user's current gem directory.
 __rvm_gems_gemdir() {
-
   if [[ "$rvm_user_flag" -eq 1 ]] ; then
     echo $(rvm system ; gem env | grep "\- $HOME" | awk '{print $NF}')
   elif [[ "$rvm_system_flag" -eq 1 ]] ; then

data/scripts/install

@@ -67,9 +67,7 @@ rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
 rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
 
-for path in src scripts bin log archives config gem ; do
-  eval "mkdir -p '\$rvm_${path}_path/'"
-done
+mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gem_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path $rvm_symlink_path
 
 for file in README LICENCE ; do
   cp -f "$source_path/$file" "$rvm_path/"

data/scripts/manage

@@ -16,7 +16,6 @@ __rvm_install_source() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   $rvm_scripts_path/log "info" "Installing Ruby from source to: $rvm_ruby_home"
-  mkdir -p "$rvm_ruby_log_path"
   __rvm_pushpop "$rvm_src_path"
   if [[ ! -z "$rvm_force_flag" ]] ; then rm -rf "$rvm_ruby_home" "$rvm_ruby_src_path" ; fi
 
@@ -148,11 +147,15 @@ PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH" ; export PATH
 exec $macruby_path/mac$binary_name $prefix "\$@"
 RubyWrapper
 )
+
           for file_name in "$rvm_ruby_home/bin/$binary_name" "$rvm_bin_path/$binary_name-$rvm_ruby_string" ; do
             rm -f $file_name
             echo "$ruby_wrapper" > $file_name
             if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
           done
+          if [[ "$binary_name" = "ruby" ]] ; then
+            echo "$ruby_wrapper" > $rvm_bin_path/$rvm_ruby_string
+          fi
           unset file_name ruby_wrapper binary_name files prefix
         done
         __rvm_irbrc
@@ -186,7 +189,6 @@ RubyWrapper
         fi
         builtin cd "$rvm_ruby_src_path"
 
-        mkdir -p "$rvm_ruby_log_path"
         mkdir -p "${rvm_ruby_home}/lib/ruby/gems/1.8/gems"
         if [[ ! -z "$rvm_ruby_configure_flags" ]] ; then
           rvm_ruby_configure_flags="$(echo $rvm_ruby_configure_flags | sed 's#--#-c --#g')"
@@ -340,7 +342,6 @@ RubyWrapper
         echo -e "java must be installed and in your path in order to install JRuby." ; return 1
       fi
 
-      mkdir -p "$rvm_ruby_log_path"
       __rvm_pushpop $rvm_src_path
       __rvm_fetch_ruby
       result=$? ; if [[ "$result" -gt 0 ]] ; then
@@ -388,7 +389,6 @@ RubyWrapper
         $rvm_scripts_path/log "error" "Prerequisite checks have failed. Aborting the installation." ; __rvm_pushpop ; return $result
       fi
 
-      mkdir -p "$rvm_ruby_log_path"
       __rvm_pushpop $rvm_src_path
 
       if [[ ! -d "$rvm_src_path/$rvm_ruby_string" ]] || [[ ! -z "$rvm_force_flag" ]] ; then
@@ -424,8 +424,8 @@ RubyWrapper
         $rvm_scripts_path/log "error" "There has been an error while trying to extract the gemstone package. Aborting the installation." ; __rvm_pushpop ; return $result
       fi
 
-      mv "$rvm_gemstone_package_file" "gemstone"
-      chmod -R 777 gemstone # for now.
+      chmod -R 777 "$rvm_gemstone_package_file" # for now.
+      ln -nfs "$rvm_gemstone_package_file" "gemstone"
 
       __rvm_pushpop
 
@@ -453,14 +453,14 @@ RubyWrapper
       #ln -fs "$rvm_ruby_home/$(echo $rvm_gemstone_package_file | awk -F'.' '{print $1}')" "$rvm_ruby_home/gemstone"
 
       if [[ ! -e ${rvm_ruby_home}/etc/conf.d/maglev.conf ]] ; then
-        $rvm_scripts_path/log "info" "Creating default 'maglev' repository." ; __rvm_pushpop ; return $result
-        $rvm_bin_path/rvm 1.8.7 rake "stone:create[maglev]" >/dev/null
+        $rvm_scripts_path/log "info" "Creating default 'maglev' repository."
+        $rvm_bin_path/rvm 1.8.7 rake "stone:create[maglev]" >/dev/null 2>&1
       fi
 
-      $rvm_scripts_path/log "info" "Generating maglev HTML documentation" ; __rvm_pushpop ; return $result
+      $rvm_scripts_path/log "info" "Generating maglev HTML documentation"
       $rvm_bin_path/rvm 1.8.7 rake rdoc >/dev/null 2>&1
 
-      $rvm_scripts_path/log "info" "Generating smalltalk FFI." ; __rvm_pushpop ; return $result
+      $rvm_scripts_path/log "info" "Generating smalltalk FFI."
       $rvm_bin_path/rvm 1.8.7 rake stwrappers >/dev/null 2>&1
 
 
@@ -479,9 +479,11 @@ RubyWrapper
       if [[ "$rvm_head_flag" = 1 ]] ; then
           mono_version="$(mono -V | head -n 1 | cut -d ' ' -f5)"
           if $rvm_scripts_path/match "$mono_version" "([0-9]+)\.([0-9]+)\.?([0-9]+)?" ; then
-            if [[ ${BASH_REMATCH[1]} -lt 2 ]] || ( [[ ${BASH_REMATCH[1]} -eq 2 ]] && [[ ${BASH_REMATCH[2]} -lt 6 ]] ) ; then
+            mono_major_ver="$(echo $mono_version | cut -d '.' -f1)"
+            mono_minor_ver="$(echo $mono_version | cut -d '.' -f2)"
+            if [[ $mono_major_ver -lt 2 ]] || ( [[ $mono_major_ver -eq 2 ]] && [[ $mono_minor_ver -lt 6 ]] ) ; then
               echo -e "Mono 2.6 (or greater) must be installed and in your path in order to build IronRuby from the repository."
-              echo -e "Version detected: ${BASH_REMATCH[0]}"
+              echo -e "Version detected: ${mono_version}"
               return 1
             fi
           else
@@ -503,8 +505,8 @@ RubyWrapper
 
           cp -r $rvm_ruby_src_path/Merlin/Main/Bin/mono_release/* $rvm_ruby_home/bin/
           cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Scripts/bin/* $rvm_ruby_home/bin/
-          cp -r $rvm_ruby_src_path/Merlin/External.LCA_RESTRICTED/Languages/Ruby/ruby-1.8.6p*/lib/ruby/* $rvm_ruby_home/lib/ruby
-          cp -r $rvm_ruby_src_path/ruby_home/lib/IronRuby
+          cp -r $rvm_ruby_src_path/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/* $rvm_ruby_home/lib/ruby
+          cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Libs/* $rvm_ruby_home/lib/IronRuby
       else
         $rvm_scripts_path/log "info" "Retrieving IronRuby"
         $rvm_scripts_path/fetch "$rvm_url"
@@ -545,6 +547,9 @@ RubyWrapper
           echo "$ruby_wrapper" > $file_name
           if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
         done
+        if [[ "$binary_name" = "ruby" ]] ; then
+          echo "$ruby_wrapper" > $rvm_bin_path/$rvm_ruby_string
+        fi
         unset file_name ruby_wrapper binary_name binary_path files prefix
       done
     ;;

data/scripts/rvm-install

@@ -67,9 +67,7 @@ rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
 rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
 
-for path in src scripts bin log archives config gem ; do
-  eval "mkdir -p '\$rvm_${path}_path/'"
-done
+mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gem_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path $rvm_symlink_path
 
 for file in README LICENCE ; do
   cp -f "$source_path/$file" "$rvm_path/"

data/scripts/selector

@@ -208,6 +208,8 @@ __rvm_select() {
 
     rvm_ruby_selected_flag=1
 
+    mkdir -p $rvm_ruby_log_path
+
     export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_configure_flags rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string
   else
     rvm_ruby_interpreter="${rvm_ruby_interpreter:-system}"

data/scripts/update

@@ -67,9 +67,7 @@ rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
 rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
 
-for path in src scripts bin log archives config gem ; do
-  eval "mkdir -p '\$rvm_${path}_path/'"
-done
+mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gem_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path $rvm_symlink_path
 
 for file in README LICENCE ; do
   cp -f "$source_path/$file" "$rvm_path/"

data/scripts/utility

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# Query the rvm key-value database for a specific key
+# Allow overrides from user specifications in $rvm_config_path/user
 __rvm_db() {
   key=$1 ; variable=$2
   if [[ -f "$rvm_config_path/user" ]] ; then
@@ -20,6 +22,7 @@ __rvm_db() {
   unset key value variable
 }
 
+# Ouput rvm environment information.
 __rvm_info() {
   if [[ ! -z "$(which ruby 2>/dev/null)" ]] ; then full_version=$(ruby -v) ; fi
 
@@ -51,10 +54,12 @@ environment:
   MY_RUBY_HOME: "$MY_RUBY_HOME"
   IRBRC:        "$IRBRC"
 Info
+if [[ ! -z "$MAGLEV_HOME" ]] ; then echo "  MAGLEV_HOME: $MAGLEV_HOME" ; fi
 
   unset full_version
 }
 
+# Output debugging information that has been found useful to help people identify and resolve issues.
 __rvm_debug() {
   $rvm_scripts_path/log "debug" "PATH:\n$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}')"
   $rvm_scripts_path/log "debug" "uname -a: $(uname -a)"
@@ -90,7 +95,10 @@ __rvm_debug() {
   $rvm_scripts_path/log "debug" "gem sources:\n$(gem sources | awk '/gems/')"
 }
 
+# ZSH has 1 based array indexing, bash has 0 based.
 if [[ ! -z "$ZSH_VERSION" ]] ; then __shell_array_start=1 ; else __shell_array_start=0 ; fi
+
+# Push an item onto a given array.
 __rvm_push() {
   array=$1 ; shift ; item=$2
   # TODO: allow loop over more arguments.
@@ -99,30 +107,29 @@ __rvm_push() {
   unset array item
 }
 
+# Clean all *duplicate* items out of the path. (keep first occurrence of each)
 __rvm_clean_path() {
   PATH=$(echo $PATH | tr -s ':' '\n' | awk '!($0 in a){a[$0];print}' | tr -s '\n' ':' | sed 's#:$##')
   export PATH
 }
 
+# Clean all rvm items out of the current working path.
 __rvm_remove_rvm_from_path() {
   PATH=$(echo $PATH | tr -s ':' '\n' | grep -v "\.rvm" | tr -s '\n' ':' | sed 's#:$##')
   export PATH
 }
 
-__rvm_gi() { gem install $rvm_gem_options $* ; }
-
+# Run a specified command and log it.
 __rvm_run() {
   log_file_name="$1" ; command="$2" ; message="$3"
-  rvm_ruby_log_path="${rvm_ruby_log_path:-$rvm_log_path}"
-  mkdir -p $(dirname "$rvm_ruby_log_path/$log_file_name.log")
-
+  if [[ -z "$rvm_ruby_log_path" ]] ; then rvm_ruby_log_path="$rvm_log_path" ; fi
   if [[ ! -z "$message" ]] ; then $rvm_scripts_path/log "info" "$message" ; fi
   if [[ ! -z "$rvm_debug_flag" ]] ; then
     $rvm_scripts_path/log "debug" "Executing: $command"
   fi
 
   touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :(
-  echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee "$rvm_ruby_log_path/$log_file_name.log" > "$rvm_ruby_log_path/$log_file_name.error.log"
+  echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee "$rvm_ruby_log_path/$log_file_name.log" >> "$rvm_ruby_log_path/$log_file_name.error.log"
   if [[ -z "$rvm_niceness" ]] || [[ "0" = "$rvm_niceness" ]] ; then
     eval "$command" >> "$rvm_ruby_log_path/$log_file_name.log" 2>> "$rvm_ruby_log_path/$log_file_name.error.log"
   else
@@ -132,6 +139,8 @@ __rvm_run() {
   unset log_file command
 }
 
+# Unset both rvm variables as well as ruby-specific variables
+# Preserve gemset if 'rvm_sticky_gems' is set (persist gemset unless clear is explicitely called).
 __rvm_cleanup_variables() {
   __rvm_unset_ruby_variables
 
@@ -140,6 +149,7 @@ __rvm_cleanup_variables() {
   unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits
 }
 
+# Unset ruby-specific variables
 __rvm_unset_ruby_variables() {
   unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_patch rvm_ruby_package_file rvm_ruby_package_name
 }
@@ -149,6 +159,7 @@ __rvm_load_rvmrc() {
   if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 }
 
+# Loop over the currently installed rubies and refresh their binscripts.
 __rvm_bin_scripts() {
   for rvm_ruby_binary in $rvm_rubies_path/*/bin/ruby ; do
   if [[ -x "$rvm_ruby_binary" ]] ; then
@@ -159,6 +170,8 @@ __rvm_bin_scripts() {
   done
 }
 
+# Write the bin/ wrapper script for currently selected ruby.
+# TODO: Adjust binscript to be able to handle all rubies not just the standard interpreteres.
 __rvm_bin_script() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 ruby_wrapper=$(cat <<RubyWrapper
@@ -178,6 +191,7 @@ RubyWrapper
   chmod +x $rvm_bin_path/$rvm_ruby_package_name
 }
 
+# Load default ruby, if default is not set load system ruby.
 __rvm_load_defaults() {
   if [[ ! -s "$rvm_config_path/system" ]] ; then
     for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME ; do
@@ -217,6 +231,8 @@ __rvm_load_defaults() {
   fi
 }
 
+# Reset any rvm gathered information about the system and its state.
+# rvm will refresh the stored information the next time it is called after reset.
 __rvm_reset() {
   PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
   PATH=$rvm_bin_path:$PATH ; export PATH
@@ -238,6 +254,7 @@ __rvm_reset() {
   rm -f $rvm_bin_path/ruby $rvm_bin_path/gem $rvm_bin_path/rake $rvm_bin_path/irb $rvm_bin_path/default*
 }
 
+# Implode removes the entire rvm installation under $rvm_path.
 __rvm_implode() {
   while : ; do
     $rvm_scripts_path/log "warn" "Are you SURE you wish for rvm to implode? This will remove $rvm_path ? (type 'yes' or 'no')"
@@ -262,6 +279,7 @@ __rvm_implode() {
   done
 }
 
+# Output the current ruby's rvm source path.
 __rvm_source_dir() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
   if [[ -z "$rvm_ruby_src_path" ]] ; then
@@ -271,6 +289,15 @@ __rvm_source_dir() {
   fi
 }
 
+# List all rvm installed rubies.
+# This is meant to be used with scripting.
+__rvm_rubies() {
+  \ls $rvm_rubies_path
+}
+
+# List all rvm installed rubies, default ruby and system ruby.
+# Display the rubies, indicate their architecture and indicate which is currently used.
+# This is not meant to be used with scripting. This is for interactive mode usage only.
 __rvm_list() {
   echo
   if [[ ! -z "$rvm_all_flag" ]] ; then
@@ -298,7 +325,9 @@ __rvm_list() {
 
     for version in $(\ls $rvm_rubies_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
       if [[ ! -z "$(echo $version | awk '/^jruby-/')" ]] ; then
-        string="$($rvm_rubies_path/$version/bin/ruby -v | awk '{print $NF}')"
+        string="[ $($rvm_rubies_path/$version/bin/ruby -v | awk '{print $NF}') ]"
+      elif [[ ! -z "$(echo $version | awk '/^maglev-/')" ]] ; 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
@@ -342,6 +371,7 @@ __rvm_list() {
   echo
 }
 
+# Initialize rvm, ensuring that the path and directories are as expected.
 __rvm_initialize() {
   rvm_ruby_load_path="."
   rvm_ruby_require=""
@@ -355,6 +385,7 @@ __rvm_initialize() {
   mkdir -p $rvm_src_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $rvm_tmp_path
 }
 
+# Update rubygems or binscripts based on CLI selection.
 __rvm_update() {
   __rvm_pushpop $rvm_path
   if [[ "head" = "$rvm_ruby_revision" ]] || [[ ! -z "$rvm_self_flag" ]] || [[ "update" = "$rvm_action" ]] || [[ ! -z "$rvm_update_flag" ]] ; then
@@ -368,6 +399,8 @@ __rvm_update() {
   __rvm_pushpop
 }
 
+# Update rvm using rubygems
+# If --head was specified, update from git repository master branch.
 __rvm_update_rvm() {
   mkdir -p "$rvm_src_path"
   __rvm_pushpop "$rvm_src_path"
@@ -422,6 +455,7 @@ __rvm_reboot() {
   fi ; unset response
 }
 
+# Perform an action using one of a selected ruby's specified binaries.
 __rvm_ruby_do() {
   __rvm_select
   __rvm_use
@@ -481,6 +515,8 @@ __rvm_ruby_do() {
   __rvm_unset_ruby_variables
 }
 
+# Loop over a set or all rvm installed rubies to perform some action.
+# Record the results and report based on CLI selections.
 __rvm_do() {
   __rvm_state
 
@@ -516,6 +552,7 @@ __rvm_do() {
   return ${#errors[*]}
 }
 
+# Output the summary in a human readable format.
 __rvm_summary() {
   export successes errors statuses
   summary="\nSummary:\n\n"
@@ -531,6 +568,7 @@ __rvm_summary() {
   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:"
@@ -552,6 +590,7 @@ __rvm_yaml() {
   return ${#errors[*]}
 }
 
+# Output the summary in a json format.
 __rvm_json() {
   json="{"
   json="$json\n  \"totals\": { \"rubies\": ${#rubies[*]}, \"successes\": ${#successes[*]}, \"errors\": ${#errors[*]}},"
@@ -576,6 +615,7 @@ __rvm_json() {
   return ${#errors[*]}
 }
 
+# Wrap the specified ruby code file in a Benchmark.bmbm block and execute it.
 __rvm_benchmark() {
   code="require \"benchmark\" \n Benchmark.bmbm do |benchmark| \n benchmark.report(\"${rvm_ruby_file}\") do \n"
   echo -e "$code" > "$rvm_tmp_path/$$.rb"
@@ -589,13 +629,14 @@ __rvm_benchmark() {
   __rvm_do
 }
 
+# Create the irbrc for the currently selected ruby installation.
 __rvm_irbrc() {
-  # Create the irbrc for the currently selected ruby installation.
   if [[ -d "$rvm_ruby_home" ]] && [[ ! -s "$rvm_ruby_irbrc" ]] ; then
     cp $rvm_scripts_path/irbrc $rvm_ruby_irbrc
   fi
 }
 
+# Push or Pop a directory based on zero or one directory argument provided.
 __rvm_pushpop() {
   if [[ -z "$1" ]] ; then
     popd > /dev/null 2>&1
@@ -604,6 +645,8 @@ __rvm_pushpop() {
   fi
 }
 
+# Save or restore the rvm's state. This is a toggle action.
+# Meant for use before and after an operation that might reset the currently selected ruby.
 __rvm_state() {
   if [[ -z "$rvm_state" ]] ; then
     if [[ -z "$(which ruby 2>/dev/null | awk /$(basename $rvm_rubies_path)/)" ]] ; then
@@ -619,6 +662,7 @@ __rvm_state() {
   fi
 }
 
+# Output an inspection of selected 'binary' scripts, based on CLI selection.
 __rvm_inspect() {
   for binary in $rvm_ruby_args ; do
     actual_file="$(which $binary 2>/dev/null)"
@@ -632,6 +676,8 @@ __rvm_inspect() {
   done
 }
 
+# Attempt to override the Darwin build settings for rubies
+# This should only be used in extreme edge cases that will not work via the default way.
 __rvm_make_flags() {
   # This is only an issue with Darwin :/
   if [[ "Darwin" = "$(uname)" ]] ; then
@@ -667,6 +713,8 @@ __rvm_make_flags() {
   fi
 }
 
+# Select a gems(et) based on CLI set options and environment.
+# This only sets 'rvm_ruby_gem_home'
 __rvm_gems_select() {
   if [[ -z "$(which gem 2>/dev/null)" ]] ; then return 0 ; fi
 
@@ -701,6 +749,7 @@ __rvm_gems_select() {
   fi
 }
 
+# Use a gems(et) specified by 'rvm_ruby_gem_home'
 __rvm_gems_use() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 -05:00
+date: 2010-01-24 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []