rvm 0.0.26 → 0.0.27

data/scripts/rvm

@@ -11,7 +11,7 @@ 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.26"
+  rvm_meta_version="0.0.27"
   rvm_meta_updated="2009.08.31"
 }
 
@@ -46,6 +46,7 @@ function __rvm_usage {
     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:
 
@@ -87,6 +88,7 @@ function __rvm_usage {
     -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:
@@ -203,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"}"
@@ -272,6 +275,7 @@ function __rvm_install-source {
   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)..."
     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."
   fi
@@ -282,12 +286,14 @@ function __rvm_install-source {
   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"
     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/*
 
@@ -370,12 +376,14 @@ function __rvm_install-ruby {
         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)..."
       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
@@ -390,6 +398,7 @@ function __rvm_install-ruby {
         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
 
@@ -414,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
@@ -446,10 +456,12 @@ function __rvm_install-ruby {
           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..."
       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/*
@@ -658,6 +670,7 @@ function __rvm_use {
 
     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
@@ -670,11 +683,12 @@ 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
 
@@ -722,13 +736,32 @@ function __rvm_list {
 
 function __rvm_reset {
 
-  __rvm_select "system"
-
   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_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 {
@@ -757,11 +790,11 @@ function __rvm_src-dir {
 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
@@ -812,7 +845,7 @@ function __rvm_cache {
 }
 
 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 rvm_prompt
+  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 {
@@ -824,7 +857,7 @@ 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)
@@ -928,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"
@@ -995,10 +1029,11 @@ 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
 cat <<-Info

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -29,7 +29,6 @@ files:
 - config/cache
 - examples/rvmrc
 - lib/rvm.rb
-- rvm.gemspec
 - scripts/rvm
 - scripts/rvm-install
 - scripts/rvm-update

data/rvm.gemspec

@@ -1,47 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{rvm}
-  s.version = "0.0.26"
-
-  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-31}
-  s.description = %q{Manages Ruby interpreter installations and switching between them.}
-  s.email = %q{wayneeseguin@gmail.com}
-  s.executables = ["rvm-install", "rvm-update"]
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    "INSTALL",
-     "LICENCE",
-     "README",
-     "config/cache",
-     "examples/rvmrc",
-     "lib/rvm.rb",
-     "rvm.gemspec",
-     "scripts/rvm",
-     "scripts/rvm-install",
-     "scripts/rvm-update"
-  ]
-  s.homepage = %q{http://github.com/wayneeseguin/rvm}
-  s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{dynamicreports}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Ruby Version Manager (rvm)}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end