rvm 0.0.57 → 0.0.58

data/scripts/utility

@@ -8,11 +8,11 @@ system:
   uname: "$(uname -a)"
 
 ruby:
-  interpreter:  "`echo $full_version | awk '{print $1}'`"
-  version:      "`echo $full_version | awk '{print $2}'`"
-  date:         "`echo $full_version | sed 's/^.*(\([0-9]\{4\}\(-[0-9][0-9]\)\{2\}\).*$/\1/'`"
-  platform:     "`echo $full_version | sed 's/^.*\[//' | sed 's/\].*$//'`"
-  patchlevel:   "`echo $full_version | sed 's/^.*(//' | sed 's/).*$//'`"
+  interpreter:  "$(echo $full_version | awk '{print $1}')"
+  version:      "$(echo $full_version | awk '{print $2}')"
+  date:         "$(echo $full_version | sed 's/^.*(\([0-9]\{4\}\(-[0-9][0-9]\)\{2\}\).*$/\1/')"
+  platform:     "$(echo $full_version | sed 's/^.*\[//' | sed 's/\].*$//')"
+  patchlevel:   "$(echo $full_version | sed 's/^.*(//' | sed 's/).*$//')"
   full_version: "$full_version"
 
 homes:
@@ -20,10 +20,10 @@ homes:
   ruby:         "${MY_RUBY_HOME:-'not set'}"
 
 binaries:
-  ruby:         "`which ruby`"
-  irb:          "`which irb`"
-  gem:          "`which gem`"
-  rake:         "`which rake`"
+  ruby:         "$(which ruby)"
+  irb:          "$(which irb)"
+  gem:          "$(which gem)"
+  rake:         "$(which rake)"
 
 environment:
   GEM_HOME:     "$GEM_HOME"
@@ -64,13 +64,13 @@ function __rvm_log {
   case "$level" in
     debug) shift ;
       if [ ! -z "$rvm_debug_flag" ] ; then
-        echo -e "\033[0;35m<d>\033[0m $message \033[0;35m</d> \033[0m "
+        echo -e "$(tput setaf 5)<d>$(tput sgr0) $message $(tput setaf 5)</d> $(tput sgr0) "
       fi
     ;;
-    info)  shift ; echo -e "\033[0;32m<i>\033[0m $message \033[0;32m</i> \033[0m " ;;
-    warn)  shift ; echo -e "\033[0;33m<w>\033[0m $message \033[0;33m</w> \033[0m " ;;
-    error) shift ; echo -e "\033[0;31m<e>\033[0m $message \033[0;31m</e> \033[0m " ;;
-    fail)  shift ; echo -e "\033[0;31m<f>\033[0m $message \033[0;31m</f> \033[0m " ; __rvm_pushpop ; return 1 ;;
+    info)  shift ; echo -e "$(tput setaf 2)<i>$(tput sgr0) $message $(tput setaf 2)</i> $(tput sgr0) " ;;
+    warn)  shift ; echo -e "$(tput setaf 3)<w>$(tput sgr0) $message $(tput setaf 3)</w> $(tput sgr0) " ;;
+    error) shift ; echo -e "$(tput setaf 1)<e>$(tput sgr0) $message $(tput setaf 1)</e> $(tput sgr0) " ;;
+    fail)  shift ; echo -e "$(tput setaf 1)<f>$(tput sgr0) $message $(tput setaf 1)</f> $(tput sgr0) " ; __rvm_pushpop ; return 1 ;;
     *) echo -e "$message"
   esac
 }
@@ -105,10 +105,10 @@ function __rvm_run {
   __rvm_log "debug" "Executing: $command"
   touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :(
   echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee "$rvm_ruby_log_path/$log_file_name.log" > "$rvm_ruby_log_path/$log_file_name.error.log"
-  if [ -z "$rvm_niceness" -o "$rvm_niceness" = "0" ] ; then
+  if [ -z "$rvm_niceness" -o "0" = "$rvm_niceness" ] ; then
     eval "$command" >> "$rvm_ruby_log_path/$log_file_name.log" 2>> "$rvm_ruby_log_path/$log_file_name.error.log"
   else
-    eval "nice -n $rvm_niceness \`$command\`" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
+    eval "nice -n $rvm_niceness \$($command)" >> $rvm_ruby_log_path/$log_file_name.log 2>> $rvm_ruby_log_path/$log_file_name.error.log
   fi
   if [ $? -gt 0 ] ; then __rvm_log "error" "Error running '$command', please check $rvm_ruby_log_path/$log_file_name.error.log" ; __rvm_pushpop ; return 1 ; fi
   unset log_file command
@@ -273,8 +273,8 @@ function __rvm_implode {
   while : ; do
     __rvm_log "warn" "Are you SURE you wish for rvm to implode? This will remove $rvm_path ? (type 'yes' or 'no')"
     read response
-    if [ "$response" = "yes" ] ; then
-      if [ "$rvm_path" = "/" ] ; then
+    if [ "yes" = "$response" ] ; then
+      if [ "/" = "$rvm_path" ] ; then
         __rvm_log "error" "remove '/' ?!... NO!"
       else
         if [ -d $rvm_path ] ; then
@@ -286,7 +286,7 @@ function __rvm_implode {
         fi
       fi
       break
-    elif [ "$response" = "no" ] ; then
+    elif [ "no" = "$response" ] ; then
       __rvm_log "info" "Cancelling implosion, no harm done :)"
       break
     fi
@@ -313,12 +313,12 @@ function __rvm_source_dir {
 function __rvm_gemdup {
   if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
   __rvm_log "debug" "$rvm_ruby_interpreter"
-  if [ "$rvm_ruby_interpreter" = "default" ] ; then
+  if [ "default" = "$rvm_ruby_interpreter" ] ; then
     # TODO: ~/.rvm/default first, then system user
     rvm_source_gem_path="$rvm_system_user_gem_path"
-  elif [ "$rvm_ruby_interpreter" = "user" ] ; then
+  elif [ "user" = "$rvm_ruby_interpreter" ] ; then
     rvm_source_gem_path="$rvm_system_user_gem_path"
-  elif [ "$rvm_ruby_interpreter" = "system" ] ; then
+  elif [ "system" = "$rvm_ruby_interpreter" ] ; then
     rvm_source_gem_path="$rvm_system_gem_path"
   else
     # TODO: use selector for this?
@@ -354,7 +354,7 @@ function __rvm_db {
     __rvm_log "fail" "__rvm_db must be called with at least one argument: __rvm_db key [value]"
   else
     value="$*"
-    if [ "$value" = "unset" -o "$value" = "delete" ] ; then
+    if [ "unset" = "$value" -o "delete" = "$value" ] ; then
       sed -i.tmp "s/^$key=.*$//" $rvm_hash_file
     else
       if [ -z "$value" ] ; then # get
@@ -381,7 +381,7 @@ function __rvm_list {
     echo -e "\nruby:\n"
     for version in $(/bin/ls -l $rvm_path/ 2> /dev/null | awk '/ ruby-[1-2].*/ { print $NF  }') ; do
       string=$($rvm_path/$version/bin/ruby -v)
-      if [ "$current_ruby" = "$version" ] ; then
+      if [[ "$version" = "$current_ruby" ]] ; then
         echo -e "=> $version : $string"
         selected="1"
       else
@@ -392,7 +392,7 @@ function __rvm_list {
     echo -e "\njruby:\n"
     for version in $(/bin/ls -l $rvm_path/ 2> /dev/null | awk '/jruby-.*/ { print $NF }') ; do
       string=$($rvm_path/$version/bin/ruby -v)
-      if [ "$current_ruby" = "$version" ] ; then
+      if [[ "$version" = "$current_ruby" ]] ; then
         echo -e "=> $version : $string"
         selected="1"
       else
@@ -403,7 +403,7 @@ function __rvm_list {
     echo -e "\nree:\n"
     for version in $(/bin/ls $rvm_path/ 2> /dev/null | awk '/ree-.*/ { print $NF }') ; do
       string="$($rvm_path/$version/bin/ruby -v | tr "\n" ' ' )"
-      if [ "$current_ruby" = "$version" ] ; then
+      if [[ "$version" = "$current_ruby" ]] ; then
         echo -e "=> $version : $string"
         selected="1"
       else
@@ -416,7 +416,7 @@ function __rvm_list {
       if [ ! -z "$version" ] ; then
         echo -e "\ndefault:\n"
         string=$($rvm_path/$version/bin/ruby -v)
-        if [ "$current_ruby" = "$version" ] ; then
+        if [[ "$version" = "$current_ruby" ]] ; then
           echo -e "=> $version : $string"
           selected="1"
         else
@@ -428,7 +428,7 @@ function __rvm_list {
     echo -e "\nsystem:\n"
     system_version=$(rvm system ; ruby -v 2> /dev/null)
     if [ ! -z "$system_version" ] ; then
-      if [ "$($(which ruby) -v)" = "$system_version" ] ; then
+      if [[ "$($(which ruby) -v)" = "$system_version" ]] ; then
         echo -e "=> $system_version\n"
       else
         echo -e "   $system_version\n"
@@ -446,7 +446,7 @@ function __rvm_initialize {
   fi
 
   # TODO: Sanitize user input, ensure that there is a / a the end...
-  if [ "$(whoami)" = "root" ] ; then
+  if [ "root" = "$(whoami)" ] ; then
     __rvm_log "fail" "root user support is not yet implemented."
     rvm_prefix_path="${rvm_prefix_path:-/usr/local/}"
   else
@@ -472,7 +472,7 @@ function __rvm_initialize {
   rvm_ruby_load_path="."
   rvm_ruby_require=""
 
-  if [ "$(uname)" = "Darwin" ] ; then rvm_archflags="${rvm_archflags:-'-arch i386 -arch x86_64'}" ; fi
+  if [ "Darwin" = "$(uname)" ] ; then rvm_archflags="${rvm_archflags:-'-arch i386 -arch x86_64'}" ; fi
 
   __rvm_clean-path
   rvm_result=$(echo $PATH | grep 'rvm\/bin:')
@@ -484,7 +484,7 @@ function __rvm_initialize {
 }
 
 function __rvm_update {
-  if [ "$rvm_ruby_revision" = "head" -o ! -z "$rvm_self_flag" -o "$rvm_action" = "update" -o ! -z "$rvm_update_flag" ] ; then
+  if [ "head" = "$rvm_ruby_revision" -o ! -z "$rvm_self_flag" -o "update" = "$rvm_action" -o ! -z "$rvm_update_flag" ] ; then
     __rvm_version
     __rvm_update_rvm
     __rvm_version
@@ -497,7 +497,7 @@ function __rvm_update {
 
 function __rvm_update_rvm {
   mkdir -p $rvm_src_path
-  if [ "$rvm_ruby_revision" = "head" ] ; then
+  if [ "head" = "$rvm_ruby_revision" ] ; then
     if [ -d $rvm_src_path/rvm/.git ] ; then
       cd $rvm_src_path/rvm/ && git pull origin master && ./scripts/install
     else
@@ -513,11 +513,11 @@ function __rvm_update_rvm {
 function __rvm_reboot {
   __rvm_log "warn" "Do you wish to reset rvm? ('yes', or 'no')"
   read response
-  if [ "$response" = "yes" ] ; then
+  if [ "yes" = "$response" ] ; then
     cd
     __rvm_reset
     mv ~/.rvm/archives ~/.archives
-    if [ "$rvm_path" = "/" ] ; then
+    if [ "/" = "$rvm_path" ] ; then
       __rvm_log "error" "remove '/' ?!... NO!"
     else
       if [ -d $rvm_path ] ; then
@@ -548,10 +548,10 @@ function __rvm_reload {
 function __rvm_ruby_do {
   __rvm_select
   __rvm_use
-  binary=`echo $rvm_action | sed 's/do$//'`
+  binary="$(echo $rvm_action | sed 's/do$//')"
   if [ -x $rvm_ruby_home/bin/$binary ] ; then
     load_path="$rvm_ruby_home/bin:$rvm_ruby_load_path"
-    if [ "$binary" = "ruby" ] ; then
+    if [ "ruby" = "$binary" ] ; then
       if [ -z "$(echo $rvm_ruby_args | awk '/\.rb$/')" ] ; then
         rvm_ruby_args="-S $rvm_ruby_args"
       fi
@@ -591,7 +591,7 @@ function __rvm_do {
     unset rvm_ruby_interpreter rvm_ruby_version
     __rvm_ruby_do
   elif [ ! -z "$rvm_ruby_version" ] ;then
-    for rvm_ruby_selector in `echo $rvm_ruby_version | tr ',' ' '` ; do
+    for rvm_ruby_selector in $(echo $rvm_ruby_version | tr ',' ' ') ; do
       unset rvm_ruby_string
       __rvm_ruby_do
     done
@@ -602,7 +602,7 @@ function __rvm_do {
     while read bin_line
     do # Keep this on second line damnit!
       if [ -x $bin_line ] ; then
-        rvm_ruby_string="`dirname $bin_line | xargs dirname | xargs basename`"
+        rvm_ruby_string="$(dirname $bin_line | xargs dirname | xargs basename)"
         __rvm_ruby_do
       fi
     done < <(/bin/ls $rvm_path/*/bin/ruby 2> /dev/null)
@@ -723,10 +723,10 @@ function __rvm_pushpop {
 
 function __rvm_state {
   if [ -z "$rvm_state" ] ; then
-    if [ -z "$(which ruby | awk /`basename $rvm_path`/)" ] ; then
+    if [ -z "$(which ruby | awk /$(basename $rvm_path)/)" ] ; then
       rvm_state=system
     else
-      rvm_state="$(dirname `which ruby` | xargs dirname | xargs basename)"
+      rvm_state="$(dirname $(which ruby) | xargs dirname | xargs basename)"
     fi
   else
     rvm_ruby_string="$rvm_state"
@@ -760,7 +760,7 @@ function __rvm_readline_install {
   __rvm_fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format"
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   cd "$rvm_src_path/$package-$version"
-  if [ "$(uname)" = "Darwin" ] ; then
+  if [ "Darwin" = "$(uname)" ] ; then
     sdk=$(ls -t /Developer/SDKs/ | head -n 1)
     CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
     LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/$sdk -arch i386 -arch x86_64"
@@ -788,19 +788,18 @@ function __rvm_iconv_install {
 }
 
 __rvm_monitor() {
-if [ -d test/ ] ; then
-  :
-elif [ -d spec/ ] ; then
-  :
-fi
-#
-#  timestamp() {
-#    if [ "$(uname)" = "Darwin" ] ; then
-#      $(stat -c "%Y" $1)
-#    else
-#      echo $(stat -f "%m" $1)
-#    fi
-#  }
-#
+  if [ -d test/ ] ; then
+    :
+  elif [ -d spec/ ] ; then
+    :
+  fi
+}
+
+timestamp() {
+  if [ "Darwin" = "$(uname)" ] ; then
+   echo $(stat -c "%Y" $1)
+  else
+    echo $(stat -f "%m" $1)
+  fi
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.57
+  version: 0.0.58
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 -04:00
+date: 2009-10-12 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []