rvm 0.0.67 → 0.0.68

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 67
+:patch: 68

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.67"
+  s.version = "0.0.68"
 
   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-29}
+  s.date = %q{2009-10-30}
   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

@@ -4,14 +4,16 @@ function __rvm_meta {
   rvm_meta_author="Wayne E. Seguin"
   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_version="${rvm_version}"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm ${rvm_meta_version} by ${rvm_meta_author} (${rvm_meta_author_email}) [${rvm_meta_website}]" ; }
 
-function __rvm_usage { cat "$rvm_path/README" | ${PAGER:-less} ; }
+function __rvm_usage { cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less} ; }
 
 function __rvm_parse_args {
+  if [[ ! -z "$(echo "$*" | awk '/trace/')" ]] ; then echo "$*" ; fi
+
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
@@ -37,6 +39,7 @@ function __rvm_parse_args {
       system|default)
         rvm_action=${rvm_action:-use}
         rvm_ruby_interpreter="$rvm_token"
+        rvm_ruby_string="$rvm_token"
       ;;
 
       jruby|ree|macruby|rbx|rubinius|mput|shyouhei|default|all)
@@ -177,6 +180,7 @@ function __rvm_parse_args {
       ;;
 
       --head)
+        if [[ -z "$rvm_ruby_string" ]] ; then rvm_ruby_string="head"; else rvm_ruby_string="${rvm_ruby_string}-head" ; fi
         rvm_ruby_revision="head"
         rvm_head_flag=1
         rvm_action="${rvm_action:-use}"
@@ -251,6 +255,7 @@ function __rvm_parse_args {
       default|system)
         rvm_action="use"
         rvm_ruby_interpreter="system"
+        rvm_ruby_string="$rvm_token"
       ;;
 
       --install)            rvm_install_on_use_flag=1          ;;
@@ -346,6 +351,13 @@ function rvm {
 
   trap '__rvm_cleanup_variables ; rm -rf "/tmp/rvm/$$" >/dev/null 2>&1' 0 1 2 3 15
 
+  # Check that this is the current version.
+  disk_version=$(cat "${rvm_path:-$HOME/.rvm}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')
+  if [[ "${rvm_version}" != "${disk_version}" ]] && [[ "reload" != "$1" ]]; then
+    echo -e "A newer version of rvm has been installed ($disk_version) than is loaded ($rvm_version), please do one of the following:\n  * 'rvm reload'\n  * open a new shell\n  * source your shell init scripts"
+    return 1
+  fi
+
   __rvm_cleanup_variables
   __rvm_load_rvmrc
   __rvm_initialize

data/scripts/gems

@@ -171,8 +171,7 @@ __rvm_gems_load() {
 
       if [[ -f "$gem" ]] ; then
         gem_file_name="$gem"
-        cache_file="$gem"
-      elif match "$gem" ".gem$" ]] ; then
+      elif match "$gem" ".gem$" ; then
         gem_file_name="$gem"
       elif [[ -z "${gem_version/ /}" ]] ; then # no version
         gem_file_name="${gem_name/ /}*.gem"
@@ -180,20 +179,23 @@ __rvm_gems_load() {
         gem_file_name="${gem_name/ /}-${gem_version/ /}.gem"
       fi
 
-      if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/${gem_file_name}" ]] ; then
+      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)"
       else
-        set -x
-        if [[ -f "$rvm_gem_path/cache/${gem_file_name}" ]] ; then
+        if [[ -f "$gem" ]] ; then
+          cache_file="$gem"
+        elif [[ -f "$rvm_gem_path/cache/${gem_file_name}" ]] ; then
           cache_file="$rvm_gem_path/cache/${gem_file_name}"
         else
-          cache_file="${cache_file:-$(/bin/ls -t "${rvm_gem_path}/*/*/cache/${gem_file_name}*" 2> /dev/null | head -n1)}"
-          if [[ -f "$cache_file" ]] ; then
-            cp "$cache_file" "$rvm_gem_path/cache/$(basename "$cache_file")"
+          cache_file="${cache_file:-$(ls ${rvm_gem_path}/*/*/cache/${gem_file_name}* 2> /dev/null | sort | head -n1)}"
+          if [[ ! -z "$cache_file" ]] && [[ -f "$cache_file" ]] ; then
+            if [[ "$(dirname $cache_file)" != "$rvm_gem_path/cache/" ]] ; then
+              cp "$cache_file" "$rvm_gem_path/cache/"
+              cache_file="$rvm_gem_path/cache/$(basename $cache_file)"
+            fi
           fi
         fi
-        set +x
 
         if [[ -z "$cache_file" ]] ; then
           if [[ -f "$gem_file_name" ]] ; then
@@ -210,7 +212,7 @@ __rvm_gems_load() {
           # TODO: Switch this to use match
           if [[ ! -z "$(echo "$rvm_ruby_gem_list" | awk "/${gem_name/ /} \(.*$gem_version/{print}")" ]] ; then
             if [[ ! -z "$rvm_force_flag" ]] ; then
-              gem="$rvm_temp_path/$gem_file_name" # install as a named local gem
+              gem="$rvm_gem_path/cache/$gem_file_name" # install as a named local gem
             fi
           else
             gem="$cache_file"

data/scripts/irbrc.rb

@@ -9,7 +9,7 @@ require "irb/ext/save-history"
 IRB.conf[:HISTORY_FILE] = File.join(ENV["HOME"], ".irb-history")
 
 # Calculate the ruby string.
-rvm_ruby_string = ENV["rvm_ruby_string"] || "#{RUBY_ENGINE}-#{RUBY_VERSION}-#{(RUBY_PATCHLEVEL) ? "p#{RUBY_PATCHLEVEL}" : "r#{RUBY_REVISION}"}"
+rvm_ruby_string = ENV["rvm_ruby_string"] || "#{RUBY_ENGINE rescue 'ruby'}-#{RUBY_VERSION}-#{(RUBY_PATCHLEVEL) ? "p#{RUBY_PATCHLEVEL}" : "r#{RUBY_REVISION}"}"
 
 # Set up the prompt to be RVM specific.
 @prompt = {
@@ -24,8 +24,10 @@ IRB.conf[:PROMPT][:RVM] = @prompt
 IRB.conf[:PROMPT_MODE] = :RVM
 
 # Load the user's irbrc file, if possible.
-if File.exists?("#{ENV["HOME"]}/.irbrc_disabled")
-  load File.join(ENV["HOME"], ".irbrc") rescue nil
+begin
+  load File.join(ENV["HOME"], ".irbrc") if File.exists?("#{ENV["HOME"]}/.irbrc")
+rescue => exception
+  puts "Error : 'load #{ENV["HOME"]}/.irbrc' : #{exception.message}"
 end
 
 # EOF

data/scripts/ruby-installer

@@ -12,7 +12,8 @@ function __rvm_install_source {
   fi
 
   result=0
-  if [[ -z "$rvm_ruby_tag" ]] && [[ -z "$rvm_ruby_revision" ]] ; then
+  # TODO: This really should be about the url instead of this hokey logic.
+  if [[ -z "$rvm_head_flag" ]] && [[ -z "$rvm_ruby_tag" ]] && [[ -z "$rvm_ruby_revision" ]] ; 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_log "info" "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
@@ -23,18 +24,24 @@ function __rvm_install_source {
     __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_name ..."
     if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
   else
-    __rvm_log "info" "Retrieving Ruby from $rvm_url"
     if [[ ! -z "$(echo $rvm_url | awk '/^git/')" ]] ; then
+
       if [[ -d "$rvm_ruby_src_path/.git" ]] ; then
         cd $rvm_ruby_src_path
         if [[ -z "$rvm_ruby_revision" ]] ; then
+          __rvm_log "info" "Pulling from $rvm_ruby_repo_url, this may take a while depending on your connection..."
           git pull origin master
           if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
         else
-          git checkout ${rvm_ruby_revision:-HEAD}
+          if [[ -z "$rvm_ruby_sha" ]] ; then
+            git checkout HEAD
+          else
+            git checkout $(echo $rvm_ruby_sha | sed 's#^s##')
+          fi
           if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
         fi
       else
+        __rvm_log "info" "Cloning from $rvm_ruby_repo_url, this may take a while depending on your connection..."
         git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path
         if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
       fi
@@ -49,19 +56,21 @@ function __rvm_install_source {
           rvm_rev=""
         else
           rvm_url=$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}
-          rvm_rev="-r $rvm_ruby_revision"
+          rvm_rev="-$rvm_ruby_revision"
         fi
       fi
 
       if [[ -d "$rvm_ruby_src_path/.svn" ]] ; then
         cd $rvm_ruby_src_path
-        if [[ -z "$rvm_rev" ]] ; then
-          __rvm_run "svn.update" "svn update"
-        else
-          __rvm_run "svn.checkout" "svn checkout -q $rvm_rev"
+        __rvm_log "info" "Updating ruby from $rvm_url"
+        __rvm_run "svn.update" "svn update"
+        if [[ ! -z "$rvm_rev" ]] ; then
+          __rvm_log "info" "Checking out revision ${rvm_rev/-r/-r } from $rvm_url"
+          __rvm_run "svn.checkout" "svn update -q ${rvm_rev/-r/-r }"
         fi
       else
-        __rvm_run "svn.checkout" "svn checkout -q $rvm_rev --force $rvm_url $rvm_ruby_src_path"
+        rm -rf $rvm_ruby_src_path
+        __rvm_run "svn.checkout" "svn checkout -q ${rvm_rev/-r/-r } $rvm_url $rvm_ruby_src_path"
       fi
       if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
     fi
@@ -535,9 +544,10 @@ function __rvm_rubygems_setup {
     __rvm_log "info" "Installing rubygems dedicated to $rvm_ruby_package_name..."
     rvm_gem_package_name="rubygems-1.3.5"
     rvm_gem_url="http://rubyforge.org/frs/download.php/60718/$rvm_gem_package_name.tgz"
-    if [[ -d "$rvm_src_path/$rvm_gem_package_name" ]] ; then
+    if [[ -d "$rvm_src_path/$rvm_gem_package_name" ]] && [[ -f "$rvm_src_path/$rvm_gem_package_name/setup.rb" ]]; then
       cd "$rvm_src_path/$rvm_gem_package_name"
     else
+      rm -rf "$rvm_src_path/$rvm_gem_package_name"
       __rvm_log "info" "Retrieving $rvm_gem_package_name"
       __rvm_fetch "$rvm_gem_url"
       mkdir -p "$rvm_src_path/$rvm_gem_package_name"

data/scripts/rvm

@@ -17,6 +17,9 @@ source $rvm_path/scripts/cli
 source $rvm_path/scripts/gems
 
 rvm_loaded_flag=1 ; export rvm_loaded_flag
+rvm_version="$(cat "${rvm_path}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')" ; export rvm_version
+
+alias rvm-restart="source \"${rvm_path}/scripts/rvm\""
 
 if [[ -f "$rvm_path/default" ]] ; then source $rvm_path/default ; fi
 

data/scripts/selector

@@ -43,14 +43,14 @@ function __rvm_select {
       rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
       unset rvm_ruby_patch_level
       if match "$rvm_ruby_version" "^1.4" ; then
-        rvm_ruby_version="1.4.0RC1"
-        rvm_ruby_string="jruby-1.4.0RC1"
+        rvm_ruby_version="1.4.0RC3"
+        rvm_ruby_string="jruby-1.4.0RC3"
         rvm_package_file="$rvm_ruby_interpreter-bin-${rvm_ruby_version}"
       else
         rvm_package_file="$rvm_ruby_interpreter-bin-$rvm_ruby_version"
         rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
       fi
-      rvm_url="http://dist.codehaus.org/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.tar.gz"
+      rvm_url="http://jruby.kenai.com/downloads/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.tar.gz"
       alias jruby_ng="jruby --ng"
       alias jruby_ng_server="jruby --ng-server"
     ;;
@@ -95,7 +95,16 @@ function __rvm_select {
       if [[ -z "$rvm_ruby_version" ]] ; then __rvm_log "fail" "Unknown ruby version: $rvm_ruby_version" ; fi
     ;;
 
-    default|system|current|user)
+    current)
+      ruby_binary="$(which binary)"
+      if match "$ruby_binary" "rvm" ; then
+        rvm_ruby_string="$(dirname "$ruby_binary" | xargs dirname | xargs basename)"
+      else
+        rvm_ruby_interpreter="system"
+      fi
+    ;;
+
+    default|system|user)
       #no-op?
     ;;
 
@@ -104,7 +113,9 @@ function __rvm_select {
         rvm_ruby_string=$(basename $MY_RUBY_HOME)
         __rvm_select
       else
-        __rvm_log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
+        if [[ -z "$rvm_ruby_string" ]] ; then
+          __rvm_log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
+        fi
       fi
   esac
 
@@ -132,7 +143,8 @@ function __rvm_select {
 
     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"
+    __rvm_unset_ruby_variables
+    rvm_ruby_interpreter="system"
   fi
 }
 
@@ -149,7 +161,7 @@ function __rvm_use {
       source $rvm_path/default
     else
       rvm_ruby_interpreter="system"
-      __rvm_log "warn" "no default rvm specified, defaulting to pre-rvm sytem."
+      __rvm_log "warn" "no default rvm specified, defaulting to pre-rvm system."
       unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
       if [[ -s $rvm_path/system ]] ; then source $rvm_path/system ; fi
     fi
@@ -246,7 +258,11 @@ __rvm_ruby_string() {
       rvm_ruby_revision="head"
       unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag
       rvm_head_flag=1
+    elif [[ "default" = "$string" ]] ; then
+      rvm_ruby_interpreter="default"
+      break
     elif [[ "system" = "$string" ]] ; then
+      rvm_ruby_interpreter="system"
       break
     elif match "$string" "^preview" ; then
       rvm_ruby_patch_level="$string"
@@ -269,6 +285,9 @@ __rvm_ruby_string() {
     elif match "$string" "^r[0-9]" ; then
       unset rvm_ruby_patch_level
       rvm_ruby_revision="$string"
+    elif match "$string" "^s[0-9]" ; then
+      unset rvm_ruby_revision
+      rvm_ruby_sha="$string"
     elif match "$string" "^t[0-9]" ; then
       unset rvm_ruby_patch_level rvm_ruby_revision
       rvm_ruby_tag="$string"

data/scripts/utility

@@ -303,8 +303,11 @@ function __rvm_implode {
 
 function __rvm_gemdir {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
-  mkdir -p $rvm_ruby_gem_home
-  echo $rvm_ruby_gem_home
+  if [[ ! -z "$GEM_HOME" ]] ; then
+    echo "$GEM_HOME"
+  else
+    gem env gemdir
+  fi
 }
 
 function __rvm_source_dir {
@@ -785,6 +788,11 @@ function __rvm_iconv_install {
 
 function __rvm_openssl_install {
   __rvm_make_flags
+    if match "$rvm_archflags" "x86_64" ; then
+      openssl_os="os/compiler darwin64-x86_64-cc"
+    else
+      openssl_os="os/compiler darwin-i386-cc"
+    fi
   __rvm_pushpop $rvm_src_path
   package="openssl" ; version="0.9.8k" ; archive_format="tar.gz"
   __rvm_log "info" "Retrieving $package-$version.$archive_format"
@@ -828,22 +836,21 @@ function __rvm_ncurses_install {
 __rvm_make_flags() {
   PATH=${rvm_path}/usr/bin:$PATH ; export PATH
   if [[ "Darwin" = "$(uname)" ]] ; then
+
     if [[ -z "$rvm_archflags" ]] ; then
-      if [[ $(echo "scale=4; $(uname -r | awk -F'.' '{print $1"."$2}') >= 10.0" | bc) -eq 1 ]] ; then
-        rvm_archflags="-arch x86_64"
-      else
-        rvm_archflags="-arch i386"
-      fi
+      # Build for the archtecture that is reported.
+      # The user may override via setting rvm_archflags in ~/.rvmrc
+      rvm_archflags="-arch $(uname -m )"
     fi
 
-    if [[ -z "$rvm_sdk" ]] ; then
-      rvm_sdk="$(ls /Developer/SDKs/ | sort | tail -n 1)"
+    if [[ "-arch x86_64" = "$rvm_archflags" ]] ; then
+      rvm_ruby_configure="${rvm_ruby_configure} --build=x86_64-apple-darwin$(uname -r) --host=x86_64-apple-darwin$(uname -r)"
+    elif [[ "-arch i386" = "$rvm_archflags" ]] ; then
+      rvm_ruby_configure="${rvm_ruby_configure} --build=i386-apple-darwin$(uname -r) --host=i386-apple-darwin$(uname -r)"
     fi
 
-    if [[ "-arch x86_64" = "$rvm_archflags" ]] ; then
-      openssl_os="os/compiler darwin64-x86_64-cc"
-    else
-      openssl_os="os/compiler darwin-i386-cc"
+    if [[ -z "$rvm_sdk" ]] ; then
+      rvm_sdk="$(ls /Developer/SDKs/ | sort | tail -n 1)"
     fi
 
     CFLAGS="-isysroot /Developer/SDKs/$rvm_sdk $rvm_archflags" ; export CFLAGS

metadata

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