rvm 0.0.27 → 0.0.28

data/bin/rvm-install

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

data/rvm.gemspec

@@ -0,0 +1,47 @@
+# 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.28"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Wayne E. Seguin"]
+  s.date = %q{2009-09-01}
+  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

data/scripts/rvm

@@ -11,8 +11,8 @@ 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.27"
-  rvm_meta_updated="2009.08.31"
+  rvm_meta_version="0.0.28"
+  rvm_meta_updated="2009.09.01"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -210,9 +210,6 @@ function __rvm_initialize {
   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"}"
 
-  if [ ! -z "$rvm_ruby_configure" ] ; then
-    rvm_ruby_configure="$(echo $rvm_ruby_configure | tr ',-' ' -')"
-  fi
   __rvm_clean-path
   rvm_result=$(echo $PATH | grep 'rvm\/bin:')
   if [ -z $rvm_result ] ; then
@@ -244,6 +241,7 @@ function __rvm_install-source {
       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
+      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" "\tExtracting $rvm_ruby_package_name ..."
       mkdir -p $rvm_source_path/$rvm_ruby_package_name
@@ -306,6 +304,7 @@ function __rvm_install-source {
     cd $rvm_source_path/$rvm_gem_package_name
   else
     __rvm_curl $rvm_gem_url
+    if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_log_path/$rvm_package_file/*.error.log" ; return 1 ; fi
     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
@@ -372,6 +371,7 @@ function __rvm_install-ruby {
       else
         __rvm_log "info" "\tDownloading $rvm_ruby_package_name, this may take a while depending on your connection..."
         __rvm_curl $rvm_url
+        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" "\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
@@ -395,10 +395,11 @@ function __rvm_install-ruby {
         cd $rvm_source_path/$rvm_gem_package_name
       else
         __rvm_curl $rvm_gem_url
+        if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_log_path/$rvm_package_file/*.error.log" ; return 1 ; fi
         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
+      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
 
@@ -410,9 +411,9 @@ function __rvm_install-ruby {
         __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
-    ;;
+      ;;
 
-    rbx|rubinius)
+      rbx|rubinius)
       rvm_ruby_repo_url=$rvm_rubinius_repo_url
       rvm_ruby_configure=""
       rvm_ruby_make="rake"
@@ -428,9 +429,9 @@ function __rvm_install-ruby {
       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
-    ;;
+      ;;
 
-    jruby)
+      jruby)
       rvm_package_file="$rvm_ruby_interpreter-bin-$rvm_ruby_version"
       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"}"
@@ -737,7 +738,7 @@ function __rvm_list {
 function __rvm_reset {
 
   PATH="$rvm_default_path" ; export PATH
-  for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME ; do unset $variable ; done
+  for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME rvm_prompt ; do unset $variable ; done
   rm -f $rvm_install_path/default*
   rm -f $rvm_install_path/current
 
@@ -951,7 +952,16 @@ function __rvm_parse-args {
       -S|--source)       rvm_source_path="$1"      ; shift ;;
       -A|--archive)      rvm_archives_path="$1"    ; shift ;;
       -G|--gems)         rvm_gem_path="$1"         ; shift ;;
-      -C|--configure)    rvm_ruby_configure="$1"   ; shift ;;
+      -C|--configure)
+        if [ ! -z "$1" ] ; then
+          rvm_ruby_configure="$(echo $1 | tr ',-' ' -')"
+          shift
+        else
+          rvm_action="error"
+          rvm_error_message="--configure *must* be followed by configure flags."
+          break;
+        fi
+      ;;
       -M|--make)         rvm_ruby_make="$1"        ; shift ;;
       -I|--make-install) rvm_ruby_make_install="$1"   ; shift ;;
       -l|--level)        rvm_ruby_patch_level="$1" ; shift ;;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-31 00:00:00 -04:00
+date: 2009-09-01 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,7 @@ files:
 - config/cache
 - examples/rvmrc
 - lib/rvm.rb
+- rvm.gemspec
 - scripts/rvm
 - scripts/rvm-install
 - scripts/rvm-update