wayneeseguin-rvm 0.0.25 → 0.0.27

data/bin/rvm-install

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 # Hot potato!!! Bash it!
-exec "bash -l -c 'cd #{File.dirname(File.dirname(__FILE__))} && ./scripts/rvm-install #{ARGV.join(' ')} && source ~/.rvm/scripts/rvm'"
+%x["bash -l -c 'cd #{File.dirname(File.dirname(__FILE__))} && ./scripts/rvm-install #{ARGV.join(' ')} && source ~/.rvm/scripts/rvm'"]
 

data/bin/rvm-update

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 # Hot potato!!! Bash it!
-exec "bash -l -c 'cd #{File.dirname(File.dirname(__FILE__))} && ./scripts/rvm-update #{ARGV.join(' ')} && source ~/.rvm/scripts/rvm'"
+%x["bash -l -c 'cd #{File.dirname(File.dirname(__FILE__))} && ./scripts/rvm-update #{ARGV.join(' ')} && source ~/.rvm/scripts/rvm'"]
 

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.25"
+  s.version = "0.0.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-08-30}
+  s.date = %q{2009-08-31}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
   s.executables = ["rvm-install", "rvm-update"]

data/scripts/rvm

@@ -7,32 +7,23 @@
 #
 # Functions
 #
-function rvm-meta {
+function __rvm_meta {
   rvm_meta_author="Wayne E. Seguin"
   rvm_meta_author_email="wayneeseguin@gmail.com"
   rvm_meta_website="http://rvm.beginrescueend.com/"
-  rvm_meta_version="0.0.25"
-  rvm_meta_updated="2009.08.25"
+  rvm_meta_version="0.0.27"
+  rvm_meta_updated="2009.08.31"
 }
 
-function rvm-version { rvm-meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
+function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
 
-function rvm-usage {
+function __rvm_usage {
 
-  rvm-meta
+  __rvm_meta
 
   cat <<-Usage
 
-  About:
-
-    rvm ${rvm_meta_version} ${rvm_meta_website}
-
-    by ${rvm_meta_author} (${rvm_meta_author_email})
-
-  Installation:
-
-    $ gem install rvm             # Install the rvm gem
-    $ rvm-install                 # Install rvm, adds hooks for bash & zsh
+  rvm ${rvm_meta_version} ${rvm_meta_website} by ${rvm_meta_author} (${rvm_meta_author_email})
 
   Usage:
 
@@ -53,15 +44,18 @@ function rvm-usage {
     reset     - Remove default and current settings, exit the shell.
                 (If you experience odd behavior try this first)
     reload    - Reload rvm source itself (useful after changing rvm source)
+    rubydo    - Used with -f to run a ruby file against specified or all rubies
     debug     - Emit environment & configuration information for *current* ruby
+    implode   - Removes all ruby installations it manages, everything in ~/.rvm
 
   Implementation:
 
     * ruby    - MRI/YARV Ruby (The Standard), defaults to 1.8.6
     jruby     - jRuby
+    rubinius  - Rubinius
     ree       - Ruby Enterprise Edition
-    default   - Resets to the default system ruby
-    all       - Used with install, installs all latest known versions
+    system    - Use the system ruby (eg. pre-rvm state)
+    default   - Use rvm set default ruby and system if it hasn't been set.
 
   Options:
 
@@ -72,15 +66,34 @@ function rvm-usage {
     -c|--configure - Options for source compile (default: --enable-shared)
     -a|--archives  - Directory to place downladed files into (~/.rvm/archives/)
     -n|--nice      - Niceness level (default: 0)
-    -d|--debug     - Toggle debug mode on for very verbose output.
     -m|--gem-set   - Named gem set for switching between different gem sets
     --rm-gem-set   - Removes a named gemset.
 
+    -l|--level     - Specify a patch level to use
+    -t|--tag       -
+    -r|--rev       - Specify the repository revision # to use or 'head' for
+
+    -P|--prefix    - Sets the prefix path for installs to be installed to
+    -B|--bin       - Specifies the path for binaries to be placed
+    -S|--source    - Specifies the src directory to use
+    -A|--archive   - Specifies the archive directory to use (tabralls / zips)
+    -G|--gems      - Specifies the root gem path to use
+    -C|--configure - Specifies any custom command line configure options
+    -M|--make      - Specify a custom make command
+    -I|--make-install - "    a custom make install command
+
+    -n|--nice      - Specify a process niceness (for slow computers)
+    -f|--file      - Specify a ruby file to run with 'rubydo' command
+    -h|--help      - Emit this output and exit
+    -d|--default   - Set the default Ruby to a specified version
+    -m|--gem-set   - Use a named gem set instead of the default set.
+    --rm-gem-set   - Remove a named gem set
+    --jit          - Enable JIT for the Rubinius build
+    --debug        - Toggle debug mode on for very verbose output.
+
   Resources:
 
-    http://rvm.beginrescueend.com/notes/
-    http://rvm.beginrescueend.com/examples/
-    http://rvm.beginrescueend.com/todo/
+    http://rvm.beginrescueend.com/
     https://www.pivotaltracker.com/projects/26822
 
 Usage
@@ -88,7 +101,7 @@ Usage
 }
 
 # Logging functions based on level
-function rvm-log   {
+function __rvm_log   {
 
   case "$1" in
     debug) shift ; echo -e "\n\033[0;35m <d> $* \033[0m" ;;
@@ -99,22 +112,22 @@ function rvm-log   {
   esac
 }
 
-function rvm-clean-path {
+function __rvm_clean-path {
   PATH=`echo $PATH | tr -s ':' '\n' | awk '!($0 in a){a[$0];print}' | tr -s '\n' ':'`
   PATH="${PATH%:}"
   export PATH
 }
 
-function rvm-remove-from-path {
+function __rvm_remove-from-path {
   PATH=`echo $PATH | tr -s ':' '\n' | grep -v "\.rvm" | tr -s '\n' ':'`
   PATH="${PATH%:}"
   export PATH
 }
 
-function rvm-gi { gem install -q --no-rdoc --no-ri $* ; }
-function rvm-gems-install { for gem in $* ; do rvm-gi $gem ; done }
+function __rvm_gi { gem install -q --no-rdoc --no-ri $* ; }
+function __rvm_gems-install { for gem in $* ; do __rvm_gi $gem ; done }
 
-function rvm-set-defaults {
+function __rvm_set-defaults {
 
   # TODO: Store defaults in "defaults/" dir.
   if [ ! -f $rvm_install_path/default ] ; then
@@ -128,16 +141,16 @@ function rvm-set-defaults {
   if [ -s $rvm_install_path/default_path ] ; then
     rvm_default_path=`cat $rvm_install_path/default_path`
   else
-    rvm-clean-path # Clean the path the first time we compute default path.
-    rvm-remove-from-path
+    __rvm_clean-path # Clean the path the first time we compute default path.
+    __rvm_remove-from-path
     echo $PATH > $rvm_install_path/default_path
     rvm_default_path=$PATH
   fi
 
-  rvm_default_ps1=`rvm-cache rvm_default_ps1`
+  rvm_default_ps1=`__rvm_cache rvm_default_ps1`
   if [ -z "$rvm_default_ps1" ] ; then
     rvm_default_ps1=$PS1
-    rvm-cache "rvm_default_ps1" "$rvm_default_ps1"
+    __rvm_cache "rvm_default_ps1" "$rvm_default_ps1"
   fi
 
   if [ -s $rvm_install_path/default_user_gem_path ] ; then
@@ -161,11 +174,11 @@ function rvm-set-defaults {
 
 }
 
-function rvm-initialize {
+function __rvm_initialize {
 
   rvm_curl=`which curl`
   if [ $? -ne 0 ] ; then
-    rvm-log "fail" "rvm expects that curl is available, which curl shows no curl :("
+    __rvm_log "fail" "rvm expects that curl is available, which curl shows no curl :("
   else
     rvm_curl="$rvm_curl -O -L -s -C - "
   fi
@@ -174,7 +187,7 @@ function rvm-initialize {
 
   # TODO: Sanitize user input, ensure that there is a / a the end...
   if [ "`whoami`" = "root" ] ; then
-    rvm-log "fail" "root user support is not yet implemented."
+    __rvm_log "fail" "root user support is not yet implemented."
     #rvm_prefix_path=${rvm_prefix_path:-/usr/local/}
   else
     rvm_prefix_path=${rvm_prefix_path:-"$HOME/."}
@@ -192,6 +205,7 @@ function rvm-initialize {
   rvm_config_path=${rvm_config_path:-"${rvm_install_path}/config"}
 
   rvm_ruby_repo_url="${rvm_ruby_repo_url:-"http://svn.ruby-lang.org/repos/ruby"}"
+  # Rubinius sha1's will be available after RC1.
   rvm_rubinius_repo_url="${rvm_rubinius_repo_url:-"git://github.com/evanphx/rubinius.git"}"
   rvm_macruby_repo_url="${rvm_macruby_repo_url:-"http://svn.macosforge.org/repository/ruby/MacRuby"}"
   rvm_jruby_repo_url="${rvm_jruby_repo_url:-"git://kenai.com/jruby~main"}"
@@ -199,7 +213,7 @@ function rvm-initialize {
   if [ ! -z "$rvm_ruby_configure" ] ; then
     rvm_ruby_configure="$(echo $rvm_ruby_configure | tr ',-' ' -')"
   fi
-  rvm-clean-path
+  __rvm_clean-path
   rvm_result=$(echo $PATH | grep 'rvm\/bin:')
   if [ -z $rvm_result ] ; then
     PATH=$rvm_bin_path:$PATH ; export PATH
@@ -208,7 +222,7 @@ function rvm-initialize {
   mkdir -p $rvm_source_path $rvm_install_path/bin $rvm_archives_path
 }
 
-function rvm-curl {
+function __rvm_curl {
 
   pushd $rvm_archives_path > /dev/null
   eval $rvm_curl "$1"
@@ -216,11 +230,11 @@ function rvm-curl {
 
 }
 
-function rvm-install-source {
+function __rvm_install-source {
 
-  if [ -z "$rvm_selected" ] ; then rvm-select $* ; fi
+  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
-  rvm-log "info" "Installing Ruby from source to: $rvm_install_path/$rvm_ruby_package_name"
+  __rvm_log "info" "Installing Ruby from source to: $rvm_install_path/$rvm_ruby_package_name"
   mkdir -p $rvm_log_path/$rvm_ruby_package_name
 
   pushd $rvm_source_path > /dev/null
@@ -228,10 +242,10 @@ function rvm-install-source {
   if [ -z "$rvm_ruby_tag" -a -z "$rvm_ruby_rev" ] ; then
     if [ ! -d $rvm_source_path/$rvm_ruby_package_name ]  ; then
       rvm_url="${rvm_url:-"ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_name.tar.gz"}"
-      rvm-log "info" "\tDownloading $rvm_ruby_package_name, this may take a while depending on your connection..."
-      rvm-curl $rvm_url
+      __rvm_log "info" "\tDownloading $rvm_ruby_package_name, this may take a while depending on your connection..."
+      __rvm_curl $rvm_url
 
-      rvm-log "info" "\tExtracting $rvm_ruby_package_name ..."
+      __rvm_log "info" "\tExtracting $rvm_ruby_package_name ..."
       mkdir -p $rvm_source_path/$rvm_ruby_package_name
       nice -n $rvm_niceness tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path
     fi
@@ -250,7 +264,7 @@ function rvm-install-source {
         rvm_rev="-r $rvm_ruby_rev"
       fi
     fi
-    rvm-log "info" "\tRetrieving Ruby from $rvm_url"
+    __rvm_log "info" "\tRetrieving Ruby from $rvm_url"
     mkdir -p $rvm_source_path/$rvm_ruby_package_name
     # TODO: Instead of always forcing, check if it's already svn for correct url and simply check out required revision
     svn checkout -q $rvm_rev --force $rvm_url $rvm_source_path/$rvm_ruby_package_name
@@ -259,36 +273,39 @@ function rvm-install-source {
   fi
 
   if [ -s ./configure ] ; then
-    rvm-log "info" "\tConfiguring $rvm_ruby_package_name using ${rvm_ruby_configure:-"--enable-shared"}, this may take a while depending on your cpu(s)..."
+    __rvm_log "info" "\tConfiguring $rvm_ruby_package_name using ${rvm_ruby_configure:-"--enable-shared"}, this may take a while depending on your cpu(s)..."
     nice -n $rvm_niceness ./configure --prefix=$rvm_install_path/$rvm_ruby_package_name ${rvm_ruby_configure:-"--enable-shared"} > $rvm_log_path/$rvm_ruby_package_name/configure.log 2> $rvm_log_path/$rvm_ruby_package_name/configure.error.log
+    if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_log_path/$rvm_package_file/*.error.log" ; return 1 ; fi
   else
-    rvm-log "warn" "\tSkipping configure step, ./configure file does not exist."
+    __rvm_log "warn" "\tSkipping configure step, ./configure file does not exist."
   fi
 
-  rvm-log "info" "\tCompiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
+  __rvm_log "info" "\tCompiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
   if [ -z "$rvm_ruby_make" ] ; then
     nice -n $rvm_niceness make > $rvm_log_path/$rvm_ruby_package_name/make.log 2> $rvm_log_path/$rvm_ruby_package_name/make.error.log
   else
     nice -n $rvm_niceness $rvm_ruby_make > $rvm_log_path/$rvm_ruby_package_name/install.log 2> $rvm_log_path/$rvm_ruby_package_name/install.error.log
   fi
+    if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_log_path/$rvm_package_file/*.error.log" ; return 1 ; fi
   if [ -z "$rvm_ruby_make" ] ; then
-    rvm-log "info" "\tInstalling $rvm_ruby_package_name"
+    __rvm_log "info" "\tInstalling $rvm_ruby_package_name"
     nice -n $rvm_niceness make install > $rvm_log_path/$rvm_ruby_package_name/install.log 2> $rvm_log_path/$rvm_ruby_package_name/install.error.log
   else
     nice -n $rvm_niceness $rvm_ruby_make_install > $rvm_log_path/$rvm_ruby_package_name/install.log 2> $rvm_log_path/$rvm_ruby_package_name/install.error.log
   fi
+  if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_log_path/$rvm_package_file/*.error.log" ; return 1 ; fi
 
   chmod +x $rvm_install_path/$rvm_ruby_package_name/bin/*
 
   ln -fs $rvm_install_path/$rvm_ruby_package_name/bin/ruby $rvm_install_path/bin/$rvm_ruby_package_name
 
-  rvm-log "info" "\tInstalling rubygems dedicated to $rvm_ruby_package_name..."
+  __rvm_log "info" "\tInstalling rubygems dedicated to $rvm_ruby_package_name..."
   rvm_gem_package_name="rubygems-1.3.5"
   rvm_gem_url="http://rubyforge.org/frs/download.php/60718/$rvm_gem_package_name.tgz"
   if [ -d $rvm_source_path/$rvm_gem_package_name ]  ; then
     cd $rvm_source_path/$rvm_gem_package_name
   else
-    rvm-curl $rvm_gem_url
+    __rvm_curl $rvm_gem_url
     mkdir -p $rvm_source_path/$rvm_gem_package_name
     nice -n $rvm_niceness tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_source_path
   fi
@@ -297,17 +314,17 @@ function rvm-install-source {
 
   nice -n $rvm_niceness $rvm_install_path/$rvm_ruby_package_name/bin/ruby $rvm_source_path/$rvm_gem_package_name/setup.rb > $rvm_log_path/$rvm_ruby_package_name/rubygems.install.log 2> $rvm_log_path/$rvm_ruby_package_name/rubygems.install.error.log
   popd > /dev/null
-  rvm-log "info" "Installation of $rvm_ruby_package_name complete."
+  __rvm_log "info" "Installation of $rvm_ruby_package_name complete."
 
   for rvm_gem_name in rake ; do
-    rvm-log "info" "Installing $rvm_gem_name"
+    __rvm_log "info" "Installing $rvm_gem_name"
     nice -n $rvm_niceness $rvm_install_path/$rvm_ruby_package_name/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q >> $rvm_log_path/$rvm_ruby_package_name/gems.install.log 2> $rvm_log_path/$rvm_ruby_package_name/gems.error.log
   done
 }
 
-function rvm-install-ruby {
+function __rvm_install-ruby {
 
-  if [ -z "$rvm_selected" ] ; then rvm-select $* ; fi
+  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
   if [ -z "$RUBYOPT" ] ; then ruby_options=$RUBYOPT ; unset RUBYOPT ; fi
 
@@ -334,65 +351,68 @@ function rvm-install-ruby {
             rvm_ruby_rev="-r $rvm_ruby_rev"
           fi
         fi
-        rvm-log "info" "\tRetrieving MacRuby from $rvm_url"
+        __rvm_log "info" "\tRetrieving MacRuby from $rvm_url"
         #mkdir -p $rvm_source_path/$rvm_ruby_package_name
         # TODO: Instead of always forcing, check if it's already svn for correct url and simply check out required revision
         #svn checkout -q $rvm_rev --force $rvm_url $rvm_source_path/$rvm_ruby_package_name
         cd $rvm_source_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."
+          __rvm_log "fail" "MacRuby can only be installed on a Darwin OS."
       fi
     ;;
 
     ruby-enterprise|ree)
       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_install_path/$rvm_ruby_package_name"
+      __rvm_log "info" "Installing Ruby Enterprise Edition from source to: $rvm_install_path/$rvm_ruby_package_name"
       pushd $rvm_source_path > /dev/null
       if [ -d $rvm_source_path/$rvm_ruby_package_name ]  ; then
         cd $rvm_source_path/$rvm_ruby_package_name
       else
-        rvm-log "info" "\tDownloading $rvm_ruby_package_name, this may take a while depending on your connection..."
-        rvm-curl $rvm_url
-        rvm-log "info" "\tExtracting $rvm_ruby_package_name..."
+        __rvm_log "info" "\tDownloading $rvm_ruby_package_name, this may take a while depending on your connection..."
+        __rvm_curl $rvm_url
+        __rvm_log "info" "\tExtracting $rvm_ruby_package_name..."
         mkdir -p $rvm_source_path/$rvm_ruby_package_name
         nice -n $rvm_niceness tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path
       fi
+      if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_log_path/$rvm_package_file/*.error.log" ; return 1 ; fi
 
-      rvm-log "info" "\tInstalling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
+      __rvm_log "info" "\tInstalling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
       mkdir -p $rvm_log_path/$rvm_ruby_package_name
 
       cd $rvm_source_path/$rvm_ruby_package_name
       nice -n $rvm_niceness ./installer -a $rvm_install_path/ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level --dont-install-useful-gems --no-tcmalloc > $rvm_log_path/$rvm_ruby_package_name/install.log 2> $rvm_log_path/$rvm_ruby_package_name/install.error.log
+      if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_log_path/$rvm_package_file/*.error.log" ; return 1 ; fi
       chmod +x $rvm_install_path/$rvm_ruby_package_name/bin/*
 
       ln -fs $rvm_install_path/$rvm_ruby_package_name/bin/ruby $rvm_install_path/bin/$rvm_ruby_package_name
 
-      rvm-log "info" "\tInstalling rubygems dedicated to $rvm_ruby_package_name..."
+      __rvm_log "info" "\tInstalling rubygems dedicated to $rvm_ruby_package_name..."
       rvm_gem_package_name="rubygems-1.3.5"
       rvm_gem_url="http://rubyforge.org/frs/download.php/60718/$rvm_gem_package_name.tgz"
       if [ -d $rvm_source_path/$rvm_gem_package_name ]  ; then
         cd $rvm_source_path/$rvm_gem_package_name
       else
-        rvm-curl $rvm_gem_url
+        __rvm_curl $rvm_gem_url
         mkdir -p $rvm_source_path/$rvm_gem_package_name
         nice -n $rvm_niceness tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_source_path
       fi
+    if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_log_path/$rvm_package_file/*.error.log" ; return 1 ; fi
       # Well this is fun... fix nil error on require_paths:
       sed -i.orig "s/require_paths\.join/require_paths.to_a.join/" $rvm_source_path/$rvm_gem_package_name/lib/rubygems/gem_path_searcher.rb > $rvm_log_path/$rvm_ruby_package_name/rubygems.install.log 2> $rvm_log_path/$rvm_ruby_package_name/rubygems.install.error.log
 
       nice -n $rvm_niceness $rvm_install_path/$rvm_ruby_package_name/bin/ruby $rvm_source_path/$rvm_gem_package_name/setup.rb > $rvm_log_path/$rvm_ruby_package_name/rubygems.install.log 2> $rvm_log_path/$rvm_ruby_package_name/rubygems.install.error.log
-      rvm-log "info" "Installation of $rvm_ruby_package_name complete."
+      __rvm_log "info" "Installation of $rvm_ruby_package_name complete."
       popd > /dev/null
 
       for rvm_gem_name in rake ; do
-        rvm-log "info" "Installing $rvm_gem_name"
+        __rvm_log "info" "Installing $rvm_gem_name"
         nice -n $rvm_niceness $rvm_install_path/$rvm_ruby_package_name/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q >> $rvm_log_path/$rvm_ruby_package_name/gems.install.log 2> $rvm_log_path/$rvm_ruby_package_name/gems.error.log
       done
     ;;
 
-    rubinius)
+    rbx|rubinius)
       rvm_ruby_repo_url=$rvm_rubinius_repo_url
       rvm_ruby_configure=""
       rvm_ruby_make="rake"
@@ -403,7 +423,8 @@ function rvm-install-ruby {
         rm -rf $rvm_install_path/$rvm_ruby_interpreter-$rvm_ruby_version
         git clone --depth 1 $rvm_ruby_repo_url $rvm_install_path/$rvm_ruby_interpreter-$rvm_ruby_version
       fi
-      cd $rvm_install_path/$rvm_ruby_interpreter-$rvm_ruby_version && rake build
+      cd $rvm_install_path/$rvm_ruby_interpreter-$rvm_ruby_version && $rvm_rubinius_jit rake build
+      if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_log_path/$rvm_package_file/*.error.log" ; return 1 ; fi
       for binary in ruby irb ; do
         ln -fs $rvm_install_path/$rvm_ruby_interpreter-$rvm_ruby_version/bin/rbx $rvm_install_path/$rvm_ruby_interpreter-$rvm_ruby_version/bin/$binary
       done
@@ -414,7 +435,7 @@ function rvm-install-ruby {
       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_install_path/$rvm_ruby_package_name"
+      __rvm_log "info" "Installing jRuby to: $rvm_install_path/$rvm_ruby_package_name"
       mkdir -p $rvm_log_path/$rvm_ruby_package_name
       pushd $rvm_source_path > /dev/null
 
@@ -428,17 +449,19 @@ function rvm-install-ruby {
         if [ -d $rvm_source_path/$rvm_ruby_package_name ]  ; then
           cd $rvm_source_path/$rvm_ruby_package_name
         else
-          rvm-log "info" "\tDownloading $rvm_package_file, this may take a while depending on your connection..."
-          rvm-curl $rvm_url
-          rvm-log "info" "\tExtracting $rvm_package_file..."
+          __rvm_log "info" "\tDownloading $rvm_package_file, this may take a while depending on your connection..."
+          __rvm_curl $rvm_url
+          __rvm_log "info" "\tExtracting $rvm_package_file..."
           nice -n $rvm_niceness unzip -q $rvm_archives_path/$rvm_package_file.zip -d $rvm_source_path
           cd $rvm_source_path/$rvm_ruby_package_name
         fi
       fi
+      if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_log_path/$rvm_package_file/*.error.log" ; return 1 ; fi
 
-      rvm-log "info" "\tInstalling $rvm_ruby_package_name..."
+      __rvm_log "info" "\tInstalling $rvm_ruby_package_name..."
       mkdir -p $rvm_install_path/$rvm_ruby_package_name/bin/
       rsync -ag $rvm_source_path/$rvm_ruby_package_name/ $rvm_install_path/$rvm_ruby_package_name/
+      if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_log_path/$rvm_package_file/*.error.log" ; return 1 ; fi
       cd $rvm_source_path/$rvm_ruby_package_name/tool/nailgun && make > $rvm_log_path/$rvm_ruby_package_name/install.nailgun.log 2> $rvm_log_path/$rvm_ruby_package_name/install.error.nailgun.log
       popd > /dev/null
       chmod +x $rvm_install_path/$rvm_ruby_package_name/bin/*
@@ -449,19 +472,19 @@ function rvm-install-ruby {
       ln -fs $rvm_install_path/$rvm_ruby_package_name/bin/ruby $rvm_install_path/bin/$rvm_ruby_package_name
 
       for rvm_gem_name in rake jruby-openssl ; do
-        rvm-log "info" "Installing $rvm_gem_name"
+        __rvm_log "info" "Installing $rvm_gem_name"
         nice -n $rvm_niceness $rvm_install_path/$rvm_ruby_package_name/bin/jgem install $rvm_gem_name --no-rdoc --no-ri -q >> $rvm_log_path/$rvm_ruby_package_name/gems.install.log 2> $rvm_log_path/$rvm_ruby_package_name/gems.error.log
       done
     ;;
 
     ruby)
-      rvm-install-source $*
+      __rvm_install-source $*
     ;;
 
     default)
-      rvm-log "fail" "please specify a ruby implementation to install."
+      __rvm_log "fail" "please specify a ruby implementation to install."
     ;;
-    *) rvm-log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
+    *) __rvm_log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
 
   esac
 
@@ -471,17 +494,17 @@ function rvm-install-ruby {
 
 }
 
-function rvm-uninstall {
+function __rvm_uninstall {
 
-  if [ -z "$rvm_selected" ] ; then rvm-select $* ; fi
+  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
   if [ ! -z "$rvm_ruby_package_name" ] ; then
     for dir in $rvm_source_path $rvm_install_path ; do
       if [ -d $dir/$rvm_ruby_package_name ] ; then
-        rvm-log "info" "Removing $dir/$rvm_ruby_package_name..."
+        __rvm_log "info" "Removing $dir/$rvm_ruby_package_name..."
         rm -rf $dir/$rvm_ruby_package_name
       else
-        rvm-log "info" "it seems that $dir/$rvm_ruby_package_name is already non existent."
+        __rvm_log "info" "it seems that $dir/$rvm_ruby_package_name is already non existent."
       fi
       if [ -e $rvm_bin_path/$rvm_ruby_package_name ] ; then
         rm -f $rvm_bin_path/$rvm_ruby_package_name
@@ -489,13 +512,13 @@ function rvm-uninstall {
     done ; unset dir
     rm -rf $rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version*/
   else
-    rvm-log "fail" "Cannot uninstall unknown package '$rvm_ruby_package_name'"
+    __rvm_log "fail" "Cannot uninstall unknown package '$rvm_ruby_package_name'"
   fi
 
 }
 
-# rvm-select implementation version patch_level
-function rvm-select {
+# __rvm_select implementation version patch_level
+function __rvm_select {
 
   rvm_ruby_interpreter="${1:-$rvm_ruby_interpreter}"
   rvm_ruby_interpreter="${rvm_ruby_interpreter:-ruby}" # Default is standard ruby
@@ -510,11 +533,12 @@ function rvm-select {
         rvm_ruby_version="head" # For now we are only supporting latest
         unset rvm_ruby_patch_level
       else
-        rvm-log "fail" "MacRuby can only be installed on a Darwin OS."
+        __rvm_log "fail" "MacRuby can only be installed on a Darwin OS."
       fi
     ;;
 
-    rubinius)
+    rbx|rubinius)
+      rvm_ruby_version="head"
       rvm_ruby_version="head"
       unset rvm_ruby_patch_level
       rvm_ruby_repo_url=$rvm_rubinius_repo_url
@@ -528,7 +552,7 @@ function rvm-select {
       rvm_ruby_version="${rvm_ruby_version:-1.3.1}"
       unset rvm_ruby_patch_level
       if [ "$rvm_ruby_version" != "1.2.0" -a "$rvm_ruby_version" != "1.3.1" ] ; then
-        rvm-log "fail" "Unknown jRuby version: $rvm_ruby_version"
+        __rvm_log "fail" "Unknown jRuby version: $rvm_ruby_version"
       fi
       alias jruby_ng="jruby --ng"
       alias jruby_ng_server="jruby --ng-server"
@@ -540,7 +564,7 @@ function rvm-select {
       rvm_ruby_patch_level="${3:-20090610}"
 
       if [ "$rvm_ruby_version" != "1.8.6" ] ; then
-        rvm-log "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
+        __rvm_log "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
       fi
     ;;
 
@@ -570,19 +594,15 @@ function rvm-select {
         unset rvm_ruby_patch_level
 
       else
-        rvm-log "fail" "Unknown ruby version: $rvm_ruby_version"
+        __rvm_log "fail" "Unknown ruby version: $rvm_ruby_version"
       fi
     ;;
 
-    system|default)
-      unset rvm_ruby_interpreter rvm_ruby_version
-      rvm-cleanup-variables
-      if [ -e $rvm_install_path/current ] ; then
-        source $rvm_install_path/current
-      fi
+    default|system)
+      #noop?
     ;;
     *)
-      rvm-log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
+      __rvm_log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
   esac
 
   if [ ! -z "$rvm_ruby_rev" ] ; then
@@ -625,17 +645,18 @@ function rvm-select {
 
 }
 
-function rvm-use {
+function __rvm_use {
 
-  if [ -z "$rvm_selected" ] ; then rvm-select $* ; fi
+  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_ruby_interpreter" ] ; then rvm_ruby_interpreter="default" ; fi
 
-  if [ "$rvm_ruby_interpreter" = "default" -o "$rvm_ruby_interpreter" = "system" -o -z "$rvm_ruby_interpreter" ] ; then
+  if [ "$rvm_ruby_interpreter" = "default" -o "$rvm_ruby_interpreter" = "system" ] ; then
     unset GEM_HOME MY_RUBY_HOME IRBRC
-    rvm-cleanup-variables
     PATH="$rvm_default_path" ; export PATH
-    if [ -e $rvm_install_path/current ] ; then
+    if [ "$rvm_ruby_interpreter" = "default" -a -s $rvm_install_path/current ] ; then
       source $rvm_install_path/current
     fi
+
   else
     GEM_HOME=$rvm_gem_home ; export GEM_HOME
     MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME
@@ -643,12 +664,13 @@ function rvm-use {
 
     # Install if not installed
     if [ ! -d $MY_RUBY_HOME ] ; then
-      rvm-log "warn" "$rvm_ruby_interpreter $rvm_ruby_version is not installed."
-      rvm-install-ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level
+      __rvm_log "warn" "$rvm_ruby_interpreter $rvm_ruby_version is not installed."
+      __rvm_install-ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level
     fi
 
     if [ ! -s "$rvm_ruby_irbrc" ] ; then
       rvm_irbrc_file=$(cat <<Config
+      require "irb/completion" rescue nil
   @prompt = {
     :PROMPT_I => "${rvm_ruby_package_name} > ", # default prompt
     :PROMPT_S => "${rvm_ruby_package_name}%l> ", # known continuation
@@ -661,16 +683,18 @@ function rvm-use {
   IRB.conf[:PROMPT][@prompt_mode] = @prompt
   IRB.conf[:PROMPT_MODE] = @prompt_mode
 
-  require "irb/completion" rescue nil
 Config
 )
-      # TODO: Prepend users irbrc, keep custom path
-      echo "$rvm_irbrc_file" > $rvm_ruby_home/.irbrc
+      if [ -s ~/.irbrc ] ; then
+        cat ~/.irbrc >  $rvm_ruby_home/.irbrc
+      fi
+      echo "$rvm_irbrc_file" >> $rvm_ruby_home/.irbrc
     fi
     PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_default_path ; export PATH
 
-    if [ ! -z "$PS1" ] ; then
-      PS1="\033[0;32m${rvm_ruby_package_name}\033[0m:: ${rvm_default_ps1}" ; export PS1
+    rvm_prompt="$rvm_ruby_package_name" ; export rvm_prompt
+    if [ ! -z "$rvm_set_prompt" -a ! -z "$PS1" ] ; then
+      PS1="\033[0;32m${rvm_prompt}\033[0m:: ${rvm_default_ps1}" ; export PS1
     fi
 
     if [ ! -z "$rvm_set_default" ] ; then
@@ -688,7 +712,7 @@ Config
   fi
 }
 
-function rvm-symlinks {
+function __rvm_symlinks {
 
   mkdir -p ${rvm_install_path}/bin
   for release in `/bin/ls $rvm_install_path | grep 'ruby-'` ; do
@@ -701,7 +725,7 @@ function rvm-symlinks {
 
 }
 
-function rvm-list {
+function __rvm_list {
 
   echo -e "\nruby:\n$(/bin/ls -l $rvm_install_path/ | awk '/ ruby-[1-2].*/ { print " - " $NF  }')\n"
   echo -e "jruby:\n$(/bin/ls -l $rvm_install_path/ | awk '/jruby-.*/ { print " - " $NF }')\n"
@@ -710,48 +734,67 @@ function rvm-list {
 
 }
 
-function rvm-reset {
-
-  rvm-select "default"
+function __rvm_reset {
 
   PATH="$rvm_default_path" ; export PATH
   for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME ; do unset $variable ; done
   rm -f $rvm_install_path/default*
   rm -f $rvm_install_path/current
 
+  __rvm_select "system"
+
 }
 
-function rvm-gem-dir {
+function __rvm_implode {
+  while : ; do
+    __rvm_log "warn" "Are you SURE you wish for rvm to implode? This will remove $rvm_install_path ? (type 'yes' or 'no')"
+    read response
+    if [ "$response" = "yes" ] ; then
+      if [ -d $rvm_install_path ] ; then
+        __rvm_log "info" "Hai! Removing $rvm_install_path"
+        rm -rf $rvm_install_path/
+      else
+        __rvm_log "info" "It appears that $rvm_install_path is already non existant."
+      fi
+      break
+    elif [ "$response" = "no" ] ; then
+      __rvm_log "info" "Cancelling implosion, no harm done :)"
+      break
+    fi
+  done
+}
+
+function __rvm_gem-dir {
 
-  if [ -z "$rvm_selected" ] ; then rvm-select $* ; fi
+  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
   mkdir -p $rvm_gem_home
   echo $rvm_gem_home
 }
 
-function rvm-src-dir {
+function __rvm_src-dir {
 
-  if [ -z "$rvm_selected" ] ; then rvm-select $* ; fi
+  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
   if [ "$rvm_ruby_interpreter" -a "$rvm_ruby_version" ] ; then
     rvm_ruby_source_dir="$rvm_source_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"
     mkdir -p $rvm_ruby_source_dir
     echo "$rvm_ruby_source_dir"
   else
-    rvm-log "fail" "No source directory exists for the default implementation."
+    __rvm_log "fail" "No source directory exists for the default implementation."
   fi
 
 }
 
 # clones from source implementation/version to current
-function rvm-gem-dup {
+function __rvm_gem-dup {
 
   if [ "$1" = "default" ] ; then
-    rvm_source_gem_dir="$default_user_gem_path"
+    rvm_source_gem_dir="$rvm_default_user_gem_path"
   elif [ "$1" = "system" ] ; then
-    rvm_source_gem_dir="$default_system_gem_path"
+    rvm_source_gem_dir="$rvm_default_system_gem_path"
   else
-    rvm_source_gem_dir=${1:-$default_user_gem_path} # TODO: check for and remove trailing /gems
+    rvm_source_gem_dir=${1:-$rvm_default_user_gem_path} # TODO: check for and remove trailing /gems
   fi
 
   if [ ! -z "$rvm_source_gem_dir" ] ; then
@@ -761,28 +804,28 @@ function rvm-gem-dup {
       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_dir/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 $rvm_ruby_interpreter version: $rvm_ruby_version"
   fi
 
 }
 
-function rvm-execute {
-  if [ -z "$rvm_selected" ] ; then rvm-select $* ; fi
+function __rvm_execute {
+  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
   $rvm_ruby_home/bin/ruby $rvm_ruby_args
 }
 
-function rvm-cache {
+function __rvm_cache {
   rvm_cache_file="$rvm_config_path/cache"
   touch $rvm_cache_file
   key="$1" ; shift
 
   if [ -z "$key" ] ; then
-    rvm-log "fail" "rvm-cache must be called with at least one argument: rvm-cache key [value]"
+    __rvm_log "fail" "__rvm_cache must be called with at least one argument: __rvm_cache key [value]"
   else
     if [ "$key" = "unset" -o "$key" = "delete" ] ; then
       sed -i~ "s/^$2=.*$//" $rvm_cache_file
@@ -801,20 +844,20 @@ function rvm-cache {
   fi
 }
 
-function rvm-cleanup-variables {
+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_install_path rvm_debug rvm_prefix_path rvm_ruby_package_name rvm_gem_path rvm_command rvm_error_message IRBRC rvm_ruby_home rvm_ruby_binary rvm_gem_set_name rvm_delete_flag rvm_ruby_tag rvm_ruby_rev rvm_url rvm_ruby_make rvm_ruby_make_install rvm_config_path
 }
 
-function rvm-get-user-defaults {
+function __rvm_get-user-defaults {
   # NOW load defaults settings. TODO: root user loads /etc/rvmrc
   if [ -s ~/.rvmrc ] ; then source ~/.rvmrc ; fi
 }
 
-function rvm-parse-args {
+function __rvm_parse-args {
   while [ $# -gt 0 ] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      install|uninstall|path|info|setup|version|srcdir|list|symlinks|reset|debug|reload|usage|help)
+      install|uninstall|path|info|setup|version|srcdir|list|symlinks|reset|debug|reload|usage|help|implode)
         rvm_action=$rvm_token
       ;;
       use)
@@ -824,7 +867,7 @@ function rvm-parse-args {
         fi
       ;;
 
-      ruby|jruby|ree|macruby|rubinius|default|all)
+      ruby|jruby|ree|macruby|rbx|rubinius|default|all)
         rvm_ruby_interpreter="$rvm_token"
         rvm_action="${rvm_action:-use}"
       ;;
@@ -918,7 +961,8 @@ function rvm-parse-args {
       -d|--default)      rvm_set_default=1                 ;;
       --debug)           rvm_debug=1                       ;;
       -m|--gem-set)      rvm_gem_set_name="$1"     ; shift ;;
-      --rm-gem-set)      rvm_gem_set_name_rm="$1"  ; shift ;;
+         --rm-gem-set)   rvm_gem_set_name_rm="$1"  ; shift ;;
+         --jit)          rvm_rubinius_jit="RBX_LLVM=1"     ;;
 
       default|system)
         rvm_action="use"
@@ -939,37 +983,22 @@ function rvm-parse-args {
 
 function rvm {
 
-  rvm-cleanup-variables
-  rvm-get-user-defaults
-  rvm-initialize
-  rvm-set-defaults
-  rvm-parse-args $*
+  __rvm_cleanup-variables
+  __rvm_get-user-defaults
+  __rvm_initialize
+  __rvm_set-defaults
+  __rvm_parse-args $*
 
   case "$rvm_action" in
-    install)
-      if [ "$rvm_ruby_interpreter" = "all" ] ; then
-        for rvm_ruby_interpreter in ruby jruby ree ; do
-          if [ "$rvm_ruby_interpreter" = "ruby" ] ; then
-            for rvm_ruby_version in 1.8.6 1.8.7 1.9.1 1.9.2 ; do
-              rvm-install-ruby $rvm_ruby_interpreter $rvm_ruby_version
-            done
-          else
-            rvm-install-ruby $rvm_ruby_interpreter $rvm_ruby_version
-          fi
-          unset rvm_ruby_version
-        done
-      else
-        rvm-install-ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level
-      fi
-    ;;
-    uninstall) rvm-uninstall $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
-    use)       rvm-use       $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
-    list)      rvm-list                                                                    ;;
-    gemdir)    rvm-gem-dir   $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
-    srcdir)    rvm-src-dir   $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
-    gemdup)    rvm-gem-dup   $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
-    symlinks)  rvm-symlinks                                                                ;;
-    version)   rvm-version                                                                 ;;
+    install)   __rvm_install-ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
+    uninstall) __rvm_uninstall    $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
+    use)       __rvm_use          $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
+    list)      __rvm_list                                                                       ;;
+    gemdir)    __rvm_gem-dir      $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
+    srcdir)    __rvm_src-dir      $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
+    gemdup)    __rvm_gem-dup      $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level ;;
+    symlinks)  __rvm_symlinks                                                                   ;;
+    version)   __rvm_version                                                                    ;;
     rubydo)
                if [ ! -z "$rvm_ruby_version" ] ; then
                  rvm_ruby_versions=$(echo $rvm_ruby_version | tr ',' ' ')
@@ -982,7 +1011,7 @@ function rvm {
                      unset rvm_ruby_version
                    fi
                    unset temp
-                   rvm-select $rvm_ruby_interpreter $rvm_ruby_version
+                   __rvm_select $rvm_ruby_interpreter $rvm_ruby_version
 
                    rvm_command="$rvm_ruby_binary $rvm_ruby_args"
                    echo "$(basename $rvm_ruby_binary):"
@@ -1000,12 +1029,13 @@ function rvm {
                  done
                fi
                ;;
-    reset)     rvm-reset                                                       ;;
+    reset)     __rvm_reset                                                          ;;
                # TODO: how can we use bin_path here for reload, default file?
-    reload)    source ~/.rvm/scripts/rvm                                       ;;
-    error)     rvm-log "fail" "$rvm_error_message ( see: rvm usage )" ; return 1;          ;;
+    reload)    source ~/.rvm/scripts/rvm                                            ;;
+    implode)   __rvm_implode                                                        ;;
+    error)     __rvm_log "fail" "$rvm_error_message ( see: rvm usage )" ; return 1; ;;
     info|debug)
-               rvm-version
+               __rvm_version
 cat <<-Info
 
 ruby:
@@ -1032,27 +1062,27 @@ environment:
 Info
 
                if [ "$rvm_action" = "debug" ] ; then
-                 rvm-log "info" "PATH:$(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$(cat ~/$file | grep rvm)\n"
+                     __rvm_log "debug" "~/$file:\n$(cat ~/$file | grep rvm)\n"
                    fi
                  done
                  if [ -s $rvm_install_path/current ] ; then
-                   rvm-log "debug" "$rvm_install_path/current:\n$($rvm_install_path/current)\n"
+                   __rvm_log "debug" "$rvm_install_path/current:\n$($rvm_install_path/current)\n"
                  fi
                  if [ -e $rvm_install_path/bin/rvm ] ; then
-                   rvm-log "debug" "rvm script in bin:\n$(ls -laht $rvm_install_path/bin/rvm)"
+                   __rvm_log "debug" "rvm script in bin:\n$(ls -laht $rvm_install_path/bin/rvm)"
                  fi
                fi
                return 0
     ;;
-    usage|help) rvm-usage ;;
+    usage|help) __rvm_usage ;;
     *)
                if [ ! -z "$rvm_action" ] ; then
-                 rvm-log "fail"  "unknown action '$rvm_action'"
+                 __rvm_log "fail"  "unknown action '$rvm_action'"
                else
-                 rvm-usage
+                 __rvm_usage
                fi
                return 1
   esac

data/scripts/rvm-install

@@ -8,10 +8,13 @@ fi
 
 info="\n\033[0;32m<i>\033[0m"
 question="\n\033[0;32m<?>\033[0m"
-
-echo -e "Installing rvm source to ~/.rvm/scripts/rvm..."
 cwd=$(pwd)
+source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
+if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
+source_dir="${source_dir:-$cwd}"
 rvm_dir=~/.rvm
+
+echo -e "Installing rvm source to ~/.rvm/scripts/rvm..."
 mkdir -p $rvm_dir
 
 for dir in src scripts bin log archives config gems examples ; do
@@ -32,8 +35,8 @@ fi
 
 for dir in scripts examples ; do
   mkdir -p $rvm_dir/$dir
-  for file in `/bin/ls $dir/`; do
-    cp $cwd/$dir/$file $rvm_dir/$dir/$file
+  for file in `/bin/ls $source_dir/$dir/`; do
+    cp $source_dir/$dir/$file $rvm_dir/$dir/$file
   done
 done
 

data/scripts/rvm-update

@@ -6,6 +6,9 @@ if [ "$user" = "root" ] ; then
   exit 1
 fi
 cwd=$(pwd)
+source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
+if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
+source_dir="${source_dir:-$cwd}"
 rvm_dir=~/.rvm
 
 info="\n\033[0;32m<i>\033[0m"
@@ -29,8 +32,8 @@ fi
 
 for dir in scripts examples ; do
   mkdir -p $rvm_dir/$dir
-  for file in `/bin/ls $dir/`; do
-    cp $cwd/$dir/$file $rvm_dir/$dir/$file
+  for file in `/bin/ls $source_dir/$dir/`; do
+    cp $source_dir/$dir/$file $rvm_dir/$dir/$file
   done
 done
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wayneeseguin-rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.25
+  version: 0.0.27
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-30 00:00:00 -07:00
+date: 2009-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -35,7 +35,6 @@ files:
 - scripts/rvm-update
 has_rdoc: false
 homepage: http://github.com/wayneeseguin/rvm
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --inline-source
@@ -57,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dynamicreports
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Ruby Version Manager (rvm)