rvm 0.0.61 → 0.0.62

data/install

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 user="$(whoami)"
-if [ "root" = "$user" ] ; then
+if [[ "root" = "$user" ]] ; then
   echo -e "$(tput setaf 1) <e> root user support is not yet implemented.$(tput sgr0)"
   exit 1
 fi
@@ -10,7 +10,7 @@ item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
 cwd=$(pwd)
 source_dir="${source_dir:-"$(dirname $0 | xargs dirname)"}"
-if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
+if [[ ! -d "$source_dir" ]] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 rvm_path=~/.rvm
 
@@ -32,34 +32,34 @@ for file_name in rvm-prompt gemsync ; do
   chmod +x $rvm_path/bin/$file_name
 done ; unset file_name
 
-if [ -z "$rvm_loaded_flag" ] ; then
+if [[ -z "$rvm_loaded_flag" ]] ; then
   for rcfile in .bash_profile .bashrc .zshrc ; do
-    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-install added line:\nif [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
+    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-install added line:\nif [[ -s ~/.rvm/scripts/rvm ]] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
     fi
   done
 fi
 
 echo -e "\n    Ensuring that rvm script location in $file is scripts/rvm not bin/rvm for: ~/.bash_profile, ~/.bashrc, ~/.zshrc..."
 for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
-  if [ -s $file ] ; then
-    if [ -L $file ] ; then         # If the file is a symlink,
+  if [[ -s $file ]] ; then
+    if [[ -L $file ]] ; then         # If the file is a symlink,
       actual_file="$(readlink $file)" # read the link target so we can preserve it.
     else
       actual_file="$file"
     fi
 
     grep 'rvm\/bin\/rvm' $actual_file > /dev/null
-    if [ $? -eq 0 ] ; then
+    if [[ $? -eq 0 ]] ; then
       sed -i.orig 's#rvm/bin/rvm #rvm/scripts/rvm #g' $actual_file
       rm -f $actual_file.orig
     fi
 
-    if [ -f ~/.profile ] ; then
+    if [[ -f ~/.profile ]] ; then
       grep '.profile' $actual_file > /dev/null
-      if [ $? -gt 0 ] ; then
+      if [[ $? -gt 0 ]] ; then
         profile=~/.profile
         echo -e "\n" >> $actual_file
         echo "source $profile" >> $actual_file
@@ -68,34 +68,34 @@ for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
   fi
 done
 
-if [ -f ~/.rvm/bin/rvm ] ; then
+if [[ -f ~/.rvm/bin/rvm ]] ; then
   echo -e "\n    Removing old rvm file from ~/.rvm/bin/rvm..."
   rm -f ~/.rvm/bin/rvm
 fi
 
 system="$(uname)"
 echo -e "\n    $(tput setaf 3)NOTES: $(tput sgr0)\n"
-if [ "Linux" = "$system" ] ; then
+if [[ "Linux" = "$system" ]] ; then
   rvm_apt_get_binary="$(which aptitude 2> /dev/null)"
   rvm_emerge_binary="$(which emerge 2> /dev/null)"
   rvm_pacman_binary="$(which pacman 2> /dev/null)"
   rvm_yum_binary="$(which yum 2> /dev/null)"
 
-  if [ ! -z "$rvm_apt_get_binary" ] ; then
+  if [[ ! -z "$rvm_apt_get_binary" ]] ; then
     echo -e "    $item For jRuby (if you wish to use it) you will need:"
     echo -e "       $ sudo aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk"
     echo -e "    $item For ree (if you wish to use it) you will need:"
     echo -e "       $ sudo aptitude install libreadline5-dev libssl-dev bison"
 
-  elif [ ! -z "$rvm_emerge_binary" ] ; then
+  elif [[ ! -z "$rvm_emerge_binary" ]] ; then
     echo -e "    $item For jRuby (if you wish to use it) you will need:"
     echo -e "       $ sudo emerge dev-java/sun-jdk dev-java/sun-jre-bin"
 
-  elif [ ! -z "$rvm_pacman_binary" ] ; then
+  elif [[ ! -z "$rvm_pacman_binary" ]] ; then
     echo -e "    $item For jRuby (if you wish to use it) you will need:"
     echo -e "       $ sudo pacman -Sy jdk jre"
 
-  elif [ ! -z "$rvm_yum_binary" ] ; then
+  elif [[ ! -z "$rvm_yum_binary" ]] ; then
     echo -e "    $item For ree (if you wish to use it) you will need:"
     echo -e "       $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
 
@@ -103,13 +103,13 @@ if [ "Linux" = "$system" ] ; then
     echo -e "    $item For jRuby (if you wish to use it) you will need:"
     echo -e "       The SUN java runtime environment and development kit."
   fi
-elif [ "Darwin" = "$system"  ] ; then
+elif [[ "Darwin" = "$system"  ]] ; then
   echo -e "      $item Be sure that you have XCode Tools installed in order to use rvm."
   echo -e "      $item If you intend on installing MacRuby you must install LLVM first."
 fi
 
 echo -e "      $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
-echo -e "      $item if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi"
+echo -e "      $item if [[ -s ~/.rvm/scripts/rvm ]] ; then source ~/.rvm/scripts/rvm ; fi"
 echo -e "      $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
 
 echo -e "\n    \033[0;33mRTFM: $(tput sgr0) http://rvm.beginrescueend.com/ \n"

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 61
+:patch: 62

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.61"
+  s.version = "0.0.62"
 
   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-20}
+  s.date = %q{2009-10-22}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/cli

@@ -5,17 +5,14 @@ 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.19"
 }
 
-function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
+function __rvm_version { __rvm_meta ; echo "rvm ${rvm_meta_version} by ${rvm_meta_author} (${rvm_meta_author_email}) [${rvm_meta_website}]" ; }
 
 function __rvm_usage {
 
-  __rvm_meta
-
   echo -e "
-  rvm ${rvm_meta_version} ${rvm_meta_website} by ${rvm_meta_author} (${rvm_meta_author_email})
+  $(__rvm_version)
 
 Usage
 
@@ -94,6 +91,7 @@ Options
   --nice          - process niceness (for slow computers, default 0)
   -m|--gem-set    - use a named gem set, instead of the default set.
   --rm-gem-set    - Remove a named gem set
+  --ree-options   - Options passed directly to ree's './installer' on the command line.
 
 Resources:
 
@@ -104,7 +102,7 @@ Resources:
 }
 
 function __rvm_parse_args {
-  while [ $# -gt 0 ] ; do
+  while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
       install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|gemsync|update|iconv|openssl|ncurses|zlib|readline)
@@ -113,7 +111,7 @@ function __rvm_parse_args {
 
       use)
         rvm_action=$rvm_token
-        if [ "ruby" = "$1" ] ; then shift ; fi
+        if [[ "ruby" = "$1" ]] ; then shift ; fi
       ;;
 
       inspect)
@@ -123,7 +121,7 @@ function __rvm_parse_args {
       ;;
 
       rm|remove)
-        rvm_action=remove
+        rvm_action="remove"
       ;;
 
       system|default)
@@ -134,7 +132,7 @@ function __rvm_parse_args {
       jruby|ree|macruby|rbx|rubinius|default|all)
         rvm_ruby_interpreter="$rvm_token"
         rvm_action="${rvm_action:-use}"
-        #if [ ! -z "$(echo $1 | awk '/^[0-9]/')" ] ; then
+        #if [[ ! -z "$(echo $1 | awk '/^[0-9]/')" ]] ; then
         if [[ ! -z "$1" ]] && [[ "$1" =~ ^[0-9] ]] ; then
           rvm_ruby_version=$1 ; shift
         fi
@@ -142,9 +140,9 @@ function __rvm_parse_args {
 
       gems|gemset)
         rvm_action="gems"
-        if [ "name" = "$1"  -o "$1" = "dir" -o "$1" = "list" -o "$1" = "empty" -o "$1" = "delete" ] ; then
+        if [[ "name" = "$1" ]] || [[ "dir" = "$1" ]] || [[ "list" = "$1" ]] || [[ "empty" = "$1" ]] || [[ "delete" = "$1" ]] ; then
           eval "rvm_${1}_flag=1" ; shift
-        elif [ "dump" = "$1" -o "$1" = "load" ] ; then
+        elif [[ "dump" = "$1" ]] || [[ "$1" = "load" ]] ; then
           eval "rvm_${1}_flag=1" ; shift
         else
           rvm_use_flag=1 # Default is to use the (named) gem set.
@@ -153,8 +151,8 @@ function __rvm_parse_args {
 
       gemdir)
         rvm_action=$rvm_token
-        if [ "system" = "$1" ] ; then rvm_ruby_interpreter="system" ; shift ; fi
-        if [ "user" = "$1"  ]   ; then rvm_ruby_interpreter="user"   ; shift ; fi
+        if [[ "system" = "$1" ]] ; then rvm_ruby_interpreter="system" ; shift ; fi
+        if [[ "user" = "$1"  ]]   ; then rvm_ruby_interpreter="user"   ; shift ; fi
         rvm_ruby_interpreter="${rvm_ruby_interpreter:-current}"
       ;;
 
@@ -165,13 +163,13 @@ function __rvm_parse_args {
 
       gemdup)
         rvm_action=$rvm_token
-        if [ -z "$1" ] ; then
+        if [[ -z "$1" ]] ; then
           rvm_ruby_interpreter="default"
-        elif [ "system" = "$1" ] ; then
+        elif [[ "system" = "$1" ]] ; then
           rvm_ruby_interpreter=$1 ; shift
-        elif [ "user" = "$1" ] ; then
+        elif [[ "user" = "$1" ]] ; then
           rvm_ruby_interpreter=$1 ; shift
-        elif [ "default" = "$1" ] ; then
+        elif [[ "default" = "$1" ]] ; then
           rvm_ruby_interpreter=$1 ; shift
         else
           rvm_ruby_interpreter=$1 ; shift
@@ -180,28 +178,27 @@ function __rvm_parse_args {
       ;;
 
       do|ruby|rake|gem|rubydo|rakedo|gemdo)
-        if [ "do" = "$rvm_action" ] ; then rvm_action="ruby" ; fi
+        if [[ "do" = "$rvm_action" ]] ; then rvm_action="ruby" ; fi
         rvm_action=$(echo $rvm_token | sed 's#do##g')
 
-        if [ "rake" = "$rvm_action" -o "$rvm_action" = "gem" -o "$rvm_action" = "ruby" ] ; then
-          if [ -z "$1" ] ; then
+        if [[ "rake" = "$rvm_action" ]] || [[ "gem" = "$rvm_action" ]] || [[ "ruby" = "$rvm_action" ]] ; then
+          if [[ -z "$1" ]] ; then
             rvm_action="error"
             rvm_error_message="the 'ruby' and 'gem' actions must be followed by arguments."
-            rvm_parse_break=1
           else
             rvm_action="ruby"
             rvm_ruby_args="$rvm_token $@"
             rvm_parse_break=1
           fi
         else
-          if [ ! -z "$(echo $1 | awk '/^-/')" ] ; then
+          if [[ ! -z "$(echo $1 | awk '/^-/')" ]] ; then
             unset rvm_ruby_version
           else
-            if [ ! -z "$(echo $1 | awk '/^[0-9]/')" ] ; then
+            if [[ ! -z "$(echo $1 | awk '/^[0-9]/')" ]] ; then
               rvm_ruby_version=$(echo "$1" | tr ',' ' ') ; shift
               unset rvm_ruby_interpreter
             else
-              if [ "jruby" = "$1" -o "$1" = "rbx" -o "$1" = "rubinius" -o "$1" = "macruby" -o "$1" = "ree" -o "$1" = "ruby-enterprise" ] ; then
+              if [[ "jruby" = "$1" ]] || [[ "rbx" = "$1" ]] || [[ "rubinius" = "$1" ]] || [[ "macruby" = "$1" ]] || [[ "ree" = "$1" ]] || [[  "ruby-enterprise" = "$1" ]] ; then
                 rvm_ruby_interpreter=$1 ; shift
               else
                 unset rvm_ruby_interpreter rvm_ruby_version
@@ -227,9 +224,9 @@ function __rvm_parse_args {
       ;;
 
       1.2.0|1.3|1.3.0|1.3.1|1.4|1.4.0)
-        if [ "1.3" = "$rvm_token" ] ; then
+        if [[ "1.3" = "$rvm_token" ]] ; then
           rvm_ruby_version="1.3.1"
-        elif [ "1.4" = "$rvm_token" ] ; then
+        elif [[ "1.4" = "$rvm_token" ]] ; then
           rvm_ruby_version="1.4.0"
         else
           rvm_ruby_version="$rvm_token"
@@ -239,7 +236,7 @@ function __rvm_parse_args {
       ;;
 
       -v|--version)
-        if [ -z "$1" ] ; then
+        if [[ -z "$1" ]] ; then
           rvm_action="version"
         else
           rvm_ruby_version="$1"
@@ -251,6 +248,10 @@ function __rvm_parse_args {
         rvm_ruby_repo_url=$rvm_token
       ;;
 
+      --ree-options)
+        rvm_ree_options="$rvm_token"
+      ;;
+
       -t|--tag)
         rvm_ruby_tag="$1";
         rvm_action="${rvm_action:-use}"
@@ -276,7 +277,7 @@ function __rvm_parse_args {
       ;;
 
       --bin)
-        if [ "update" = "$rvm_action" ] ; then
+        if [[ "update" = "$rvm_action" ]] ; then
           rvm_bin_flag=1
         else
           rvm_bin_path="$1" ; shift
@@ -284,7 +285,7 @@ function __rvm_parse_args {
         ;;
 
       -j)
-        if [ ! -z "$1" ] ; then
+        if [[ ! -z "$1" ]] ; then
           rvm_make_flags="$rvm_make_flags -j$1"
           shift
         else
@@ -295,7 +296,7 @@ function __rvm_parse_args {
 
 
       -C|--configure)
-        if [ ! -z "$1" ] ; then
+        if [[ ! -z "$1" ]] ; then
           rvm_ruby_configure="$(echo $1 | tr ',' ' ')"
           shift
         else
@@ -305,7 +306,7 @@ function __rvm_parse_args {
       ;;
 
       -r|--require)
-        if [ -z "$1" ] ; then
+        if [[ -z "$1" ]] ; then
           rvm_action="error"
           rvm_error_message="-r|--require *must* be followed by a library name."
         else
@@ -315,7 +316,7 @@ function __rvm_parse_args {
       ;;
 
       -I|--include)
-        if [ -z "$1" ] ; then
+        if [[ -z "$1" ]] ; then
           rvm_action="error"
           rvm_error_message="-I|--include *must* be followed by a path."
         else
@@ -373,32 +374,33 @@ function __rvm_parse_args {
       ;;
 
       *)
-        if [ ! -z "$rvm_token" ] ; then
-          if [ "gems" = "$rvm_action" ] ; then
-            if [ ! -z "$(echo $rvm_token | awk '/\.gems$/')" ] ; then
+        if [[ ! -z "$rvm_token" ]] ; then
+          if [[ "gems" = "$rvm_action" ]] ; then
+            if [[ ! -z "$(echo $rvm_token | awk '/\.gems$/')" ]] ; then
               rvm_file_name="$(echo $rvm_token | sed 's#\.gems##g').gems"
-              # elif [ ! -z "$(echo $rvm_token | awk '/\.gems$/')" ] ; then
+              # elif [[ ! -z "$(echo $rvm_token | awk '/\.gems$/')" ]] ; then
             else
               rvm_gem_set_name="$(echo $rvm_token | sed 's#\.gems##g')"
               rvm_file_name="$rvm_gem_set_name.gems"
             fi
-          elif [ ! -z "$(echo $rvm_token | awk '/,/')" ] ; then
+          elif [[ ! -z "$(echo $rvm_token | awk '/,/')" ]] ; then
             rvm_ruby_version="$rvm_token"
-            if [ -z "$rvm_action" ] ; then
+            if [[ -z "$rvm_action" ]] ; then
               rvm_action="do" # Not sure if we really want to do this but we'll try it out.
             fi
-          elif [ ! -z "$(echo $rvm_token | awk '/^.+%.+$/')" ] ; then
+          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 [[ ! -z "$(echo $rvm_token | awk '/^[0-9].[0-9]/')" ]] ; then
           elif [[ ! -z "$rvm_token" ]] && [[ "$rvm_token" =~ ^[0-9].[0-9] ]] ; then
             rvm_ruby_string="$rvm_token"
+            rvm_action="${rvm_action:-rvm_token}"
           else
-            if [ ! -z "$(echo $rvm_token | awk '/\.rb$/{print}')" ] ; then # we have a specified ruby script
+            if [[ ! -z "$(echo $rvm_token | awk '/\.rb$/{print}')" ]] ; then # we have a specified ruby script
             #if [[ ! -z "$rvm_token" ]] && [[ " ! $rvm_token =~ \.rb$ ]] ; then # we have a specified ruby script
               rvm_ruby_args=$rvm_token
               rvm_ruby_file=$rvm_token
-              if [ -z "$rvm_action" ] ; then
+              if [[ -z "$rvm_action" ]] ; then
                 rvm_action="ruby" # Not sure if we really want to do this but we'll try it out.
               fi
             else
@@ -410,18 +412,17 @@ function __rvm_parse_args {
           rvm_action="error"
           rvm_error_message="Unrecognized command line argument(s): '$rvm_token $@'"
         fi
-        if [ "error" = "$rvm_action" ] ; then
+        if [[ "error" = "$rvm_action" ]] ; then
           break;
         fi
 
     esac
 
-    if [ -z "$rvm_action" -a ! -z "$rvm_ruby_string" ] ; then rvm_action="use" ; fi
-
-    if [ ! -z "$rvm_parse_break" -o ! -z "$rvm_error_message" ] ; then unset rvm_parse_break; break; fi
+    if [[ -z "$rvm_action" ]] && [[ ! -z "$rvm_ruby_string" ]]  ; then rvm_action="use" ; fi
+    if [[ ! -z "$rvm_parse_break" ]] || [[ ! -z "$rvm_error_message" ]] ; then unset rvm_parse_break; break; fi
   done
 
-  if [ ! -z "$rvm_error_message" ] ; then __rvm_pushpop ; return 1 ; fi
+  if [[ ! -z "$rvm_error_message" ]] ; then __rvm_pushpop ; return 1 ; fi
 }
 
 function rvm {
@@ -434,7 +435,7 @@ function rvm {
   __rvm_load_defaults
   __rvm_parse_args $@
 
-  if [ -z "$rvm_trace_flag" ] ; then set +x ; else set -x ; fi
+  if [[ -z "$rvm_trace_flag" ]] ; then set +x ; else set -x ; fi
   result=0
   case "$rvm_action" in
     use)        __rvm_use              ; result=$? ;;
@@ -445,7 +446,6 @@ function rvm {
     version)    __rvm_version          ; result=$? ;;
     reset)      __rvm_reset            ; result=$? ;;
                 # TODO: how can we use bin_path here for reload, default file?
-    reload)     __rvm_reload           ; result=$? ;;
     implode)    __rvm_implode          ; result=$? ;;
     update)     __rvm_update           ; result=$? ;;
     readline)   __rvm_readline_install ; result=$? ;;
@@ -455,6 +455,9 @@ function rvm {
     ruby)       __rvm_do               ; result=$? ;;
     inspect)    __rvm_inspect          ; result=$? ;;
     gems)       __rvm_gems             ; result=$? ;;
+    reload)
+      source "$rvm_path/scripts/rvm"
+    ;;
 
     iconv|openssl|ncurses|zlib|readline)
       __rvm_${rvm_action}_install
@@ -480,7 +483,7 @@ function rvm {
     info|debug)
       __rvm_version
       __rvm_info
-      if [ "debug" = "$rvm_action" ] ; then rvm_debug_flag=1 ; __rvm_debug ; fi
+      if [[ "debug" = "$rvm_action" ]] ; then rvm_debug_flag=1 ; __rvm_debug ; fi
     ;;
 
     error)
@@ -490,7 +493,7 @@ function rvm {
     ;;
 
     *)
-      if [ ! -z "$rvm_action" ] ; then
+      if [[ ! -z "$rvm_action" ]] ; then
         __rvm_log "fail"  "unknown action '$rvm_action'"
       else
         __rvm_usage
@@ -498,7 +501,7 @@ function rvm {
       result=1
   esac
 
-  if [ "1" = "$rvm_trace_flag" ] ; then set +x ; unset rvm_trace_flag ; fi
+  if [[ "1" = "$rvm_trace_flag" ]] ; then set +x ; unset rvm_trace_flag ; fi
 
   return $result
 }