rvm 0.0.58 → 0.0.59

data/install

@@ -76,16 +76,16 @@ fi
 system="$(uname)"
 echo -e "\n    $(tput setaf 3)NOTES: $(tput sgr0)\n"
 if [ "Linux" = "$system" ] ; then
-  rvm_apt_get_binary="$(which apt-get 2> /dev/null)"
+  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
     echo -e "    $item For jRuby (if you wish to use it) you will need:"
-    echo -e "       $ sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
+    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 apt-get install libreadline5-dev libssl-dev bison"
+    echo -e "       $ sudo aptitude install libreadline5-dev libssl-dev bison"
 
   elif [ ! -z "$rvm_emerge_binary" ] ; then
     echo -e "    $item For jRuby (if you wish to use it) you will need:"

data/lib/VERSION.yml

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

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.58"
+  s.version = "0.0.59"
 
   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-12}
+  s.date = %q{2009-10-16}
   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,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.12"
+  rvm_meta_updated="2009.10.16"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -100,7 +100,7 @@ Resources:
   http://rvm.beginrescueend.com/
   https://www.pivotaltracker.com/projects/26822
 
-" | ${PAGER:-/usr/bin/less}
+" | ${PAGER:-less}
 }
 
 function __rvm_parse_args {
@@ -131,11 +131,11 @@ function __rvm_parse_args {
         rvm_ruby_interpreter="$rvm_token"
       ;;
 
-      # TODO: if $1 is a $version string nab it and shift
       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 [[ $1 =~ ^[0-9] ]] ; then
           rvm_ruby_version=$1 ; shift
         fi
       ;;
@@ -375,18 +375,24 @@ function __rvm_parse_args {
       *)
         if [ ! -z "$rvm_token" ] ; then
           if [ "gems" = "$rvm_action" ] ; then
-            if [ -z "$(echo $rvm_token | awk '/\.gems$/')" ] ; then
-              rvm_gem_set_name=$(echo $rvm_token | sed 's/\.gems//g')
-            else
+            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
+            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
             rvm_ruby_version="$rvm_token"
             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
+            rvm_gem_set_name="$(echo $rvm_token | awk -F'%' '{print $2}')"
+            rvm_ruby_string="$(echo $rvm_token | awk -F'%' '{print $1}')"
           else
-            if [ ! -z "$(echo $rvm_token | awk '/\.rb$/{print}' 2> /dev/null)" ] ; then # we have a specified ruby script
+            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
               rvm_ruby_args=$rvm_token
               rvm_ruby_file=$rvm_token
               if [ -z "$rvm_action" ] ; then
@@ -406,6 +412,9 @@ function __rvm_parse_args {
         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
   done
 
@@ -414,10 +423,10 @@ function __rvm_parse_args {
 
 function rvm {
 
-  trap '__rvm_cleanup_variables ; rm -f "/tmp/rvm/$$" >/dev/null 2>&1' 0 1 2 3 15
+  trap '__rvm_cleanup_variables ; rm -rf "/tmp/rvm/$$" >/dev/null 2>&1' 0 1 2 3 15
 
   __rvm_cleanup_variables
-  __rvm_load-rvmrc
+  __rvm_load_rvmrc
   __rvm_initialize
   __rvm_load_defaults
   __rvm_parse_args $@

data/scripts/completion

@@ -130,7 +130,7 @@ function __rvm_completion_reply
 function _rvm {
 
   __rvm_cleanup_variables
-  __rvm_load-rvmrc
+  __rvm_load_rvmrc
   __rvm_initialize
   __rvm_load_defaults
   __rvm_parse_args $@

data/scripts/gems

@@ -1,6 +1,8 @@
 #!/bin/bash
+
 __rvm_gems() {
-  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
+  unset GEM_PATH
+  if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi
 
   if [ ! -z "$rvm_use_flag" ] ; then
     __rvm_gems_use
@@ -23,14 +25,16 @@ __rvm_gems() {
 
 __rvm_gems_select() {
   if [ -z "$rvm_gem_set_name" ] ; then
-    if [ ! -z "$rvm_ruby_gem_home" -a ! -z "$rvm_ruby_version" ] ; then
-      rvm_gem_set_name=$(echo $rvm_ruby_gem_home | xargs basename | sed "s/${rvm_ruby_version}[-]*//")
+    if [ ! -z "$GEM_HOME" ] ; then
+      rvm_gem_set_name=$(echo $GEM_HOME | xargs basename | awk -F'%' '{print $2}')
     fi
 
-    if [ -z "$rvm_gem_set_name" ] ; then unset rvm_gem_set_name ; fi
+    if [ ! -z "$rvm_ruby_gem_home" ] ; then
+      rvm_gem_set_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F'%' '{print $2}')
+    fi
 
-    if [ ! -z "$rvm_gem_set_name" -a ! -z "$(echo $rvm_gem_set_name | awk '/^\d\.\d/')" ] ; then
-      rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
+    if [ ! -z "$rvm_gem_set_name" ] && [[ ! "$rvm_gem_set_name" =~ ^\d\.\d ]] ; then
+      rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
     else
       if [ ! -z "$rvm_ruby_interpreter" -a ! -z "$rvm_ruby_version" -a "$rvm_ruby_interpreter" != "system" ] ; then
         rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
@@ -42,25 +46,28 @@ __rvm_gems_select() {
         __rvm_log "error" "Cannot select gem home, something definitely wrong :/"
       fi
     fi
+    if [ -z "$rvm_gem_set_name" ] ; then unset rvm_gem_set_name ; fi
   else
-    rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
+    rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
   fi
 }
 
 __rvm_gems_use() {
-  __rvm_gems_select ; 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
 }
 
 __rvm_gems_name() {
-  __rvm_gems_select ; echo "$rvm_gem_set_name"
+  echo "$rvm_gem_set_name"
 }
 
 __rvm_gems_dir() {
-  __rvm_gems_select ; echo "$rvm_ruby_gem_home"
+  echo "$rvm_ruby_gem_home"
 }
 
 __rvm_gems_list() {
-  __rvm_gems_select ; gem list
+  for gemdir in "$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%"* ; do
+    echo "$gemdir" | awk -F'%' '{print $2}'
+  done
 }
 
 __rvm_gems_clear() {
@@ -71,11 +78,20 @@ __rvm_gems_clear() {
 }
 
 __rvm_gems_dump() {
-  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
-  __rvm_gems_select
-  rvm_gem_set_name="${rvm_gem_set_name:-"default"}"
-  rvm_file_name="${rvm_file_name:-"$rvm_gem_set_name.gems"}"
+  if [ ! -z "$rvm_ruby_gem_home" ] ; then
+    GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME ;
+    GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH ;
+  fi
+
+  if [ -z "$rvm_file_name" ] ; then
+    if [ ! -z "$rvm_gem_set_name" ] ; then
+      rvm_file_name="$rvm_gem_set_name.gems"
+    else
+      rvm_file_name="default.gems"
+    fi
+  fi
 
+  touch $rvm_file_name
   echo "# $rvm_file_name generated gem dump file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_file_name
 
   for gem in $(gem list | sed 's/[\(|\)]//g' | sed 's/, /,/g' | tr ' ' ';') ; do
@@ -92,70 +108,87 @@ __rvm_gems_dump() {
 }
 
 __rvm_gems_load() {
-  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
-  __rvm_gems_select
-  rvm_gem_set_name="${rvm_gem_set_name:-"default"}"
-  rvm_file_name="${rvm_file_name:-"$rvm_gem_set_name.gems"}"
-
-  echo "Loading $rvm_file_name file..."
-  rvm_ruby_gem_list=$(/bin/ls $rvm_ruby_gem_home/specifications/ 2> /dev/null | sed 's/\.gemspec$//' 2> /dev/null)
-  while read line
-  do # Keep this on 2nd line :( bash fail.
-    # TODO: Switch to a different field separator than ; to allow for evals
-    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_postfix="$(echo $gem | sed "s/$gem_name//" | sed "s/-v[=]*[ ]*$gem_version//")"
-
-    if [ -f "$gem" ] ; then
-      gem_file_name="${gem}"
-    elif [ -z "$gem_version" ] ; then # no version
-      gem_file_name="${gem_name}*.gem"
-    else # version
-      gem_file_name="$gem_name-$gem_version.gem"
+  if [ ! -z "$rvm_ruby_gem_home" ] ; then
+    GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME ;
+    GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH ;
+  fi
+
+  if [ -z "$rvm_file_name" ] ; then
+    if [ -f "$rvm_gem_set_name.gems" ] ; then
+      rvm_file_name="$rvm_gem_set_name.gems"
+    elif [ -f "default.gems" ] ; then
+      rvm_file_name="default.gems"
+    elif [ -f "system.gems" ] ; then
+      rvm_file_name="system.gems"
     fi
+  fi
 
-    cache_file=$(/bin/ls -t "$rvm_gem_path/*/*/cache/${gem_file_name}*" 2> /dev/null | head -n1)
-    if [ -z "$cache_file" ] ; then
-      if [ -z "$gem_version" ] ; then
-        gem="$gem_name"
-      else
-        gem="$gem_name -v $gem_version"
+  if [ -f "$rvm_file_name" ] ; then
+    echo "Loading $rvm_file_name file..."
+    rvm_ruby_gem_list=$(/bin/ls $rvm_ruby_gem_home/specifications/ 2> /dev/null | sed 's/\.gemspec$//' 2> /dev/null)
+    while read line
+    do # Keep this on 2nd line :( bash fail.
+      # TODO: Switch to a different field separator than ; to allow for evals
+      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_postfix="$(echo $gem | sed "s/$gem_name//" | sed "s/-v[=]*[ ]*$gem_version//")"
+
+      if [ -f "$gem" ] ; then
+        gem_file_name="${gem}"
+      elif [[ "$gem" =~ ".gem$" ]] ; then
+        gem_file_name="${gem}"
+      elif [ -z "$gem_version" ] ; then # no version
+        gem_file_name="${gem_name}*.gem"
+      else # version
+        gem_file_name="$gem_name-$gem_version.gem"
       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 [ ! -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
+
+      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
+          else
+            unset gem
+            __rvm_log "info" "$gem_name $gem_version is already installed, skipping. (use --force to force these to install regardless)"
+          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
-      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"
+      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
+        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"
+        fi
       fi
-    fi
-    unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
-  done < <(awk '/^[\.\/a-zA-Z]/{print}' "$rvm_file_name")
+      unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
+    done < <(awk '/^[\.\/a-zA-Z]/{print}' "$rvm_file_name")
+  else
+    __rvm_log "error" "$rvm_file_name does not exist to load from."
+  fi
 }
 
 __rvm_gems_delete () {
-  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
-  __rvm_gems_select
   if [ ! -z "$rvm_gem_set_name" ] ; then
-    gemdir="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version-$rvm_gem_set_name"
+    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

data/scripts/install

@@ -76,16 +76,16 @@ fi
 system="$(uname)"
 echo -e "\n    $(tput setaf 3)NOTES: $(tput sgr0)\n"
 if [ "Linux" = "$system" ] ; then
-  rvm_apt_get_binary="$(which apt-get 2> /dev/null)"
+  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
     echo -e "    $item For jRuby (if you wish to use it) you will need:"
-    echo -e "       $ sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
+    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 apt-get install libreadline5-dev libssl-dev bison"
+    echo -e "       $ sudo aptitude install libreadline5-dev libssl-dev bison"
 
   elif [ ! -z "$rvm_emerge_binary" ] ; then
     echo -e "    $item For jRuby (if you wish to use it) you will need:"

data/scripts/ruby-installer

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 function __rvm_install_source {
-  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi
   __rvm_log "info" "Installing Ruby from source to: $rvm_ruby_home"
   mkdir -p "$rvm_ruby_log_path"
 
@@ -44,7 +44,7 @@ function __rvm_install_source {
         rvm_url="$rvm_ruby_repo_url/tags/$rvm_ruby_tag"
         rvm_rev=""
       else
-        if [ "head" = "$rvm_ruby_revision" -o  "trunk" = "$rvm_ruby_revision"] ; then
+        if [ "head" = "$rvm_ruby_revision" -o  "trunk" = "$rvm_ruby_revision" ] ; then
           rvm_url="$rvm_ruby_repo_url/trunk"
           rvm_rev=""
         else
@@ -117,7 +117,7 @@ function __rvm_install_source {
 
 function __rvm_install_ruby {
 
-  if [ -z "$rvm_selected_flag" ]   ; then __rvm_select $* ; fi
+  if [ -z "$rvm_ruby_selected_flag" ]   ; then __rvm_select $* ; fi
   if [ ! -z "$RUBYOPT" ]      ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
   if [ "$(uname)" = "Darwin" ] ; then ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS ; fi
 
@@ -140,7 +140,7 @@ function __rvm_install_ruby {
         rvm_url="$(__rvm_db "ree_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
         __rvm_log "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
         __rvm_pushpop "$rvm_src_path"
-        if [ -z "$rvm_force_flag" -a -d "$rvm_ruby_src_path" -a ! -z $($rvm_ruby_src_path/*) ]  ; then
+        if [ -z "$rvm_force_flag" -a -d "$rvm_ruby_src_path" -a ! -x "$rvm_ruby_src_path/installer" ]  ; then
           __rvm_log "It appears that the archive has already been extracted. Skipping extract (use --force to force re-download and extract)."
         else
           __rvm_log "Downloading $rvm_ruby_package_file, this may take a while depending on your connection..."
@@ -328,15 +328,6 @@ RubyWrapper
     ;;
 
     ruby)
-      #if [ "$(uname)" = "Darwin" ] ; then
-      #  if [ "$(echo $rvm_ruby_version | awk '/1\.8/')" ] ; then
-      #    rvm_ruby_configure="${rvm_ruby_configure:-"--enable-shared"} "
-      #  else
-      #    rvm_ruby_configure="${rvm_ruby_configure:-"--enable-shared"} "
-      #  fi
-      #else
-      #  rvm_ruby_configure="${rvm_ruby_configure:-"--enable-pthread"} "
-      #fi
       __rvm_install_source $*
     ;;
 
@@ -359,8 +350,7 @@ function __rvm_manage_rubies {
     unset rvm_ruby_interpreter rvm_ruby_version
     __rvm_${rvm_action}_ruby
   elif [ ! -z "$rvm_ruby_version" ] ;then
-    for rvm_ruby_selector in $(echo $rvm_ruby_version | tr ',' ' ') ; do
-      unset rvm_ruby_string
+    for rvm_ruby_string in $(echo $rvm_ruby_version | tr ',' ' ') ; do
       __rvm_${rvm_action}_ruby
       __rvm_unset_ruby_variables
     done
@@ -389,7 +379,7 @@ function __rvm_manage_rubies {
 }
 
 function __rvm_uninstall_ruby {
-  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi
 
   if [ ! -z "$rvm_ruby_package_name" ] ; then
     for dir in $rvm_path ; do
@@ -410,7 +400,7 @@ function __rvm_uninstall_ruby {
 }
 
 function __rvm_remove_ruby {
-  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi
 
   if [ ! -z "$rvm_ruby_package_name" ] ; then
     for dir in $rvm_src_path $rvm_path ; do

data/scripts/rvm-install

@@ -76,16 +76,16 @@ fi
 system="$(uname)"
 echo -e "\n    $(tput setaf 3)NOTES: $(tput sgr0)\n"
 if [ "Linux" = "$system" ] ; then
-  rvm_apt_get_binary="$(which apt-get 2> /dev/null)"
+  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
     echo -e "    $item For jRuby (if you wish to use it) you will need:"
-    echo -e "       $ sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
+    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 apt-get install libreadline5-dev libssl-dev bison"
+    echo -e "       $ sudo aptitude install libreadline5-dev libssl-dev bison"
 
   elif [ ! -z "$rvm_emerge_binary" ] ; then
     echo -e "    $item For jRuby (if you wish to use it) you will need:"

data/scripts/selector

@@ -3,13 +3,16 @@
 # __rvm_select implementation version patch_level
 function __rvm_select {
   if [ ! -z "$rvm_ruby_string" ] ; then
-    __rvm_ruby_string
-  elif [ ! -z "$rvm_ruby_selector" ] ; then
-    if [ ! -z "$(echo $rvm_ruby_selector | awk '/^[0-9]/')" ] ; then
+    if [ ! -z "$(echo "$rvm_ruby_string" | awk '/^.+%.+$/')" ] ; then
+      rvm_gem_set_name="$(echo "$rvm_ruby_string" | awk -F'%' '{print $2}')"
+      rvm_ruby_string="$(echo "$rvm_ruby_string" | awk -F'%' '{print $1}')"
+    fi
+
+    if [ ! -z "$(echo "$rvm_ruby_string" | awk '/^[0-9]/')" ] ; then
       rvm_ruby_interpreter="${rvm_ruby_interpreter:-ruby}"
-      rvm_ruby_version=$rvm_ruby_selector
+      rvm_ruby_version=$rvm_ruby_string
     else
-      rvm_ruby_interpreter="$rvm_ruby_selector"
+      rvm_ruby_interpreter="$rvm_ruby_string"
       unset rvm_ruby_version
     fi
   elif [ ! -z "$rvm_ruby_interpreter" ] ; then
@@ -21,6 +24,7 @@ function __rvm_select {
     fi
   fi
 
+  if [ ! -z "$rvm_ruby_string" ] ; then __rvm_ruby_string ; fi
   if [ "1.8" = "$rvm_ruby_version" ] ; then rvm_ruby_version="1.8.6" ; fi
   if [ "1.9" = "$rvm_ruby_version" ] ; then rvm_ruby_version="1.9.1" ; fi
 
@@ -72,7 +76,7 @@ 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"))"}"
+      rvm_ruby_patch_level="${rvm_ruby_revision:-"$(__rvm_db "ree_${rvm_ruby_version}_patch_level")"}"
       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
@@ -122,8 +126,6 @@ function __rvm_select {
     rvm_major_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $2 }')
     rvm_minor_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $3 }')
 
-    __rvm_gems_select
-
     if [ -z "$rvm_ruby_patch_level" ] ; then
       rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_interpreter-$rvm_ruby_version"}"
       rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"}"
@@ -143,16 +145,16 @@ function __rvm_select {
     rvm_ruby_src_path="$rvm_src_path/$rvm_ruby_string"
     rvm_ruby_binary="$rvm_ruby_home/bin/ruby"
     rvm_ruby_irbrc="$rvm_ruby_home/.irbrc"
-    rvm_selected_flag=1
+    rvm_ruby_selected_flag=1
 
-    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected_flag rvm_ruby_string
+    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string
   else
     rvm_ruby_gem_home=$GEM_HOME
   fi
 }
 
 function __rvm_use {
-  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi
   if [ -z "$rvm_ruby_interpreter" ] ; then rvm_ruby_interpreter="default" ; fi
 
   if [ "default" = "$rvm_ruby_interpreter" ] ; then
@@ -245,7 +247,12 @@ function __rvm_ruby_string {
   if [ "system" = "$rvm_ruby_interpreter" ] ; then
     rvm_ruby_string="system"
   elif [ ! -z "$rvm_ruby_string" ] ; then
-    ruby_string=$(echo "$rvm_ruby_string" | sed 's/ruby-enterprise/ree/g') # dash-antics :
+    ruby_string=$(echo "$rvm_ruby_string" | sed 's/ruby-enterprise/ree/g') # dash-antics
+    if [ ! -z "$(echo "$rvm_ruby_string" | awk -F'%' '{print $2}')" ] ; then
+      rvm_gem_set_name=$(echo "$rvm_ruby_string" | awk -F'%' '{print $2}')
+    fi
+    set +x
+    ruby_string=$(echo "$rvm_ruby_string" | awk -F'%' '{print $1}')
     __rvm_unset_ruby_variables
 
     rvm_ruby_interpreter=$(echo $ruby_string |  awk -F'-' '{print $1}')

data/scripts/update

@@ -76,16 +76,16 @@ fi
 system="$(uname)"
 echo -e "\n    $(tput setaf 3)NOTES: $(tput sgr0)\n"
 if [ "Linux" = "$system" ] ; then
-  rvm_apt_get_binary="$(which apt-get 2> /dev/null)"
+  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
     echo -e "    $item For jRuby (if you wish to use it) you will need:"
-    echo -e "       $ sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
+    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 apt-get install libreadline5-dev libssl-dev bison"
+    echo -e "       $ sudo aptitude install libreadline5-dev libssl-dev bison"
 
   elif [ ! -z "$rvm_emerge_binary" ] ; then
     echo -e "    $item For jRuby (if you wish to use it) you will need:"

data/scripts/utility

@@ -63,9 +63,7 @@ function __rvm_log {
   message=$1
   case "$level" in
     debug) shift ;
-      if [ ! -z "$rvm_debug_flag" ] ; then
-        echo -e "$(tput setaf 5)<d>$(tput sgr0) $message $(tput setaf 5)</d> $(tput sgr0) "
-      fi
+      ((rvm_debug_flag)) && echo -e "$(tput setaf 5)<d>$(tput sgr0) $message $(tput setaf 5)</d> $(tput sgr0) "
     ;;
     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) " ;;
@@ -84,7 +82,7 @@ __rvm_push() {
   unset array item
 }
 
-function __rvm_clean-path {
+function __rvm_clean_path {
   PATH=$(echo $PATH | tr -s ':' '\n' | awk '!($0 in a){a[$0];print}' | tr -s '\n' ':' | sed 's/:$//')
   export PATH
 }
@@ -116,15 +114,15 @@ function __rvm_run {
 
 function __rvm_cleanup_variables {
   __rvm_unset_ruby_variables
-  unset rvm_selected_flag rvm_action rvm_irbrc_file rvm_src_path rvm_path rvm_prefix_path rvm_gem_path rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_config_path rvm_bin_path rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_head_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_log_path rvm_file_name
+  unset rvm_ruby_selected_flag rvm_action rvm_irbrc_file rvm_src_path rvm_path rvm_prefix_path rvm_gem_path rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_config_path rvm_bin_path rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_head_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_log_path rvm_file_name
 }
 
 function __rvm_unset_ruby_variables {
-  unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected_flag rvm_ruby_selector rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home
+  unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home
 }
 
 # TODO: root user loadng of /etc/rvmrc
-function __rvm_load-rvmrc {
+function __rvm_load_rvmrc {
   if [ -s ~/.rvmrc ] ; then source ~/.rvmrc ; fi
 }
 
@@ -139,7 +137,7 @@ function __rvm_bin_scripts {
 }
 
 function __rvm_bin_script {
-  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi
 ruby_wrapper=$(cat <<RubyWrapper
 #!/bin/bash
 
@@ -294,13 +292,13 @@ function __rvm_implode {
 }
 
 function __rvm_gemdir {
-  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi
   mkdir -p $rvm_ruby_gem_home
   echo $rvm_ruby_gem_home
 }
 
 function __rvm_source_dir {
-  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi
   if [ -z "$rvm_ruby_src_path" ] ; then
     __rvm_log "fail" "No source directory exists for the default implementation."
   else
@@ -311,7 +309,7 @@ function __rvm_source_dir {
 # clones from source implementation/version to default
 # TODO: Merge this into 'rvm sync'
 function __rvm_gemdup {
-  if [ -z "$rvm_selected_flag" ] ; then __rvm_select $* ; fi
+  if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi
   __rvm_log "debug" "$rvm_ruby_interpreter"
   if [ "default" = "$rvm_ruby_interpreter" ] ; then
     # TODO: ~/.rvm/default first, then system user
@@ -474,7 +472,7 @@ function __rvm_initialize {
 
   if [ "Darwin" = "$(uname)" ] ; then rvm_archflags="${rvm_archflags:-'-arch i386 -arch x86_64'}" ; fi
 
-  __rvm_clean-path
+  __rvm_clean_path
   rvm_result=$(echo $PATH | grep 'rvm\/bin:')
   if [ -z $rvm_result ] ; then
     PATH=$rvm_bin_path:$PATH ; export PATH
@@ -541,11 +539,11 @@ function __rvm_reboot {
   fi ; unset response
 }
 
-function __rvm_reload {
+__rvm_reload() {
   source $rvm_path/scripts/rvm
 }
 
-function __rvm_ruby_do {
+__rvm_ruby_do() {
   __rvm_select
   __rvm_use
   binary="$(echo $rvm_action | sed 's/do$//')"
@@ -553,7 +551,11 @@ function __rvm_ruby_do {
     load_path="$rvm_ruby_home/bin:$rvm_ruby_load_path"
     if [ "ruby" = "$binary" ] ; then
       if [ -z "$(echo $rvm_ruby_args | awk '/\.rb$/')" ] ; then
-        rvm_ruby_args="-S $rvm_ruby_args"
+        #if [[ $rvm_ruby_args =~ '\.rb$' ]] ; then
+        if [ -z "$prefix" ] ; then prefix="-S" ; fi
+        if [[ ! $rvm_ruby_args =~ $prefix ]] ; then
+          rvm_ruby_args="$prefix $rvm_ruby_args"
+        fi
       fi
       rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_require -I$load_path $rvm_ruby_args"
     else
@@ -591,8 +593,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
-      unset rvm_ruby_string
+    for rvm_ruby_string in $(echo $rvm_ruby_version | tr ',' ' ') ; do
       __rvm_ruby_do
     done
   elif [ ! -z "$rvm_ruby_interpreter" ] ; then
@@ -717,7 +718,7 @@ function __rvm_pushpop {
   if [ -z "$1" ] ; then
     popd > /dev/null 2>&1
   else
-    pushd $1 > /dev/null 2>&1
+    pushd "$1" > /dev/null 2>&1
   fi
 }
 
@@ -795,6 +796,9 @@ __rvm_monitor() {
   fi
 }
 
+#
+# Actual Utility functions.
+#
 timestamp() {
   if [ "Darwin" = "$(uname)" ] ; then
    echo $(stat -c "%Y" $1)
@@ -803,3 +807,14 @@ timestamp() {
   fi
 }
 
+# Usage: contains "a_string" "${an_array[@]}"
+contains() {
+  local pattern="$1" ; shift
+  local index list
+  list=("$@")
+  for index in "${!list[@]}" ; do
+    [[ ${list[index]} = $pattern ]] && { echo $index ; return 0 ; }
+  done
+  echo -1 ; return 1
+}
+

metadata

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