wayneeseguin-rvm 0.0.20 → 0.0.22

data/bash/rvm

@@ -3,7 +3,7 @@
 rvm_author="Wayne E. Seguin"
 rvm_author_email="wayneeseguin@gmail.com"
 rvm_website="http://rvm.beginrescueend.com/"
-rvm_version="0.0.21"
+rvm_version="0.0.22"
 rvm_updated="2009.08.25"
 
 #
@@ -96,42 +96,17 @@ function rvm-usage {
     * Settings file, user overridable
     * Show current in rvm list, if applicable
 
-  Many Thanks:
-
-    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
-
-    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
 
 }
 
 # Logging functions based on level
-function rvm-log   { echo -e "\n $* \e[0m" ; }
-function rvm-log-debug { rvm-log "\e[4;34m <d> \e[0m$*" ; }
-function rvm-log-info  { rvm-log "\e[0;32m <i> \e[0m$*" ; }
-function rvm-log-warn  { rvm-log "\e[0;33m <w> \e[0m$*" ; }
-function rvm-log-error { rvm-log "\e[0;31m <e> \e[0m$*" ; }
-function rvm-log-fail  { rvm-log "\e[0;31m <e> \e[0m$*" ; return 1 ; }
+function rvm-log   { echo -e "\n $* \033[0m" ; }
+function rvm-log-debug { rvm-log "\033[4;34m <d> \033[0m$*" ; }
+function rvm-log-info  { rvm-log "\033[0;32m <i> \033[0m$*" ; }
+function rvm-log-warn  { rvm-log "\033[0;33m <w> \033[0m$*" ; }
+function rvm-log-error { rvm-log "\033[0;31m <e> \033[0m$*" ; }
+function rvm-log-fail  { rvm-log "\033[0;31m <e> \033[0m$*" ; return 1 ; }
 
 function rvm-gi { gem install -q --no-rdoc --no-ri $* ; }
 
@@ -190,13 +165,13 @@ function rvm-install-source {
   fi
 
   rvm-log-info "\tConfiguring $package_name using ${configure-'--enable-shared'}, this may take a while depending on your cpu(s)..."
-  ./configure --prefix=$install_path/$package_name ${configure-'--enable-shared'} > $install_path/$package_name/configure.log 2> $install_path/$package_name/configure.error.log
+  ./configure --prefix=$install_path/$package_name ${configure-'--enable-shared'} > $install_path/log/$package_name/configure.log 2> $install_path/log/$package_name/configure.error.log
 
   rvm-log-info "\tCompiling $package_name, this may take a while, depending on your cpu(s)..."
-  make > $install_path/$package_name/make.log 2> $install_path/$package_name/make.error.log
+  make > $install_path/log/$package_name/make.log 2> $install_path/log/$package_name/make.error.log
 
   rvm-log-info "\tInstalling $package_name"
-  make install > $install_path/$package_name/install.log 2> $install_path/$package_name/install.error.log
+  make install > $install_path/log/$package_name/install.log 2> $install_path/log/$package_name/install.error.log
   chmod +x $install_path/$package_name/bin/*
 
   # Create the ~/.rvm/bin/$package_name
@@ -214,13 +189,13 @@ function rvm-install-source {
   fi
   # Well this is fun... fix nil error on require_paths:
   sed -i '' "s/require_paths\.join/require_paths.to_a.join/" $source_path/$package_name/$gem_package_name/lib/rubygems/gem_path_searcher.rb 
-  $install_path/$package_name/bin/ruby ./setup.rb > $install_path/$package_name/rubygems.install.log 2> $install_path/$package_name/rubygems.install.error.log
+  $install_path/$package_name/bin/ruby ./setup.rb > $install_path/log/$package_name/rubygems.install.log 2> $install_path/log/$package_name/rubygems.install.error.log
   popd > /dev/null
   rvm-log-info "Installation of $package_name complete."
 
   for gem_name in rake ; do
     rvm-log-info "Installing $gem_name"
-    $install_path/$package_name/bin/gem install $gem_name --no-rdoc --no-ri -q >> $install_path/$package_name/gems.install.log
+    $install_path/$package_name/bin/gem install $gem_name --no-rdoc --no-ri -q >> $install_path/log/$package_name/gems.install.log 2> $install_path/log/$package_name/gems.error.log
   done
 }
 
@@ -250,7 +225,7 @@ function rvm-install-ruby {
 
       rvm-log-info "\tInstalling $package_name, this may take a while, depending on your cpu(s)..."
       mkdir -p $install_path/$package_name
-      ./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 
+      ./installer -a $install_path/ruby-enterprise-$version-$patchlevel --dont-install-useful-gems > $install_path/log/$package_name/install.log 2> $install_path/log/$package_name/install.error.log 
       chmod +x $install_path/$package_name/bin/*
 
       ln -fs $install_path/$package_name/bin/ruby $install_path/bin/$package_name
@@ -266,13 +241,13 @@ function rvm-install-ruby {
       fi
       # Well this is fun... fix nil error on require_paths:
       sed -i '' "s/require_paths\.join/require_paths.to_a.join/" $source_path/$package_name/$gem_package_name/lib/rubygems/gem_path_searcher.rb 
-      $install_path/$package_name/bin/ruby ./setup.rb > $install_path/$package_name/rubygems.install.log 2> $install_path/$package_name/rubygems.install.error.log
+      $install_path/$package_name/bin/ruby ./setup.rb > $install_path/log/$package_name/rubygems.install.log 2> $install_path/log/$package_name/rubygems.install.error.log
       rvm-log-info "Installation of $package_name complete."
       popd > /dev/null
       
       for gem_name in rake ; do
         rvm-log-info "Installing $gem_name"
-        $install_path/$package_name/bin/gem install $gem_name --no-rdoc --no-ri -q >> $install_path/$package_name/gems.install.log
+        $install_path/$package_name/bin/gem install $gem_name --no-rdoc --no-ri -q >> $install_path/log/$package_name/gems.install.log 2> $install_path/log/$package_name/gems.error.log
       done
     ;;
 
@@ -300,7 +275,7 @@ function rvm-install-ruby {
       rvm-log-info "\tInstalling $package_name..."
       mkdir -p $install_path/$package_name/bin/
       rsync -ag $source_path/$package_name/ $install_path/$package_name/
-      cd $source_path/$package_name/tool/nailgun && make > $install_path/$package_name/install.nailgun.log 2> $install_path/$package_name/install.error.nailgun.log 
+      cd $source_path/$package_name/tool/nailgun && make > $install_path/log/$package_name/install.nailgun.log 2> $install_path/log/$package_name/install.error.nailgun.log 
       popd > /dev/null
       chmod +x $install_path/$package_name/bin/*
       for binary in jruby jgem jirb ; do
@@ -311,7 +286,7 @@ function rvm-install-ruby {
 
       for gem_name in rake jruby-openssl ; do
         rvm-log-info "Installing $gem_name"
-        $install_path/$package_name/bin/jgem install $gem_name --no-rdoc --no-ri -q >> $install_path/$package_name/gems.install.log
+        $install_path/$package_name/bin/jgem install $gem_name --no-rdoc --no-ri -q >> $install_path/log/$package_name/gems.install.log 2> $install_path/log/$package_name/gems.error.log
       done
     ;;
 
@@ -477,7 +452,7 @@ function rvm-use {
     done
   fi
 
-  rvm-log-info "Switching to $implementation $version $patchlevel ..."
+  rvm-log-info "Switching to $implementation $version $patchlevel ...\n"
   if [ ! -z "$BASH_VERSION" ] ; then
     exec bash -l
   elif [ ! -z "$ZSH_VERSION" ] ; then
@@ -727,6 +702,8 @@ function rvm {
       *)               rvm-usage ; return 1
     esac 
   done 
+
+  if [ "$debug" = "1" ] ; then set -x ; fi
  
   curl=`which curl`
   if [ $? -ne 0 ] ; then
@@ -790,8 +767,6 @@ function rvm {
    echo $default_system_ruby > $install_path/default_system_ruby
   fi
 
-  if [ "$debug" = "1" ] ; then set -x ; fi
-
   case "$action" in
     install) 
       if [ "$implementation" = "all" ] ; then 
@@ -800,8 +775,9 @@ function rvm {
             for version in 1.8.6 1.8.7 1.9.1 1.9.2 ; do
               rvm-install-ruby $implementation $version $patchlevel 
             done
+            unset version patchlevel 
           else
-              rvm-install-ruby $implementation $version $patchlevel 
+            rvm-install-ruby $implementation $version $patchlevel 
           fi
         done
       else
@@ -843,3 +819,5 @@ function rvm {
 
 }
 
+if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi # magic :)
+

data/bash/rvm-install

@@ -2,22 +2,21 @@
 
 user=`whoami`
 if [ "$user" = "root" ] ; then 
-  echo -e "\e[0;31m <e> \e[0mroot user support is not yet implemented.\e[0m"
+  echo -e "\033[0;31m <e> \033[0mroot user support is not yet implemented.\033[0m"
   exit 1
 fi
 
-info="\n\e[0;32m<i>\e[0m"
-question="\n\e[0;32m<?>\e[0m"
+info="\n\033[0;32m<i>\033[0m"
+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/
 
 # State what is required to use rvm
-echo -e "\n\e[0;32mrvm\e[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 "\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 -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 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"
 
 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')? "
@@ -48,8 +47,6 @@ if [ "${response:0:1}" = "s" ] ; then
     fi
   done
   
-  touch ~/.profile
-  
   if [ "$user_shell" = "bash" -o "$user_shell" = "both" ] ; then
   
     touch ~/.bash_profile
@@ -57,12 +54,13 @@ if [ "${response:0:1}" = "s" ] ; 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
   
     touch ~/.zshrc
@@ -71,14 +69,9 @@ if [ "${response:0:1}" = "s" ] ; then
       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\e[0;31m<e> An error has occurred, we were expecting either bash or zsh however we encountered $user_shell \e[0m"
+    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
@@ -86,25 +79,29 @@ 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`" ] ; 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..."
+  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 "     For example: ruby-1.9.1-p243 -e 'puts \"hello world\"' #=> hello world"
@@ -112,5 +109,5 @@ echo -e "$info Contact wayneeseguin on irc.freenod.net in #rvm for any questions
 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."
+echo -e "$info To start using rvm see: \033[0;32m rvm usage\033[0m, Now close this login shell and open a new one."
 

data/bash/rvm-update

@@ -2,11 +2,11 @@
 
 user=`whoami`
 if [ "$user" = "root" ] ; then 
-  echo -e "\e[0;31m <e> \e[0mroot user support is not yet implemented.\e[0m"
+  echo -e "\033[0;31m <e> \033[0mroot user support is not yet implemented.\033[0m"
   exit 1
 fi
 
-info="\n\e[0;32m<i>\e[0m"
+info="\n\033[0;32m<i>\033[0m"
 
 echo -e "$info Updating rvm source ~/.rvm/bin/rvm ..."
 mkdir -p ~/.rvm/src ~/.rvm/bin
@@ -16,6 +16,5 @@ echo -e "\n    Thank you, come again! \n"
 echo -e "        ~ Wayne"
 
 source ~/.rvm/bin/rvm
-
-rvm-symlinks
+rvm symlinks
 

data/rvm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.20"
+  s.version = "0.0.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]

metadata

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