rvm 0.0.82 → 0.0.83

data/binscripts/rvm-prompt

@@ -10,7 +10,7 @@ add(){
   fi
 }
 
-if [[ ! -z "$(which ruby | awk '/rvm/{print}')" ]] ; then
+if [[ ! -z "$(which ruby 2>/dev/null | awk '/rvm/{print}')" ]] ; then
   unset format
   while [[ $# -gt 0 ]] ; do
     token="$1" ; shift
@@ -30,7 +30,7 @@ if [[ ! -z "$(which ruby | awk '/rvm/{print}')" ]] ; then
     add "patchlevel"
   fi
 
-  ruby_string=$(dirname "$(which ruby)" | xargs dirname | xargs basename)
+  ruby_string=$(dirname "$(which ruby 2>/dev/null)" | xargs dirname | xargs basename)
   if [[ ! -z "$interpreter_flag" ]] ; then
     interpreter="$(echo $ruby_string | awk -F'-' '{print $1}')"
   fi

data/config/db

@@ -19,6 +19,9 @@ 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_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
 ree_1.8.7_patch_level=2009.10
+rbx_version=1.0.0-rc1
+rbx_patch_level=20091125
+rbx_url=http://asset.rubini.us/rubinius-1.0.0-rc1-20091125.tar.gz
 ruby_1.9.1_patch_level=243
 ruby_1.9.2_patch_level=preview1
 ruby_1.8.5_patch_level=231

data/install

@@ -38,7 +38,9 @@ cp -f "$source_dir/README" "$rvm_path/"
 rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
-  cp -Rf "$source_dir/$dir_name" "$rvm_path"
+  if [[ -d "$source_dir/$dir_name" ]] ; then
+    cp -Rf "$source_dir/$dir_name" "$rvm_path"
+  fi
 done ; unset dir_name
 
 #
@@ -73,43 +75,7 @@ chmod +x $rvm_path/scripts/rvm
 #
 # System Checks
 #
-system="$(uname)"
-echo -e "\n$(tput setaf 2)Notes: $(tput sgr0)\n"
-if [[ "Linux" = "$system" ]] ; then
-  rvm_apt_get_binary="$(which aptitude 2> /dev/null)"
-  rvm_emerge_binary="$(which emerge 2> /dev/null)"
-  rvm_pacman_binary="$(which pacman 2> /dev/null)"
-  rvm_yum_binary="$(which yum 2> /dev/null)"
-
-  if [[ ! -z "$rvm_apt_get_binary" ]] ; then
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      $ aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk"
-    echo -e "    $item For ree (if you wish to use it) you will need:"
-    echo -e "      $ aptitude install libreadline5-dev libssl-dev bison"
-    echo -e "    $item For 1.9.X (if you wish to use it) we additionally recommend:"
-    echo -e "      $ aptitude install libxml2-dev"
-
-  elif [[ ! -z "$rvm_emerge_binary" ]] ; then
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
-
-  elif [[ ! -z "$rvm_pacman_binary" ]] ; then
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      $ pacman -Sy jdk jre"
-
-  elif [[ ! -z "$rvm_yum_binary" ]] ; then
-    echo -e "    $item For ree (if you wish to use it) you will need:"
-    echo -e "      $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
-
-  else
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      The SUN java runtime environment and development kit."
-  fi
-elif [[ "Darwin" = "$system"  ]] ; then
-  echo -e "    $item Be sure that you have XCode Tools (Version 3.2.1 (1613) or later) installed in order to use rvm."
-  echo -e "    $item You can download the latest XCode tools from developer.apple.com. This will be necessary with the dvd install for Snow Leopard which has bugs."
-  echo -e "    $item If you intend on installing MacRuby you must install LLVM first."
-fi
+$rvm_path/scripts/notes
 
 echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
 echo -e "    $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 82
+:patch: 83

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.82"
+  s.version = "0.0.83"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-11-21}
+  s.date = %q{2009-11-26}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -44,9 +44,11 @@ Gem::Specification.new do |s|
      "scripts/install",
      "scripts/irbrc",
      "scripts/irbrc.rb",
+     "scripts/libraries",
      "scripts/log",
      "scripts/match",
      "scripts/monitor",
+     "scripts/notes",
      "scripts/ruby-installer",
      "scripts/rvm",
      "scripts/rvm-install",

data/scripts/array

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+if [[ ! -z "$ZSH_VERSION" ]] ; then __array_start=1 ; else __array_start=0 ; fi
+
 # Usage: contains "a_string" "${an_array[@]}"
 array_contains() {
   local pattern="$1" ; shift
@@ -12,11 +14,14 @@ array_contains() {
 }
 
 array_length() {
-  array=$1 ; return "${#array[*]}"
+  array=$1
+  eval "length=\${#${array}[*]}"
+  echo $length
+  return length
 }
 
 array_push() {
-  array=$1 ; shift ; item=$2
+  array=$1 ; item=$2
   # TODO: allow loop over more arguments.
   eval "index=\$((\${#${array}[*]} + $__array_start))"
   eval "${array}[${index}]=${item}"

data/scripts/cli

@@ -17,7 +17,7 @@ __rvm_parse_args() {
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline|monitor)
+      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline|monitor|notes)
         rvm_action=$rvm_token
       ;;
 
@@ -353,7 +353,11 @@ rvm() {
     gems)          __rvm_gems                ; result=$?  ;;
     remove)        __rvm_remove_ruby         ; result=$?  ;;
     ruby|gem|rake) __rvm_do                  ; result=$?  ;;
-    monitor)       $rvm_scripts_path/monitor ; result=$?  ;;
+    monitor)
+      export rvm_ruby_version rvm_ruby_string
+      $rvm_scripts_path/monitor ; result=$?
+    ;;
+    notes)         $rvm_scripts_path/notes   ; result=$?  ;;
     reload)        source "$rvm_path/scripts/rvm"      ;;
     install|uninstall) __rvm_manage_rubies   ; result=$? ;;
     tests|specs)   rvm_action="rake" ; __rvm_do ; result=$? ;;

data/scripts/fetch

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-fetch_command=$(which curl)
+fetch_command=$(which curl 2>/dev/null)
 if [[ $? -ne 0 ]] ; then
   $rvm_scripts_path/log "fail" "rvm requires curl, which does not seem to exist in your path :("
   exit 1

data/scripts/gems

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
 __rvm_gems_select() {
+  if [[ -z "$(which gem 2>/dev/null)" ]] ; then return 0 ; fi
+
   if [[ -z "$rvm_gem_set_name" ]] ; then
     if [[ ! -z "$GEM_HOME" ]] ; then
       rvm_gem_set_name=$(echo $GEM_HOME | xargs basename | awk -F'%' '{print $2}')
@@ -15,12 +17,12 @@ __rvm_gems_select() {
     else
       if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ ! -z "$rvm_ruby_version" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
         rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
-      elif [[ -z "$GEM_HOME" ]] ; then
+      elif [[ -z "$GEM_HOME" ]]  && [[ ! -z "$(which gem 2>/dev/null)" ]] ; then
         rvm_ruby_gem_home=$(gem env gemdir)
       elif [[ ! -z "$GEM_HOME" ]] ; then
         rvm_ruby_gem_home="$GEM_HOME"
       else
-        $rvm_scripts_path/log "error" "Cannot select gem home, something definitely wrong :/"
+        unset rvm_ruby_gem_home
       fi
     fi
     if [[ -z "$rvm_gem_set_name" ]] ; then unset rvm_gem_set_name ; fi
@@ -243,6 +245,7 @@ __rvm_gems_load() {
 }
 
 __rvm_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
@@ -260,6 +263,11 @@ __rvm_gems() {
   unset GEM_PATH
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
 
+  if [[ -z "$(which gem 2>/dev/null)" ]] ; then
+    $rvm_scripts_path/log "error" "'gem' was not found, cannot perform gem actions."
+    return 1
+  fi
+
   if [[ ! -z "$rvm_clear_flag" ]] ; then
     __rvm_gems_clear
   elif [[ ! -z "$rvm_load_flag" ]] ; then

data/scripts/install

@@ -38,7 +38,9 @@ cp -f "$source_dir/README" "$rvm_path/"
 rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
-  cp -Rf "$source_dir/$dir_name" "$rvm_path"
+  if [[ -d "$source_dir/$dir_name" ]] ; then
+    cp -Rf "$source_dir/$dir_name" "$rvm_path"
+  fi
 done ; unset dir_name
 
 #
@@ -73,43 +75,7 @@ chmod +x $rvm_path/scripts/rvm
 #
 # System Checks
 #
-system="$(uname)"
-echo -e "\n$(tput setaf 2)Notes: $(tput sgr0)\n"
-if [[ "Linux" = "$system" ]] ; then
-  rvm_apt_get_binary="$(which aptitude 2> /dev/null)"
-  rvm_emerge_binary="$(which emerge 2> /dev/null)"
-  rvm_pacman_binary="$(which pacman 2> /dev/null)"
-  rvm_yum_binary="$(which yum 2> /dev/null)"
-
-  if [[ ! -z "$rvm_apt_get_binary" ]] ; then
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      $ aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk"
-    echo -e "    $item For ree (if you wish to use it) you will need:"
-    echo -e "      $ aptitude install libreadline5-dev libssl-dev bison"
-    echo -e "    $item For 1.9.X (if you wish to use it) we additionally recommend:"
-    echo -e "      $ aptitude install libxml2-dev"
-
-  elif [[ ! -z "$rvm_emerge_binary" ]] ; then
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
-
-  elif [[ ! -z "$rvm_pacman_binary" ]] ; then
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      $ pacman -Sy jdk jre"
-
-  elif [[ ! -z "$rvm_yum_binary" ]] ; then
-    echo -e "    $item For ree (if you wish to use it) you will need:"
-    echo -e "      $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
-
-  else
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      The SUN java runtime environment and development kit."
-  fi
-elif [[ "Darwin" = "$system"  ]] ; then
-  echo -e "    $item Be sure that you have XCode Tools (Version 3.2.1 (1613) or later) installed in order to use rvm."
-  echo -e "    $item You can download the latest XCode tools from developer.apple.com. This will be necessary with the dvd install for Snow Leopard which has bugs."
-  echo -e "    $item If you intend on installing MacRuby you must install LLVM first."
-fi
+$rvm_path/scripts/notes
 
 echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
 echo -e "    $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"

data/scripts/libraries

@@ -0,0 +1,109 @@
+#!/usr/bin/env bash
+
+#
+# ruby supporting libraries:
+#
+__rvm_readline_install() {
+  __rvm_make_flags
+  __rvm_pushpop $rvm_src_path
+  package="readline" ; version="5.2" ; archive_format="tar.gz"
+  # TODO: Figure out how to list, grab and apply the patches
+  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
+  $rvm_scripts_path/fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format"
+  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
+  builtin cd "$rvm_src_path/$package-$version"
+  if [[ "Darwin" = "$(uname)" ]] ; then
+    #sdk=$(\ls -t /Developer/SDKs/ | head -n 1)
+    #CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
+    #LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/$sdk -arch i386 -arch x86_64"
+    #export CFLAGS LDFLAGS
+    __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
+  else
+    __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
+  fi
+  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  __rvm_pushpop
+}
+
+__rvm_iconv_install() {
+  __rvm_make_flags
+  __rvm_pushpop $rvm_src_path
+  package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
+  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
+  $rvm_scripts_path/fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format"
+  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
+  builtin cd "$rvm_src_path/$package-$version"
+  __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
+  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  __rvm_pushpop
+}
+
+__rvm_curl_install() {
+  __rvm_make_flags
+  __rvm_pushpop $rvm_src_path
+  package="curl" ; version=7.19.7 ; archive_format="tar.gz"
+  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
+  $rvm_scripts_path/fetch "http://curl.haxx.se/download/$package-$version.$archive_format"
+  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
+  builtin cd "$rvm_src_path/$package-$version"
+  __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
+  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  __rvm_pushpop
+}
+
+__rvm_openssl_install() {
+  __rvm_make_flags
+    if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
+      openssl_os="os/compiler darwin64-x86_64-cc"
+    else
+      openssl_os="os/compiler darwin-i386-cc"
+    fi
+  __rvm_pushpop $rvm_src_path
+  package="openssl" ; version="0.9.8k" ; archive_format="tar.gz"
+  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
+  $rvm_scripts_path/fetch "http://www.openssl.org/source/$package-$version.tar.gz"
+  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
+  builtin cd "$rvm_src_path/$package-$version"
+  __rvm_run "$package/config" "./config --prefix=$rvm_path/usr zlib no-asm no-krb5 shared" "Configuring $package."
+  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  __rvm_pushpop
+}
+
+__rvm_zlib_install() {
+  __rvm_make_flags
+  __rvm_pushpop $rvm_src_path
+  package="zlib" ; version="1.2.3" ; archive_format="tar.gz"
+  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
+  $rvm_scripts_path/fetch "http://www.zlib.net/$package-$version.tar.gz"
+  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
+  builtin cd "$rvm_src_path/$package-$version"
+  __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
+  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  __rvm_pushpop
+}
+
+__rvm_ncurses_install() {
+  __rvm_make_flags
+  __rvm_pushpop $rvm_src_path
+  package="ncurses" ; version="5.7" ; archive_format="tar.gz"
+  $rvm_scripts_path/log "info" "Retrieving $package"
+  $rvm_scripts_path/fetch "ftp://invisible-island.net/ncurses/ncurses.tar.gz"
+  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package.$archive_format -C $rvm_src_path" "Extracting $package.$archive_format"
+  builtin cd "$rvm_src_path/$package-$version"
+  __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs" "Configuring $package."
+  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  __rvm_pushpop
+}
+

data/scripts/monitor

@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
 
+rvm_monitor_sleep=3
+original_ruby_version=$rvm_ruby_version
+original_ruby_string=$rvm_ruby_string
+
+source $rvm_scripts_path/rvm
+
 timestamp() {
   if [[ "Darwin" = "$(uname)" ]] ; then
     echo $(stat -f "%m" $1)
@@ -8,34 +14,62 @@ timestamp() {
   fi
 }
 
-if [[ -d "test/" ]] ; then test_timestamp=$(timestamp "test/") ; fi
-if [[ -d "spec/" ]] ; then spec_timestamp=$(timestamp "spec/") ; fi
+push_if_timestamp_changed() {
+  file=$1
+  file_timestamp=$(timestamp $file)
+
+  eval "time=\$${framework}_timestamp"
+  if [[ "$file_timestamp" -gt $time ]] ; then
+    array_push "changed_${framework}_files" $file
+  fi
+}
+
+update_timestamp() {
+  if [[ -d "${1}/" ]] ; then
+    touch "$rvm_path/${1}_timestamp"
+    eval "${1}_timestamp=\$(timestamp \"$rvm_path/${1}_timestamp\")"
+  fi
+}
+
+update_timestamp "test"
+update_timestamp "spec"
 
 while : ; do
   changed_test_files=() ; changed_spec_files=()
 
-  if [[ -d "test/" ]] ; then
-    while read -r line ; do
-      if [[ $(timestamp $file) -gt $timestamp ]] ; then
-        array_push $changed_test_files $file
-      fi
-    done < <($(\ls test/**/*_test.rb))
-  fi
+  for framework in test spec ; do
+
+    if [[ -d "$framework/" ]] ; then
+
+      files=($(\ls ${framework}/**/*_${framework}.rb))
+      for file in $files ; do
+        push_if_timestamp_changed $file $framework
+      done
+
+      if [[ "$(array_length "changed_${framework}_files")" -gt 0 ]] ; then
+        rvm_ruby_version=$original_ruby_version
+        rvm_ruby_string=$original_ruby_string
+        if [[ "spec" = "$framework" ]] ; then
+          rvm_action="spec"
+          rvm_ruby_args="spec/spec_helper.rb ${changed_spec_files[*]}"
+          __rvm_do
 
-  if [[ -d "spec/" ]] ; then
-    while read -r line ; do
-      if [[ $(timestamp $file) -gt $timestamp ]] ; then
-        array_push $changed_spec_files $file
+        elif [[ "test" = "$framework" ]] ; then
+          rvm_action="ruby"
+          rvm_ruby_args=" -r$(echo "${changed_test_files[*]}" | sed 's/ / -r/g') test/test_helper.rb"
+          __rvm_do
+        fi
+        update=1
       fi
-    done < <($(\ls spec/**/*_spec.rb))
-  fi
+    fi
 
-  if [[ $(array_length $changed_test_files) -gt 0 ]] ; then
-    testrb "${myarray[*]}"
-  fi
+    if [[ "$update" -eq 1 ]] ; then
+      update_timestamp $framework
+    fi
+  done
 
-  if [[ $(array_length $changed_spec_files) -gt 0 ]] ; then
-    spec "${myarray[*]}"
-  fi
+  unset update changed_test_files changed_spec_files
+
+  sleep $rvm_monitor_sleep
 done
 

data/scripts/notes

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+system="$(uname)"
+
+item="$(tput setaf 2)* $(tput sgr0)"
+
+echo -e "\n$(tput setaf 2)rvm notes for $system $(tput sgr0)\n"
+
+if [[ "Linux" = "$system" ]] ; then
+  rvm_apt_get_binary="$(which aptitude 2> /dev/null)"
+  rvm_emerge_binary="$(which emerge 2> /dev/null)"
+  rvm_pacman_binary="$(which pacman 2> /dev/null)"
+  rvm_yum_binary="$(which yum 2> /dev/null)"
+
+  if [[ ! -z "$rvm_apt_get_binary" ]] ; then
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "\n       $ aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk"
+    echo -e "\n    $item For MRI & ree (if you wish to use it) you will need:"
+    echo -e "\n       $ aptitude install bison build-essential zlib1g-dev libssl-dev libreadline5-dev libxml2-dev"
+
+  elif [[ ! -z "$rvm_emerge_binary" ]] ; then
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "\n       $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
+
+  elif [[ ! -z "$rvm_pacman_binary" ]] ; then
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "       $ pacman -Sy jdk jre"
+
+  elif [[ ! -z "$rvm_yum_binary" ]] ; then
+    echo -e "    $item For ree (if you wish to use it) you will need:"
+    echo -e "\n       $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
+
+  else
+    echo -e "    $item For JRuby (if you wish to use it) you will need:"
+    echo -e "\n      The SUN java runtime environment and development kit."
+  fi
+elif [[ "Darwin" = "$system"  ]] ; then
+  echo -e "    $item Be sure that you have XCode Tools (Version 3.2.1 (1613) or later) installed in order to use rvm."
+  echo -e "\n    $item You should download the latest XCode tools from developer.apple.com. This will be necessary with the dvd install for Snow Leopard which has bugs."
+  echo -e "\n    $item If you intend on installing MacRuby you must install LLVM first."
+fi
+
+echo
+

data/scripts/ruby-installer

@@ -26,7 +26,7 @@ __rvm_install_source() {
   else
     if [[ ! -z "$(echo $rvm_url | awk '/^git/')" ]] ; then
       if [[ -d "$rvm_ruby_src_path/.git" ]] ; then
-        builtin builtin cd $rvm_ruby_src_path
+        builtin cd $rvm_ruby_src_path
         if [[ -z "$rvm_ruby_revision" ]] ; then
           $rvm_scripts_path/log "info" "Pulling from $rvm_ruby_repo_url, this may take a while depending on your connection..."
           git pull origin master
@@ -73,11 +73,11 @@ __rvm_install_source() {
     fi
   fi
 
-  builtin builtin cd $rvm_ruby_src_path
+  builtin cd $rvm_ruby_src_path
   if [[ $? -gt 0 ]] ; then result=$? ; $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; __rvm_pushpop ; return $result ; fi
 
   if [[ -z "$rvm_ruby_configure" ]] && [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
-    rvm_autoconf="$(which autoconf)"
+    rvm_autoconf="$(which autoconf 2>/dev/null)"
     if [[ $? -gt 0 ]] ; then $rvm_scripts_path/log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
     __rvm_run "autoconf" "$rvm_autoconf" "Running autoconf"
     # if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi # Don't barf on autoconf fail...
@@ -96,11 +96,11 @@ __rvm_install_source() {
     $rvm_scripts_path/log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
   fi
 
-  rvm_ruby_make=${rvm_ruby_make:-"/usr/bin/make"}
+  rvm_ruby_make=${rvm_ruby_make:-"make"}
   __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
   if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
-  rvm_ruby_make_install=${rvm_ruby_make_install:-"/usr/bin/make install"}
+  rvm_ruby_make_install=${rvm_ruby_make_install:-"make install"}
   __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_package_name"
   if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
@@ -237,22 +237,32 @@ RubyWrapper
       echo "$(export rvm_install_on_use_flag=1 ; rvm 1.8.7)" # This should install if missing.
       # TODO: use 'rvm gems load' here:
       unset CFLAGS LDFLAGS ARCHFLAGS # Important.
-      __rvm_unset_ruby_variables ; rvm_ruby_string="rbx-head" ; __rvm_select
+      # __rvm_unset_ruby_variables ; rvm_ruby_string="rbx-head" ; __rvm_select
 
       unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
 
-      rvm_ruby_repo_url="$rvm_rubinius_repo_url"
-      rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
-
-      if [[ ! -d "$rvm_ruby_home" ]] || [[ ! -d "$rvm_ruby_home/.git" ]] ; then
-        rm -rf "$rvm_ruby_home" ; builtin cd "$rvm_home"
-        __rvm_run "rbx.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_home" "Cloning $rvm_ruby_repo_url"
-        builtin cd "$rvm_ruby_home"
+      if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.0/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
+        if [[ ! -f "$rvm_archives_path/$rvm_ruby_package_name.tar.gz" ]] ; then
+          $rvm_scripts_path/log "info" "Downloading $rvm_ruby_file, this may take a while depending on your connection..."
+          $rvm_scripts_path/fetch "$rvm_url"
+          result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+        fi
+        __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_file.tar.gz ..."
+        if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+        mv $rvm_src_path/rubinius-$rvm_ruby_version $rvm_ruby_src_path
       else
-        builtin cd "$rvm_ruby_home"
-        __rvm_run "rbx.repo" "git pull origin master" "Pulling from origin master"
+        rvm_ruby_repo_url="$rvm_rubinius_repo_url"
+        #rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
+        if [[ ! -d "$rvm_ruby_src_path" ]] || [[ ! -d "$rvm_ruby_src_path/.git" ]] ; then
+          rm -rf "$rvm_ruby_src_path" ; builtin cd "$rvm_home"
+          __rvm_run "rbx.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path" "Cloning $rvm_ruby_repo_url"
+          builtin cd "$rvm_ruby_src_path"
+        else
+          builtin cd "$rvm_ruby_src_path"
+          __rvm_run "rbx.repo" "git pull origin master" "Pulling from origin master"
+        fi
       fi
 
       #if [[ ! -x "$rvm_ruby_distclean" ]] ; then
@@ -263,19 +273,19 @@ RubyWrapper
       # RBX_PREFIX="$rvm_ruby_home" ; export RBX_PREFIX
       # Also see 'rakelib/configuration.rake'
 
-      builtin cd "$rvm_ruby_home"
+      builtin cd "$rvm_ruby_src_path"
       # TODO: Once installer is done add the prefix:
-      #rvm_ruby_configure="./configure --prefix=$rvm_ruby_home" ; message="Configuring rbx"
-      rvm_ruby_configure="./configure" ; message="Configuring rbx"
+      rvm_ruby_configure="./configure --prefix=$rvm_ruby_home" ; message="Configuring rbx"
+      #rvm_ruby_configure="./configure" ; message="Configuring rbx"
       if [[ ! -z "$rvm_jit_flag" ]] ; then
         rvm_ruby_configure="$rvm_ruby_configure --enable-llvm" ; message="$message with LLVM enabled"
       fi
       __rvm_run "configure" "$rvm_ruby_configure" "$message"
 
       if [[ "$rvm_trace_flag" -eq 1 ]] ; then
-        rvm_ruby_make="\$(rvm 1.8.7 ; rake --trace)" ; message="Compiling rbx"
+        rvm_ruby_make="\$(rvm 1.8.7 ; rake install --trace)" ; message="Compiling rbx"
       else
-        rvm_ruby_make="\$(rvm 1.8.7 ; rake)" ; message="Compiling rbx"
+        rvm_ruby_make="\$(rvm 1.8.7 ; rake install)" ; message="Compiling rbx"
       fi
       __rvm_run "rake" "$rvm_ruby_make" "$message"
 
@@ -288,18 +298,6 @@ RubyWrapper
         ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary_name
       done ; unset binary_name binaries
 
-      __rvm_run "rake.install" "$rvm_ruby_home/bin/rbx gem install rake --no-rdoc --no-ri" "Installing Rake"
-
-      binary=rake
-      if [[ -f $rvm_ruby_gem_home/bin/$binary ]] ; then
-        if [[ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ]] ; then
-          cp $rvm_ruby_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
-        fi
-        chmod +x $rvm_ruby_home/bin/$binary
-        __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$binary"
-        __rvm_inject_gem_env "$rvm_ruby_home/bin/$binary"
-      fi ; unset binary
-
       binaries="erb ri rdoc"
       __rvm_post_install
 
@@ -325,6 +323,19 @@ RubyWrapper
         done ; unset file_name
         unset ruby_wrapper binary_name files prefix
       done
+
+      __rvm_run "rake.install" "$rvm_ruby_home/bin/rbx gem install rake --no-rdoc --no-ri" "Installing Rake"
+
+      binary=rake
+      if [[ -f $rvm_ruby_gem_home/bin/$binary ]] ; then
+        if [[ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ]] ; then
+          cp $rvm_ruby_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
+        fi
+        chmod +x $rvm_ruby_home/bin/$binary
+        __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$binary"
+        __rvm_inject_gem_env "$rvm_ruby_home/bin/$binary"
+      fi ; unset binary
+
       __rvm_irbrc
       __rvm_bin_scripts
     ;;
@@ -410,7 +421,6 @@ RubyWrapper
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
 
-      rvm_ruby_repo_url=$rvm_shyouhei_repo_url
       unset rvm_ruby_configure
       rvm_ruby_src_path=$rvm_ruby_home
       # rvm_ruby_make="rake"
@@ -428,7 +438,7 @@ RubyWrapper
       fi
 
       if [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
-          rvm_autoconf="$(which autoconf)"
+          rvm_autoconf="$(which autoconf 2>/dev/null)"
           if [[ $? -gt 0 ]] ; then $rvm_scripts_path/log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
           __rvm_run "autoconf" "$rvm_autoconf" "Running autoconf"
           # if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi # Don't barf on autoconf fail...
@@ -636,8 +646,9 @@ __rvm_rubygems_setup() {
 
 __rvm_inject_ruby_shebang() {
   __rvm_actual_file $1
+
   if [[ -f "$actual_file" ]] ; then
-    sed -i.orig -e "s=env [j]*ruby=env $rvm_ruby_home/bin/ruby=" $actual_file
+    sed -i -e '1,1s=.*=#!'"$rvm_ruby_home/bin/ruby=" $actual_file
     rm -f $actual_file.orig ; chmod +x "$actual_file"
   fi ; unset actual_file
 }

data/scripts/rvm

@@ -13,7 +13,11 @@ if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
 if [[ "root" = "$(whoami)" ]] ; then
   rvm_path="${rvm_path:-/usr/local/rvm}"
 else
-  rvm_path="${rvm_path:-$HOME/.rvm}"
+  if [[ -d "$HOME/.rvm" ]] ; then
+    rvm_path="${rvm_path:-$HOME/.rvm}"
+  else
+    rvm_path="${rvm_path:-/usr/local/rvm}"
+  fi
 fi
 
 source $rvm_path/scripts/array
@@ -23,6 +27,7 @@ source $rvm_path/scripts/selector
 source $rvm_path/scripts/ruby-installer # TODO: Script not function.
 source $rvm_path/scripts/cli
 source $rvm_path/scripts/gems
+source $rvm_path/scripts/libraries
 
 rvm_loaded_flag=1 ; export rvm_loaded_flag
 

data/scripts/rvm-install

@@ -38,7 +38,9 @@ cp -f "$source_dir/README" "$rvm_path/"
 rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
-  cp -Rf "$source_dir/$dir_name" "$rvm_path"
+  if [[ -d "$source_dir/$dir_name" ]] ; then
+    cp -Rf "$source_dir/$dir_name" "$rvm_path"
+  fi
 done ; unset dir_name
 
 #
@@ -73,43 +75,7 @@ chmod +x $rvm_path/scripts/rvm
 #
 # System Checks
 #
-system="$(uname)"
-echo -e "\n$(tput setaf 2)Notes: $(tput sgr0)\n"
-if [[ "Linux" = "$system" ]] ; then
-  rvm_apt_get_binary="$(which aptitude 2> /dev/null)"
-  rvm_emerge_binary="$(which emerge 2> /dev/null)"
-  rvm_pacman_binary="$(which pacman 2> /dev/null)"
-  rvm_yum_binary="$(which yum 2> /dev/null)"
-
-  if [[ ! -z "$rvm_apt_get_binary" ]] ; then
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      $ aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk"
-    echo -e "    $item For ree (if you wish to use it) you will need:"
-    echo -e "      $ aptitude install libreadline5-dev libssl-dev bison"
-    echo -e "    $item For 1.9.X (if you wish to use it) we additionally recommend:"
-    echo -e "      $ aptitude install libxml2-dev"
-
-  elif [[ ! -z "$rvm_emerge_binary" ]] ; then
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
-
-  elif [[ ! -z "$rvm_pacman_binary" ]] ; then
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      $ pacman -Sy jdk jre"
-
-  elif [[ ! -z "$rvm_yum_binary" ]] ; then
-    echo -e "    $item For ree (if you wish to use it) you will need:"
-    echo -e "      $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
-
-  else
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      The SUN java runtime environment and development kit."
-  fi
-elif [[ "Darwin" = "$system"  ]] ; then
-  echo -e "    $item Be sure that you have XCode Tools (Version 3.2.1 (1613) or later) installed in order to use rvm."
-  echo -e "    $item You can download the latest XCode tools from developer.apple.com. This will be necessary with the dvd install for Snow Leopard which has bugs."
-  echo -e "    $item If you intend on installing MacRuby you must install LLVM first."
-fi
+$rvm_path/scripts/notes
 
 echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
 echo -e "    $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"

data/scripts/selector

@@ -40,14 +40,12 @@ __rvm_select() {
 
     rbx|rubinius)
       rvm_ruby_interpreter="rbx"
-      rvm_ruby_version="${rvm_ruby_version:-head}"
-      unset rvm_ruby_patch_level
+      rvm_ruby_version=${rvm_ruby_version:-"$($rvm_scripts_path/db "$rvm_config_path/db" "rbx_version")"}
+      rvm_ruby_patch_level=${rvm_ruby_patch_level:-"$($rvm_scripts_path/db "$rvm_config_path/db" "rbx_patch_level")"}
       rvm_ruby_repo_url=${rvm_rbx_repo_url:-"$($rvm_scripts_path/db "$rvm_config_path/db" "rubinius_repo_url")"}
-      rvm_ruby_string="rbx-head" # for now :)
-      rvm_url=$rvm_ruby_repo_url
-      rvm_ruby_configure=" true "
-      rvm_ruby_make="build"
-      rvm_ruby_make_install=""
+      #rvm_ruby_string="rbx-head" # for now :)
+      rvm_url=$($rvm_scripts_path/db "$rvm_config_path/db" "rbx_url")
+      rvm_ruby_file="rubinius-$rvm_ruby_version-$rvm_ruby_patch_level"
     ;;
 
     jruby)
@@ -108,7 +106,7 @@ __rvm_select() {
     ;;
 
     current)
-      ruby_binary="$(which binary)"
+      ruby_binary="$(which binary 2>/dev/null)"
       if $rvm_scripts_path/match "$ruby_binary" "rvm" ; then
         rvm_ruby_string="$(dirname "$ruby_binary" | xargs dirname | xargs basename)"
       else

data/scripts/update

@@ -38,7 +38,9 @@ cp -f "$source_dir/README" "$rvm_path/"
 rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
-  cp -Rf "$source_dir/$dir_name" "$rvm_path"
+  if [[ -d "$source_dir/$dir_name" ]] ; then
+    cp -Rf "$source_dir/$dir_name" "$rvm_path"
+  fi
 done ; unset dir_name
 
 #
@@ -73,43 +75,7 @@ chmod +x $rvm_path/scripts/rvm
 #
 # System Checks
 #
-system="$(uname)"
-echo -e "\n$(tput setaf 2)Notes: $(tput sgr0)\n"
-if [[ "Linux" = "$system" ]] ; then
-  rvm_apt_get_binary="$(which aptitude 2> /dev/null)"
-  rvm_emerge_binary="$(which emerge 2> /dev/null)"
-  rvm_pacman_binary="$(which pacman 2> /dev/null)"
-  rvm_yum_binary="$(which yum 2> /dev/null)"
-
-  if [[ ! -z "$rvm_apt_get_binary" ]] ; then
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      $ aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk"
-    echo -e "    $item For ree (if you wish to use it) you will need:"
-    echo -e "      $ aptitude install libreadline5-dev libssl-dev bison"
-    echo -e "    $item For 1.9.X (if you wish to use it) we additionally recommend:"
-    echo -e "      $ aptitude install libxml2-dev"
-
-  elif [[ ! -z "$rvm_emerge_binary" ]] ; then
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
-
-  elif [[ ! -z "$rvm_pacman_binary" ]] ; then
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      $ pacman -Sy jdk jre"
-
-  elif [[ ! -z "$rvm_yum_binary" ]] ; then
-    echo -e "    $item For ree (if you wish to use it) you will need:"
-    echo -e "      $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
-
-  else
-    echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "      The SUN java runtime environment and development kit."
-  fi
-elif [[ "Darwin" = "$system"  ]] ; then
-  echo -e "    $item Be sure that you have XCode Tools (Version 3.2.1 (1613) or later) installed in order to use rvm."
-  echo -e "    $item You can download the latest XCode tools from developer.apple.com. This will be necessary with the dvd install for Snow Leopard which has bugs."
-  echo -e "    $item If you intend on installing MacRuby you must install LLVM first."
-fi
+$rvm_path/scripts/notes
 
 echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
 echo -e "    $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"

data/scripts/utility

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
 __rvm_info() {
-  full_version=$(ruby -v)
+  if [[ ! -z "$(which ruby 2>/dev/null)" ]] ; then full_version=$(ruby -v) ; fi
+
   cat <<Info
 
 system:
@@ -20,16 +21,17 @@ homes:
   ruby:         "${MY_RUBY_HOME:-'not set'}"
 
 binaries:
-  ruby:         "$(which ruby)"
-  irb:          "$(which irb)"
-  gem:          "$(which gem)"
-  rake:         "$(which rake)"
+  ruby:         "$(which ruby 2>/dev/null)"
+  irb:          "$(which irb 2>/dev/null)"
+  gem:          "$(which gem 2>/dev/null)"
+  rake:         "$(which rake 2>/dev/null)"
 
 environment:
   GEM_HOME:     "$GEM_HOME"
   MY_RUBY_HOME: "$MY_RUBY_HOME"
   IRBRC:        "$IRBRC"
 Info
+
   unset full_version
 }
 
@@ -109,7 +111,7 @@ __rvm_run() {
 
 __rvm_cleanup_variables() {
   __rvm_unset_ruby_variables
-  unset rvm_ruby_selected_flag rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_gem_set_name 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 CFLAGS LDFLAGS ARCHFLAGS
+  unset rvm_ruby_selected_flag rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_gem_set_name 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_unset_ruby_variables() {
@@ -166,22 +168,24 @@ __rvm_load_defaults() {
 
   rvm_system_ruby=$($rvm_scripts_path/db "$rvm_config_path/db" "system_ruby")
   if [[ ! -z "$rvm_system_ruby" ]] ; then
-    rvm_system_ruby=$(which ruby)
+    rvm_system_ruby=$(which ruby 2>/dev/null)
     if [[ $? -ne 0 ]] ; then
-      $rvm_scripts_path/log "info" "System ruby not found, no db will be stored."
+      $rvm_scripts_path/log "info" "System ruby not found, no system default will be stored."
     else
       $rvm_scripts_path/db "$rvm_config_path/db" "system_ruby" "$rvm_system_ruby"
 
       # Now store system system & user gem paths
-      rvm_system_user_gem_path=$($rvm_scripts_path/db "$rvm_config_path/db" "system_user_gem_path")
-      if [[ -z "$rvm_system_user_gem_path" ]] ; then
-        rvm_system_user_gem_path=$( rvm system ; gem env gemdir user; )
-        $rvm_scripts_path/db "$rvm_config_path/db" "system_user_gem_path" "$rvm_system_user_gem_path"
-      fi
-      rvm_system_gem_path=$($rvm_scripts_path/db "$rvm_config_path/db" "system_gem_path")
-      if [[ -z "$rvm_system_gem_path" ]] ; then
-        rvm_system_gem_path=$( rvm system ; gem env gemdir; )
-        $rvm_scripts_path/db "$rvm_config_path/db" "system_gem_path" "$rvm_system_gem_path"
+      if [[ ! -z "$(which gem 2>/dev/null)" ]] ; then
+        rvm_system_user_gem_path=$($rvm_scripts_path/db "$rvm_config_path/db" "system_user_gem_path")
+        if [[ -z "$rvm_system_user_gem_path" ]] ; then
+          rvm_system_user_gem_path=$( rvm system ; gem env gemdir user; )
+          $rvm_scripts_path/db "$rvm_config_path/db" "system_user_gem_path" "$rvm_system_user_gem_path"
+        fi
+        rvm_system_gem_path=$($rvm_scripts_path/db "$rvm_config_path/db" "system_gem_path")
+        if [[ -z "$rvm_system_gem_path" ]] ; then
+          rvm_system_gem_path=$( rvm system ; gem env gemdir; )
+          $rvm_scripts_path/db "$rvm_config_path/db" "system_gem_path" "$rvm_system_gem_path"
+        fi
       fi
     fi
   fi
@@ -256,7 +260,11 @@ __rvm_list() {
       echo -e "macruby(-nightly) # the default macruby\nmacruby-head # Build from the macruby git repository"
     fi
   else
-    current_ruby="$(which ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
+    ruby=$(which ruby 2>/dev/null) ; current_ruby=""
+    if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo $ruby | awk '/rvm/')" ]] ; then
+      current_ruby="$(echo $ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
+    fi
+
     for version in $(\ls -l $rvm_path/ 2> /dev/null | awk '/ ruby-[1-2].*/ { print $NF  }') ; do
       string=$($rvm_path/$version/bin/ruby -v)
       if [[ "$version" = "$current_ruby" ]] ; then
@@ -336,13 +344,15 @@ __rvm_list() {
       fi ; unset version
     fi
 
-    system_version=$(rvm system ; ruby -v 2> /dev/null)
+    system_version=$(rvm system ; which ruby 2>/dev/null && ruby -v 2> /dev/null)
     if [[ ! -z "$system_version" ]] ; then
       if [[ "$($(which ruby) -v)" = "$system_version" ]] ; then
         echo -e "=> $(tput setaf 2)system$(tput sgr0) ( ruby -v # => $system_version )\n"
       else
         echo -e "   $(tput setaf 2)system$(tput sgr0) ( ruby -v # => $system_version )\n"
       fi
+    else
+      $rvm_scripts_path/log "info" "No system ruby found."
     fi ; unset current_ruby version selected
   fi
 }
@@ -413,8 +423,12 @@ __rvm_ruby_do() {
   binary="$(echo $rvm_action | sed 's#do$##')"
   if [[ -x "$rvm_ruby_home/bin/$binary" ]] ; then
     binary="$rvm_ruby_home/bin/$binary"
+  elif [[ -x "$rvm_ruby_gem_home/bin/$binary" ]] ; then
+    binary="$rvm_ruby_gem_home/bin/$binary"
   elif [[ "system" = "$rvm_ruby_string" ]] && [[ -x "$(which $binary)" ]] ; then
-    binary="$(which $binary)"
+    binary="$(which $binary 2>/dev/null)"
+  #elif [[ "spec" = "$binary" ]] ; then
+    #binary="$(which $binary 2>/dev/null)"
   else
     $rvm_scripts_path/log "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
     __rvm_unset_ruby_variables
@@ -442,8 +456,8 @@ __rvm_ruby_do() {
     rvm_command="$binary $rvm_ruby_mode $rvm_ruby_args"
   fi
 
+  mkdir -p ./log/$rvm_ruby_string/
   if [[ ! -z "$rvm_json_flag" ]] || [[ ! -z "$rvm_yaml_flag" ]] || [[ ! -z "$rvm_summary_flag" ]] ; then
-    mkdir -p ./log/$rvm_ruby_string/
     touch ./log/$rvm_ruby_string/$rvm_action.log ./log/$rvm_ruby_string/$rvm_action.error.log
     eval "$rvm_command" >> ./log/$rvm_ruby_string/$rvm_action.log 2>> ./log/$rvm_ruby_string/$rvm_action.error.log
   else
@@ -451,6 +465,7 @@ __rvm_ruby_do() {
     eval "$rvm_command"
   fi
   result=$?
+
   if [[ $result -eq 0 ]]; then
     eval "successes=(${successes[*]} $rvm_ruby_string)"
   else
@@ -583,10 +598,10 @@ __rvm_pushpop() {
 
 __rvm_state() {
   if [[ -z "$rvm_state" ]] ; then
-    if [[ -z "$(which ruby | awk /$(basename $rvm_path)/)" ]] ; then
+    if [[ -z "$(which ruby 2>/dev/null | awk /$(basename $rvm_path)/)" ]] ; then
       rvm_state=system
     else
-      rvm_state="$(dirname $(which ruby) | xargs dirname | xargs basename)"
+      rvm_state="$(dirname "$(which ruby 2>/dev/null)" | xargs dirname | xargs basename)"
     fi
   else
     rvm_ruby_string="$rvm_state"
@@ -598,7 +613,7 @@ __rvm_state() {
 
 __rvm_inspect() {
   for binary in $rvm_ruby_args ; do
-    actual_file=$(which $binary)
+    actual_file="$(which $binary 2>/dev/null)"
     $rvm_scripts_path/log "info" "$actual_file:"
     if [[ ! -z "$rvm_shebang_flag" ]] ; then cat $actual_file | head -n 1    ; fi
     if [[ ! -z "$rvm_env_flag" ]]     ; then cat $actual_file | awk '/ENV/'  ; fi
@@ -609,113 +624,6 @@ __rvm_inspect() {
   done
 }
 
-#
-# ruby supporting libraries:
-#
-__rvm_readline_install() {
-  __rvm_make_flags
-  __rvm_pushpop $rvm_src_path
-  package="readline" ; version="5.2" ; archive_format="tar.gz"
-  # TODO: Figure out how to list, grab and apply the patches
-  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-  $rvm_scripts_path/fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format"
-  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
-  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
-  builtin cd "$rvm_src_path/$package-$version"
-  if [[ "Darwin" = "$(uname)" ]] ; then
-    #sdk=$(\ls -t /Developer/SDKs/ | head -n 1)
-    #CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
-    #LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/$sdk -arch i386 -arch x86_64"
-    #export CFLAGS LDFLAGS
-    __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
-  else
-    __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
-  fi
-  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
-  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
-  __rvm_pushpop
-}
-
-__rvm_iconv_install() {
-  __rvm_make_flags
-  __rvm_pushpop $rvm_src_path
-  package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
-  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-  $rvm_scripts_path/fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format"
-  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
-  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
-  builtin cd "$rvm_src_path/$package-$version"
-  __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
-  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
-  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
-  __rvm_pushpop
-}
-
-__rvm_curl_install() {
-  __rvm_make_flags
-  __rvm_pushpop $rvm_src_path
-  package="curl" ; version=7.19.7 ; archive_format="tar.gz"
-  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-  $rvm_scripts_path/fetch "http://curl.haxx.se/download/$package-$version.$archive_format"
-  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
-  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
-  builtin cd "$rvm_src_path/$package-$version"
-  __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
-  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
-  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
-  __rvm_pushpop
-}
-
-__rvm_openssl_install() {
-  __rvm_make_flags
-    if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
-      openssl_os="os/compiler darwin64-x86_64-cc"
-    else
-      openssl_os="os/compiler darwin-i386-cc"
-    fi
-  __rvm_pushpop $rvm_src_path
-  package="openssl" ; version="0.9.8k" ; archive_format="tar.gz"
-  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-  $rvm_scripts_path/fetch "http://www.openssl.org/source/$package-$version.tar.gz"
-  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
-  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
-  builtin cd "$rvm_src_path/$package-$version"
-  __rvm_run "$package/config" "./config --prefix=$rvm_path/usr zlib no-asm no-krb5 shared" "Configuring $package."
-  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
-  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
-  __rvm_pushpop
-}
-
-__rvm_zlib_install() {
-  __rvm_make_flags
-  __rvm_pushpop $rvm_src_path
-  package="zlib" ; version="1.2.3" ; archive_format="tar.gz"
-  $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-  $rvm_scripts_path/fetch "http://www.zlib.net/$package-$version.tar.gz"
-  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
-  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
-  builtin cd "$rvm_src_path/$package-$version"
-  __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
-  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
-  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
-  __rvm_pushpop
-}
-
-__rvm_ncurses_install() {
-  __rvm_make_flags
-  __rvm_pushpop $rvm_src_path
-  package="ncurses" ; version="5.7" ; archive_format="tar.gz"
-  $rvm_scripts_path/log "info" "Retrieving $package"
-  $rvm_scripts_path/fetch "ftp://invisible-island.net/ncurses/ncurses.tar.gz"
-  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
-  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package.$archive_format -C $rvm_src_path" "Extracting $package.$archive_format"
-  builtin cd "$rvm_src_path/$package-$version"
-  __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs" "Configuring $package."
-  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
-  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
-  __rvm_pushpop
-}
-
 __rvm_make_flags() {
   PATH=${rvm_path}/usr/bin:$PATH ; export PATH
   # This is only an issue with Darwin :/
@@ -745,8 +653,8 @@ __rvm_make_flags() {
       ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS
       # Use the latest sdk available.
       if [[ -z "$rvm_sdk" ]] ; then rvm_sdk="$(basename -a /Developer/SDKs/* | awk '/^M/' | sort | tail -n 1)" ; fi
-      CFLAGS="-isysroot /Developer/SDKs/$rvm_sdk $rvm_archflags" ; export CFLAGS
-      LDFLAGS="-Wl,-syslibroot /Developer/SDKs/$rvm_sdk $rvm_archflags" ; export LDFLAGS
+      CFLAGS="${CFLAGS:-"-isysroot /Developer/SDKs/$rvm_sdk $rvm_archflags"}" ; export CFLAGS
+      LDFLAGS="${LDFLAGS:-"-Wl,-syslibroot /Developer/SDKs/$rvm_sdk $rvm_archflags"}" ; export LDFLAGS
       # CXXFLAGS="-mmacosx-version-min="$(sw_vers -productVersion | awk -F'.' '{print $1"."$2}')" -isysroot /Developer/SDKs/$rvm_sdk " ; export CXXFLAGS
     fi
   fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.82
+  version: 0.0.83
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-21 00:00:00 -05:00
+date: 2009-11-26 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -48,9 +48,11 @@ files:
 - scripts/install
 - scripts/irbrc
 - scripts/irbrc.rb
+- scripts/libraries
 - scripts/log
 - scripts/match
 - scripts/monitor
+- scripts/notes
 - scripts/ruby-installer
 - scripts/rvm
 - scripts/rvm-install