rvm 0.0.2 → 0.0.3

data/README

@@ -1 +1,62 @@
-After installation simply run rvm usage for more information.
+
+  Usage:
+
+    rvm Action [Implementation] [Options]
+
+  Action:
+
+    * usage  - Show this usage information
+    use      - Switch to using a specific ruby versio (new login shell)
+    info     - Show information for current ruby
+    gemdir   - Switch to gem directory for installation (new login shell)
+    srcdir   - Switch to src directory for the current ruby installation
+    gemdup   - Clone source implementation version gems to currently used version
+    install  - Install a ruby version, default is from source
+    debug    - Emit environment and configuration information for debugging
+
+  Implementation:
+
+    * ruby   - MRI/YARV Ruby (The Standard), defaults to 1.8.6
+    jruby    - jRuby
+    ree      - Ruby Enterprise Edition
+    rubinius - Rubinius (NIY)
+    default  - Resets to the default system ruby
+    all      - Used with install, installs all latest known versions
+  
+  Options: 
+
+    -v|--version    - Ruby Package Version, defaults to 'latest'
+    -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
+    -c|--configure  - Options for source compile (default: --enable-shared)
+    -d|--debug      - Toggle debug mode on for extra messages (NIY)
+
+  Notes:
+
+    * 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 gemdup to simply allow for a path to base gem dir to clone from
+    * rvm gemdir default
+    * Debug level messages
+    * Rubinius (not in first revisions)
+    * Shell detection instead of simply assuming bash (not in first revisions)
+

data/bash/rvm

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 rvm_author="Wayne E. Seguin"
-rvm_version="0.0.2"
+rvm_version="0.0.3"
 rvm_updated="2009.08.23"
 
 #
@@ -25,6 +25,7 @@ function usage {
     use      - Switch to using a specific ruby versio (new login shell)
     info     - Show information for current ruby
     gemdir   - Switch to gem directory for installation (new login shell)
+    srcdir   - Switch to src directory for the current ruby installation
     gemdup   - Clone source implementation version gems to currently used version
     install  - Install a ruby version, default is from source
     debug    - Emit environment and configuration information for debugging
@@ -44,6 +45,7 @@ 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
+    -c|--configure  - Options for source compile (default: --enable-shared)
     -d|--debug      - Toggle debug mode on for extra messages (NIY)
 
   Notes:
@@ -68,7 +70,8 @@ function usage {
   TODO: (in order)
 
     * Documentation
-    * Change gemdir to simply allow for a path to base gem dir to clone from
+    * Change gemdup to simply allow for a path to base gem dir to clone from
+    * rvm gemdir default
     * Debug level messages
     * Rubinius (not in first revisions)
     * Shell detection instead of simply assuming bash (not in first revisions)
@@ -83,7 +86,7 @@ function debug { log "\e[4;34m <d> $*" ; }
 function info  { log "\e[0;32m <i> $*" ; }
 function warn  { log "\e[0;33m <w> $*" ; }
 function error { log "\e[0;31m <e> $*" ; }
-function fail  { log "\e[0;31m <e> $*" ; }
+function fail  { log "\e[0;31m <e> $*" ; return 1 ; }
 
 function ruby-gi { gem install -q --no-rdoc --no-ri $* ; }
 
@@ -129,7 +132,7 @@ function ruby-install-source {
     if [ ! -f "$package_name.tar.gz" ] ; then $curl $url ; fi
     tar xzf $package_name.tar.gz && cd $package_name/
   fi
-  ./configure --prefix=$install_path/$package_name --enable-shared && make && make install 
+  ./configure --prefix=$install_path/$package_name ${configure-'--enable-shared'} && make && make install 
   chmod +x $install_path/$package_name/bin/*
   popd
 
@@ -191,9 +194,6 @@ function ruby-install {
 
   ruby-gi rake
 
-  MY_RUBY_HOME=ruby_home
-  export ruby_home GEM_HOME PATH MY_RUBY_HOME
-
 }
 
 function ruby-use {
@@ -202,15 +202,15 @@ function ruby-use {
 
     default)
       rm -f ~/.rvm/current
-      unset ruby_home
+      unset MY_RUBY_HOME
       unset GEM_HOME
     ;;
-    #leopard) ruby_home="/System/Library/Frameworks/Ruby.framework/Versions/Current/usr"; GEM_HOME="$HOME/.gem/ruby/1.8" ;;
+    #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}"
       if [ "$version" = "1.2.0" -o "$version" = "1.3.1" ] ; then
-        ruby_home="$install_path/jruby-$version"
+        MY_RUBY_HOME="$install_path/jruby-$version"
         GEM_HOME="$HOME/.gem/jruby/1.8"
         alias ruby_ng="jruby --ng"
         alias ruby_ng_server="jruby --ng-server"
@@ -223,7 +223,7 @@ function ruby-use {
       version=${version-1.8.6}
       if [ "$version" = "1.8.6" ] ; then
         patchlevel="${3-20090610}"
-        ruby_home="$install_path/ruby-enterprise-$version-$patchlevel"
+        MY_RUBY_HOME="$install_path/ruby-enterprise-$version-$patchlevel"
         GEM_HOME="$HOME/.gem/ruby-enterprise/1.8"
       else
         fail "Unknown Ruby Enterprise Edition version: $version"
@@ -233,15 +233,15 @@ function ruby-use {
     ruby)
       if [ "$version" = "1.8.6" ] ; then
         patchlevel="${patchlevel-369}"
-        ruby_home="$install_path/ruby-1.8.6-p$patchlevel"
+        MY_RUBY_HOME="$install_path/ruby-1.8.6-p$patchlevel"
         GEM_HOME="$HOME/.gem/ruby/1.8"
       elif [ "$version" = "1.8.7" ] ; then
         patchlevel="${patchlevel-174}"
-        ruby_home="$install_path/ruby-1.8.7-p$patchlevel"
+        MY_RUBY_HOME="$install_path/ruby-1.8.7-p$patchlevel"
         GEM_HOME="$HOME/.gem/ruby/1.8"
       elif [ "$version" = "1.9.1" -o "$version" = "1.9" ] ; then
         patchlevel="${patchlevel-243}"
-        ruby_home="$install_path/ruby-1.9.1-p$patchlevel"
+        MY_RUBY_HOME="$install_path/ruby-1.9.1-p$patchlevel"
         GEM_HOME="$HOME/.gem/ruby/1.9.1"
       else
         fail "Unknown ruby version: $version"
@@ -254,18 +254,17 @@ function ruby-use {
   esac
 
   if [ ! "$implementation" = "default" ] ; then
-    MY_RUBY_HOME=$ruby_home
-    RUBY_VERSION="$($ruby_home/bin/ruby -v | sed 's/^\(.*\) (.*$/\1/')"
-    export GEM_HOME ruby_home MY_RUBY_HOME RUBY_VERSION
+    RUBY_VERSION="$($MY_RUBY_HOME/bin/ruby -v | sed 's/^\(.*\) (.*$/\1/')"
+    export GEM_HOME MY_RUBY_HOME RUBY_VERSION
 
-    if [ ! -d $ruby_home ] ; then
+    if [ ! -d $MY_RUBY_HOME ] ; then
       warn "$implementation $version is not installed, installing."
       ruby-install $implementation $version $patchlevel
     fi
 
     # Setup ~/.rvm/current
-    echo "PATH=$ruby_home/bin:$GEM_HOME/bin:\$PATH ; export PATH" > ~/.rvm/current
-    for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME ruby_home ; do
+    echo "PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:\$PATH ; export PATH" > ~/.rvm/current
+    for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME ; do
       eval "export $variable"
       eval value=\$${variable}
       echo "${variable}='$value' ; export ${variable}" >> ~/.rvm/current
@@ -285,7 +284,7 @@ function ruby-gem-dir {
     jruby)   GEM_HOME="$HOME/.gem/jruby/1.8" ;;
     ree)     GEM_HOME="$HOME/.gem/ruby-enterprise/1.8"  ;;
     ruby)
-      if [ "$version" = "1.8.6" ] ; then
+      if [ "$version" = "1.8.6" -o "$version" = "1.8" ] ; then
         GEM_HOME="$HOME/.gem/ruby/1.8"
       elif [ "$version" = "1.8.7" ] ; then
         GEM_HOME="$HOME/.gem/ruby/1.8"
@@ -298,39 +297,77 @@ function ruby-gem-dir {
     *)
       fail "Ruby implementation '$implementation' is not known."
   esac
-  cd $GEM_HOME
+
+  if [ -d $GEM_HOME ] ; then
+    cd $GEM_HOME
+  else
+    fail "$implementation $version GEM directory does not exist."
+  fi
 
 }
 
-# clones from source implementation/version to current
-function ruby-gem-dup {
+function ruby-src-dir {
+  case "$implementation" in
 
-  source_implementation=${1-ruby}
-  source_version=${2-1.8.6}
+    jruby)
+      version="${version-1.3.1}"
+      if [ "$version" = "1.2.0" -o "$version" = "1.3.1" ] ; then
+        src_dir="$source_path/$implementation-$version"
+      else
+        fail "Unknown jRuby version: $version"
+      fi
+    ;;
+
+    ree)
+      version=${version-1.8.6}
+      if [ "$version" = "1.8.6" ] ; then
+        patchlevel="${3-20090610}"
+        src_dir="$source_path/ruby-enterprise-$version-$patchlevel"
+      else
+        fail "Unknown Ruby Enterprise Edition version: $version"
+      fi
+    ;;
 
-  # TODO: use ruby-gem-dir for this once it has stabilized
-  case "$source_implementation" in
-    jruby)   gemdir="$HOME/.gem/jruby/1.8" ;;
-    ree)     gemdir="$HOME/.gem/ruby-enterprise/1.8"  ;;
     ruby)
-      if [ "$source_version" = "1.8.6" ] ; then
-        gemdir="$HOME/.gem/ruby/1.8"
-      elif [ "$source_version" = "1.8.7" ] ; then
-        gemdir="$HOME/.gem/ruby/1.8"
-      elif [ "$source_version" = "1.9.1" -o "$version" = "1.9" ] ; then
-        gemdir="$HOME/.gem/ruby/1.9.1"
+      if [ "$version" = "1.8.6" -o "$version" = "1.8" ] ; then
+        patchlevel="${patchlevel-369}"
+        src_dir="$source_path/ruby-1.8.6-p$patchlevel"
+      elif [ "$version" = "1.8.7" ] ; then
+        patchlevel="${patchlevel-174}"
+        src_dir="$source_path/ruby-1.8.7-p$patchlevel"
+      elif [ "$version" = "1.9.1" -o "$version" = "1.9" ] ; then
+        patchlevel="${patchlevel-243}"
+        src_dir="$source_path/ruby-1.9.1-p$patchlevel"
+      else
+        fail "Unknown ruby version: $version"
       fi
     ;;
+
+    *)
+      fail "Ruby implementation '$implementation' is not known."
+      return 1
   esac
 
-  if [ ! -z "$gemdir" ] ; then
-    for gem_name_version in `ls $gemdir/gems` ; do
+  if [ -d $src_dir ] ; then
+    cd $src_dir
+  else
+    fail "$implementation $version source directory does not exist."
+  fi
+
+}
+
+# clones from source implementation/version to current
+function ruby-gem-dup {
+
+  gem_dir=$1 # TODO: check for and remove trailing /gems
+  if [ ! -z "$gem_dir" ] ; then
+    for gem_name_version in `ls $gem_dir/gems` ; do
       gem_name=${gem_name_version%-*}
       gem_version=${gem_name_version##*-}
       if [ -d $GEM_HOME/gems/$gem_name_version ] ; then
         echo "$gem_name_version already installed."
       else
-        ruby-gi $gemdir/cache/$gem_name-$gem_version.gem
+        ruby-gi $gem_dir/cache/$gem_name-$gem_version.gem
       fi
     done
   else
@@ -343,16 +380,24 @@ function rvm-version { info "rvm $rvm_version" ; }
 
 function rvm {
 
+  # Cleanup, aisle 3
+  for variable in action implementation patchlevel version source_path install_path manager debug prefix_path ; do 
+    eval "unset $variable" 
+  done
   while [ $# -gt 0 ] ; do
-    arg="$1" ; shift
-    case "$arg" in 
-      install|use|path|info|gemdir|gemdup|setup|version|debug)
-                       action=$arg                ;;
+    token="$1" ; shift
+    case "$token" in 
+      install|use|path|info|gemdir|gemdup|setup|version|debug|srcdir)
+                       action=$token              ;;
       ruby|jruby|ree|default|all)
-                       implementation="$arg"      ;;
+                       implementation="$token"    ;;
+      1.8|1.9|1.8.6|1.8.7|1.9.1|1.2.0|1.3.1)
+                       version="$token"           ;;
       -v|--version)    version="$1"      ; shift  ;;
       -l|--level)      patchlevel="$1"   ; shift  ;;
       -p|--prefix)     install_path="$1" ; shift  ;;  
+      -s|--source)     source_path="$1"  ; shift  ;; # Undocumented / untested "feature"
+      -c|--configure)  configure="$1"    ; shift  ;;
       -m|--manager)    manager="$1"      ; shift  ;;
       -d|--debug)      debug=true                 ;;
       *)               usage ; return 1
@@ -362,14 +407,14 @@ function rvm {
   curl="curl -O -L -s "
   implementation=${implementation-'ruby'}
   username=`whoami`
+
+  # TODO: Sanitize user input, ensure that there is a / a the end...
   if [ "$username" = "root" ] ; then 
     prefix_path=${prefix-/usr/local/}
   else
     prefix_path=${prefix-$HOME/.}
   fi
-
-  # TODO: Sanitize user input, ensure that there is a / a the end...
-  source_path="${prefix_path}rvm/src"
+  source_path="${source_path-${prefix_path}rvm/src}"
   install_path="${prefix_path}rvm"
   
   mkdir -p $source_path $install_path
@@ -398,6 +443,7 @@ function rvm {
     ;;
     use)     ruby-use     $implementation $version $patchlevel ;;
     gemdir)  ruby-gem-dir $implementation $version $patchlevel ;;
+    srcdir)  ruby-src-dir $implementation $version $patchlevel ;;
     gemdup)  ruby-gem-dup $implementation $version $patchlevel ;;
     info)    ruby-info    $implementation $version $patchlevel ;;
     version) rvm-version                                       ;;

data/bash/rvm-install

@@ -17,5 +17,10 @@ if [ -z "`grep '\.rvm/current' ~/.bash_profile`" ] ; then
   echo "if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi" >> ~/.bash_profile
 fi
 
-source ~/.bash_profile
+if [ -z "`grep '\.profile' ~/.bash_profile`" ] ; then
+  echo "Adding 'source ~/.profile' to the end of ~/.bash_profile."
+  echo "if [ -f ~/.profile ] ; then source ~/.profile ; fi" >> ~/.bash_profile
+fi
+
+source ~/.rvm/bin/rvm
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Wayne E. Seguin