rvm 0.0.16 → 0.0.17

data/README

@@ -1,7 +1,7 @@
 
   About:
 
-    rvm 0.0.16 http://github.com/wayneeseguin/rvm
+    rvm 0.0.17 http://github.com/wayneeseguin/rvm
 
     by Wayne E. Seguin (wayneeseguin@gmail.com)
 
@@ -26,6 +26,8 @@
                 (highly expiramental) Example: rvm gemdup ~/.gem/ruby/1.8/
     install   - Install a ruby version, default is from source
     uninstall - Uninstall a ruby version
+    reset     - Remove default and current settings, exit the shell.
+                (If you experience odd behavior try this first)
     debug     - Emit environment & configuration information for *current* ruby
 
   Implementation:

data/bash/rvm

@@ -3,7 +3,7 @@
 rvm_author="Wayne E. Seguin"
 rvm_author_email="wayneeseguin@gmail.com"
 rvm_website="http://github.com/wayneeseguin/rvm"
-rvm_version="0.0.16"
+rvm_version="0.0.17"
 rvm_updated="2009.08.25"
 
 #
@@ -44,6 +44,8 @@ function rvm-usage {
                 (highly expiramental) Example: rvm gemdup ~/.gem/ruby/1.8/
     install   - Install a ruby version, default is from source
     uninstall - Uninstall a ruby version
+    reset     - Remove default and current settings, exit the shell.
+                (If you experience odd behavior try this first)
     debug     - Emit environment & configuration information for *current* ruby
 
   Implementation:
@@ -388,13 +390,10 @@ function rvm-use {
   case "$implementation" in
 
     default)
-      # TODO: There is a reproducible bug here when switching off of 1.8.7...
-      #       Seems that the path is not reset properly.
       rm -f $install_path/current
       source $install_path/default
       PATH="$default_path" ; export PATH
     ;;
-    #leopard) MY_RUBY_HOME="/System/Library/Frameworks/Ruby.framework/Versions/Current/usr"; GEM_HOME="$HOME/.gem/ruby/1.8" ;;
 
     jruby)
       version="${version-1.3.1}"
@@ -490,6 +489,25 @@ function rvm-list {
   echo "ree:"
   ls $install_path/ | awk '/ruby-enterprise-.*/ { print " - " $NF }'
   echo
+  echo "default:"
+  echo " - system (`$default_system_ruby -v`)"
+}
+
+function rvm-reset {
+
+  PATH="$default_path" ; export PATH
+  for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME ; do
+    unset $variable
+  done
+  rm -f $install_path/default* $install_path/current
+  if [ ! -z "$BASH_VERSION" ] ; then
+    exec bash -l
+  elif [ ! -z "$ZSH_VERSION" ] ; then
+    exec zsh -l
+  else
+    rvm-log-fail "Your shell is not supported bash and zsh are currently supported."
+  fi
+  
 }
  
 function rvm-gem-dir {
@@ -623,12 +641,15 @@ function rvm {
   while [ $# -gt 0 ] ; do
     token="$1" ; shift
     case "$token" in 
-      install|uninstall|use|path|info|setup|version|debug|srcdir|list)
-                       action=$token                           ;;
+      install|uninstall|use|path|info|setup|version|srcdir|list|reset|debug)
+        action=$token
+      ;;
+
       ruby|jruby|ree|default|all)
-                       implementation="$token"
-                       action="${action-use}"
+        implementation="$token"
+        action="${action-use}"
       ;;
+
       gemdir)
         action=$token
         if [ "$1" = "system" ] ; then
@@ -640,10 +661,12 @@ function rvm {
 
         implementation="${implementation-current}" 
       ;;
+
       1.8|1.8.6|1.8.7|1.9|1.9.1|1.9.2|1.2.0|1.3.1)
                        version="$token"  
                        action="${action-use}"
       ;;
+
       -v|--version)    
                        if [ -z "$1" ] ; then  
                          action="version"
@@ -652,6 +675,7 @@ function rvm {
                        fi
                        shift
       ;;
+
       -l|--level)      patchlevel="$1"   ; shift               ;;
       -p|--prefix)     install_path="$1" ; shift               ;;  
       -s|--source)     source_path="$1"  ; shift               ;; # Undocumented / untested "feature"
@@ -716,6 +740,14 @@ function rvm {
     ruby -r rubygems -e "puts Gem::default_path.compact[1] || Gem::default_path.compact.first" > $install_path/default_system_gem_path
   fi
 
+  # system ruby version
+  if [ -s $install_path/default_system_ruby ] ; then
+    default_system_ruby=`cat $install_path/default_system_ruby`
+  else
+   default_system_ruby=`which ruby`
+   echo $default_system_ruby > $install_path/default_system_ruby
+  fi
+
   if [ "$debug" = "1" ] ; then set -x ; fi
 
   case "$action" in
@@ -742,6 +774,7 @@ function rvm {
     gemdup)    rvm-gem-dup   $implementation $version $patchlevel ;;
     info)      rvm-info      $implementation $version $patchlevel ;;
     version)   rvm-version                                        ;;
+    reset)     rvm-reset                                          ;;
     debug)     
                rvm-version
                rvm-info

data/bash/rvm-update

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+user=`whoami`
+if [ "$user" = "root" ] ; then 
+  echo -e "\e[0;31m <e> \e[0mroot user support is not yet implemented.\e[0m"
+  exit 1
+fi
+
+info="\n\e[0;32m<i>\e[0m"
+
+echo -e "$info Updating rvm source ~/.rvm/bin/rvm ..."
+mkdir -p ~/.rvm/src ~/.rvm/bin
+cp $(pwd)/bash/rvm ~/.rvm/bin/
+
+echo -e "\n    Thank you, come again! \n"
+echo -e "        ~ Wayne"
+
+source ~/.rvm/bin/rvm
+

data/bin/rvm-install

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

data/bin/rvm-update

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

data/rvm.gemspec

@@ -0,0 +1,45 @@
+# 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.17"
+
+  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-25}
+  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",
+     "bash/rvm",
+     "bash/rvm-install",
+     "bash/rvm-update",
+     "lib/rvm.rb",
+     "rvm.gemspec"
+  ]
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -10,13 +10,14 @@ bindir: bin
 cert_chain: []
 
 date: 2009-08-25 00:00:00 -04:00
-default_executable: rvm-install
+default_executable: 
 dependencies: []
 
 description: Manages Ruby interpreter installations and switching between them.
 email: wayneeseguin@gmail.com
 executables: 
 - rvm-install
+- rvm-update
 extensions: []
 
 extra_rdoc_files: 
@@ -27,7 +28,9 @@ files:
 - README
 - bash/rvm
 - bash/rvm-install
+- bash/rvm-update
 - lib/rvm.rb
+- rvm.gemspec
 has_rdoc: true
 homepage: http://github.com/wayneeseguin/rvm
 licenses: []