rvm 0.0.59 → 0.0.60

data/install

@@ -37,7 +37,7 @@ if [ -z "$rvm_loaded_flag" ] ; then
     if [ ! -e ~/$rcfile ] ; then touch ~/$rcfile ; fi
     if [ -z "$(awk '/\.rvm\/scripts\/rvm/' ~/$rcfile)" ] ; then
       echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/$rcfile."
-      echo -e "\n# rvm installer added line:\nif [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
+      echo -e "\n# rvm-install added line:\nif [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
     fi
   done
 fi
@@ -53,7 +53,7 @@ for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
 
     grep 'rvm\/bin\/rvm' $actual_file > /dev/null
     if [ $? -eq 0 ] ; then
-      sed -i.orig 's/rvm\/bin\/rvm/rvm\/scripts\/rvm/g' $actual_file
+      sed -i.orig 's#rvm/bin/rvm #rvm/scripts/rvm #g' $actual_file
       rm -f $actual_file.orig
     fi
 

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 59
+:patch: 60

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.59"
+  s.version = "0.0.60"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-10-16}
+  s.date = %q{2009-10-18}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "rvm.gemspec",
      "scripts/aliases",
      "scripts/cli",
+     "scripts/color",
      "scripts/completion",
      "scripts/functions",
      "scripts/gems",

data/scripts/cli

@@ -5,7 +5,7 @@ function __rvm_meta {
   rvm_meta_author_email="wayneeseguin@gmail.com"
   rvm_meta_website="http://rvm.beginrescueend.com/"
   rvm_meta_version="$(cat $rvm_path/lib/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')"
-  rvm_meta_updated="2009.10.16"
+  rvm_meta_updated="2009.10.18"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -158,8 +158,8 @@ function __rvm_parse_args {
         rvm_ruby_interpreter="${rvm_ruby_interpreter:-current}"
       ;;
 
-      --load|load|dump)
-        rvm_action=gems
+      --load|load|dump|clear)
+        rvm_action="gems"
         eval "rvm_${rvm_token}_flag=1"
       ;;
 
@@ -390,6 +390,9 @@ function __rvm_parse_args {
           elif [ ! -z "$(echo $rvm_token | awk '/^.+%.+$/')" ] ; then
             rvm_gem_set_name="$(echo $rvm_token | awk -F'%' '{print $2}')"
             rvm_ruby_string="$(echo $rvm_token | awk -F'%' '{print $1}')"
+          #elif [ ! -z "$(echo $rvm_token | awk '/^[0-9].[0-9]/')" ] ; then
+          elif [[ $rvm_token =~ ^[0-9].[0-9] ]] ; then
+            rvm_ruby_string="$rvm_token"
           else
             if [ ! -z "$(echo $rvm_token | awk '/\.rb$/{print}')" ] ; then # we have a specified ruby script
             #if [[ ! $rvm_token =~ \.rb$ ]] ; then # we have a specified ruby script

data/scripts/color

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+__color() {
+  case "$1" in
+    # regular colors
+    black)    tput setaf 0 ;;
+    red)      tput setaf 1 ;;
+    green)    tput setaf 2 ;;
+    yellow)   tput setaf 3 ;;
+    blue)     tput setaf 4 ;;
+    magenta)  tput setaf 5 ;;
+    cyan)     tput setaf 6 ;;
+    white)    tput setaf 7 ;;
+
+    # emphasized (bolded) colors
+    eblack)   tput bold ; tput setaf 0 ;;
+    ered)     tput bold ; tput setaf 1 ;;
+    egreen)   tput bold ; tput setaf 2 ;;
+    eyellow)  tput bold ; tput setaf 3 ;;
+    eblue)    tput bold ; tput setaf 4 ;;
+    emagenta) tput bold ; tput setaf 5 ;;
+    ecyan)    tput bold ; tput setaf 6 ;;
+    ewhite)   tput bold ; tput setaf 7 ;;
+
+    # underlined colors
+    ublack)   set smul unset rmul ; tput setaf 0 ;;
+    ured)     set smul unset rmul ; tput setaf 1 ;;
+    ugreen)   set smul unset rmul ; tput setaf 2 ;;
+    uyellow)  set smul unset rmul ; tput setaf 3 ;;
+    ublue)    set smul unset rmul ; tput setaf 4 ;;
+    umagenta) set smul unset rmul ; tput setaf 5 ;;
+    ucyan)    set smul unset rmul ; tput setaf 6 ;;
+    uwhite)   set smul unset rmul ; tput setaf 7 ;;
+
+    # background colors
+    bblack)   tput setab 0 ;;
+    bred)     tput setab 1 ;;
+    bgreen)   tput setab 2 ;;
+    byellow)  tput setab 3 ;;
+    bblue)    tput setab 4 ;;
+    bmagenta) tput setab 5 ;;
+    bcyan)    tput setab 6 ;;
+    bwhite)   tput setab 7 ;;
+
+    # Defaults
+    default)  tput setaf 9 ;;
+    bdefault) tput setab 9 ;;
+    none)     tput sgr0    ;;
+    *)        tput sgr0    # Reset
+  esac
+}
+

data/scripts/gems

@@ -4,8 +4,8 @@ __rvm_gems() {
   unset GEM_PATH
   if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi
 
-  if [ ! -z "$rvm_use_flag" ] ; then
-    __rvm_gems_use
+  if [ ! -z "$rvm_clear_flag" ] ; then
+    __rvm_gems_clear
   elif [ ! -z "$rvm_load_flag" ] ; then
     __rvm_gems_load
   elif [ ! -z "$rvm_dump_flag" ] ; then
@@ -18,8 +18,9 @@ __rvm_gems() {
     __rvm_gems_dir
   elif [ ! -z "$rvm_list_flag" ] ; then
     __rvm_gems_list
-  elif [ ! -z "$rvm_clear_flag" ] ; then
-    __rvm_gems_clear
+  #elif [ ! -z "$rvm_use_flag" ] ; then
+  else
+    __rvm_gems_use
   fi
 }
 
@@ -53,7 +54,10 @@ __rvm_gems_select() {
 }
 
 __rvm_gems_use() {
-  mkdir -p "$rvm_ruby_gem_home" ; GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
+  mkdir -p "$rvm_ruby_gem_home"
+  GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
+  GEM_PATH="$GEM_HOME" ; export GEM_PATH
+  __rvm_use
 }
 
 __rvm_gems_name() {
@@ -71,9 +75,30 @@ __rvm_gems_list() {
 }
 
 __rvm_gems_clear() {
+  unset rvm_ruby_gem_home rvm_gem_set_name GEM_HOME GEM_PATH
+  __rvm_gems_select
   __rvm_gems_use
-  if [ -d "$rvm_ruby_gem_home" -a "$rvm_ruby_gem_home" != '/' ] ; then
-    rm -rf "$rvm_ruby_gem_home"
+}
+
+__rvm_gems_delete () {
+  if [ ! -z "$rvm_gem_set_name" ] ; then
+    gemdir="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
+    if [ -d "$gemdir" -a ! -z "$rvm_force_flag" ] ; then
+        rm -rf  "$gemdir"
+    elif [ -d "$gemdir" ] ; then
+      __rvm_log "warn" "Are you SURE you wish to remove the installed gems '$rvm_gem_set_name ' ($gemdir)?"
+      echo -n "(anything other than 'yes' will cancel) > "
+      read response
+      if [ "yes" = "$response" ] ; then
+        rm -rf  "$gemdir"
+      else
+        __rvm_log "info" "Not doing anything, phew... close call that one eh?"
+      fi
+    else
+      __rvm_log "info" "$gemdir already does not exist."
+    fi ; unset gemdir
+  else
+    __rvm_log "error" "A gems name must be specified in order to delete a gems."
   fi
 }
 
@@ -132,7 +157,7 @@ __rvm_gems_load() {
       gem="$(echo $line | awk -F';' '{print $1}')"
       gem_prefix="$(echo $line | awk -F';' '{print $2}')"
       gem_name="$(echo $gem | awk '{print $1}')"
-      gem_version="$(echo $gem | sed 's/^.*-v[=]*[ ]*//' | awk '{print $1}')"
+      gem_version="$(echo $gem | awk '{print $2}' | sed 's/^.*-v[=]*[ ]*//' )"
       gem_postfix="$(echo $gem | sed "s/$gem_name//" | sed "s/-v[=]*[ ]*$gem_version//")"
 
       if [ -f "$gem" ] ; then
@@ -145,38 +170,47 @@ __rvm_gems_load() {
         gem_file_name="$gem_name-$gem_version.gem"
       fi
 
-      cache_file=$(/bin/ls -t "$rvm_gem_path/*/*/cache/${gem_file_name}*" 2> /dev/null | head -n1)
-      if [ -z "$cache_file" ] ; then
-        if [ -f "$gem_file_name" ] ; then
-          gem="$gem_file_name"
-        elif [ -z "$gem_version" ] ; then
-          gem="$gem_name"
-        else
-          gem="$gem_name -v $gem_version"
-        fi
-      else # cached
-        gem_file_name="$(basename $cache_file)"
-        gem_string="$(echo "$gem_file_name" | sed 's/\.gem$//')"
-        if [ ! -z "$(echo "$rvm_ruby_gem_list" | awk "/$gem_string/{print}")" ] ; then
-        #if [[ $rvm_ruby_gem_list =~ $gem_string ]] ; then
-          if [ ! -z "$rvm_force_flag" ] ; then
-            cp $cache_file $rvm_temp_path/$gem_file_name
-            gem="$rvm_temp_path/$gem_file_name" # install as a named local gem
+      if [ -z "$rvm_force_flag" -a -f "$rvm_ruby_gem_home/specifications/${gem_file_name/\.gem/.gemspec}" ] ; then
+        unset gem
+        __rvm_log "info" "$(__color "green")$gem_name $gem_version$(__color "none") is already installed, skipping. (--force to re-install)"
+      else
+        cache_file=$(/bin/ls -t "$rvm_gem_path/*/*/cache/${gem_file_name}*" 2> /dev/null | head -n1)
+        if [ -z "$cache_file" ] ; then
+          if [ -f "$gem_file_name" ] ; then
+            gem="$gem_file_name"
+          elif [ -z "$gem_version" ] ; then
+            gem="$gem_name"
           else
-            unset gem
-            __rvm_log "info" "$gem_name $gem_version is already installed, skipping. (use --force to force these to install regardless)"
+            gem="$gem_name -v $gem_version"
+          fi
+        else # cached
+          gem_file_name="$(basename $cache_file)"
+          gem_string="$(echo "$gem_file_name" | sed 's/\.gem$//')"
+          if [ ! -z "$(echo "$rvm_ruby_gem_list" | awk "/$gem_string/{print}")" ] ; then
+            #if [[ $rvm_ruby_gem_list =~ $gem_string ]] ; then
+            if [ ! -z "$rvm_force_flag" ] ; then
+              cp $cache_file $rvm_temp_path/$gem_file_name
+              gem="$rvm_temp_path/$gem_file_name" # install as a named local gem
+            fi
+          else
+            gem="$cache_file"
           fi
-        else
-          gem="$cache_file"
         fi
       fi
 
       if [ ! -z "$gem" ] ; then
         # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line.
         if [ -z "$vars" ] ; then
-          GEM_HOME="$rvm_ruby_gem_home" GEM_PATH="$rvm_ruby_gem_home" $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix
+          command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix"
         else
-          eval "GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix"
+          command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix"
+        fi
+        eval $command > /dev/null 2>&1
+        result=$?
+        if [[ $result -eq 0 ]] ; then
+        __rvm_log "info" "$(__color "green")$gem_name $gem_version$(__color "none") installed. (--force to re-install)"
+        else
+          __rvm_log "error" "$(__color "red")$gem_name $gem_version$(__color "none") failed to install. (--force to re-install)"
         fi
       fi
       unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
@@ -186,26 +220,3 @@ __rvm_gems_load() {
   fi
 }
 
-__rvm_gems_delete () {
-  if [ ! -z "$rvm_gem_set_name" ] ; then
-    gemdir="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
-    if [ -d "$gemdir" -a ! -z "$rvm_force_flag" ] ; then
-        rm -rf  "$gemdir"
-    elif [ -d "$gemdir" ] ; then
-      __rvm_log "warn" "Are you SURE you wish to remove the installed gems '$rvm_gem_set_name ' ($gemdir)?"
-      echo -n "(anything other than 'yes' will cancel) > "
-      read response
-      if [ "yes" = "$response" ] ; then
-        rm -rf  "$gemdir"
-      else
-        __rvm_log "info" "Not doing anything, phew... close call that one eh?"
-      fi
-    else
-      __rvm_log "info" "$gemdir already does not exist."
-    fi ; unset gemdir
-  else
-    __rvm_log "error" "A gems name must be specified in order to delete a gems."
-  fi
-}
-
-

data/scripts/install

@@ -37,7 +37,7 @@ if [ -z "$rvm_loaded_flag" ] ; then
     if [ ! -e ~/$rcfile ] ; then touch ~/$rcfile ; fi
     if [ -z "$(awk '/\.rvm\/scripts\/rvm/' ~/$rcfile)" ] ; then
       echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/$rcfile."
-      echo -e "\n# rvm installer added line:\nif [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
+      echo -e "\n# rvm-install added line:\nif [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
     fi
   done
 fi
@@ -53,7 +53,7 @@ for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
 
     grep 'rvm\/bin\/rvm' $actual_file > /dev/null
     if [ $? -eq 0 ] ; then
-      sed -i.orig 's/rvm\/bin\/rvm/rvm\/scripts\/rvm/g' $actual_file
+      sed -i.orig 's#rvm/bin/rvm #rvm/scripts/rvm #g' $actual_file
       rm -f $actual_file.orig
     fi
 

data/scripts/rvm

@@ -9,6 +9,7 @@
 if [ -s ~/.rvmrc ] ; then source ~/.rvmrc ; fi
 eval rvm_path="${rvm_path:-~/.rvm}"
 
+source $rvm_path/scripts/color
 source $rvm_path/scripts/utility
 source $rvm_path/scripts/selector
 source $rvm_path/scripts/ruby-installer # TODO: Script not function.

data/scripts/rvm-install

@@ -37,7 +37,7 @@ if [ -z "$rvm_loaded_flag" ] ; then
     if [ ! -e ~/$rcfile ] ; then touch ~/$rcfile ; fi
     if [ -z "$(awk '/\.rvm\/scripts\/rvm/' ~/$rcfile)" ] ; then
       echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/$rcfile."
-      echo -e "\n# rvm installer added line:\nif [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
+      echo -e "\n# rvm-install added line:\nif [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
     fi
   done
 fi
@@ -53,7 +53,7 @@ for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
 
     grep 'rvm\/bin\/rvm' $actual_file > /dev/null
     if [ $? -eq 0 ] ; then
-      sed -i.orig 's/rvm\/bin\/rvm/rvm\/scripts\/rvm/g' $actual_file
+      sed -i.orig 's#rvm/bin/rvm #rvm/scripts/rvm #g' $actual_file
       rm -f $actual_file.orig
     fi
 

data/scripts/selector

@@ -76,7 +76,9 @@ function __rvm_select {
     ruby-enterprise|ree)
       rvm_ruby_interpreter=ree
       rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ree_version")"}
-      rvm_ruby_patch_level="${rvm_ruby_revision:-"$(__rvm_db "ree_${rvm_ruby_version}_patch_level")"}"
+      if [ "$rvm_ruby_version" != "head" ] ; then
+        rvm_ruby_patch_level="${rvm_ruby_patch_level:-$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")}"
+      fi
       rvm_ruby_package_name="ree-$rvm_ruby_version-$rvm_ruby_patch_level"
       rvm_ruby_package_file="ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level"
       if [ -z "$(echo $rvm_ruby_version | awk '/^1\.8/')" ] ; then
@@ -87,16 +89,13 @@ function __rvm_select {
     ruby)
       if [ ! -z "$rvm_ruby_tag" ] ; then
         rvm_ruby_version=$(echo $rvm_ruby_tag | sed 's/^v//' | sed 's/\///' | awk -F'_' '{print 1 "." $2 "." $3 }')
-        rvm_ruby_patch_level=$rvm_ruby_tag # $(echo $rvm_ruby_tag | sed 's/^v//' | sed 's/\///' | awk -F'_' '{print $4 }')
-      fi
-      if [ -z "$rvm_ruby_version" ] ; then
-        rvm_ruby_version=$(__rvm_db "ruby_version") # Default verison is 1.8.6
-      fi
-      rvm_ruby_patch_level=${rvm_ruby_patch_level:-$(__rvm_db "ruby_${rvm_ruby_version}_patch_level")} # Default verison is 1.8.6
-      if [ -z "rvm_ruby_patch_level" ] ; then unset rvm_ruby_patch_level ; fi
-      if [ -z "rvm_ruby_version" ] ; then
-        __rvm_log "fail" "Unknown ruby version: $rvm_ruby_version"
+        # rvm_ruby_patch_level=$rvm_ruby_tag # $(echo $rvm_ruby_tag | sed 's/^v//' | sed 's/\///' | awk -F'_' '{print $4 }')
+        if [ -z "$rvm_ruby_patch_level" ] ; then rvm_ruby_patch_level=$rvm_Ruby_tag ; fi
       fi
+      if [ -z "$rvm_ruby_version" ] ; then rvm_ruby_version=$(__rvm_db "ruby_version") ; fi
+      if [ -z "$rvm_ruby_patch_level" ] ; then rvm_ruby_patch_level="$(__rvm_db "ruby_${rvm_ruby_version/ /}_patch_level")" ; fi
+      if [ -z "$rvm_ruby_patch_level" ] ; then unset rvm_ruby_patch_level ; fi
+      if [ -z "$rvm_ruby_version" ] ; then __rvm_log "fail" "Unknown ruby version: $rvm_ruby_version" ; fi
     ;;
 
     default|system|current|user)
@@ -257,12 +256,23 @@ function __rvm_ruby_string {
 
     rvm_ruby_interpreter=$(echo $ruby_string |  awk -F'-' '{print $1}')
     rvm_ruby_version=$(echo $ruby_string |  awk -F'-' '{print $2}')
+    if [ "$rvm_ruby_version" != "head" ] ; then
+      patch_level=$(echo $ruby_string |  awk -F'-' '{print $3}')
+      if [ ! -z "$patch_level" ] ; then rvm_ruby_patch_level="$patch_level" ; fi
+    else
+      rvm_ruby_patch_level="head"
+    fi
+
     if [ ! -z "$(echo $rvm_ruby_interpreter | awk '/^1\.[8-9]/')" ] ; then
       rvm_ruby_patch_level=$rvm_ruby_version
       rvm_ruby_version=$rvm_ruby_interpreter
       rvm_ruby_interpreter="ruby"
       if [ -z "$rvm_ruby_patch_level" ] ; then
-        rvm_ruby_patch_level="${rvm_ruby_patch_level:-$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")}"
+        if [ "$rvm_ruby_version" != "head" ] ; then
+          rvm_ruby_patch_level="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
+        else
+          rvm_ruby_patch_level="head"
+        fi
       fi
     elif [ ! -z "$(echo $rvm_ruby_interpreter | awk '/^1\.[3-4]/')" ] ; then
       rvm_ruby_version=$rvm_ruby_interpreter

data/scripts/update

@@ -37,7 +37,7 @@ if [ -z "$rvm_loaded_flag" ] ; then
     if [ ! -e ~/$rcfile ] ; then touch ~/$rcfile ; fi
     if [ -z "$(awk '/\.rvm\/scripts\/rvm/' ~/$rcfile)" ] ; then
       echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/$rcfile."
-      echo -e "\n# rvm installer added line:\nif [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
+      echo -e "\n# rvm-install added line:\nif [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
     fi
   done
 fi
@@ -53,7 +53,7 @@ for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
 
     grep 'rvm\/bin\/rvm' $actual_file > /dev/null
     if [ $? -eq 0 ] ; then
-      sed -i.orig 's/rvm\/bin\/rvm/rvm\/scripts\/rvm/g' $actual_file
+      sed -i.orig 's#rvm/bin/rvm #rvm/scripts/rvm #g' $actual_file
       rm -f $actual_file.orig
     fi
 

data/scripts/utility

@@ -53,7 +53,6 @@ function __rvm_debug {
   if [ -f $rvm_path/bin/rvm ] ; then
     __rvm_log "error" "rvm script in bin! \n$(ls -laht $rvm_path/bin/rvm)"
   fi
-
 }
 
 # Logging functions based on level
@@ -87,7 +86,7 @@ function __rvm_clean_path {
   export PATH
 }
 
-function __rvm_remove-rvm-from-path {
+function __rvm_remove_rvm_from_path {
   PATH=$(echo $PATH | tr -s ':' '\n' | grep -v "\.rvm" | tr -s '\n' ':' | sed 's/:$//')
   export PATH
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.59
+  version: 0.0.60
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 -04:00
+date: 2009-10-18 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - rvm.gemspec
 - scripts/aliases
 - scripts/cli
+- scripts/color
 - scripts/completion
 - scripts/functions
 - scripts/gems