Merge branch 'master' into truffle-head

Conflicts: bin/jruby.bash bin/jruby.sh truffle/src/main/java/org/jruby/truffle/nodes/core/TruffleInteropNodes.java
jruby · Jun 14, 2015 · eeb9299 · eeb9299
2 parents 5c66685 + 2ad052f
commit eeb9299
Showing 97 changed files with 2,403 additions and 1,588 deletions.
diff --git a/bin/jruby.bash b/bin/jruby.bash
@@ -149,7 +149,9 @@ done
 # The Truffle jar always needs to be on the boot classpath so that the VM can
 # substitute classes. We add it even if the jar isn't necessarily available,
 # but this doesn't cause any problems.
-JRUBY_CP="$JRUBY_CP$CP_DELIMITER$JRUBY_HOME/lib/jruby-truffle.jar"
+if [ -e "$JRUBY_HOME/lib/jruby-truffle.jar" ]; then
+  JRUBY_CP="$JRUBY_CP$CP_DELIMITER$JRUBY_HOME/lib/jruby-truffle.jar"
+fi
 
 if $cygwin; then
     JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`

diff --git a/bin/jruby.sh b/bin/jruby.sh
@@ -110,7 +110,9 @@ done
 # The Truffle jar always needs to be on the boot classpath so that the VM can
 # substitute classes. We add it even if the jar isn't necessarily available,
 # but this doesn't cause any problems.
-JRUBY_CP="$JRUBY_CP$CP_DELIMITER$JRUBY_HOME/lib/jruby-truffle.jar"
+if [ -e "$JRUBY_HOME/lib/jruby-truffle.jar" ]; then
+  JRUBY_CP="$JRUBY_CP$CP_DELIMITER$JRUBY_HOME/lib/jruby-truffle.jar"
+fi
 
 # ----- Set Up The System Classpath -------------------------------------------
 

diff --git a/bin/rake b/bin/rake
@@ -13,7 +13,7 @@ version = ">= 0"
 if ARGV.first
   str = ARGV.first
   str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
-  if str =~ /\A_(.*)_\z/
+  if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
     version = $1
     ARGV.shift
   end

diff --git a/bin/rdoc b/bin/rdoc
@@ -13,7 +13,7 @@ version = ">= 0"
 if ARGV.first
   str = ARGV.first
   str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
-  if str =~ /\A_(.*)_\z/
+  if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
     version = $1
     ARGV.shift
   end

diff --git a/bin/ri b/bin/ri
@@ -13,7 +13,7 @@ version = ">= 0"
 if ARGV.first
   str = ARGV.first
   str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
-  if str =~ /\A_(.*)_\z/
+  if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
     version = $1
     ARGV.shift
   end

diff --git a/core/src/main/java/org/jruby/RubyEnumerable.java b/core/src/main/java/org/jruby/RubyEnumerable.java