rvm 0.0.79 → 0.0.80

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 79
+:patch: 80

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.79"
+  s.version = "0.0.80"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-11-18}
+  s.date = %q{2009-11-19}
   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

@@ -293,7 +293,7 @@ __rvm_parse_args() {
           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.
+              rvm_action="ruby" # Not sure if we really want to do this but we'll try it out.
             fi
           elif match "$rvm_token" "^.+%.+$" ; then
             rvm_gem_set_name="$(echo "$rvm_token" | awk -F'%' '{print $2}')"
@@ -311,7 +311,7 @@ __rvm_parse_args() {
               rvm_ruby_args=$rvm_token
               rvm_ruby_file=$rvm_token
               if [[ -z "$rvm_action" ]] ; then
-                rvm_action="ruby" # Not sure if we really want to do this but we'll try it out.
+                rvm_action="ruby"
               fi
             else
               rvm_action="error"

data/scripts/gems

@@ -148,8 +148,15 @@ __rvm_gems_load() {
         gem_postfix="$(basename $gem | sed "s#.*\.gem##")"
       else
         gem_name="$(echo $gem | 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 match "$gem" "--version" ; then
+          gem_version="$(echo $gem | sed 's#.*--version[=]*[ ]*##' | awk '{print $1}')"
+          gem_postfix="$(echo $gem | sed "s#${gem_name/ /}##" | sed "s#--version[=]*[ ]*${gem_version/ /}##")"
+        elif match "$gem" "-v" ; then
+          gem_version="$(echo $gem | sed 's#.*-v[=]*[ ]*##' | awk '{print $1}')"
+          gem_postfix="$(echo $gem | sed "s#${gem_name/ /}##" | sed "s#-v[=]*[ ]*${gem_version/ /}##")"
+        else
+          unset gem_version # no version
+        fi
       fi
 
       if [[ -f "$gem" ]] ; then

data/scripts/selector

@@ -206,6 +206,8 @@ __rvm_use() {
       __rvm_log "info" "Now using system ruby."
     fi
 
+    rvm_ruby_string="system"
+
   else
     GEM_HOME=$rvm_ruby_gem_home ; export GEM_HOME
     GEM_PATH=$rvm_ruby_gem_home ; export GEM_PATH

data/scripts/utility

@@ -381,13 +381,19 @@ __rvm_db() {
 
 __rvm_list() {
   if [[ ! -z "$rvm_all_flag" ]] ; then
-    svn list http://svn.ruby-lang.org/repos/ruby/tags/ | grep 'v1_[8|9]' | sed 's#^v1_##' | sed 's#/$##' | awk -F'_' '{print "1."$1"."$2 " -l "$3}' | sed 's#p$##'
-    echo -e "jruby 1.2.0\njruby 1.3.0\njruby 1.3.1\njruby (1.4.0, the default)\njruby --head"
-    echo -e "rbx (rubinius head, the default)\nrbx-head --jit"
-    echo -e "ree 1.8.6-head\nree (1.8.7, the default)"
-    echo -e "mput head (shyouhei head, the default)"
+    while read -r tag
+    do
+      prefix="$(echo ${tag/\//} | sed 's#^v1_##' | awk -F'_' '{print "(ruby-)1."$1"."$2}' | sed 's#p$##')"
+      echo "${prefix}-t${tag/\//}"
+      unset prefix tag
+    done < <(svn list http://svn.ruby-lang.org/repos/ruby/tags/ | awk '/^v1_[8|9]/')
+    echo -e "(ruby-)1.8.6(-p383)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p174)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1"
+    echo -e "jruby-1.2.0\njruby-1.3.0\njruby-1.3.1\njruby(-1.4.0) # the default\njruby-head"
+    echo -e "rbx(-head) # rubinius head, the default rbx \nrbx(-head) --jit (rubinius head with LLVM enabled)"
+    echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
+    echo -e "mput(-head) # shyouhei head, the default mput"
     if [[ "Darwin" = "$(uname)" ]] ; then
-      echo -e "macruby-nightly (macruby-nightly, the default)\nmacruby-head"
+      echo -e "macruby(-nightly) # the default macruby\nmacruby-head # Build from the macruby git repository"
     fi
   else
     current_ruby="$(which ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
@@ -584,41 +590,47 @@ __rvm_ruby_do() {
   __rvm_use
   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"
-    # TODO: the else case below should be run if $rvm_ruby_args =~ /\.rb$/
-    if [[ "ruby" = "$binary" ]] && [[ "$rvm_benchmark_flag" -ne 1 ]] ; then
-      if match "$rvm_ruby_args" "\.rb$" ; then
-        if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
-        if ! match "$rvm_ruby_args" "$prefix" ; then
-          rvm_ruby_args="$prefix $rvm_ruby_args"
-        fi
+    binary="$rvm_ruby_home/bin/$binary"
+  elif [[ "system" = "$rvm_ruby_string" ]] && [[ -x "$(which $binary)" ]] ; then
+    binary="$(which $binary)"
+  else
+    __rvm_log "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
+    __rvm_unset_ruby_variables
+    return 1
+  fi
+
+  load_path="$rvm_ruby_home/bin:$rvm_ruby_load_path"
+  # TODO: the else case below should be run if $rvm_ruby_args =~ /\.rb$/
+  if [[ "ruby" = "$binary" ]] && [[ "$rvm_benchmark_flag" -ne 1 ]] ; then
+    if match "$rvm_ruby_args" "\.rb$" ; then
+      if [[ -z "$prefix" ]] ; then prefix="-S" ; fi
+      if ! match "$rvm_ruby_args" "$prefix" ; then
+        rvm_ruby_args="$prefix $rvm_ruby_args"
       fi
-      rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_require -I$load_path $rvm_ruby_args"
-    elif [[ "gem" = "$binary" ]] && match "$rvm_ruby_args" '^install' ; then
-      rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args --no-rdoc --no-ri"
-    else
-      rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args"
     fi
+    rvm_command="$binary $rvm_ruby_require -I$load_path $rvm_ruby_args"
+  elif [[ "gem" = "$binary" ]] && match "$rvm_ruby_args" '^install' ; then
+    rvm_command="$binary $rvm_ruby_args --no-rdoc --no-ri"
+  else
+    rvm_command="$binary $rvm_ruby_args"
+  fi
 
-    if [[ ! -z "$rvm_json_flag" ]] || [[ ! -z "$rvm_yaml_flag" ]] || [[ ! -z "$rvm_summary_flag" ]] ; then
-      mkdir -p ./log/$rvm_ruby_string/
-      touch ./log/$rvm_ruby_string/$rvm_action.log ./log/$rvm_ruby_string/$rvm_action.error.log
-      eval "$rvm_command" >> ./log/$rvm_ruby_string/$rvm_action.log 2>> ./log/$rvm_ruby_string/$rvm_action.error.log
-    else
-      echo -e "\n\n\033[0;32m$rvm_ruby_string: $($rvm_ruby_home/bin/ruby -v | tr "\n" ' ')\033[0m\n"
-      eval "$rvm_command"
-    fi
-    result=$?
-    if [[ $result -eq 0 ]]; then
-      eval "successes=(${successes[*]} $rvm_ruby_string)"
-    else
-      eval "errors=(${errors[*]} $rvm_ruby_string)"
-    fi
-    eval "rubies=(${rubies[*]} $rvm_ruby_string)"
-    eval "statuses=(${statuses[*]} $result)"
+  if [[ ! -z "$rvm_json_flag" ]] || [[ ! -z "$rvm_yaml_flag" ]] || [[ ! -z "$rvm_summary_flag" ]] ; then
+    mkdir -p ./log/$rvm_ruby_string/
+    touch ./log/$rvm_ruby_string/$rvm_action.log ./log/$rvm_ruby_string/$rvm_action.error.log
+    eval "$rvm_command" >> ./log/$rvm_ruby_string/$rvm_action.log 2>> ./log/$rvm_ruby_string/$rvm_action.error.log
+  else
+    echo -e "\n\n\033[0;32m$rvm_ruby_string: $($rvm_ruby_home/bin/ruby -v | tr "\n" ' ')\033[0m\n"
+    eval "$rvm_command"
+  fi
+  result=$?
+  if [[ $result -eq 0 ]]; then
+    eval "successes=(${successes[*]} $rvm_ruby_string)"
   else
-    __rvm_log "warn" "'$rvm_ruby_home/bin/$binary' either does not exist or is not executable? :("
+    eval "errors=(${errors[*]} $rvm_ruby_string)"
   fi
+  eval "rubies=(${rubies[*]} $rvm_ruby_string)"
+  eval "statuses=(${statuses[*]} $result)"
   __rvm_unset_ruby_variables
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.79
+  version: 0.0.80
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 -05:00
+date: 2009-11-19 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []