rvm 0.0.78 → 0.0.79

data/config/db

@@ -4,7 +4,7 @@ rubinius_repo_url=git://github.com/evanphx/rubinius.git
 shyouhei_repo_url=git://github.com/shyouhei/ruby.git
 macruby_version=nightly
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
-macruby_nightly_url=http://macruby.icoretech.org/latest
+macruby_nightly_url=http://macruby.icoretech.org/latest/macruby_nightly-latest.pkg
 jruby_version=1.4.0
 jruby_repo_url=git://github.com/jruby/jruby.git
 jruby_url=http://jruby.kenai.com/downloads/

data/install

@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
 
 rc_files="$HOME/.bash_profile $HOME/.bashrc $HOME/.zshrc"
+if [[ -f "/etc/rvmrc" ]] ; then source "/etc/rvmrc" ; fi
 if [[ "root" = "$(whoami)" ]] ; then
-  rvm_path=/usr/local/rvm
+  rvm_path="${rvm_path:-/usr/local/rvm}"
   rc_files="$rc_files /etc/profile /etc/zshenv"
 else
-  rvm_path=$HOME/.rvm
+  if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+  rvm_path="${rvm_path:-$HOME/.rvm}"
 fi
 
 #
@@ -73,19 +75,19 @@ if [[ "Linux" = "$system" ]] ; 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 "        $ 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"
+    echo -e "        $ aptitude install libreadline5-dev libssl-dev bison"
     echo -e "      $item For 1.9.X (if you wish to use it) we additionally recommend:"
-    echo -e "        $ sudo aptitude install libxml2-dev"
+    echo -e "        $ aptitude install libxml2-dev"
 
   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"
+    echo -e "        $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
 
   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"
+    echo -e "        $ pacman -Sy jdk jre"
 
   elif [[ ! -z "$rvm_yum_binary" ]] ; then
     echo -e "      $item For ree (if you wish to use it) you will need:"

data/lib/VERSION.yml

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

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.78"
+  s.version = "0.0.79"
 
   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-14}
+  s.date = %q{2009-11-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/cli

@@ -135,8 +135,8 @@ __rvm_parse_args() {
       ;;
 
       specs|tests)
-        rvm_action="do"
-        rvm_ruby_args="rake $rvm_token"
+        rvm_action="rake"
+        rvm_ruby_args="$(echo $rvm_token | sed 's/s$//')"
       ;;
 
       -v|--version)

data/scripts/gems

@@ -121,10 +121,15 @@ __rvm_gems_load() {
       rvm_file_name="default.gems"
     elif [[ -f "system.gems" ]] ; then
       rvm_file_name="system.gems"
+    elif [[ -f ".gems" ]] ; then
+      rvm_file_name=".gems"
+    else
+      __rvm_log "error" "No gem set file found."
+      return 1
     fi
   fi
 
-  mkdir -p "$rvm_gem_path/cache"
+  mkdir -p "$rvm_gem_path/cache" # Ensure the base cache dir is initialized.
 
   if [[ -f "$rvm_file_name" ]] ; then
     echo "Loading $rvm_file_name file..."
@@ -132,7 +137,9 @@ __rvm_gems_load() {
 
     while read -r line
     do # Keep this on 2nd line :(
-      # TODO: Switch to a different field separator than ; to allow for evals
+      #
+      # Parse the line
+      #
       gem="$(echo $line | awk -F';' '{print $1}')"
       gem_prefix="$(echo $line | awk -F';' '{print $2}')"
       if match "$gem" "\.gem$" ; then
@@ -149,12 +156,15 @@ __rvm_gems_load() {
         gem_file_name="$gem"
       elif match "$gem" ".gem$" ; then
         gem_file_name="$gem"
-      elif [[ -z "${gem_version/ /}" ]] ; then # no version
+      elif [[ -z "${gem_version/ /}" ]] ; then # no v/Users/wayne/projects/db0/rvm/scripts/gems
         gem_file_name="${gem_name/ /}*.gem"
       else # version
         gem_file_name="${gem_name/ /}-${gem_version/ /}.gem"
       fi
 
+      #
+      # Evaluate
+      #
       if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/${gem_file_name}spec" ]] ; then
         unset gem
         __rvm_log "warn" "$(__color "yellow")$gem_name $gem_version$(__color "none") exists, skipping (--force to re-install)"
@@ -200,7 +210,16 @@ __rvm_gems_load() {
         # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line.
         __rvm_make_flags
         __rvm_log "info" "Installing $gem_name $gem_version..."
-        command="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 $vars"
+        if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
+          command="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 $vars"
+        else
+          if [[ ! -z "$rvm_ruby_home" ]] ; then
+            command="$gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
+          else
+            command="$gem_prefix gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
+          fi
+        fi
+        if [[ -f "$gem" ]] ; then command="${command} -l" ; fi
         eval $command > /dev/null 2>&1
         result=$?
         if [[ $result -eq 0 ]] ; then

data/scripts/install

@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
 
 rc_files="$HOME/.bash_profile $HOME/.bashrc $HOME/.zshrc"
+if [[ -f "/etc/rvmrc" ]] ; then source "/etc/rvmrc" ; fi
 if [[ "root" = "$(whoami)" ]] ; then
-  rvm_path=/usr/local/rvm
+  rvm_path="${rvm_path:-/usr/local/rvm}"
   rc_files="$rc_files /etc/profile /etc/zshenv"
 else
-  rvm_path=$HOME/.rvm
+  if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+  rvm_path="${rvm_path:-$HOME/.rvm}"
 fi
 
 #
@@ -73,19 +75,19 @@ if [[ "Linux" = "$system" ]] ; 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 "        $ 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"
+    echo -e "        $ aptitude install libreadline5-dev libssl-dev bison"
     echo -e "      $item For 1.9.X (if you wish to use it) we additionally recommend:"
-    echo -e "        $ sudo aptitude install libxml2-dev"
+    echo -e "        $ aptitude install libxml2-dev"
 
   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"
+    echo -e "        $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
 
   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"
+    echo -e "        $ pacman -Sy jdk jre"
 
   elif [[ ! -z "$rvm_yum_binary" ]] ; then
     echo -e "      $item For ree (if you wish to use it) you will need:"

data/scripts/ruby-installer

@@ -120,7 +120,6 @@ __rvm_install_ruby() {
 
   if [[ -z "$rvm_ruby_selected_flag" ]]  ; then __rvm_select $* ; fi
   if [[ ! -z "$RUBYOPT" ]]     ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
-  __rvm_make_flags
 
   case "$rvm_ruby_interpreter" in
     macruby)
@@ -141,7 +140,7 @@ __rvm_install_ruby() {
           rvm_url="$(__rvm_db "macruby_nightly_url")"
           __rvm_log "info" "Retrieving the latest nightly macruby build..."
           __rvm_fetch "$rvm_url"
-          mv "$rvm_archives_path/latest" "$rvm_archives_path/macruby_nightly.pkg"
+          mv "$rvm_archives_path/macruby_nightly-latest.pkg" "$rvm_archives_path/macruby_nightly.pkg"
           __rvm_run "macruby/extract" "sudo installer -pkg '$rvm_path/archives/macruby_nightly.pkg' -target '/'"
           mkdir -p "$rvm_ruby_home/bin"
         fi
@@ -225,6 +224,7 @@ RubyWrapper
           result=1
         else
           rvm_ruby_repo_url=$rvm_url
+          __rvm_make_flags
           __rvm_install_source $*
         fi
       fi
@@ -235,6 +235,7 @@ RubyWrapper
       # prereqs, 1.8.6+ + rake. Yes this could all be one line... not pushing our luck.
       echo "$(export rvm_install_on_use_flag=1 ; rvm 1.8.7)" # This should install if missing.
       # TODO: use 'rvm gems load' here:
+      unset CFLAGS LDFLAGS ARCHFLAGS # Important.
       __rvm_unset_ruby_variables ; rvm_ruby_string="rbx-head" ; __rvm_select
 
       unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
@@ -402,6 +403,7 @@ RubyWrapper
     ;;
 
     mput|shyouhei)
+      __rvm_make_flags
       unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
@@ -463,6 +465,7 @@ RubyWrapper
     ;;
 
     ruby)
+      __rvm_make_flags
       __rvm_install_source $*
     ;;
 

data/scripts/rvm-install

@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
 
 rc_files="$HOME/.bash_profile $HOME/.bashrc $HOME/.zshrc"
+if [[ -f "/etc/rvmrc" ]] ; then source "/etc/rvmrc" ; fi
 if [[ "root" = "$(whoami)" ]] ; then
-  rvm_path=/usr/local/rvm
+  rvm_path="${rvm_path:-/usr/local/rvm}"
   rc_files="$rc_files /etc/profile /etc/zshenv"
 else
-  rvm_path=$HOME/.rvm
+  if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+  rvm_path="${rvm_path:-$HOME/.rvm}"
 fi
 
 #
@@ -73,19 +75,19 @@ if [[ "Linux" = "$system" ]] ; 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 "        $ 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"
+    echo -e "        $ aptitude install libreadline5-dev libssl-dev bison"
     echo -e "      $item For 1.9.X (if you wish to use it) we additionally recommend:"
-    echo -e "        $ sudo aptitude install libxml2-dev"
+    echo -e "        $ aptitude install libxml2-dev"
 
   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"
+    echo -e "        $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
 
   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"
+    echo -e "        $ pacman -Sy jdk jre"
 
   elif [[ ! -z "$rvm_yum_binary" ]] ; then
     echo -e "      $item For ree (if you wish to use it) you will need:"

data/scripts/update

@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
 
 rc_files="$HOME/.bash_profile $HOME/.bashrc $HOME/.zshrc"
+if [[ -f "/etc/rvmrc" ]] ; then source "/etc/rvmrc" ; fi
 if [[ "root" = "$(whoami)" ]] ; then
-  rvm_path=/usr/local/rvm
+  rvm_path="${rvm_path:-/usr/local/rvm}"
   rc_files="$rc_files /etc/profile /etc/zshenv"
 else
-  rvm_path=$HOME/.rvm
+  if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+  rvm_path="${rvm_path:-$HOME/.rvm}"
 fi
 
 #
@@ -73,19 +75,19 @@ if [[ "Linux" = "$system" ]] ; 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 "        $ 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"
+    echo -e "        $ aptitude install libreadline5-dev libssl-dev bison"
     echo -e "      $item For 1.9.X (if you wish to use it) we additionally recommend:"
-    echo -e "        $ sudo aptitude install libxml2-dev"
+    echo -e "        $ aptitude install libxml2-dev"
 
   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"
+    echo -e "        $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
 
   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"
+    echo -e "        $ pacman -Sy jdk jre"
 
   elif [[ ! -z "$rvm_yum_binary" ]] ; then
     echo -e "      $item For ree (if you wish to use it) you will need:"

data/scripts/utility

@@ -130,7 +130,7 @@ __rvm_run() {
 
 __rvm_cleanup_variables() {
   __rvm_unset_ruby_variables
-  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_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_log_path rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags
+  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_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_log_path rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags CFLAGS LDFLAGS ARCHFLAGS
 }
 
 __rvm_unset_ruby_variables() {
@@ -338,6 +338,7 @@ __rvm_gemdup() {
 __rvm_gem_sync() {
   if [[ ! -z "$rvm_source_gem_path" ]] ; then
     for rvm_gem_name_version in $rvm_source_gem_path/gems/* ; do
+      rvm_gem_name_version=$(basename $rvm_gem_name_version)
       rvm_gem_name="${rvm_gem_name_version%-*}"
       rvm_gem_version="${rvm_gem_name_version##*-}"
       if [[ -d $GEM_HOME/gems/$rvm_gem_name_version ]] ; then
@@ -572,7 +573,7 @@ __rvm_reboot() {
     fi
     gem install rvm --no-rdoc --no-ri -q
     __rvm_update_rvm
-    source ~/.rvm/scripts/rvm
+    source $rvm_path/scripts/rvm
   else
     __rvm_log "info" "Carry on then..."
   fi ; unset response
@@ -637,13 +638,13 @@ __rvm_do() {
       unset rvm_ruby_string rvm_ruby_version
       __rvm_ruby_do
   else # all
-    while read -r bin_line
-    do # Keep this on second line damnit!
-      if [[ -x "$bin_line" ]] ; then
-        rvm_ruby_string="$(dirname $bin_line | xargs dirname | xargs basename)"
+    rubies=($(\ls $rvm_path/*/bin/ruby))
+    for full_binary in ${rubies[@]} ; do
+      if [[ -x "$full_binary" ]] ; then
+        rvm_ruby_string="$(dirname $full_binary | xargs dirname | xargs basename)"
         __rvm_ruby_do
       fi
-    done < <(\ls $rvm_path/*/bin/ruby 2> /dev/null)
+    done ; unset full_binary rubies
   fi
 
   if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
@@ -876,7 +877,9 @@ __rvm_make_flags() {
     # ls /usr/lib/gcc/i686-apple-darwin10
 
     # Set the build & host type
-    if [[ $(sysctl hw.cpu64bit_capable | awk '{print $2}') = 1 ]] ; then # we could also use: sysctl hw.optional.x86_64
+    if [[ "Power Macintosh" = "$(sysctl hw.machine | awk -F: '{print $2}' | sed 's/^ //')" ]] ; then
+      : # Do nothing ?
+    elif [[ $(sysctl hw.cpu64bit_capable | awk '{print $2}') = 1 ]] ; then # we could also use: sysctl hw.optional.x86_64
       #   64 bit capable
       if [[ "-arch x86_64" = "$rvm_archflags" ]] ; then
         rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
@@ -891,13 +894,15 @@ __rvm_make_flags() {
       if [[ -z "$rvm_archflags" ]] ; then rvm_archflags="-arch i386" ; fi
       rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=i386-apple-darwin$(uname -r) --host=i386-apple-darwin$(uname -r)"
     fi
-    ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS
 
-    # Use the latest sdk available.
-    if [[ -z "$rvm_sdk" ]] ; then rvm_sdk="$(basename -a /Developer/SDKs/* | awk '/^M/' | sort | tail -n 1)" ; fi
-    CFLAGS="-isysroot /Developer/SDKs/$rvm_sdk $rvm_archflags" ; export CFLAGS
-    LDFLAGS="-Wl,-syslibroot /Developer/SDKs/$rvm_sdk $rvm_archflags" ; export LDFLAGS
-    # CXXFLAGS="-mmacosx-version-min="$(sw_vers -productVersion | awk -F'.' '{print $1"."$2}')" -isysroot /Developer/SDKs/$rvm_sdk " ; export CXXFLAGS
+    if [[ ! -z "$rvm_archflags" ]] ; then
+      ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS
+      # Use the latest sdk available.
+      if [[ -z "$rvm_sdk" ]] ; then rvm_sdk="$(basename -a /Developer/SDKs/* | awk '/^M/' | sort | tail -n 1)" ; fi
+      CFLAGS="-isysroot /Developer/SDKs/$rvm_sdk $rvm_archflags" ; export CFLAGS
+      LDFLAGS="-Wl,-syslibroot /Developer/SDKs/$rvm_sdk $rvm_archflags" ; export LDFLAGS
+      # CXXFLAGS="-mmacosx-version-min="$(sw_vers -productVersion | awk -F'.' '{print $1"."$2}')" -isysroot /Developer/SDKs/$rvm_sdk " ; export CXXFLAGS
+    fi
   fi
 }
 

metadata

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