wayneeseguin-rvm 0.0.42 → 0.0.44

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 42
+:patch: 44

data/rvm.gemspec

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

@@ -36,8 +36,8 @@ function __rvm_usage {
     uninstall - Uninstall a ruby version
     reset     - Remove default and current settings, exit the shell.
                 (If you experience odd behavior try this first)
-    rubydo    - Used with -f to run a ruby file against specified or all rubies
-    gemdo     - Used with -f to execute a command using selected ruby's 'gem'
+    rubydo    - Used with -S to run a ruby file against specified or all rubies
+    gemdo     - Used with -S to execute a command using selected ruby's 'gem'
     debug     - Emit environment & configuration information for *current* ruby
 
     reload    - Reload rvm source itself (useful after changing rvm source)
@@ -106,11 +106,7 @@ function __rvm_parse-args {
   while [ $# -gt 0 ] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      install|uninstall|remove|path|info|setup|version|srcdir|list|symlinks|reset|debug|reload|usage|help|implode|update|readline|iconv)
-        rvm_action=$rvm_token
-      ;;
-
-      use)
+      install|uninstall|remove|path|info|setup|version|srcdir|list|symlinks|reset|debug|reload|usage|help|implode|update|readline|iconv|benchmark|bench|use)
         rvm_action=$rvm_token
       ;;
 
@@ -139,6 +135,8 @@ function __rvm_parse-args {
           rvm_ruby_interpreter="default"
         elif [ "$1" = "system" ] ; then
           rvm_ruby_interpreter=$1 ; shift
+        elif [ "$1" = "user" ] ; then
+          rvm_ruby_interpreter=$1 ; shift
         elif [ "$1" = "default" ] ; then
           rvm_ruby_interpreter=$1 ; shift
         else
@@ -262,7 +260,7 @@ function __rvm_parse-args {
 
       -f|--file)
         rvm_action="rubydo"
-        rvm_ruby_args="$1"
+        rvm_ruby_file="$1"
         shift
       ;;
 
@@ -313,7 +311,7 @@ function __rvm_parse-args {
          --rm-gem-set)   rvm_gem_set_name_rm="$1"  ; shift ;;
       tests|specs)       rvm_action="tests"                ;;
 
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|debug|--force|--all|--dump|--summary|--jit|--latest)
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|yaml|--json|json)
         eval "rvm_$(echo $rvm_token | sed 's/-//g')_flag=1"
       ;;
 
@@ -330,9 +328,10 @@ function __rvm_parse-args {
               rvm_action="rubydo" # Not sure if we really want to do this but we'll try it out.
             fi
           else
-            echo $rvm_token | grep '\.rb$' > /dev/null
-            if [ $? -eq 0 ] ; then # we have a specified ruby script
+
+            if [ ! -z "`echo $rvm_token | awk '/\.rb$/{print}' 2> /dev/null`" ] ; then # we have a specified ruby script
               rvm_ruby_args=$rvm_token
+              rvm_ruby_file=$rvm_token
               if [ -z "$rvm_action" ] ; then
                 rvm_action="rubydo" # Not sure if we really want to do this but we'll try it out.
               fi
@@ -386,6 +385,7 @@ function rvm {
     iconv)      __rvm_iconv_install    ; result=$? ;;
     reboot)     __rvm_reboot           ; result=$? ;;
     usage|help) __rvm_usage            ; result=$? ;;
+    bench|benchmark)  __rvm_benchmark  ; result=$? ;;
     rubydo|rakedo|gemdo) __rvm_do      ; result=$? ;;
 
     tests|specs)

data/scripts/rvm-install

@@ -20,7 +20,7 @@ for dir in src scripts bin log archives config gems examples ; do
 done
 for dir in config scripts examples lib ; do
   mkdir -p $rvm_dir/$dir
-  /bin/cp -r $source_dir/$dir/ $rvm_dir/$dir
+  /bin/cp -Rf $source_dir/$dir $rvm_dir
 done
 cp $source_dir/scripts/rvm-prompt $rvm_dir/bin/
 chmod +x $rvm_dir/bin/rvm-prompt

data/scripts/rvm-prompt

@@ -1,5 +1,5 @@
 #!/bin/bash
-if [ ! -z "$(echo `which ruby` | grep '\.rvm')" ] ; then
+if [ ! -z "$(which ruby | awk '/\.rvm/{print}')" ] ; then
   echo "[$(which ruby | xargs dirname | xargs dirname | xargs basename | tr '-' ':')]"
 fi
 

data/scripts/rvm-ruby-installer

@@ -204,7 +204,7 @@ function __rvm_install-ruby {
         __rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q
       done
 
-      __rvm_bin_script
+      __rvm_bin_scripts
 
       popd > /dev/null
     ;;
@@ -235,7 +235,26 @@ function __rvm_install-ruby {
       for binary in ruby irb ; do
         ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary
       done
-      __rvm_bin_script
+      $rvm_ruby_home/bin/rbx -S gem install rake --no-rdoc --no-ri
+
+      ruby_wrapper=$(cat <<RubyWrapper
+#!/bin/bash
+
+GEM_HOME="$rvm_gem_home" ; export GEM_HOME
+GEM_PATH="$rvm_gem_home" ; export GEM_PATH
+MY_RUBY_HOME="$rvm_ruby_home" ; export MY_RUBY_HOME
+PATH="$rvm_ruby_home/bin:$rvm_gem_home/bin:\$PATH" ; export PATH
+
+exec $rvm_ruby_home/bin/rbx -S gem "\$@"
+RubyWrapper
+)
+      echo "$ruby_wrapper" > $rvm_bin_path/gem-$rvm_ruby_package_name
+      echo "$ruby_wrapper" > $rvm_ruby_home/bin/gem
+      unset ruby_wrapper
+      chmod +x $rvm_bin_path/$rvm_ruby_package_name
+      chmod +x $rvm_ruby_home/bin/gem
+
+      __rvm_bin_scripts
     ;;
 
     jruby)
@@ -279,7 +298,7 @@ function __rvm_install-ruby {
         ln -fs $rvm_ruby_home/bin/$binary $rvm_ruby_home/bin/${binary#j}
       done
 
-      __rvm_bin_script
+      __rvm_bin_scripts
 
       ln -fs $rvm_ruby_home/bin/ruby $rvm_path/bin/$rvm_ruby_package_name
       for rvm_gem_name in rake jruby-openssl ; do

data/scripts/rvm-selector

@@ -209,12 +209,11 @@ function __rvm_use {
       done
 
       if [ -s $rvm_path/bin/$rvm_ruby_package_name ] ; then
-        ln -fs $rvm_path/bin/$rvm_ruby_package_name $rvm_path/bin/ruby
         ln -fs $rvm_path/bin/$rvm_ruby_package_name $rvm_path/bin/default-ruby # So that people know what it's for :)
-        ln -fs $rvm_path/bin/gem-$rvm_ruby_package_name $rvm_path/bin/gem
-        ln -fs $rvm_path/bin/irb-$rvm_ruby_package_name $rvm_path/bin/irb
+        ln -fs $rvm_path/bin/gem-$rvm_ruby_package_name $rvm_path/bin/default-gem
+        ln -fs $rvm_path/bin/irb-$rvm_ruby_package_name $rvm_path/bin/default-irb
       else
-        rm -f $rvm_path/bin/ruby $rvm_path/bin/default-ruby $rvm_path/bin/gem $rvm_path/bin/irb
+        rm -f $rvm_path/bin/default*
       fi
       unset rvm_default_flag
     fi

data/scripts/rvm-update

@@ -20,7 +20,7 @@ for dir in src scripts bin log archives config gems examples ; do
 done
 for dir in config scripts examples lib ; do
   mkdir -p $rvm_dir/$dir
-  /bin/cp -r $source_dir/$dir/ $rvm_dir/$dir
+  /bin/cp -Rf $source_dir/$dir $rvm_dir
 done
 cp $source_dir/scripts/rvm-prompt $rvm_dir/bin/
 chmod +x $rvm_dir/bin/rvm-prompt

data/scripts/rvm-utility

@@ -175,7 +175,7 @@ function __rvm_load-defaults {
   fi
 
   rvm_system_ruby=`__rvm_db "system_ruby"`
-  if [ -z "$rvm_system_ruby" ] ; then
+  if [ ! -z "$rvm_system_ruby" ] ; then
     rvm_system_ruby=`which ruby`
     if [ $? -ne 0 ] ; then
       __rvm_log "info" "System ruby not found, no db will be stored."
@@ -185,12 +185,12 @@ function __rvm_load-defaults {
       # Now store system system & user gem paths
       rvm_system_user_gem_path=`__rvm_db "system_user_gem_path"`
       if [ -z "$rvm_system_user_gem_path" ] ; then
-        rvm_system_user_gem_path=`ruby -r rubygems -e "puts Gem::default_path.compact.first"`
+        rvm_system_user_gem_path=$( rvm system ; gem env gemdir user; )
         __rvm_db "system_user_gem_path" "$rvm_system_user_gem_path"
       fi
       rvm_system_gem_path=`__rvm_db "system_gem_path"`
       if [ -z "$rvm_system_gem_path" ] ; then
-        rvm_system_gem_path=`ruby -r rubygems -e "puts Gem::default_path.compact[1] || Gem::default_path.compact.first"`
+        rvm_system_gem_path=$( rvm system ; gem env gemdir; )
         __rvm_db "system_gem_path" "$rvm_system_gem_path"
       fi
     fi
@@ -212,6 +212,8 @@ function __rvm_reset {
     __rvm_db "$system_config" "delete"
   done ; unset system_config variable
 
+  rm -f $rvm_path/bin/ruby $rvm_path/bin/gem $rvm_path/bin/rake $rvm_path/bin/irb $rvm_path/bin/default*
+
 }
 
 function __rvm_implode {
@@ -258,13 +260,17 @@ function __rvm_src-dir {
 
 # clones from source implementation/version to default
 function __rvm_gem-dup {
-
-  if [ "$1" = "default" ] ; then
+    __rvm_log "debug" "$rvm_ruby_interpreter"
+  if [ "$rvm_ruby_interpreter" = "default" ] ; then
+    # TODO: ~/.rvm/default first, then system user
     rvm_source_gem_dir="$rvm_system_user_gem_path"
-  elif [ "$1" = "system" ] ; then
+  elif [ "$rvm_ruby_interpreter" = "user" ] ; then
+    rvm_source_gem_dir="$rvm_system_user_gem_path"
+  elif [ "$rvm_ruby_interpreter" = "system" ] ; then
     rvm_source_gem_dir="$rvm_system_gem_path"
   else
-    rvm_source_gem_dir=${1:-$rvm_system_user_gem_path} # TODO: check for and remove trailing /gems
+    # TODO: use selector for this?
+    rvm_source_gem_dir=${rvm_gem_home/$rvm_ruby_interpreter/$rvm_ruby_version}
   fi
 
   if [ ! -z "$rvm_source_gem_dir" ] ; then
@@ -281,7 +287,6 @@ function __rvm_gem-dup {
   else
     __rvm_log "fail" "Unknown $rvm_ruby_interpreter version: $rvm_ruby_version"
   fi
-
 }
 
 function __rvm_db {
@@ -530,8 +535,8 @@ function __rvm_ruby_do {
     else
       eval "errors=(${errors[*]} $rvm_ruby_string)"
     fi
-    eval "all=(${all[*]} $rvm_ruby_string)"
-    eval "results=(${results[*]} $result)"
+    eval "rubies=(${rubies[*]} $rvm_ruby_string)"
+    eval "statuses=(${statuses[*]} $result)"
     # TODO: keep track of and re-set the previous selected ruby ;)
   else
     __rvm_log "warn" "'$rvm_ruby_home/bin/$binary' either does not exist or is not executable? :("
@@ -540,7 +545,7 @@ function __rvm_ruby_do {
 }
 
 function __rvm_do {
-  all=() ; successes=() ; errors=() ; results=()
+  rubies=() ; successes=() ; errors=() ; statuses=()
   # TODO: Extract the common functionality out of the if below
   if [ ! -z "$rvm_ruby_version" ] ; then
     for rvm_ruby_selector in `echo $rvm_ruby_version | tr ',' ' '` ; do
@@ -566,19 +571,78 @@ function __rvm_do {
   fi
 
   if [ ! -z "$rvm_summary_flag" ] ; then
-    export successes errors results
+    export successes errors statuses
     echo -e "\nSummary:"
     echo -e "\033[0;32msuccessful (${#successes[*]}) : [ $(echo "${successes[*]}" | sed 's/ /, /g') ]\033[0m"
     echo -e "\033[0;31merrors (${#errors[*]}) : [ $(echo "${errors[*]}" | sed 's/ /, /g') ]\033[0m"
-    echo -e "all (${#all[*]}) : [ $(echo "${all[*]}" | sed 's/ /, /g') ]"
-    echo -e "exit results: [ $(echo "${results[*]}" | sed 's/ /, /g') ]\n"
+    echo -e "rubies (${#rubies[*]}) : [ $(echo "${rubies[*]}" | sed 's/ /, /g') ]"
+    echo -e "statuses: [ $(echo "${statuses[*]}" | sed 's/ /, /g') ]\n"
+  fi
+
+  if [ ! -z "$rvm_yaml_flag" ] ; then
+    export successes errors statuses
+    echo -e "\nYAML:"
+    echo -e "  totals:"
+    echo -e "    rubies: ${#rubies[*]}"
+    echo -e "    successes: ${#successes[*]}"
+    echo -e "    errors: ${#errors[*]}"
+    echo -e "  successes:"
+    for var in ${successes[*]} ; do
+      echo -e "    - $var"
+    done
+    echo -e "  errors:"
+    for var in ${errors[*]} ; do
+      echo -e "    - $var"
+    done
+    echo -e "  rubies:"
+    for var in ${rubies[*]} ; do
+      echo -e "    - $var"
+    done
+    echo -e "  statuses:"
+    for var in ${statuses[*]} ; do
+      echo -e "    - $var"
+    done
+  fi
+
+  if [ ! -z "$rvm_json_flag" ] ; then
+  summary=$(cat <<-Summary
+    \nSummary:
+    JSON:
+    {
+     "totals": { "rubies": ${#rubies[*]}, "successes": ${#successes[*]}, "errors": ${#errors[*]}},
+     "successful": [ "$(echo ${successes[*]} | sed 's/ /", "/g')" ],
+     "errors": [ "$(echo ${errors[*]} | sed 's/ /", "/g')" ],
+     "rubies": [ "$(echo ${rubies[*]} | sed 's/ /", "/g')" ],
+     "statuses": [ $(echo ${statuses[*]} | sed 's/ /, /g') ]
+    }
+Summary
+)
+    echo -e "$summary"
   else
-    unset bin_line  rvm_summary_flag
-    # successes errors
+    unset bin_line rvm_summary_flag
   fi
   return ${#errors[*]}
 }
 
+function __rvm_benchmark {
+rvm_code="$(cat <<RubyCode
+#!/usr/bin/env ruby
+require "benchmark"
+Benchmark.bmbm do|benchmark|
+  benchmark.report("benchmarking '$rvm_ruby_file'") do
+
+RubyCode
+)"
+echo "$rvm_code" > /tmp/$$.rb
+cat $rvm_ruby_file >> /tmp/$$.rb
+echo -e "\n  end\nend\n" >> /tmp/$$.rb
+unset rvm_code
+rvm_ruby_args="/tmp/$$.rb"
+rvm_action="rubydo"
+if [ ! -z "$rvm_debug_flag" ] ; then echo -e "/tmp/$$.rb:\n$(cat /tmp/$$.rb)" ; fi
+__rvm_do
+}
+
 function __rvm_ruby_string {
   if [ "$rvm_ruby_interpreter" = "system" ] ; then
     rvm_ruby_string="system"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wayneeseguin-rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.42
+  version: 0.0.44
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-17 00:00:00 -07:00
+date: 2009-09-18 00:00:00 -07:00
 default_executable: rvm-install
 dependencies: []