rvm 0.0.72 → 0.0.73

data/config/db

@@ -5,8 +5,9 @@ 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
-jruby_version=1.3.1
+jruby_version=1.4.0
 jruby_repo_url=git://github.com/jruby/jruby.git
+jruby_url=http://jruby.kenai.com/downloads/
 ruby_configure=--enable-shared
 interpreter=ruby
 ruby_version=1.8.6

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 72
+:patch: 73

data/rvm.gemspec

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

data/scripts/ruby-installer

@@ -342,27 +342,23 @@ RubyWrapper
 
         cd "$rvm_ruby_src_path"
         ant dist
-
       else
-        if [[ -d $rvm_ruby_src_path ]] ; then
-          cd $rvm_ruby_src_path
+        if [[ -z "$rvm_force_flag" ]] && [[ -f $rvm_package_file ]] && [[ -s $rvm_package_file ]] ; then
+          __rvm_log "info" "It appears that $rvm_package_file has already been downloaded, skipping. Use --force to force re-download."
         else
-          if [[ -z "$rvm_force_flag" ]] && [[ -f $rvm_package_file ]] && [[ -s $rvm_package_file ]] ; then
-            __rvm_log "info" "It appears that $rvm_package_file has already been downloaded, skipping. Use --force to force re-download."
-          else
-            __rvm_log "info" "Downloading $rvm_package_file, this may take a while depending on your connection..."
-            __rvm_fetch $rvm_url
-          fi
-          __rvm_run "extract" "tar zxf $rvm_archives_path/$rvm_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_package_file..."
-          if [[ "$rvm_package_file" != "$rvm_ruby_string" ]] ; then
-            mv $rvm_src_path/$rvm_package_file $rvm_src_path/$rvm_ruby_string
-          fi
-          cd $rvm_ruby_src_path
+          __rvm_log "info" "Downloading $rvm_package_file, this may take a while depending on your connection..."
+          __rvm_fetch "$rvm_url"
+        fi
+        __rvm_run "extract" "tar zxf $rvm_archives_path/$rvm_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_package_file..."
+        if [[ "$rvm_package_file" != "$rvm_ruby_string" ]] ; then
+          mv "$rvm_src_path/$rvm_package_file" "$rvm_src_path/$rvm_ruby_string"
         fi
+        cd "$rvm_ruby_src_path"
       fi
 
-      mkdir -p $rvm_ruby_home/bin/
-      __rvm_run "nailgun" "cd $rvm_ruby_src_path/tool/nailgun && /usr/bin/make $rvm_make_flags" "Installing $rvm_ruby_package_name..."
+      mkdir -p "$rvm_ruby_home/bin/"
+      cd "$rvm_ruby_src_path/tool/nailgun" && /usr/bin/make $rvm_make_flags
+
       __rvm_pushpop
 
       if [[ -z "$rvm_ruby_home" ]] || [[ "$rvm_ruby_home" = "/" ]] ; then echo "WTH?!?! rvm_ruby_home == / ??? not removing." ; return 1000000 ; fi

data/scripts/selector

@@ -57,16 +57,11 @@ function __rvm_select {
         rvm_ruby_string="jruby-head"
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
         rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
-      elif match "$rvm_ruby_version" "^1.4" ; then
-        rvm_url="http://jruby.kenai.com/downloads/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.tar.gz"
-        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_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
-        rvm_url="http://jruby.kenai.com/downloads/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.tar.gz"
-        rvm_package_file="$rvm_ruby_interpreter-bin-$rvm_ruby_version"
+        rvm_package_file="${rvm_ruby_interpreter}-bin-${rvm_ruby_version}"
         rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
+        rvm_url="http://jruby.kenai.com/downloads/${rvm_ruby_version}/${rvm_package_file}.tar.gz"
       fi
       alias jruby_ng="jruby --ng"
       alias jruby_ng_server="jruby --ng-server"

data/scripts/utility

@@ -384,11 +384,13 @@ __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, the default)\njruby 1.4.1\njruby --head"
+    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 "macruby-nightly (macruby-nightly, the default)\nmacruby-head"
     echo -e "mput head (shyouhei head, the default)"
+    if [[ "Darwin" = "$(uname)" ]] ; then
+      echo -e "macruby-nightly (macruby-nightly, the default)\nmacruby-head"
+    fi
   else
     current_ruby="$(which ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
     echo -e "\nruby:\n"

metadata

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