rvm 0.0.4 → 0.0.5

data/README

@@ -1,4 +1,10 @@
 
+  About:
+
+    rvm 0.0.5 http://github.com/wayneeseguin/rvm
+
+    by Wayne E. Seguin (wayneeseguin@gmail.com)
+
   Usage:
 
     rvm Action [Implementation] [Options]
@@ -10,7 +16,8 @@
     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
+    gemdup   - Clone source implementation version gems to currently used version 
+               (expiramental)
     install  - Install a ruby version, default is from source
     debug    - Emit environment and configuration information for debugging
 
@@ -19,7 +26,6 @@
     * 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
   
@@ -30,7 +36,7 @@
     -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)
+    -d|--debug      - Toggle debug mode on for extra messages (NYI)
 
   Notes:
 
@@ -45,18 +51,29 @@
   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-install           # Install rvm, adds source hooks for bash & zsh
+    $ rvm install jruby     # Install jRuby (default version is 1.3.1)
+    $ rvm use ruby -v 1.9.1 # Use Ruby 1.9.1, installs if necessary
+    $ rvm use 1.9           # Equivalent to above, due to defaults
+    $ rvm use 1.8           # Use Ruby 1.8.6, installs if necessary
     $ 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)
+
+  Credits:
+
+    Bash Support Testing
+
+      - Daniel Neighman (dneighman@gmail.com)
+        irc: hassox    ; github: http://github.com/hassox
+
+      - John Mettraux (jmettraux@openwfe.org)
+        irc: jmettraux ; github: http://github.com/jmettraux
+    
+    ZSH Support Testing
+
+      - Franco Lazzarino (flazzarino@gmail.com)
+        irc: flazz     ; github: http://github.com/flazz
 

data/bash/rvm

@@ -1,7 +1,9 @@
 #!/bin/bash
 
 rvm_author="Wayne E. Seguin"
-rvm_version="0.0.4"
+rvm_author_email="wayneeseguin@gmail.com"
+rvm_website="http://github.com/wayneeseguin/rvm"
+rvm_version="0.0.5"
 rvm_updated="2009.08.23"
 
 #
@@ -11,10 +13,16 @@ rvm_updated="2009.08.23"
 #
 # Functions
 #
-function usage {
+function rvm-usage {
 
   cat <<-Usage
 
+  About:
+
+    rvm ${rvm_version} ${rvm_website}
+
+    by ${rvm_author} (${rvm_author_email})
+
   Usage:
 
     rvm Action [Implementation] [Options]
@@ -36,7 +44,6 @@ function usage {
     * 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
   
@@ -47,7 +54,7 @@ function usage {
     -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)
+    -d|--debug      - Toggle debug mode on for extra messages (NYI)
 
   Notes:
 
@@ -62,21 +69,31 @@ function usage {
   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.1, install first if not installed
-    $ rvm use 1.9           # Equivalent to above, due to dof efaults
-    $ rvm use 1.8           # Use Ruby 1.8.6, install first if not installed
+    $ rvm-install           # Install rvm, adds source hooks for bash & zsh
+    $ rvm install jruby     # Install jRuby (default version is 1.3.1)
+    $ rvm use ruby -v 1.9.1 # Use Ruby 1.9.1, installs if necessary
+    $ rvm use 1.9           # Equivalent to above, due to defaults
+    $ rvm use 1.8           # Use Ruby 1.8.6, installs if necessary
     $ 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)
+
+  Credits:
+
+    Bash Support Testing
+
+      - Daniel Neighman (dneighman@gmail.com)
+        irc: hassox    ; github: http://github.com/hassox
+
+      - John Mettraux (jmettraux@openwfe.org)
+        irc: jmettraux ; github: http://github.com/jmettraux
+    
+    ZSH Support Testing
+
+      - Franco Lazzarino (flazzarino@gmail.com)
+        irc: flazz     ; github: http://github.com/flazz
 
 Usage
 
@@ -90,9 +107,9 @@ function warn  { log "\e[0;33m <w> $*" ; }
 function error { log "\e[0;31m <e> $*" ; }
 function fail  { log "\e[0;31m <e> $*" ; return 1 ; }
 
-function ruby-gi { gem install -q --no-rdoc --no-ri $* ; }
+function rvm-gi { gem install -q --no-rdoc --no-ri $* ; }
 
-function ruby-info {
+function rvm-info {
 
   full_version=$(ruby -v)
   ruby_implementation=$(echo "$full_version" | awk '{print $1}')
@@ -115,11 +132,12 @@ Info
 
 }
 
-function ruby-install-source {
+function rvm-install-source {
 
-  case "${version-$1}" in
+  version="${1:-1.8.6}"
+  case "$version" in
     1.9|1.9.1) major="1.9" ; minor="1" ; level="${2-243}" ;;
-    1.9.2)     major="1.9" ; minor="2" ; level="review1" ;;
+    1.9.2)     major="1.9" ; minor="2" ; level="${2-review1}" ;;
     1.8|1.8.6) major="1.8" ; minor="6" ; level="${2-369}" ;;
         1.8.7) major="1.8" ; minor="7" ; level="${2-174}" ;;
     *) fail "Ruby version '$version' is unknown."
@@ -132,7 +150,7 @@ function ruby-install-source {
   if [ -d $package_name ]  ; then
     cd $package_name
   else
-    if [ ! -f "$package_name.tar.gz" ] ; then $curl $url ; fi
+    if [ ! -f "$package_name.tar.gz" ] ; then curl -O -L -s $url ; fi
     tar xzf $package_name.tar.gz && cd $package_name/
   fi
   ./configure --prefix=$install_path/$package_name ${configure-'--enable-shared'} && make && make install 
@@ -144,7 +162,7 @@ function ruby-install-source {
   if [ -d $gem_package_name ]  ; then
     cd $gem_package_name
   else
-    if [ ! -f $gem_package_name.tgz ] ; then $curl $gem_url ; fi
+    if [ ! -f $gem_package_name.tgz ] ; then curl -O -L -s $gem_url ; fi
     tar zxf $gem_package_name.tgz && cd $gem_package_name
   fi
   # Well this is fun... fix nil error on require_paths:
@@ -154,7 +172,7 @@ function ruby-install-source {
 
 }
 
-function ruby-install {
+function rvm-install-ruby {
 
   case "$implementation" in
 
@@ -167,7 +185,7 @@ function ruby-install {
       if [ -d $package_name ]  ; then
         cd $package_name
       else
-        if [ ! -f "$package_name.tar.gz" ] ; then $curl $url ; fi
+        if [ ! -f "$package_name.tar.gz" ] ; then curl -O -L -s $url ; fi
         tar xzf $package_name.tar.gz && cd $package_name/
       fi
       cd ruby-enterprise-$version-$patchlevel && ./installer -a $install_path/ruby-enterprise-$version-$patchlevel --dont-install-useful-gems
@@ -177,7 +195,7 @@ function ruby-install {
 
     jruby)
       version=${version-1.3.1} # 1.2.0, 1.3.1
-      patchlevel="" # No patchlevel for jRuby
+      unset patchlevel # No patchlevel for jRuby
       package_name="$implementation-bin-$version"
       package_dir="$implementation-$version"
       url="http://dist.codehaus.org/$implementation/$version/$package_name.zip"
@@ -185,7 +203,7 @@ function ruby-install {
       if [ -d $package_name ]  ; then
         cd $package_name
       else
-        if [ ! -f "$package_name.zip" ] ; then $curl $url ; fi
+        if [ ! -f "$package_name.zip" ] ; then curl -O -L -s $url ; fi
         jar xf $package_name.zip && cd $package_name/
       fi
       mkdir -p $install_path/$package_dir/bin/
@@ -196,23 +214,25 @@ function ruby-install {
       cd $source_path/$package_dir/tool/nailgun && make
       popd
       chmod +x $install_path/$package_dir/bin/*
-      ruby-gi jruby-openssl
+      rvm-gi jruby-openssl
     ;;
 
     ruby)
-      version=${version-1.8.6}
-      ruby-install-source $version ${patchlevel-$3}
+      rvm-install-source ${version-1.8.6} ${patchlevel-$3}
     ;;
 
+    default)
+      fail "please specify a ruby implementation to install."
+    ;;
     *) fail "Ruby implementation '$implementation' is not known."
 
   esac
 
-  ruby-gi rake
+  rvm-gi rake
 
 }
 
-function ruby-use {
+function rvm-use {
 
   case "$implementation" in
 
@@ -247,22 +267,26 @@ function ruby-use {
     ;;
 
     ruby)
-      if [ "$version" = "1.8.6" ] ; then
-        level="${patchlevel-369}"
-        MY_RUBY_HOME="$install_path/ruby-1.8.6-p$level"
-        GEM_HOME="$HOME/.gem/ruby/1.8"
-      elif [ "$version" = "1.8.7" ] ; then
+      if [ "$version" = "1.8.7" ] ; then
         level="${patchlevel-174}"
         MY_RUBY_HOME="$install_path/ruby-1.8.7-p$level"
         GEM_HOME="$HOME/.gem/ruby/1.8"
-      elif [ "$version" = "1.9.1" -o "$version" = "1.9" ] ; then
-        level="${patchlevel-243}"
-        MY_RUBY_HOME="$install_path/ruby-1.9.1-p$level"
-        GEM_HOME="$HOME/.gem/ruby/1.9"
+
+      elif [ "$version" = "1.8.6" -o "$version" = "1.8" ] ; then
+        level="${patchlevel-369}"
+        MY_RUBY_HOME="$install_path/ruby-1.8.6-p$level"
+        GEM_HOME="$HOME/.gem/ruby/1.8"
+
       elif [ "$version" = "1.9.2" ] ; then
         level="${patchlevel-review1}"
         MY_RUBY_HOME="$install_path/ruby-1.9.2-p$level"
-        GEM_HOME="$HOME/.gem/ruby/1.9"
+        GEM_HOME="$HOME/.gem/ruby/1.9.2"
+
+      elif [ "$version" = "1.9.1" -o "$version" = "1.9" ] ; then
+        level="${patchlevel-243}"
+        MY_RUBY_HOME="$install_path/ruby-1.9.1-p$level"
+        GEM_HOME="$HOME/.gem/ruby/1.9.1"
+
       else
         fail "Unknown ruby version: $version"
       fi
@@ -279,7 +303,7 @@ function ruby-use {
 
     if [ ! -d $MY_RUBY_HOME ] ; then
       warn "$implementation $version is not installed, installing."
-      ruby-install $implementation $version $level
+      rvm-install-ruby $implementation $version $level
     fi
 
     # Setup ~/.rvm/current
@@ -294,20 +318,30 @@ function ruby-use {
   fi
 
   info "Switching to $implementation $version $patchlevel ..."
-  exec bash --login
-
+  if [ ! -z "$BASH_VERSION" ] ; then
+    exec bash -l
+  elif [ ! -z "$ZSH_VERSION" ] ; then
+    exec zsh -l
+  else
+    fail "Your shell '$0' is not supported."
+  fi
 }
  
-function ruby-gem-dir {
+function rvm-gem-dir {
 
   case "$implementation" in
     jruby)   GEM_HOME="$HOME/.gem/jruby/1.8" ;;
     ree)     GEM_HOME="$HOME/.gem/ruby-enterprise/1.8"  ;;
     ruby)
-      if [ "${version%\.*}" = "1.8" ] ; then
+      if [ "$version" = "1.8" -o "$version" = "1.8.6" ] ; then
         GEM_HOME="$HOME/.gem/ruby/1.8"
-      elif [ "${version%\.*}" = "1.9" ] ; then
-        GEM_HOME="$HOME/.gem/ruby/1.9"
+
+      elif [ "$version" = "1.9.2" ] ; then
+        GEM_HOME="$HOME/.gem/ruby/1.9.2"
+
+      elif [ "$version" = "1.9" -o "$version" = "1.9.1" ] ; then
+        GEM_HOME="$HOME/.gem/ruby/1.9.1"
+
       else
         fail "Unknown ruby version: $version"
       fi
@@ -317,14 +351,14 @@ function ruby-gem-dir {
   esac
 
   if [ -d $GEM_HOME ] ; then
-    cd $GEM_HOME
+    echo $GEM_HOME && cd $GEM_HOME
   else
     fail "$implementation $version GEM directory does not exist."
   fi
 
 }
 
-function ruby-src-dir {
+function rvm-src-dir {
   case "$implementation" in
 
     jruby)
@@ -339,26 +373,25 @@ function ruby-src-dir {
     ree)
       version=${version-1.8.6}
       if [ "$version" = "1.8.6" ] ; then
-        patchlevel="${3-20090610}"
-        src_dir="$source_path/ruby-enterprise-$version-$patchlevel"
+        src_dir="$source_path/ruby-enterprise-$version-"${3-20090610}""
       else
         fail "Unknown Ruby Enterprise Edition version: $version"
       fi
     ;;
 
     ruby)
-      if [ "$version" = "1.8.6" -o "$version" = "1.8" ] ; then
-        level="${patchlevel-369}"
-        src_dir="$source_path/ruby-1.8.6-p$level"
-      elif [ "$version" = "1.8.7" ] ; then
-        level="${patchlevel-174}"
-        src_dir="$source_path/ruby-1.8.7-p$level"
-      elif [ "$version" = "1.9.1" -o "$version" = "1.9" ] ; then
-        level="${patchlevel-243}"
-        src_dir="$source_path/ruby-1.9.1-p$level"
+      if [ "$version" = "1.8.7" ] ; then
+        src_dir="$source_path/ruby-1.8.7-p${patchlevel-174}"
+
+      elif [ "${version%\.*}" = "1.8" ] ; then
+        src_dir="$source_path/ruby-1.8.6-p${patchlevel-369}"
+
       elif [ "$version" = "1.9.2" ] ; then
-        level="${patchlevel-review1}"
-        src_dir="$source_path/ruby-1.9.2-p$level"
+        src_dir="$source_path/ruby-1.9.2-p${patchlevel-review1}"
+
+      elif [ "${version%\.*}" = "1.9" ] ; then
+        src_dir="$source_path/ruby-1.9.1-p${patchlevel-243}"
+
       else
         fail "Unknown ruby version: $version"
       fi
@@ -378,7 +411,7 @@ function ruby-src-dir {
 }
 
 # clones from source implementation/version to current
-function ruby-gem-dup {
+function rvm-gem-dup {
 
   gem_dir=$1 # TODO: check for and remove trailing /gems
   if [ ! -z "$gem_dir" ] ; then
@@ -388,7 +421,7 @@ function ruby-gem-dup {
       if [ -d $GEM_HOME/gems/$gem_name_version ] ; then
         echo "$gem_name_version already installed."
       else
-        ruby-gi $gem_dir/cache/$gem_name-$gem_version.gem
+        rvm-gi $gem_dir/cache/$gem_name-$gem_version.gem
       fi
     done
   else
@@ -408,25 +441,29 @@ function rvm {
   while [ $# -gt 0 ] ; do
     token="$1" ; shift
     case "$token" in 
-      install|use|path|info|gemdir|gemdup|setup|version|debug|srcdir)
-                       action=$token              ;;
+      install|use|path|info|gemdir|setup|version|debug|srcdir)
+                       action=$token                           ;;
       ruby|jruby|ree|default|all)
-                       implementation="$token"    ;;
-      1.8|1.9|1.8.6|1.8.7|1.9.1|1.9.2|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
+                       implementation="$token"                 ;;
+      1.8|1.8.6|1.8.7|1.9|1.9.1|1.9.2|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               ;;
+      -u|--gemdup)     action="gemdup" ; gem_dir="$1" ; shift  ;;
+      -d|--debug)      debug=true                              ;;
+      *)               rvm-usage ; return 1
     esac 
   done 
   
-  curl="curl -O -L -s "
-  implementation=${implementation-'ruby'}
+  if [ -z "$implementation" -a -z "$version" ] ; then 
+    implementation="default"
+  else
+    implementation=${implementation-'ruby'}
+  fi
   username=`whoami`
 
   # TODO: Sanitize user input, ensure that there is a / a the end...
@@ -440,7 +477,9 @@ function rvm {
   
   mkdir -p $source_path $install_path
 
-  original_path=`cat $install_path/.original_path`
+  if [ -f ~/.rvm/original_path ] ; then
+    original_path=`cat ~/.rvm/original_path`
+  fi
   if [ -z "$original_path" ] ; then 
     echo $PATH > $install_path/.original_path
     original_path=$PATH
@@ -452,21 +491,21 @@ function rvm {
         for implementation in ruby jruby ree ; do
           if [ "$implementation" = "ruby" ] ; then
             for version in 1.8.6 1.8.7 1.9.1 1.9.2 ; do
-              ruby-install $implementation $version $patchlevel 
+              rvm-install-ruby $implementation $version $patchlevel 
             done
           else
-              ruby-install $implementation $version $patchlevel 
+              rvm-install-ruby $implementation $version $patchlevel 
           fi
         done
       else
-        ruby-install $implementation $version $patchlevel 
+        rvm-install-ruby $implementation $version $patchlevel 
       fi
     ;;
-    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 ;;
+    use)     rvm-use     $implementation $version $patchlevel ;;
+    gemdir)  rvm-gem-dir $implementation $version $patchlevel ;;
+    srcdir)  rvm-src-dir $implementation $version $patchlevel ;;
+    gemdup)  rvm-gem-dup $implementation $version $patchlevel ;;
+    info)    rvm-info    $implementation $version $patchlevel ;;
     version) rvm-version                                       ;;
     debug)   
              rvm-version
@@ -478,9 +517,10 @@ function rvm {
              return 0
     ;;
     *) 
-             usage 
              if [ ! -z "$action" ] ; then
                fail  "unknown action '$action'"
+             else
+               rvm-usage 
              fi
              return 1
   esac

data/bash/rvm-install

@@ -2,25 +2,30 @@
 
 mkdir -p ~/.rvm/src ~/.rvm/bin
 
-cwd=`pwd`
-cp $cwd/bash/rvm ~/.rvm/bin/
+cp $(pwd)/bash/rvm ~/.rvm/bin/
 
-touch ~/.bash_profile
-
-if [ -z "`grep '\.rvm/bin/rvm' ~/.bash_profile`" ] ; then
-  echo "Adding 'source ~/.rvm' to your ~/.bash_profile."
-  echo "source ~/.rvm/bin/rvm" >> ~/.bash_profile
+touch ~/.profile
+if [ -z "`grep '\.rvm/bin/rvm' ~/.profile`" ] ; then
+  echo "Adding 'source ~/.rvm/bin/rvm' to your ~/.profile."
+  echo "source ~/.rvm/bin/rvm" >> ~/.profile
 fi
 
-if [ -z "`grep '\.rvm/current' ~/.bash_profile`" ] ; then
-  echo "Adding 'source ~/.rvm/current' ~/.bash_profile."
-  echo "if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi" >> ~/.bash_profile
+if [ -z "`grep '\.rvm/current' ~/.profile`" ] ; then
+  echo "Adding 'source ~/.rvm/current' ~/.profile."
+  echo "if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi" >> ~/.profile
 fi
 
+touch ~/.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
+touch ~/.zprofile
+if [ -z "`grep '\.profile' ~/.zprofile`" ] ; then
+  echo "Adding 'source ~/.profile' to the end of ~/.zprofile."
+  echo "if [ -f ~/.profile ] ; then source ~/.profile ; fi" >> ~/.zprofile
+fi
+
+echo -e "\n\e[0;32mOpen a new shell and enjoy rvm: rvm usage\e[0m\n"
 

metadata

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