rvm 0.0.15 → 0.0.16

data/README

@@ -1,10 +1,15 @@
 
   About:
 
-    rvm 0.0.10 http://github.com/wayneeseguin/rvm
+    rvm 0.0.16 http://github.com/wayneeseguin/rvm
 
     by Wayne E. Seguin (wayneeseguin@gmail.com)
 
+  Installation:
+
+    $ gem install rvm             # Install the rvm gem
+    $ rvm-install                 # Install rvm, adds hooks for bash & zsh
+
   Usage:
 
     rvm Action [Implementation] [Options]
@@ -12,16 +17,16 @@
   Action:
 
     * usage   - Show this usage information
-    use       - Switch to using a specific ruby versio (new login shell)
+    use       - Switch to using a specific ruby version (new login shell)
     info      - Show information for current ruby
     list      - Show currently installed versions
     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 version gems to current version 
                 (highly expiramental) Example: rvm gemdup ~/.gem/ruby/1.8/
     install   - Install a ruby version, default is from source
     uninstall - Uninstall a ruby version
-    debug     - Emit environment and configuration information for debugging
+    debug     - Emit environment & configuration information for *current* ruby
 
   Implementation:
 
@@ -52,8 +57,6 @@
 
   Examples:
 
-    $ gem install rvm             # Install the rvm gem
-    $ rvm-install                 # Install rvm, adds 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
@@ -72,7 +75,7 @@
     * Settings file, user overridable
     * Show current in rvm list, if applicable
 
-  Credits:
+  Many Thanks:
 
     Bash Support Testing
 
@@ -87,3 +90,13 @@
       - Franco Lazzarino (flazzarino@gmail.com)
         irc: flazz     ; github: http://github.com/flazz
 
+    Ubuntu Linux Support Testing
+
+      - Anita Kuno (anteaya@anteaya.info)
+        irc: anteaya   ; github: http://github.com/anteaya
+
+    Website Design
+
+      - Jim Lindley (jlindley@gmail.com)
+        irc: jlindley  ; github: http://github.com/jlindley
+

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.15"
+rvm_version="0.0.16"
 rvm_updated="2009.08.25"
 
 #
@@ -23,6 +23,11 @@ function rvm-usage {
 
     by ${rvm_author} (${rvm_author_email})
 
+  Installation:
+
+    $ gem install rvm             # Install the rvm gem
+    $ rvm-install                 # Install rvm, adds hooks for bash & zsh
+
   Usage:
 
     rvm Action [Implementation] [Options]
@@ -30,7 +35,7 @@ function rvm-usage {
   Action:
 
     * usage   - Show this usage information
-    use       - Switch to using a specific ruby versio (new login shell)
+    use       - Switch to using a specific ruby version (new login shell)
     info      - Show information for current ruby
     list      - Show currently installed versions
     gemdir    - Switch to gem directory for installation (new login shell)
@@ -70,8 +75,6 @@ function rvm-usage {
 
   Examples:
 
-    $ gem install rvm             # Install the rvm gem
-    $ rvm-install                 # Install rvm, adds 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
@@ -90,7 +93,7 @@ function rvm-usage {
     * Settings file, user overridable
     * Show current in rvm list, if applicable
 
-  Credits:
+  Many Thanks:
 
     Bash Support Testing
 
@@ -105,6 +108,16 @@ function rvm-usage {
       - Franco Lazzarino (flazzarino@gmail.com)
         irc: flazz     ; github: http://github.com/flazz
 
+    Ubuntu Linux Support Testing
+
+      - Anita Kuno (anteaya@anteaya.info)
+        irc: anteaya   ; github: http://github.com/anteaya
+
+    Website Design
+
+      - Jim Lindley (jlindley@gmail.com)
+        irc: jlindley  ; github: http://github.com/jlindley
+
 Usage
 
 }
@@ -167,7 +180,7 @@ function rvm-install-source {
   else
     if [ ! -f "$package_name.tar.gz" ] ; then 
       rvm-log-info "\tDownloading $package_name, this may take a while depending on your connection..."
-      curl -O -L -s $url 
+      $curl $url 
     fi
     rvm-log-info "\tExtracting $package_name..."
     tar xzf $package_name.tar.gz && cd $package_name
@@ -184,7 +197,7 @@ function rvm-install-source {
   chmod +x $install_path/$package_name/bin/*
 
   # Create the ~/.rvm/bin/$package_name
-  ln -s $install_path/$package_name/bin/ruby $install_path/bin/$package_name
+  ln -fs $install_path/$package_name/bin/ruby $install_path/bin/$package_name
 
   # Now install rubygems for this ruby version.
   rvm-log-info "\tInstalling rubygems dedicated to $package_name..."
@@ -193,7 +206,7 @@ function rvm-install-source {
   if [ -d $gem_package_name ]  ; then
     cd $gem_package_name
   else
-    if [ ! -f $gem_package_name.tgz ] ; then curl -O -L -s $gem_url ; fi
+    if [ ! -f $gem_package_name.tgz ] ; then $curl $gem_url ; fi
     tar zxf $gem_package_name.tgz && cd $gem_package_name
   fi
   # Well this is fun... fix nil error on require_paths:
@@ -224,7 +237,7 @@ function rvm-install-ruby {
       else
         if [ ! -f "$package_name.tar.gz" ] ; then 
           rvm-log-info "\tDownloading $package_name, this may take a while depending on your connection..."
-          curl -O -L -s $url
+          $curl $url
         fi
         rvm-log-info "\tExtracting $package_name..."
         tar xzf $package_name.tar.gz && cd $package_name
@@ -235,7 +248,7 @@ function rvm-install-ruby {
       ./installer -a $install_path/ruby-enterprise-$version-$patchlevel --dont-install-useful-gems > $install_path/$package_name/install.log 2> $install_path/$package_name/install.error.log 
       chmod +x $install_path/$package_name/bin/*
 
-      ln -s $install_path/$package_name/bin/ruby $install_path/bin/$package_name
+      ln -fs $install_path/$package_name/bin/ruby $install_path/bin/$package_name
 
       rvm-log-info "\tInstalling rubygems dedicated to $package_name..."
       gem_package_name="rubygems-1.3.5"
@@ -243,7 +256,7 @@ function rvm-install-ruby {
       if [ -d $gem_package_name ]  ; then
         cd $gem_package_name
       else
-        if [ ! -f $gem_package_name.tgz ] ; then curl -O -L -s $gem_url ; fi
+        if [ ! -f $gem_package_name.tgz ] ; then $curl $gem_url ; fi
         tar zxf $gem_package_name.tgz && cd $gem_package_name
       fi
       # Well this is fun... fix nil error on require_paths:
@@ -273,7 +286,7 @@ function rvm-install-ruby {
       else
         if [ ! -f "$zipfile.zip" ] ; then 
           rvm-log-info "\tDownloading $zipfile, this may take a while depending on your connection..."
-          curl -O -L -s $url 
+          $curl $url 
         fi
         rvm-log-info "\tExtracting $zipfile..."
         jar xf $zipfile.zip
@@ -286,10 +299,10 @@ function rvm-install-ruby {
       popd > /dev/null
       chmod +x $install_path/$package_name/bin/*
       for binary in jruby jgem jirb ; do
-        ln -sf $install_path/$package_name/bin/$binary $install_path/$package_name/bin/${binary#j}
+        ln -fs $install_path/$package_name/bin/$binary $install_path/$package_name/bin/${binary#j}
       done
 
-      ln -s $install_path/$package_name/bin/ruby $install_path/bin/$package_name
+      ln -fs $install_path/$package_name/bin/ruby $install_path/bin/$package_name
 
       for gem_name in rake jruby-openssl ; do
         rvm-log-info "Installing $gem_name"
@@ -606,6 +619,7 @@ function rvm {
   for variable in action implementation patchlevel version source_path install_path manager debug prefix_path ; do 
     eval "unset $variable" 
   done
+  
   while [ $# -gt 0 ] ; do
     token="$1" ; shift
     case "$token" in 
@@ -617,13 +631,14 @@ function rvm {
       ;;
       gemdir)
         action=$token
-        if [ "$2" = "system" ] ; then
-          implementation="system" 
-        elif [ "$1" = "user" ] ; then 
-          implementation="user" 
-        else
-          implementation="current" 
+        if [ "$1" = "system" ] ; then
+          implementation="system" ; shift
+        fi
+        if [ "$1" = "user" ] ; then 
+          implementation="user"  ; shift
         fi
+
+        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"  
@@ -646,7 +661,14 @@ function rvm {
       *)               rvm-usage ; return 1
     esac 
   done 
-  
+ 
+  curl=`which curl`
+  if [ $? -ne 0 ] ; then
+    rvm-log-fail "rvm expects that curl is available, which curl shows no curl :("
+  else
+    curl="$curl -O -L -s"
+  fi
+
   if [ -z "$implementation" -a -z "$version" ] ; then 
     implementation="default"
   else
@@ -723,9 +745,12 @@ function rvm {
     debug)     
                rvm-version
                rvm-info
-               rvm-log-info "PATH:$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"%5}')"
-               rvm-log-info ".bash_profile: \n$(cat ~/.bash_profile | tail -n 5)\n"
-               rvm-log-info ".zprofile: \n$(cat ~/.zprofile | tail -n 5)\n"
+               rvm-log-info "PATH:$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}')"
+               for file in ~/.bash_profile ~/.zprofile ; do
+                 if [ -s $file ] ; then
+                   rvm-log-info "$file: \n$(cat ~/$file| tail -n 5)\n"
+                 fi
+               done
                rvm-log-info "$install_path/current: \n$(cat $install_path/current)\n"
                return 0
     ;;

data/bash/rvm-install

@@ -19,40 +19,38 @@ echo -e "$info In order to use rvm two items must occur in your shell's load pat
 echo -e "\n\e[0;32m    (a)\e[0m if [ -f ~/.rvm/bin/rvm ] ; then source ~/.rvm/bin/rvm ; fi"
 echo -e "\e[0;32m    (b)\e[0m if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi"
 
-echo -n -e "$question Would you like (u)s to set this up for you, or do it (y)ourself (u/y)? "
 while : ; do
+  echo -n -e "$question Do you want this (s)cript to set this up for you, or do it (m)anually yourself ('s' or 'm')? "
   read response
-  if [ "${response:0:1}" = "u" ] ; then
+  if [ "${response:0:1}" = "s" ] ; then
     echo 'w00t!'
     break
-  elif [ "${response:0:1}" = "f" ] ; then
+  elif [ "${response:0:1}" = "m" ] ; then
     echo -e "$info Please make sure that both lines (a) and (b) are in place, with (a) sourced *first*."
     break
-  else
-    echo -n -e "$question Would you like (u)s to set this up for you, or do it yoursel(f) (u/f)? "
   fi
 done
 
-if [ "${response:0:1}" = "u" ] ; then
+if [ "${response:0:1}" = "s" ] ; then
 
-  # Find out the user's shell bash / zsh
-  echo -n -e "$question Do you use (b)ash or (z)sh for your shell (the default on most *nix systems is bash, press control + C to cancel the installation)\n(b/z) ? "
   while : ; do
+    echo -n -e "$question Do you use b(a)sh or (z)sh or b(o)th for your shell (the default on most *nix systems is bash, press control + C to cancel the installation)\n(a/z/o)? "
     read response
-    if [ "${response:0:1}" = "b" ] ; then
+    if [ "${response:0:1}" = "a" ] ; then
       user_shell="bash"
       break
     elif [ "${response:0:1}" = "z" ] ; then
       user_shell="zsh"
       break
-    else
-      echo -n -e "$question Do you use (b)ash or (z)sh for your shell (the default on most *nix systems is bash, press control + C to cancel the installation)\n(b/z) ? "
+    elif [ "${response:0:1}" = "o" ] ; then
+      user_shell="both"
+      break
     fi
   done
   
   touch ~/.profile
   
-  if [ "$user_shell" = "bash" ] ; then
+  if [ "$user_shell" = "bash" -o "$user_shell" = "both" ] ; then
   
     touch ~/.bash_profile
     if [ -z "`grep '\.rvm/bin/rvm' ~/.bash_profile`" ] ; then
@@ -65,7 +63,7 @@ if [ "${response:0:1}" = "u" ] ; then
       echo "if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi" >> ~/.bash_profile
     fi
   
-  elif [ "$user_shell" = "zsh" ] ; then
+  elif [ "$user_shell" = "zsh" -o "$user_shell" = "both" ] ; then
   
     touch ~/.zshrc
     if [ -z "`grep '\.rvm/bin/rvm' ~/.zshrc`" ] ; then
@@ -86,10 +84,29 @@ if [ "${response:0:1}" = "u" ] ; then
   fi
 fi
 
-echo -e "\n$info If you add ~/.rvm/bin/ to your path you will be able to rever to installed ruby binaries using: <implementation>-<version>p<patchlevel>"
+system=`uname`
+if [ "$system" = "Linux" ] ; then
+  echo -e "For jRuby (if you wish to use it) you will need:"
+  if [ ! -z "`which apt-get`" ] ; then
+    echo -e " sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk  "
+  elif [ ! -z "`which emerge`" ] ; then
+    echo -e "emerge dev-java/sun-jdk dev-java/sun-jre-bin"
+  elif [ ! -z "`which pacman`" ] ; then
+    echo -e "pacman -Sy jdk jre"
+  elif [ ! -z "`which yum`" ] ; then
+    echo -e "yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
+  else
+    echo -e "The SUN java runtime environment and development kit."
+  fi
+#elif [ "$sytem" = "Darwin" ] ; then
+#else
+
+fi
+
+echo -e "\n$info If you add ~/.rvm/bin/ to your path you will be able to refer to installed ruby binaries using: <implementation>-<version>p<patchlevel>"
 echo -e "     For example: ~/.ruby-1.9.1p243 -e 'puts \"hello world\"' #=> hello world"
 echo -e "$info Contact wayneeseguin on irc.freenod.net in #rvm for any questions / feedback."
-echo -e "     I truely hope that you find rvm helpful! Thank you very much for using rvm. \n"
+echo -e "     I truly hope that you find rvm helpful! Thank you very much for using rvm. \n"
 echo -e "       ~ Wayne"
 
 echo -e "$info To start using rvm see: \e[0;32m rvm usage\e[0m, Now close this login shell and open a new one."

metadata

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