rvm 0.0.51 → 0.0.52

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 51
+:patch: 52

data/rvm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.51"
+  s.version = "0.0.52"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]

data/scripts/ruby-installer

@@ -14,7 +14,7 @@ function __rvm_install_source {
 
   result=0
   if [ -z "$rvm_ruby_tag" -a -z "$rvm_ruby_rev" ] ; then
-    if [ ! -d $rvm_ruby_src_path ]  ; then
+    if [ ! -f $rvm_archives_path/$rvm_ruby_package_name.tar.gz ]  ; then
       rvm_url="${rvm_url:-"ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_name.tar.gz"}"
       __rvm_run "fetch" "__rvm_fetch $rvm_url" "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
       if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
@@ -194,13 +194,17 @@ function __rvm_install_ruby {
       rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
       #rvm_ruby_rev="head"
 
+      # For Installer, can do this once it's ready:
+      RBX_PREFIX=$rvm_ruby_home ; export RBX_PREFIX
+      # Also see 'rakelib/configuration.rake'
+
       if [ ! -d $rvm_ruby_home -o ! -d $rvm_ruby_home/.git ] ; then
         rm -rf $rvm_ruby_home
-        git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_home
+        __rvm_run "rbx.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_home" "Cloning $rvm_ruby_repo_url"
         cd $rvm_ruby_home
       else
         cd $rvm_ruby_home
-        git pull origin master
+        __rvm_run "rbx.repo" "git pull origin master" "Pulling from origin master"
       fi
 
       # prereqs, 1.8.6 w/ParseTree & rake. Yes this could all be one line... not pushing our luck.
@@ -214,17 +218,28 @@ function __rvm_install_ruby {
         __rvm_run "build" "\`rvm 1.8.6 -m rbx ; rake build\`" "Building rbx"
       fi
 
-      binaries="ruby irb"
-      for binary in $(echo $binaries) ; do
-        ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary
-      done ; unset binary binaries
+      binaries="ruby irb" # Trick to work in more shells :)
+      for binary_name in $(echo $binaries) ; do
+        ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary_name
+      done ; unset binary_name binaries
 
-      $rvm_ruby_home/bin/rbx -S gem install rake --no-rdoc --no-ri
+      __rvm_run "rake.install" "$rvm_ruby_home/bin/rbx gem install rake --no-rdoc --no-ri" "Installing Rake"
+      binary=rake
+      if [ -f $rvm_gem_home/bin/$binary ] ; then
+        if [ "$rvm_gem_home" != "$rvm_ruby_home" ] ; then
+          cp $rvm_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
+        fi
+        chmod +x $rvm_ruby_home/bin/$binary
+        __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$binary"
+        __rvm_inject_gem_env "$rvm_ruby_home/bin/$binary"
+      fi ; unset binary
 
       binaries="erb ri rdoc"
       __rvm_post_install
 
-      for binary_name in gem rake ; do
+      binaries="gem" # Trick to work in more shells :)
+      for binary_name in $(echo $binaries); do
+        if [ $binary_name != "gem" ] ; then prefix="-S" ; fi
         ruby_wrapper=$(cat <<RubyWrapper
 #!/bin/bash
 
@@ -233,15 +248,16 @@ 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 $binary_name "\$@"
+exec $rvm_ruby_home/bin/rbx $prefix $binary_name "\$@"
 RubyWrapper
 )
-        for file_name in $rvm_path/bin/$binary-$rvm_ruby_package_name $rvm_ruby_home/bin/$binary ; do
+        files="$rvm_ruby_home/bin/$binary_name $rvm_path/bin/$binary_name-$rvm_ruby_package_name"
+        for file_name in $(echo $files)  ; do
           rm -f $file_name
           echo "$ruby_wrapper" > $file_name
           if [ -f $file_name ] ; then chmod +x $file_name ; fi
         done ; unset file_name
-        unset ruby_wrapper binary_name
+        unset ruby_wrapper binary_name files prefix
       done
       __rvm_irbrc
       __rvm_bin_scripts

data/scripts/utility

@@ -531,8 +531,15 @@ function __rvm_ruby_do {
     else
       rvm_command="$rvm_ruby_home/bin/$binary $rvm_ruby_args"
     fi
-    echo -e "\n$rvm_ruby_string: $($rvm_ruby_home/bin/$binary -v)"
-    eval "$rvm_command"
+
+    if [ ! -z "$rvm_json_flag" -o ! -z "$rvm_yaml_flag" -o ! -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$rvm_ruby_string: $($rvm_ruby_home/bin/$binary -v)"
+      eval "$rvm_command"
+    fi
     result=$?
     if [ $result -eq 0 ]; then
       eval "successes=(${successes[*]} $rvm_ruby_string)"
@@ -584,32 +591,37 @@ function __rvm_do {
 
 function __rvm_summary {
   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 "rubies (${#rubies[*]}) : [ $(echo "${rubies[*]}" | sed 's/ /, /g') ]"
-  echo -e "statuses: [ $(echo "${statuses[*]}" | sed 's/ /, /g') ]\n"
+  summary="\nSummary:\n"
+  summary="$summary \033[0;32m${#successes[*]} successful: $(echo "${successes[*]}" | sed 's/ /, /g')\033[0m\n"
+  summary="$summary \033[0;31m${#errors[*]} errors: $(echo "${errors[*]}" | sed 's/ /, /g')\033[0m\n"
+  total=${#rubies[*]}
+  if [ ! -z "$ZSH_VERSION" ] ; then array_start=1 ; else array_start=0 ; fi
+  for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
+    __rvm_log "debug" "${rubies[$index]} returned ${statuses[$index]}"
+    summary="$summary ${rubies[$index]} returned ${statuses[$index]}"
+    if (( $index + 1 < $total + $array_start )) ; then summary="$summary\n" ; fi
+  done ; unset index array_start
+  echo -e "$summary" | tee -a log/summary.log
   return ${#errors[*]}
 }
 
 function __rvm_yaml {
   export successes errors statuses
-  yaml="\ntotals:\n    rubies: ${#rubies[*]}\n    successes: ${#successes[*]}\n    errors: ${#errors[*]}\n  successes:"
+  yaml="totals:\n  rubies: ${#rubies[*]}\n  successes: ${#successes[*]}\n  errors: ${#errors[*]}\nsuccesses:"
   for var in ${successes[*]} ; do
-    yaml="$yaml\n    - $var"
+    yaml="$yaml\n  - $var"
   done
-  yaml="$yaml\n  errors:"
+  yaml="$yaml\nerrors:"
   for var in ${errors[*]} ; do
-    yaml="$yaml\n    - $var"
+    yaml="$yaml\n  - $var"
   done
-  yaml="$yaml\n  rubies:"
+  yaml="$yaml\nrubies:"
   total=${#rubies[*]}
   if [ ! -z "$ZSH_VERSION" ] ; then array_start=1 ; else array_start=0 ; fi
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
-    echo "${rubies[$index]}: ${statuses[$index]}"
-    yaml="$yaml\n    \"${rubies[$index]}\": ${statuses[$index]}"
+    __rvm_log "debug" "${rubies[$index]}: ${statuses[$index]}"
+    yaml="$yaml\n  \"${rubies[$index]}\": ${statuses[$index]}"
   done ; unset index array_start
-
   mkdir -p log
   echo -e "$yaml" | tee -a log/summary.yaml
 
@@ -626,7 +638,7 @@ function __rvm_json {
   total=${#rubies[*]}
   if [ ! -z "$ZSH_VERSION" ] ; then array_start=1 ; else array_start=0 ; fi
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
-    echo "${rubies[$index]}: ${statuses[$index]}"
+    __rvm_log "debug" "${rubies[$index]}: ${statuses[$index]}"
     json="$json\n    {\"${rubies[$index]}\": ${statuses[$index]}}"
     if (( $index + 1 < $total + $array_start )) ; then json="$json,  " ; fi
   done ; unset index array_start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.51
+  version: 0.0.52
 platform: ruby
 authors: 
 - Wayne E. Seguin