rvm 0.0.44 → 0.0.45

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 44
+:patch: 45

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.44"
+  s.version = "0.0.45"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-09-18}
+  s.date = %q{2009-09-20}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "lib/VERSION.yml",
      "lib/rvm.rb",
      "rvm.gemspec",
+     "scripts/gemsync",
      "scripts/rvm",
      "scripts/rvm-aliases",
      "scripts/rvm-cli",

data/scripts/gemsync

@@ -0,0 +1,21 @@
+#/bin/bash
+#
+# gemsync - Standalone gemsync utility.
+#
+# Example:
+#   gemsync --from 1.8.6 -m foo --to 1.9.1 -m bar
+#
+source ~/.bash_profile # load rvm
+
+from_string=`echo "$@" | sed 's/--/;/g' | tr ';' "\n" | awk '/from/ {print}' | sed 's/from//'`
+to_string=`echo "$@" | sed 's/--/;/g' | tr ';' "\n" | awk '/to/ {print}' | sed 's/to//'`
+
+if [ -z "$from_string" ] ; then echo "Invalid arguments. Missing --from <ruby selector>" ; exit 1 ; fi
+if [ -z "$to_string" ] ; then echo "Invalid arguments. Missing --to <ruby selector>" ; exit 1 ; fi
+
+ # first we use where we want.
+rvm $to_string
+
+# Then we sync from the source.
+rvm sync $from_string
+

data/scripts/rvm-cli

@@ -106,10 +106,14 @@ function __rvm_parse-args {
   while [ $# -gt 0 ] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      install|uninstall|remove|path|info|setup|version|srcdir|list|symlinks|reset|debug|reload|usage|help|implode|update|readline|iconv|benchmark|bench|use)
+      install|uninstall|path|info|setup|version|srcdir|list|symlinks|reset|debug|reload|usage|help|implode|update|readline|iconv|benchmark|bench|use|sync)
         rvm_action=$rvm_token
       ;;
 
+      rm|remove)
+        rvm_action=remove
+      ;;
+
       system|default)
         rvm_action=${rvm_action:-use}
         rvm_ruby_interpreter="$rvm_token"
@@ -147,7 +151,7 @@ function __rvm_parse-args {
 
       do|rubydo|rakedo|gemdo)
         rvm_action=$rvm_token
-        if [ "$rvm_action" = "do" ] ; then rvm_action="do" ; fi
+        if [ "$rvm_action" = "do" ] ; then rvm_action="rubydo" ; fi
         temp=$(echo $1 | awk '{print substr($1, 0, 1)}')
         if [ "$temp" = "-" ] ; then
           unset rvm_ruby_version
@@ -298,6 +302,7 @@ function __rvm_parse-args {
         rvm_ruby_interpreter="system"
       ;;
 
+      --install)         rvm_install_on_use=1              ;;
       --prefix)          rvm_prefix_path="$1"      ; shift ;;
       -G|--gems)         rvm_gem_path="$1"         ; shift ;;
       --source)          rvm_source_path="$1"      ; shift ;;
@@ -352,12 +357,12 @@ function __rvm_parse-args {
     if [ ! -z "$rvm_parse_break" -o ! -z "$rvm_error_message" ] ; then unset rvm_parse_break; break; fi
   done
 
-  if [ ! -z "$rvm_error_message" ] ; then popd 2> /dev/null ; return 1 ; fi
+  if [ ! -z "$rvm_error_message" ] ; then __rvm_pushpop ; return 1 ; fi
 }
 
 function rvm {
 
-  __rvm_cleanup-variables
+  __rvm_cleanup_variables
   __rvm_load-rvmrc
   __rvm_initialize
   __rvm_load-defaults
@@ -366,7 +371,7 @@ function rvm {
   if [ -z "$rvm_debug_flag" ] ; then set +x ; else set -x ; fi
   result=0
   case "$rvm_action" in
-    install)    __rvm_install-ruby     ; result=$? ;;
+    install)    __rvm_install          ; result=$? ;;
     uninstall)  __rvm_uninstall        ; result=$? ;;
     remove)     __rvm_remove           ; result=$? ;;
     use)        __rvm_use              ; result=$? ;;
@@ -388,6 +393,12 @@ function rvm {
     bench|benchmark)  __rvm_benchmark  ; result=$? ;;
     rubydo|rakedo|gemdo) __rvm_do      ; result=$? ;;
 
+    sync)
+      result=0
+      rvm_source_gem_path=`__rvm_select ; echo $rvm_gem_home`
+      __rvm_gem_sync
+    ;;
+
     tests|specs)
       rvm_summary_flag=1
       rvm_action="rake"
@@ -401,7 +412,7 @@ function rvm {
       result=0
     ;;
 
-    error)      __rvm_log "fail" "$rvm_error_message ( see: 'rvm usage' )" ; popd 2> /dev/null ; return 1; ;;
+    error)      __rvm_log "fail" "$rvm_error_message ( see: 'rvm usage' )" ; __rvm_pushpop ; return 1; ;;
     *)
       if [ ! -z "$rvm_action" ] ; then
         __rvm_log "fail"  "unknown action '$rvm_action'"

data/scripts/rvm-install

@@ -15,15 +15,20 @@ source_dir="${source_dir:-$cwd}"
 rvm_dir=~/.rvm
 
 echo -e "\nInstalling rvm to ~/.rvm/ ..."
-for dir in src scripts bin log archives config gems examples ; do
-  mkdir -p $rvm_dir/$dir
+for dir_name in src scripts bin log archives config gems examples ; do
+  mkdir -p $rvm_dir/$dir_name
 done
-for dir in config scripts examples lib ; do
-  mkdir -p $rvm_dir/$dir
-  /bin/cp -Rf $source_dir/$dir $rvm_dir
-done
-cp $source_dir/scripts/rvm-prompt $rvm_dir/bin/
-chmod +x $rvm_dir/bin/rvm-prompt
+
+for dir_name in config scripts examples lib ; do
+  mkdir -p $rvm_dir/$dir_name
+  /bin/cp -Rf $source_dir/$dir_name $rvm_dir
+done ; unset dir_name
+
+for file_name in rvm-prompt gemsync ; do
+  mv $rvm_dir/scripts/$file_name $rvm_dir/bin/
+  chmod +x $rvm_dir/bin/$file_name
+done ; unset file_name
+
 
 # State what is required to use rvm
 echo -e "\n\033[0;32mrvm\033[0m is a shell script that allows a user to manage multiple ruby versions in their own account."

data/scripts/rvm-ruby-installer

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function __rvm_install-source {
+function __rvm_install_source {
 
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
@@ -8,7 +8,7 @@ function __rvm_install-source {
   __rvm_log "info" "Installing Ruby from source to: $rvm_ruby_home"
   mkdir -p $rvm_ruby_log_path
 
-  pushd $rvm_source_path > /dev/null
+  __rvm_pushpop $rvm_source_path
 
   if [ ! -z "$rvm_force_flag" ] ; then
     rm -rf $rvm_ruby_home
@@ -72,7 +72,7 @@ function __rvm_install-source {
   fi
 
   cd $rvm_ruby_src_path
-  if [ $? -gt 0 ] ; then result=$? ; __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd > /dev/null ; return $result ; fi
+  if [ $? -gt 0 ] ; then result=$? ; __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; __rvm_pushpop ; return $result ; fi
 
   if [ ! -s "$rvm_ruby_src_path/configure" -a "$rvm_ruby_interpreter" = "ruby" ] ; then
     rvm_autoconf=`which autoconf`
@@ -122,13 +122,36 @@ function __rvm_install-source {
   __rvm_rubygems_setup
   __rvm_bin_script
   __rvm_run "chmod.bin" chmod +x $rvm_ruby_home/bin/*
-
-  popd > /dev/null
-
   __rvm_post_install
+  __rvm_pushpop
+}
+
+function __rvm_install {
+# TODO: Extract the outer looping mechanism with ruby_do's
+  rubies=() ; successes=() ; errors=() ; statuses=()
+  # TODO: Extract the common functionality out of the if below
+  if [ ! -z "$(echo "$rvm_ruby_version" | awk '/,/')" ] ; then
+    rvm_ruby_versions=`echo $rvm_ruby_version | tr ',' ' '`
+    for rvm_ruby_string in $rvm_ruby_versions ; do
+      unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_home rvm_ruby_binary rvm_ruby_package_name rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected
+      if [ ! -z "$(echo $rvm_ruby_selector | awk '/^[0-9]/')" ] ; then
+        rvm_ruby_interpreter="ruby"
+        rvm_ruby_version="$rvm_ruby_selector"
+      else
+        rvm_ruby_interpreter="$rvm_ruby_selector"
+        unset rvm_ruby_version
+      fi
+      __rvm_log "debug" $rvm_ruby_string
+      __rvm_select
+      __rvm_install_ruby
+    done
+  else
+    __rvm_select
+    __rvm_install_ruby
+  fi
 }
 
-function __rvm_install-ruby {
+function __rvm_install_ruby {
 
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
   if [ ! -z "$RUBYOPT" ]    ; then ruby_options=$RUBYOPT ; unset RUBYOPT ; fi
@@ -163,18 +186,18 @@ function __rvm_install-ruby {
         fi
         #__rvm_fetch $rvm_url
         #__rvm_run /usr/sbin/installer -pkg $rvm_ruby_package_name.pkg -target "$rvm_path/$rvm_ruby_package_name/"
-        __rvm_install-source
+        __rvm_install_source
         unset DESTDIR
       else
         __rvm_log "fail" "MacRuby can only be installed on a Darwin OS."
       fi
+      __rvm_irbrc
     ;;
 
     ruby-enterprise|ree)
-      __rvm_select
       rvm_url="http://rubyforge.org/frs/download.php/58677/$rvm_ruby_package_name.tar.gz"
       __rvm_log "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
-      pushd $rvm_source_path > /dev/null
+      __rvm_pushpop $rvm_source_path
       if [ -d $rvm_ruby_src_path ]  ; then
         cd $rvm_ruby_src_path
       else
@@ -204,13 +227,13 @@ function __rvm_install-ruby {
         __rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q
       done
 
+      __rvm_irbrc
       __rvm_bin_scripts
-
-      popd > /dev/null
+      __rvm_post_install
+      __rvm_pushpop
     ;;
 
     rbx|rubinius)
-      # TODO: check if system is 1.8.X otherwise use rvm's 1.8.X and check for parsetree, install if missing
       unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
       PATH="$rvm_system_path" ; export PATH
       rvm_ruby_repo_url=$rvm_rubinius_repo_url
@@ -227,17 +250,25 @@ function __rvm_install-ruby {
         git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_home
       fi
       cd $rvm_ruby_home
+
+      # prereqs, 1.8.6 w/ParseTree & rake. Yes this could all be one line... not pushing our luck.
+      bash -l -c 'rvm 1.8.6 --debug --install' # This should install if missing.
+      bash -l -c 'rvm 1.8.6 -m rbx ; $rvm_ruby_home/bin/gem install --no-rdoc --no-ri rake ParseTree' # This should install if missing.
+      rake186rbx=`rvm 1.8.6 -m rbx ; which rake`
       if [ ! -z "$rvm_jit_flag" ]; then
-        __rvm_run "build" RBX_LLVM=1 rake build
+        __rvm_run "build" RBX_LLVM=1 $rake186rbx build
       else
-        __rvm_run "build" rake build
+        __rvm_run "build" $rake186rbx build
       fi
+      unset rake186rbx
+
       for binary in ruby irb ; do
         ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary
       done
       $rvm_ruby_home/bin/rbx -S gem install rake --no-rdoc --no-ri
 
-      ruby_wrapper=$(cat <<RubyWrapper
+      for binary_name in gem rake ; do
+        ruby_wrapper=$(cat <<RubyWrapper
 #!/bin/bash
 
 GEM_HOME="$rvm_gem_home" ; export GEM_HOME
@@ -245,15 +276,16 @@ GEM_PATH="$rvm_gem_home" ; export GEM_PATH
 MY_RUBY_HOME="$rvm_ruby_home" ; export MY_RUBY_HOME
 PATH="$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH" ; export PATH
 
-exec $rvm_ruby_home/bin/rbx -S gem "\$@"
+exec $rvm_ruby_home/bin/rbx -S $binary_name "\$@"
 RubyWrapper
 )
-      echo "$ruby_wrapper" > $rvm_bin_path/gem-$rvm_ruby_package_name
-      echo "$ruby_wrapper" > $rvm_ruby_home/bin/gem
-      unset ruby_wrapper
-      chmod +x $rvm_bin_path/$rvm_ruby_package_name
-      chmod +x $rvm_ruby_home/bin/gem
-
+        for file_name in $rvm_bin_path/gem-$rvm_ruby_package_name $rvm_ruby_home/bin/gem ; do
+          echo "$ruby_wrapper" > $file_name
+          if [ -f $file_name ] ; then chmod +x $file_name ; fi
+        done
+        unset ruby_wrapper binary_name file_name
+      done
+      __rvm_irbrc
       __rvm_bin_scripts
     ;;
 
@@ -262,9 +294,9 @@ RubyWrapper
       rvm_url="http://dist.codehaus.org/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.zip"
       rvm_jruby_repo_url="${rvm_jruby_repo_url:-"git://kenai.com/jruby~main"}"
 
-      __rvm_log "info" "Installing jRuby to: $rvm_ruby_home"
+      __rvm_log "info" "Installing JRuby to: $rvm_ruby_home"
       mkdir -p $rvm_ruby_log_path
-      pushd $rvm_source_path > /dev/null
+      __rvm_pushpop $rvm_source_path
 
       if [ ! -z "$rvm_ruby_rev" ] ; then
         if [ ! -d $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version -o ! -d $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version/.git ] ; then
@@ -275,8 +307,12 @@ RubyWrapper
         if [ -d $rvm_ruby_src_path ]  ; then
           cd $rvm_ruby_src_path
         else
-          __rvm_log "info" "\tDownloading $rvm_package_file, this may take a while depending on your connection..."
-          __rvm_fetch $rvm_url
+          if [ -z "$rvm_force_flag" -a -f $rvm_package_file -a -s $rvm_package_file ] ; then
+            __rvm_log "info" "\tIt appears that $rvm_package_file has already been downloaded, skipping. Use --force to force re-download."
+          else
+            __rvm_log "info" "\tDownloading $rvm_package_file, this may take a while depending on your connection..."
+            __rvm_fetch $rvm_url
+          fi
           __rvm_log "info" "\tExtracting $rvm_package_file..."
           rvm_unzip=`which unzip`
           if [ $? -ne 0 ] ; then
@@ -292,16 +328,17 @@ RubyWrapper
       mkdir -p $rvm_ruby_home/bin/
       __rvm_run "sync" rsync -ag $rvm_ruby_src_path/ $rvm_ruby_home/
       __rvm_run "nailgun" cd $rvm_ruby_src_path/tool/nailgun && make $rvm_make_flags
-      popd > /dev/null
+      __rvm_pushpop
       chmod +x $rvm_ruby_home/bin/*
       for binary in jruby jgem jirb ; do
         ln -fs $rvm_ruby_home/bin/$binary $rvm_ruby_home/bin/${binary#j}
       done
 
+      __rvm_irbrc
       __rvm_bin_scripts
 
       ln -fs $rvm_ruby_home/bin/ruby $rvm_path/bin/$rvm_ruby_package_name
-      for rvm_gem_name in rake jruby-openssl ; do
+      for rvm_gem_name in jruby-openssl ; do
         __rvm_log "info" "Installing $rvm_gem_name"
         __rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q
       done
@@ -311,7 +348,7 @@ RubyWrapper
         # Merge configure options with user specified options
         rvm_ruby_configure="--enable-shared=true --enable-pthread $rvm_ruby_configure "
         if [ "`uname`" = "Darwin" ] ; then ARCHFLAGS="-arch x86_64 -arch i386" ; export ARCHFLAGS ; fi
-      __rvm_install-source $*
+      __rvm_install_source $*
     ;;
 
     default)
@@ -351,7 +388,6 @@ function __rvm_remove {
 }
 
 function __rvm_uninstall {
-
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
   if [ ! -z "$rvm_ruby_package_name" ] ; then
@@ -376,9 +412,11 @@ function __rvm_uninstall {
 function __rvm_post_install {
 
   for binary in gem irb erb ri rdoc testrb rake ; do
-    if [ -f $rvm_ruby_src_path/bin/$binary ] ; then
-      if [ "$rvm_ruby_src_path" != "$rvm_ruby_home" ] ; then
-        cp $rvm_ruby_src_path/bin/$binary $rvm_ruby_home/bin/$binary
+    if [ -f $rvm_ruby_home/bin/$binary -o -f $rvm_ruby_src_path/bin/$binary ] ; then
+      if [ "$rvm_ruby_src_path" != "$rvm_ruby_home" -a $rvm_ruby_src_path/bin/$binary] ; then
+        cp -f $rvm_ruby_src_path/bin/$binary $rvm_ruby_home/bin/$binary
+      elif [ -f "$rvm_gem_home/bin/$binary" ] ; then
+        cp -f $rvm_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
       fi
       string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_gem_home/bin:' + ENV['PATH']"
       awk "NR==2 {print \"$string\"} {print}" $rvm_ruby_home/bin/$binary > $rvm_ruby_home/bin/$binary.new
@@ -415,7 +453,6 @@ function __rvm_post_install {
 }
 
 function __rvm_rubygems_setup {
-
   if [ "`echo $rvm_ruby_version | awk '{print substr($1, 0, 3)}'`" != "1.9" ] ; then
     __rvm_log "info" "\tInstalling rubygems dedicated to $rvm_ruby_package_name..."
     rvm_gem_package_name="rubygems-1.3.5"

data/scripts/rvm-selector

@@ -134,9 +134,6 @@ function __rvm_select {
 
     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_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_gem_home rvm_path rvm_source_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_source_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected rvm_ruby_string
 
-    if [ ! -z "$rvm_load_flag" ] ; then __rvm_gemset_load ; fi
-    if [ ! -z "$rvm_dump_flag" ] ; then __rvm_gemset_dump ; fi
-
   else
     rvm_gem_home=$GEM_HOME
   fi
@@ -218,5 +215,8 @@ function __rvm_use {
       unset rvm_default_flag
     fi
   fi
+
+  if [ ! -z "$rvm_load_flag" ] ; then __rvm_gemset_load ; fi
+  if [ ! -z "$rvm_dump_flag" ] ; then __rvm_gemset_dump ; fi
 }
 

data/scripts/rvm-update

@@ -15,15 +15,20 @@ source_dir="${source_dir:-$cwd}"
 rvm_dir=~/.rvm
 
 echo -e "\nInstalling rvm to ~/.rvm/ ..."
-for dir in src scripts bin log archives config gems examples ; do
-  mkdir -p $rvm_dir/$dir
+for dir_name in src scripts bin log archives config gems examples ; do
+  mkdir -p $rvm_dir/$dir_name
 done
-for dir in config scripts examples lib ; do
-  mkdir -p $rvm_dir/$dir
-  /bin/cp -Rf $source_dir/$dir $rvm_dir
-done
-cp $source_dir/scripts/rvm-prompt $rvm_dir/bin/
-chmod +x $rvm_dir/bin/rvm-prompt
+
+for dir_name in config scripts examples lib ; do
+  mkdir -p $rvm_dir/$dir_name
+  /bin/cp -Rf $source_dir/$dir_name $rvm_dir
+done ; unset dir_name
+
+for file_name in rvm-prompt gemsync ; do
+  mv $rvm_dir/scripts/$file_name $rvm_dir/bin/
+  chmod +x $rvm_dir/bin/$file_name
+done ; unset file_name
+
 
 # State what is required to use rvm
 echo -e "\n\033[0;32mrvm\033[0m is a shell script that allows a user to manage multiple ruby versions in their own account."

data/scripts/rvm-utility

@@ -3,6 +3,9 @@
 function __rvm_info {
 cat <<Info
 
+system:
+  uname: "$(uname -a)"
+
 ruby:
   interpreter:  "`ruby -v | awk '{print $1}'`"
   version:      "`ruby -v | awk '{print $2}'`"
@@ -29,34 +32,33 @@ Info
 }
 
 function __rvm_debug {
+  __rvm_log "debug" "\nPATH:\n$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}')"
 
-  __rvm_log "info" "PATH:$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}')"
-
-  for file in .bash_profile .bashrc .zshrc ; do
-    if [ -s $file ] ; then
-      __rvm_log "debug" "~/$file:\n$(grep rvm ~/$file)\n"
+  for file_name in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
+    if [ -s $file_name ] ; then
+      __rvm_log "debug" "\n$file_name:\n$(grep 'rvm' $file_name)"
     fi
   done
 
-  if [ -s $rvm_path/default ] ; then
-    __rvm_log "debug" "$rvm_path/default:\n$($rvm_path/default)\n"
-  fi
+  for file_name in $rvm_path/default $rvm_path/system $rvm_path/config/db ~/.rvmrc ~/.gemrc; do
+    if [ -f $file_name -a -s $file_name ] ; then
+      __rvm_log "debug" "$file_name (filtered):\n$(cat $file_name | awk '!/assword|_key/')\n"
+    fi
+  done
 
-  if [ -e $rvm_path/bin/rvm ] ; then
-    __rvm_log "debug" "rvm script in bin:\n$(ls -laht $rvm_path/bin/rvm)"
+  if [ -f $rvm_path/bin/rvm ] ; then
+    __rvm_log "error" "rvm script in bin! \n$(ls -laht $rvm_path/bin/rvm)"
   fi
-
 }
 
 # Logging functions based on level
 function __rvm_log {
-
   case "$1" in
-    debug) shift ; echo -e "\033[0;35m <d> \033[0m $*" ;;
-    info)  shift ; echo -e "\033[0;32m <i> \033[0m $*" ;;
-    warn)  shift ; echo -e "\033[0;33m <w> \033[0m $*" ;;
-    error) shift ; echo -e "\033[0;31m <e> \033[0m $*" ;;
-    fail)  shift ; echo -e "\033[0;31m <e> \033[0m $*" ; popd 2> /dev/null ; return 1 ;;
+    debug) shift ; echo -e "\033[0;35m<debug> \033[0m $* \033[0;35m</debug> \033[0m " ;;
+    info)  shift ; echo -e "\033[0;32m<info> \033[0m $* \033[0;32m</info> \033[0m " ;;
+    warn)  shift ; echo -e "\033[0;33m<warning> \033[0m $* \033[0;33m</warning> \033[0m " ;;
+    error) shift ; echo -e "\033[0;31m<error> \033[0m $* \033[0;31m</error> \033[0m " ;;
+    fail)  shift ; echo -e "\033[0;31m<fail> \033[0m $* \033[0;31m</fail> \033[0m " ; __rvm_pushpop ; return 1 ;;
     *) echo -e "$*"
   esac
 }
@@ -86,12 +88,12 @@ function __rvm_run {
   else
     eval "nice -n $rvm_niceness /bin/bash -l -c '$command'" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
   fi
-  if [ $? -gt 0 ] ; then __rvm_log "error" "Error running '$command', please check $rvm_ruby_log_path/$log_file_name.error.log" ; popd 2> /dev/null ; return 1 ; fi
+  if [ $? -gt 0 ] ; then __rvm_log "error" "Error running '$command', please check $rvm_ruby_log_path/$log_file_name.error.log" ; __rvm_pushpop ; return 1 ; fi
   unset log_file command
 }
 
-function __rvm_cleanup-variables {
-  unset rvm_selected rvm_action rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_irbrc_file rvm_ruby_irbrc rvm_source_path rvm_path rvm_prefix_path rvm_ruby_package_name rvm_gem_path rvm_command rvm_error_message rvm_ruby_home rvm_ruby_binary rvm_gem_set_name rvm_ruby_tag rvm_ruby_rev rvm_url rvm_ruby_make rvm_ruby_configure rvm_ruby_make_install rvm_config_path rvm_ruby_string rvm_bin_path 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_install_on_use
+function __rvm_cleanup_variables {
+  unset rvm_selected rvm_action rvm_ruby_interpreter rvm_ruby_patch_level rvm_ruby_version rvm_irbrc_file rvm_ruby_irbrc rvm_source_path rvm_path rvm_prefix_path rvm_ruby_package_name rvm_gem_path rvm_command rvm_error_message rvm_ruby_home rvm_ruby_binary rvm_gem_set_name rvm_ruby_tag rvm_ruby_rev rvm_url rvm_ruby_make rvm_ruby_configure rvm_ruby_make_install rvm_config_path rvm_ruby_string rvm_bin_path 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_install_on_use rvm_json_flag rvm_yaml_flag
 }
 
 # TODO: root user loadng of /etc/rvmrc
@@ -101,7 +103,7 @@ function __rvm_load-rvmrc {
 
 function __rvm_bin_scripts {
   # NOTE: This depends on the forthcoming ruby_string select functionality.
-  rvm_ruby_binaries=`/bin/ls $rvm_path/*/bin/ruby`
+  rvm_ruby_binaries=`/bin/ls $rvm_path/*/bin/ruby 2> /dev/null`
   for rvm_ruby_binary in $rvm_ruby_binaries ; do
     if [ -x $rvm_ruby_binary ] ; then
       rvm_ruby_string=`dirname $rvm_ruby_binary | xargs dirname | xargs basename`
@@ -131,7 +133,7 @@ RubyWrapper
 
 function __rvm_fetch {
 
-  pushd $rvm_archives_path > /dev/null
+  __rvm_pushpop $rvm_archives_path
   eval $rvm_fetch "$1"
   result=$?
   if [ $result -gt 0 ] ; then
@@ -141,7 +143,7 @@ function __rvm_fetch {
       __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
     fi
   fi
-  popd 2> /dev/null
+  __rvm_pushpop
   return $result
 }
 
@@ -259,33 +261,38 @@ function __rvm_src-dir {
 }
 
 # clones from source implementation/version to default
+# TODO: Merge this into 'rvm sync'
 function __rvm_gem-dup {
     __rvm_log "debug" "$rvm_ruby_interpreter"
   if [ "$rvm_ruby_interpreter" = "default" ] ; then
     # TODO: ~/.rvm/default first, then system user
-    rvm_source_gem_dir="$rvm_system_user_gem_path"
+    rvm_source_gem_path="$rvm_system_user_gem_path"
   elif [ "$rvm_ruby_interpreter" = "user" ] ; then
-    rvm_source_gem_dir="$rvm_system_user_gem_path"
+    rvm_source_gem_path="$rvm_system_user_gem_path"
   elif [ "$rvm_ruby_interpreter" = "system" ] ; then
-    rvm_source_gem_dir="$rvm_system_gem_path"
+    rvm_source_gem_path="$rvm_system_gem_path"
   else
     # TODO: use selector for this?
-    rvm_source_gem_dir=${rvm_gem_home/$rvm_ruby_interpreter/$rvm_ruby_version}
+    rvm_source_gem_path=${rvm_gem_home/$rvm_ruby_interpreter/$rvm_ruby_version}
   fi
+  __rvm_gem_sync
+}
 
-  if [ ! -z "$rvm_source_gem_dir" ] ; then
-    for rvm_gem_name_version in `/bin/ls $rvm_source_gem_dir/gems` ; do
+function __rvm_gem_sync {
+  if [ ! -z "$rvm_source_gem_path" ] ; then
+    for rvm_gem_name_version in `/bin/ls $rvm_source_gem_path/gems 2> /dev/null` ; do
       rvm_gem_name=${rvm_gem_name_version%-*}
       rvm_gem_version=${rvm_gem_name_version##*-}
       if [ -d $GEM_HOME/gems/$rvm_gem_name_version ] ; then
         echo "$rvm_gem_name_version already installed."
       else
-        __rvm_gi $rvm_source_gem_dir/cache/$rvm_gem_name-$rvm_gem_version.gem
+        __rvm_gi $rvm_source_gem_path/cache/$rvm_gem_name-$rvm_gem_version.gem
       fi
     done
     unset rvm_gem_name_version rvm_gem_name rvm_gem_version
   else
-    __rvm_log "fail" "Unknown $rvm_ruby_interpreter version: $rvm_ruby_version"
+    __rvm_log "fail" "Unknown ruby selected :("
+    result=1
   fi
 }
 
@@ -319,7 +326,7 @@ function __rvm_symlinks {
 # TODO: Account for the ruby wrapper script files
 
   mkdir -p ${rvm_path}/bin
-  for release in `/bin/ls $rvm_path | grep 'ruby-'` ; do
+  for release in `/bin/ls $rvm_path 2> /dev/null | grep 'ruby-'` ; do
     for binary in irb gem rdoc ri erb ; do
       if [ -x $rvm_path/$release/bin/$binary ] ; then
         ln -fs $rvm_path/$release/bin/$binary $rvm_path/bin/$binary-${release#ruby-}
@@ -345,7 +352,7 @@ function __rvm_list {
   else
     current=`which ruby | xargs dirname | xargs dirname | xargs basename`
     echo -e "\nruby:\n"
-    for version in `/bin/ls -l $rvm_path/ | awk '/ ruby-[1-2].*/ { print $NF  }'` ; do
+    for version in `/bin/ls -l $rvm_path/ 2> /dev/null | awk '/ ruby-[1-2].*/ { print $NF  }'` ; do
       string=`$rvm_bin_path/$version -v`
       if [ "$current" = "$version" ] ; then
         echo -e "=> $version : $string"
@@ -357,7 +364,7 @@ function __rvm_list {
     unset version
 
     echo -e "\njruby:\n"
-    for version in `/bin/ls -l $rvm_path/ | awk '/jruby-.*/ { print $NF }'` ; do
+    for version in `/bin/ls -l $rvm_path/ 2> /dev/null | awk '/jruby-.*/ { print $NF }'` ; do
       string=`$rvm_bin_path/$version -v`
       if [ "$current" = "$version" ] ; then
         echo -e "=> $version : $string"
@@ -369,7 +376,7 @@ function __rvm_list {
     unset version
 
     echo -e "\nree:\n"
-    for version in `/bin/ls $rvm_path/ | awk '/ruby-enterprise-.*/ { print $NF }'` ; do
+    for version in `/bin/ls $rvm_path/ 2> /dev/null | awk '/ruby-enterprise-.*/ { print $NF }'` ; do
       string=`$rvm_bin_path/$version -v | tr "\n" ' ' `
       if [ "$current" = "$version" ] ; then
         echo -e "=> $version : $string"
@@ -394,10 +401,13 @@ function __rvm_list {
     fi
 
     echo -e "\nsystem:\n"
-    if [ "$selected" = "1" ] ; then
-      echo -e "   $($rvm_system_ruby -v)\n"
-    else
-      echo -e "=> $($rvm_system_ruby -v)\n"
+    system_version=`bash -l -c 'rvm system ; ruby -v 2> /dev/null'`
+    if [ ! -z "$system_version" ] ; then
+      if [ "$selected" = "1" ] ; then
+        echo -e "   $system_version\n"
+      else
+        echo -e "=> $system_version\n"
+      fi
     fi
     unset current version selected
   fi
@@ -541,23 +551,23 @@ function __rvm_ruby_do {
   else
     __rvm_log "warn" "'$rvm_ruby_home/bin/$binary' either does not exist or is not executable? :("
   fi
-    unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_home rvm_ruby_binary rvm_ruby_package_name rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected
+  unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_home rvm_ruby_binary rvm_ruby_package_name rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected
 }
 
 function __rvm_do {
+# TODO: Extract the outer looping mechanism with rvm_install's
   rubies=() ; successes=() ; errors=() ; statuses=()
   # TODO: Extract the common functionality out of the if below
   if [ ! -z "$rvm_ruby_version" ] ; then
     for rvm_ruby_selector in `echo $rvm_ruby_version | tr ',' ' '` ; do
-      temp=$(echo $rvm_ruby_selector | awk '{print substr($1, 0, 1)}')
-      if [ ! -z "$(echo $temp | grep '[0-9]')" ] ; then
+      if [ ! -z "$(echo $rvm_ruby_selector | awk '/^[0-9]/')" ] ; then
         rvm_ruby_interpreter="ruby"
         rvm_ruby_version="$rvm_ruby_selector"
       else
         rvm_ruby_interpreter="$rvm_ruby_selector"
         unset rvm_ruby_version
       fi
-      unset temp
+      unset rvm_ruby_string
       __rvm_ruby_do
     done
   else # all
@@ -569,7 +579,11 @@ function __rvm_do {
       fi
     done < <(/bin/ls $rvm_path/*/bin/ruby 2> /dev/null)
   fi
+  __rvm_summary
+  return ${#errors[*]}
+}
 
+function __rvm_summary {
   if [ ! -z "$rvm_summary_flag" ] ; then
     export successes errors statuses
     echo -e "\nSummary:"
@@ -581,43 +595,45 @@ function __rvm_do {
 
   if [ ! -z "$rvm_yaml_flag" ] ; then
     export successes errors statuses
-    echo -e "\nYAML:"
-    echo -e "  totals:"
-    echo -e "    rubies: ${#rubies[*]}"
-    echo -e "    successes: ${#successes[*]}"
-    echo -e "    errors: ${#errors[*]}"
-    echo -e "  successes:"
+    yaml="\nYAML:\n  totals:\n    rubies: ${#rubies[*]}\n    successes: ${#successes[*]}\n    errors: ${#errors[*]}\n  successes:"
     for var in ${successes[*]} ; do
-      echo -e "    - $var"
+      yaml="$yaml\n    - $var"
     done
-    echo -e "  errors:"
+    yaml="$yaml\n  errors:"
     for var in ${errors[*]} ; do
-      echo -e "    - $var"
-    done
-    echo -e "  rubies:"
-    for var in ${rubies[*]} ; do
-      echo -e "    - $var"
-    done
-    echo -e "  statuses:"
-    for var in ${statuses[*]} ; do
-      echo -e "    - $var"
+      yaml="$yaml\n    - $var"
     done
+    yaml="$yaml\n  rubies:"
+    total=${#rubies[*]}
+    if [ ! -z "$ZSH_VERSION" ] ; then array_start=1 ; else array_start=0 ; fi
+    for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
+      echo "${rubies[$index]}: ${statuses[$index]}"
+      yaml="$yaml\n    \"${rubies[$index]}\": ${statuses[$index]}"
+    done ; unset index array_start
+    echo -e "$yaml"
   fi
 
   if [ ! -z "$rvm_json_flag" ] ; then
-  summary=$(cat <<-Summary
-    \nSummary:
-    JSON:
-    {
-     "totals": { "rubies": ${#rubies[*]}, "successes": ${#successes[*]}, "errors": ${#errors[*]}},
-     "successful": [ "$(echo ${successes[*]} | sed 's/ /", "/g')" ],
-     "errors": [ "$(echo ${errors[*]} | sed 's/ /", "/g')" ],
-     "rubies": [ "$(echo ${rubies[*]} | sed 's/ /", "/g')" ],
-     "statuses": [ $(echo ${statuses[*]} | sed 's/ /, /g') ]
-    }
-Summary
-)
-    echo -e "$summary"
+    #
+    # TODO: Merge statuses & rubies:
+    #   rubies:
+    #     "jruby...": 0
+    #     "1.9.1...": 1
+    #
+  json="JSON:\n{"
+  json="$json\n  \"totals\": { \"rubies\": ${#rubies[*]}, \"successes\": ${#successes[*]}, \"errors\": ${#errors[*]}},"
+  json="$json\n  \"successful\": [ "$(echo ${successes[*]} | sed 's/ /", "/g')" ],"
+  json="$json\n  \"errors\": [ "$(echo ${errors[*]} | sed 's/ /", "/g')" ],"
+  json="$json\n  \"rubies\": {"
+    total=${#rubies[*]}
+    if [ ! -z "$ZSH_VERSION" ] ; then array_start=1 ; else array_start=0 ; fi
+    for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
+      echo "${rubies[$index]}: ${statuses[$index]}"
+      json="$json\n    {\"${rubies[$index]}\": ${statuses[$index]}}"
+      if (( $index + 1 < $total + $array_start )) ; then json="$json,  " ; fi
+    done ; unset index array_start
+    json="$json\n  }\n}"
+    echo -e "$json"
   else
     unset bin_line rvm_summary_flag
   fi
@@ -674,34 +690,26 @@ function __rvm_ruby_string {
 }
 
 function __rvm_gemset_dump {
-  if [ -z "$rvm_gem_set_name" ] ; then
-    file_name="default"
-  else
-    file_name="$rvm_gem_set_name"
-  fi
+  file_name=${rvm_gem_set_name:-'default'}
 
   echo "# $rvm_gem_set_name.gemset generated gem dump file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_gem_set_name.gemset
 
-  gems="`gem list | sed 's/[\(|\)]//g' | sed 's/, /,/g' | tr ' ' ';'`"
-  for gem in $gems ; do
+  for gem in `gem list | sed 's/[\(|\)]//g' | sed 's/, /,/g' | tr ' ' ';'` ; do
     name=`echo $gem | awk -F';' '{print $1}'`
     if [ -z "$rvm_latest_flag" ] ; then
       versions=`echo $gem | awk -F';' '{print $2}' | sed 's/,/ /g'`
       for version in $versions ; do
         echo "$name -v$version" >> $file_name.gemset
-      done
-      unset version
+      done ; unset version versions
     else
       echo "$name" >> $file_name.gemset
-    fi
-    unset name
-  done
-  unset file_name gems versions
+    fi ; unset name
+  done ; unset file_name
 }
 
 function __rvm_gemset_load {
   echo "Loading $rvm_load_file file..."
-  rvm_ruby_gem_list=`/bin/ls $rvm_gem_home/specifications/ | sed 's/\.gemspec$//' 2> /dev/null`
+  rvm_ruby_gem_list=`/bin/ls $rvm_gem_home/specifications/ 2> /dev/null | sed 's/\.gemspec$//' 2> /dev/null`
   while read line
   do # Keep this on 2nd line :( bash fail.
     # TODO: Switch to a different field separator than ; to allow for evals
@@ -716,7 +724,8 @@ function __rvm_gemset_load {
     else # version
       gem_file_name="$gem_name-$gem_version.gem"
     fi
-    cache_file=`/bin/ls -t $rvm_gem_path/*/*/cache/${gem_file_name}* | head -n1 2> /dev/null`
+
+    cache_file=`/bin/ls -t $rvm_gem_path/*/*/cache/${gem_file_name}* 2> /dev/null | head -n1`
     if [ -z "$cache_file" ] ; then
       if [ -z "$gem_version" ] ; then
         gem="$gem_name"
@@ -774,15 +783,21 @@ Config
     touch $rvm_ruby_irbrc
     echo -e "\n$rvm_irbrc_file" > $rvm_ruby_home/.irbrc
   fi
-
 }
 
+function __rvm_pushpop {
+  if [ -z "$1" ] ; then
+    popd > /dev/null 2>&1
+  else
+    pushd $1 > /dev/null 2>&1
+  fi
+}
 
 #
 # ruby supporting libraries:
 #
 function __rvm_readline_install {
-  pushd $rvm_path/src > /dev/null
+  __rvm_pushpop $rvm_path/src
   package=readline
   version=5.2
   # TODO: Figure out how to list, grab and apply the patches
@@ -800,11 +815,11 @@ function __rvm_readline_install {
   fi
   __rvm_run "$package.make" make
   __rvm_run "$package.make.install" make install
-  popd > /dev/null
+  __rvm_pushpop
 }
 
 function __rvm_iconv_install {
-  pushd $rvm_path/src > /dev/null
+  __rvm_pushpop $rvm_path/src
   package=libiconv
   version=1.13.1
   __rvm_fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.tar.gz"
@@ -813,7 +828,5 @@ function __rvm_iconv_install {
   __rvm_run "$package.configure" ./configure --prefix=$rvm_path/usr --disable-shared
   __rvm_run "$package.make" make
   __rvm_run "$package.make.install" make install
-
-  popd > /dev/null
+  __rvm_pushpop
 }
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.44
+  version: 0.0.45
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-18 00:00:00 -04:00
+date: 2009-09-20 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -30,6 +30,7 @@ files:
 - lib/VERSION.yml
 - lib/rvm.rb
 - rvm.gemspec
+- scripts/gemsync
 - scripts/rvm
 - scripts/rvm-aliases
 - scripts/rvm-cli