rvm 0.0.1 → 0.0.2

data/LICENCE

@@ -0,0 +1,18 @@
+Copyright (c) 2009 Wayne E. Seguin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bash/rvm

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 rvm_author="Wayne E. Seguin"
-rvm_version="0.0.1"
+rvm_version="0.0.2"
 rvm_updated="2009.08.23"
 
 #
@@ -17,27 +17,26 @@ function usage {
 
   Usage:
 
-    $0 Action [Implementation] [Options]
+    rvm Action [Implementation] [Options]
 
   Action:
 
-    install  - Install a ruby version, default is from source
+    * usage  - Show this usage information
     use      - Switch to using a specific ruby versio (new login shell)
-    path     - Set path for current ruby
     info     - Show information for current ruby
     gemdir   - Switch to gem directory for installation (new login shell)
     gemdup   - Clone source implementation version gems to currently used version
-    setup    - Place rvm to in default path (~/.bin/ && .profile)
-    * usage  - Show this usage information
+    install  - Install a ruby version, default is from source
+    debug    - Emit environment and configuration information for debugging
 
   Implementation:
 
-    * ruby   - MRI/YARV Ruby (The Standard)
+    * ruby   - MRI/YARV Ruby (The Standard), defaults to 1.8.6
     jruby    - jRuby
     ree      - Ruby Enterprise Edition
-    rubinius - Rubinius (NI)
-    leopard  - Leopard's system Ruby ( Mac OS X only )
+    rubinius - Rubinius (NIY)
     default  - Resets to the default system ruby
+    all      - Used with install, installs all latest known versions
   
   Options: 
 
@@ -45,16 +44,32 @@ function usage {
     -l|--level      - Patch level for the specified Ruby version
     -p|--prefix     - Package and source directory prefix, with trailing slash!
                       Default is a users home directory and /usr/local/ for root
-    -m|--manager    - Package Manager to use, one of:
-                      {port,aptitude,apt-get,emerge,yum,pacman}
-    -d|--debug      - Toggle debug mode on
+    -d|--debug      - Toggle debug mode on for extra messages (NIY)
 
   Notes:
 
-    * Defaults are denoted with a * prefix.
+    * Defaults above are denoted with a '*' prefix.
+    * rvm is intended to be run as an individual user (not root, yet)
+    * All ruby installation, configuration and source files are in ~/.rvm
+    * To manually reset to defaults: "rm -f ~/.rvm/current", then open new shell
+    * To preserve previous gem installations for a particular ruby version copy,
+      move, symlink or copy the old gem directory to (1.8 for 1.8.X): 
+      ~/.gem/\$interpreter/\$version
+
+  Examples:
+
+    $ gem install rvm       # Install the rvm gem
+    $ rvm-install           # Install rvm, adds source hooks to ~/.bash_profile
+    $ rvm install jruby     # Install jRuby, default 1.3.1
+    $ rvm use ruby -v 1.9.1 # Use Ruby 1.9, install first if not installed
+    $ rvm use -v 1.9        # Equivalent to above, because of defaults
+    $ rvm use default       # Use the system default (as if no rvm)
 
   TODO: (in order)
 
+    * Documentation
+    * Change gemdir to simply allow for a path to base gem dir to clone from
+    * Debug level messages
     * Rubinius (not in first revisions)
     * Shell detection instead of simply assuming bash (not in first revisions)
 
@@ -123,14 +138,6 @@ function ruby-install-source {
 function ruby-install {
 
   case "$implementation" in
-    leopard) # no-op
-      system_type=`uname`
-      if [ "$system_type" = "Darwin" ] ; then
-        echo "Leopard ruby is not installable via rvm."
-      else
-        fail "leopard ruby is the default ruby installed on Mac OS X (Darwin), you are on: $system_type"
-      fi
-    ;;
 
     ree)
       version=${version-1.8.6}
@@ -198,11 +205,7 @@ function ruby-use {
       unset ruby_home
       unset GEM_HOME
     ;;
-
-    leopard)
-      ruby_home="/System/Library/Frameworks/Ruby.framework/Versions/Current/usr"
-      GEM_HOME="$HOME/.gem/ruby/1.8"
-    ;;
+    #leopard) ruby_home="/System/Library/Frameworks/Ruby.framework/Versions/Current/usr"; GEM_HOME="$HOME/.gem/ruby/1.8" ;;
 
     jruby)
       version="${version-1.3.1}"
@@ -279,7 +282,6 @@ function ruby-use {
 function ruby-gem-dir {
 
   case "$implementation" in
-    leopard) GEM_HOME="$HOME/.gem/ruby/1.8"  ;;
     jruby)   GEM_HOME="$HOME/.gem/jruby/1.8" ;;
     ree)     GEM_HOME="$HOME/.gem/ruby-enterprise/1.8"  ;;
     ruby)
@@ -308,7 +310,6 @@ function ruby-gem-dup {
 
   # TODO: use ruby-gem-dir for this once it has stabilized
   case "$source_implementation" in
-    leopard) gemdir="$HOME/.gem/ruby/1.8"  ;;
     jruby)   gemdir="$HOME/.gem/jruby/1.8" ;;
     ree)     gemdir="$HOME/.gem/ruby-enterprise/1.8"  ;;
     ruby)
@@ -338,40 +339,23 @@ function ruby-gem-dup {
 
 }
 
-function rvm-setup {
-
-  rm -f ~/.bin/rvm
-  bindir=$(dirname `which rvm`)
-  gemsdir="$(dirname $bindir)/gems"
-  cd $gemsdir/`ls -t ~/.gem/ruby/1.8/gems | grep rvm | head -n 1`
-  bash/rvm-setup
-
-  info "~/.bin/rvm is symlinked to the gem's rvm script and ~/.bin is in your path.\n" \
-       "You may now use rvm via the command line the next time you open a terminal shell."
-
-}
-
-function rvm-version {
-
-  info "rvm $rvm_version"
-
-}
+function rvm-version { info "rvm $rvm_version" ; }
 
 function rvm {
 
   while [ $# -gt 0 ] ; do
     arg="$1" ; shift
     case "$arg" in 
-      install|use|path|info|gemdir|gemdup|setup|version)
+      install|use|path|info|gemdir|gemdup|setup|version|debug)
                        action=$arg                ;;
-      ruby|jruby|ree|leopard|default)
+      ruby|jruby|ree|default|all)
                        implementation="$arg"      ;;
       -v|--version)    version="$1"      ; shift  ;;
       -l|--level)      patchlevel="$1"   ; shift  ;;
       -p|--prefix)     install_path="$1" ; shift  ;;  
       -m|--manager)    manager="$1"      ; shift  ;;
       -d|--debug)      debug=true                 ;;
-      *)               usage
+      *)               usage ; return 1
     esac 
   done 
   
@@ -401,11 +385,11 @@ function rvm {
       if [ "$implementation" = "all" ] ; then 
         for implementation in ruby jruby ree ; do
           if [ "$implementation" = "ruby" ] ; then
-            for versions in 1.8.6 1.8.7 1.9.1 ; do
-              ruby-install 
+            for version in 1.8.6 1.8.7 1.9.1 ; do
+              ruby-install $implementation $version $patchlevel 
             done
           else
-              ruby-install 
+              ruby-install $implementation $version $patchlevel 
           fi
         done
       else
@@ -415,11 +399,23 @@ function rvm {
     use)     ruby-use     $implementation $version $patchlevel ;;
     gemdir)  ruby-gem-dir $implementation $version $patchlevel ;;
     gemdup)  ruby-gem-dup $implementation $version $patchlevel ;;
-    path)    ruby-path    $implementation $version $patchlevel ;;
     info)    ruby-info    $implementation $version $patchlevel ;;
     version) rvm-version                                       ;;
-    setup)   rvm-setup                                         ;;
-    *) usage ; fail  "unknown action '$action'"
+    debug)   
+             rvm-version
+             info "GEM_HOME: $GEM_HOME\nMY_RUBY_HOME: $MY_RUBY_HOME"
+             info "ruby: `which ruby`\ngem: `which gem`\nirb: `which irb`"
+             info "PATH:$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"%5}')"
+             info "\n.bash_profile: \n$(cat ~/.bash_profile | tail -n 5)\n"
+             info "\n.rvm/current: \n$(cat ~/.rvm/current)\n"
+             return 0
+    ;;
+    *) 
+             usage 
+             if [ ! -z "$action" ] ; then
+               fail  "unknown action '$action'"
+             fi
+             return 1
   esac
 
 }

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(' ')}'"
+exec "bash -c 'cd #{File.dirname(File.dirname(__FILE__))} && ./bash/rvm-install #{ARGV.join(' ')} ; source ~/.bash_profile'"
 

data/lib/rvm.rb

@@ -0,0 +1,3 @@
+module RVM
+  VERSION = YAML.load_file("#{File.dirname(File.dirname(__FILE__))}/VERSION.yml")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-23 00:00:00 -04:00
+date: 2009-08-24 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -23,9 +23,11 @@ extra_rdoc_files:
 - README
 files: 
 - INSTALL
+- LICENCE
 - README
 - bash/rvm
 - bash/rvm-install
+- lib/rvm.rb
 has_rdoc: true
 homepage: http://github.com/wayneeseguin/rvm
 licenses: []