rvm 0.0.22 → 0.0.23

data/bash/rvm-install

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 user=`whoami`
-if [ "$user" = "root" ] ; then 
+if [ "$user" = "root" ] ; then
   echo -e "\033[0;31m <e> \033[0mroot user support is not yet implemented.\033[0m"
   exit 1
 fi
@@ -11,13 +11,15 @@ question="\n\033[0;32m<?>\033[0m"
 
 echo -e "Installing rvm source to ~/.rvm/bin/rvm..."
 mkdir -p ~/.rvm/src ~/.rvm/bin
-cp $(pwd)/bash/rvm ~/.rvm/bin/
+for script in rvm ; do # Preparing for refactoring.
+  cp "`dirname "${0}"`/$script" ~/.rvm/bin/
+done
+
 
 # State what is required to use rvm
 echo -e "\n\033[0;32mrvm\033[0m is a shell script that allows a user to manage multiple ruby versions in their own account."
-echo -e "$info In order to use rvm two items must occur in your shell's load paths:"
+echo -e "$info In order to use rvm the following line must occur in your shell's loading files:"
 echo -e "\n\033[0;32m    (a)\033[0m if [ -f ~/.rvm/bin/rvm ] ; then source ~/.rvm/bin/rvm ; fi"
-echo -e "\033[0;32m    (b)\033[0m if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi"
 
 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')? "
@@ -47,68 +49,62 @@ if [ "${response:0:1}" = "s" ] ; then
       break
     fi
   done
-  
-  touch ~/.profile
-  
+
   if [ "$user_shell" = "bash" -o "$user_shell" = "both" ] ; then
-  
+
     touch ~/.bash_profile
     if [ -z "`grep '\.rvm/bin/rvm' ~/.bash_profile`" ] ; then
       echo "Adding 'if [ -f ~/.rvm/bin/rvm ] ; then source ~/.rvm/bin/rvm ; fi' to your ~/.bash_profile."
       echo "if [ -f ~/.rvm/bin/rvm ] ; then source ~/.rvm/bin/rvm ; fi" >> ~/.bash_profile
     fi
-    
-    if [ -z "`grep '\.rvm/current' ~/.bash_profile`" ] ; then
-      echo "Adding 'if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi' ~/.bash_profile."
-      echo "if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi" >> ~/.bash_profile
+    touch ~/.bashrc
+    if [ -z "`grep '\.rvm/bin/rvm' ~/.bashrc`" ] ; then
+      echo "Adding 'if [ -f ~/.rvm/bin/rvm ] ; then source ~/.rvm/bin/rvm ; fi' to your ~/.bashrc."
+      echo "if [ -f ~/.rvm/bin/rvm ] ; then source ~/.rvm/bin/rvm ; fi" >> ~/.bashrc
     fi
-  
-  elif [ "$user_shell" = "zsh" -o "$user_shell" = "both" ] ; then
-  
+
+  fi
+
+  if [ "$user_shell" = "zsh" -o "$user_shell" = "both" ] ; then
+
     touch ~/.zshrc
     if [ -z "`grep '\.rvm/bin/rvm' ~/.zshrc`" ] ; then
       echo "Adding 'if [ -f ~/.rvm/bin/rvm ] ; then source ~/.rvm/bin/rvm ; fi' to your ~/.zshrc."
       echo "if [ -f ~/.rvm/bin/rvm ] ; then source ~/.rvm/bin/rvm ; fi" >> ~/.zshrc
     fi
-    
-    if [ -z "`grep '\.rvm/current' ~/.zshrc`" ] ; then
-      echo "Adding 'if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi' ~/.zshrc."
-      echo "if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi" >> ~/.zshrc
-    fi
-  
-  else
-  
-    echo -e "\n\033[0;31m<e> An error has occurred, we were expecting either bash or zsh however we encountered $user_shell \033[0m"
-    return 1
-  
   fi
+
 fi
 
 system=`uname`
 if [ "$system" = "Linux" ] ; then
-  echo -e "For jRuby (if you wish to use it) you will need:"
-  if [ ! -z "`which apt-get 2>/dev/null`" ] ; then
-    echo -e " sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk  "
-  elif [ ! -z "`which emerge 2>/dev/null`" ] ; then
-    echo -e "emerge dev-java/sun-jdk dev-java/sun-jre-bin"
-  elif [ ! -z "`which pacman 2>/dev/null`" ] ; then
-    echo -e "pacman -Sy jdk jre"
-  elif [ ! -z "`which yum 2>/dev/null`" ] ; then
-    echo -e "yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
+  rvm_apt_get_binary=`which apt-get`
+  rvm_emerge_binary=`which emerge`
+  rvm_pacman_binary=`which pacman`
+  rvm_yum_binary=`which yum`
+
+  echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
+  if [ ! -z "$rvm_apt_get_binary" ] ; then
+    echo -e "\033[0;32m <i> \033[0msudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk  "
+  elif [ ! -z "$rvm_emerge_binary" ] ; then
+    echo -e "\033[0;32m <i> \033[0msudo emerge dev-java/sun-jdk dev-java/sun-jre-bin"
+  elif [ ! -z "$rvm_pacman_binary" ] ; then
+    echo -e "\033[0;32m <i> \033[0msudo pacman -Sy jdk jre"
+  elif [ ! -z "$rvm_yum_binary" ] ; then
+    echo -e "\033[0;32m <i> \033[0myum 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."
+    echo -e "\033[0;32m <i> \033[0mThe SUN java runtime environment and development kit."
   fi
 #elif [ "$sytem" = "Darwin" ] ; then
 #else
-
 fi
 
 source ~/.rvm/bin/rvm
-rvm-symlinks
+rvm symlinks
 
-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 "\n$info If you add ~/.rvm/bin/ to your path you will be able to refer to installed ruby binaries using: <implementation>-<version><patchlevel>"
 echo -e "     For example: ruby-1.9.1-p243 -e 'puts \"hello world\"' #=> hello world"
-echo -e "$info Contact wayneeseguin on irc.freenod.net in #rvm for any questions / feedback."
+echo -e "$info Contact wayneeseguin on irc.freenode.net in #rvm for any questions / feedback."
 echo -e "     I truly hope that you find rvm helpful! Thank you very much for using rvm. \n"
 echo -e "       ~ Wayne"
 

data/bash/rvm-update

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 user=`whoami`
-if [ "$user" = "root" ] ; then 
-  echo -e "\033[0;31m <e> \033[0mroot user support is not yet implemented.\033[0m"
+if [ "$user" = "root" ] ; then
+  echo -e "\033[0;31m <e> \033[0mroot user support is not implemented yet.\033[0m"
   exit 1
 fi
 
@@ -10,12 +10,13 @@ info="\n\033[0;32m<i>\033[0m"
 
 echo -e "$info Updating rvm source ~/.rvm/bin/rvm ..."
 mkdir -p ~/.rvm/src ~/.rvm/bin
-cp $(pwd)/bash/rvm ~/.rvm/bin/
+for script in rvm ; do # Prepairing for refactoring.
+  cp "`dirname "${0}"`/$script" ~/.rvm/bin/
+done
 
 echo -e "\n    Thank you, come again! \n"
 echo -e "        ~ Wayne"
 
 source ~/.rvm/bin/rvm
-
-rvm-symlinks
+rvm symlinks
 

data/bash/rvmrc.sample

@@ -0,0 +1,30 @@
+# Example rvm Defaults file.
+# This file shows some examples of setting defaults to your own tastes.
+
+# Default action to assume
+#rvm_action="use"
+
+# Default ruby implementation
+#rvm_implementation="ruby"
+
+# Default ruby version
+#rvm_version="1.8.6"
+
+# Default patchlevel to set, if implementation is set
+#rvm_patchlevel="369"
+
+# Default prefix path (~/, or /usr/local/src/ for example.)
+#rvm_prefix_path="$HOME/."
+
+# Default Install Path
+#rvm_install_path="${rvm_prefix_path}rvm"
+
+# Default Archives Path
+#rvm_archive_path="${rvm_install_path}/archives"
+
+# Default Source Path
+#rvm_source_path="${rvm_install_path}/src"
+
+# Default Log Path
+#rvm_log_path="${rvm_install_path}/log"
+

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.22"
+  s.version = "0.0.23"
 
   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-26}
+  s.date = %q{2009-08-27}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
   s.executables = ["rvm-install", "rvm-update"]
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "bash/rvm",
      "bash/rvm-install",
      "bash/rvm-update",
+     "bash/rvmrc.sample",
      "lib/rvm.rb",
      "rvm.gemspec"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 -04:00
+date: 2009-08-27 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,7 @@ files:
 - bash/rvm
 - bash/rvm-install
 - bash/rvm-update
+- bash/rvmrc.sample
 - lib/rvm.rb
 - rvm.gemspec
 has_rdoc: true