jruby · Jan 20, 2016 · Jan 20, 2016 · Jan 27, 2016 · Feb 4, 2016 · Feb 4, 2016
Showing 661 changed files with 2,467 additions and 2,335 deletions.
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.1/apache-maven-3.3.1-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
diff --git a/core/src/main/java/org/jruby/Main.java b/core/src/main/java/org/jruby/Main.java
@@ -258,10 +258,10 @@ public Status run() {
     private Status internalRun() {
         doShowVersion();
         doShowCopyright();
+        doPrintProperties();
 
-        if (!config.getShouldRunInterpreter() ) {
+        if (!config.getShouldRunInterpreter()) {
             doPrintUsage(false);
-            doPrintProperties();
             return new Status();
         }
 

diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -841,8 +841,11 @@ public IRubyObject runInterpreter(ThreadContext context, Node rootNode, IRubyObj
             assert self == getTopSelf();
             final JRubyTruffleInterface truffleContext = getTruffleContext();
             Main.printTruffleTimeMetric("before-run");
-            truffleContext.execute((RootNode) rootNode);
-            Main.printTruffleTimeMetric("after-run");
+            try {
+              truffleContext.execute((RootNode) rootNode);
+            } finally {
+              Main.printTruffleTimeMetric("after-run");
+            }
             return getNil();
         } else {
             return interpreter.execute(this, rootNode, self);
@@ -890,7 +893,7 @@ public JRubyTruffleInterface getTruffleContext() {
     }
 
     private JRubyTruffleInterface loadTruffle() {
-        Main.printTruffleTimeMetric("before-load-truffle-context");
+        Main.printTruffleTimeMetric("before-load-context");
 
         final Class<?> clazz;
 
@@ -909,7 +912,7 @@ private JRubyTruffleInterface loadTruffle() {
             throw new RuntimeException("Error while calling the constructor of Truffle's RubyContext", e);
         }
 
-        Main.printTruffleTimeMetric("after-load-truffle-context");
+        Main.printTruffleTimeMetric("after-load-context");
 
         return truffleContext;
     }

diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
@@ -1510,8 +1510,9 @@ public static IRubyObject system(ThreadContext context, IRubyObject recv, IRubyO
     @JRubyMethod(name = "system", required = 1, rest = true, module = true, visibility = PRIVATE)
     public static IRubyObject system19(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         Ruby runtime = context.runtime;
+        boolean needChdir = !runtime.getCurrentDirectory().equals(runtime.getPosix().getcwd());
 
-        if (runtime.getPosix().isNative() && !Platform.IS_WINDOWS) {
+        if (!needChdir && runtime.getPosix().isNative() && !Platform.IS_WINDOWS) {
             // MRI: rb_f_system
             long pid;
             int[] status = new int[1];

diff --git a/core/src/main/java/org/jruby/ir/persistence/IRReaderStream.java b/core/src/main/java/org/jruby/ir/persistence/IRReaderStream.java
@@ -275,6 +275,7 @@ public Instr decodeInstr() {
             case RESCUE_EQQ: return RescueEQQInstr.decode(this);
             case RESTORE_ERROR_INFO: return RestoreErrorInfoInstr.decode(this);
             case RETURN: return ReturnInstr.decode(this);
+            case RETURN_OR_RETHROW_SAVED_EXC: return ReturnOrRethrowSavedExcInstr.decode(this);
             case RUNTIME_HELPER: return RuntimeHelperCall.decode(this);
             case SEARCH_CONST: return SearchConstInstr.decode(this);
             case SET_CAPTURED_VAR: return SetCapturedVarInstr.decode(this);
@@ -455,6 +456,7 @@ public Operand decode(OperandType type) {
             case STRING_LITERAL: return StringLiteral.decode(this);
             case SVALUE: return SValue.decode(this);
             case SYMBOL: return Symbol.decode(this);
+            case SYMBOL_PROC: return SymbolProc.decode(this);
             case TEMPORARY_VARIABLE: return TemporaryLocalVariable.decode(this);
             case UNBOXED_BOOLEAN: return new UnboxedBoolean(decodeBoolean());
             case UNBOXED_FIXNUM: return new UnboxedFixnum(decodeLong());

diff --git a/core/src/main/java/org/jruby/ir/persistence/IRWriterStream.java b/core/src/main/java/org/jruby/ir/persistence/IRWriterStream.java
@@ -209,7 +209,7 @@ public void encode(StaticScope.Type value) {
 
     @Override
     public void encode(Operation value) {
-        encode((byte) value.ordinal());
+        encode(value.ordinal());
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -274,7 +274,7 @@ public class Options {
     public static final Option<Boolean> TRUFFLE_CALL_GRAPH = bool(TRUFFLE, "truffle.callgraph", false, "Maintain a call graph.");
     public static final Option<String> TRUFFLE_CALL_GRAPH_WRITE = string(TRUFFLE, "truffle.callgraph.write", "File to write the call garph to on exit.");
 
-    public static final Option<Boolean> TRUFFLE_GRAAL_WARNING_UNLESS = bool(TRUFFLE, "truffle.graal.warn_unless", false, "Warn unless the JVM has the Graal compiler.");
+    public static final Option<Boolean> TRUFFLE_GRAAL_WARNING_UNLESS = bool(TRUFFLE, "truffle.graal.warn_unless", true, "Warn unless the JVM has the Graal compiler.");
 
     public static String dump() {
         return "# JRuby configuration options with current values\n" +

diff --git a/core/src/main/java/org/jruby/util/io/ChannelStream.java b/core/src/main/java/org/jruby/util/io/ChannelStream.java
@@ -152,7 +152,7 @@ public void checkPermissionsSubsetOf(ModeFlags subsetModes) {
     public ModeFlags getModes() {
     	return modes;
     }
-    
+
     public void setModes(ModeFlags modes) {
         this.modes = modes;
     }
@@ -168,7 +168,7 @@ public void setSync(boolean sync) {
     public void setBinmode() {
         // No-op here, no binmode handling needed.
     }
-    
+
     public boolean isBinmode() {
         return false;
     }
@@ -193,15 +193,15 @@ public void waitUntilReady() throws IOException, InterruptedException {
         }
     }
 
-    public boolean readDataBuffered() {
-        return reading && (hasUngotChars() || buffer.hasRemaining());
+    public final boolean readDataBuffered() {
+        return hasBufferedInputBytes();
     }
 
     private boolean hasUngotChars() {
         return ungotChars.length() > 0;
     }
 
-    public boolean writeDataBuffered() {
+    public final boolean writeDataBuffered() {
         return !reading && buffer.position() > 0;
     }
 
@@ -308,7 +308,7 @@ public synchronized int getline(ByteList dst, byte terminator) throws IOExceptio
 
         int totalRead = 0;
         boolean found = false;
-        
+
         if (hasUngotChars()) {
             for(int i = 0; i < ungotChars.length(); i++){
                 byte ungotc = (byte) ungotChars.get(i);
@@ -318,7 +318,7 @@ public synchronized int getline(ByteList dst, byte terminator) throws IOExceptio
             }
             clearUngotChars();
         }
-        
+
         while (!found) {
             final byte[] bytes = buffer.array();
             final int begin = buffer.arrayOffset() + buffer.position();
@@ -352,7 +352,7 @@ public synchronized int getline(ByteList dst, byte terminator, long limit) throw
 
         int totalRead = 0;
         boolean found = false;
-        
+
         if (hasUngotChars()) {
             for(int i = 0; i < ungotChars.length(); i++){
                 byte ungotc = (byte) ungotChars.get(i);
@@ -363,7 +363,7 @@ public synchronized int getline(ByteList dst, byte terminator, long limit) throw
             }
             clearUngotChars();
         }
-        
+
         while (!found) {
             final byte[] bytes = buffer.array();
             final int begin = buffer.arrayOffset() + buffer.position();
@@ -393,7 +393,7 @@ public synchronized int getline(ByteList dst, byte terminator, long limit) throw
     }
 
     /**
-     * 
+     *
      */
     private void clearUngotChars() {
         if(ungotChars.length() > 0) {
@@ -494,7 +494,7 @@ public synchronized ByteList readall() throws IOException, BadDescriptorExceptio
      */
     private final int copyBufferedBytes(ByteBuffer dst) {
         final int bytesToCopy = dst.remaining();
-        
+
         if (hasUngotChars() && dst.hasRemaining()) {
             for(int i = 0; i < ungotChars.length(); i++){
                 byte ungotc = (byte) ungotChars.get(i);
@@ -533,7 +533,7 @@ private final int copyBufferedBytes(ByteBuffer dst) {
      */
     private final int copyBufferedBytes(byte[] dst, int off, int len) {
         int bytesCopied = 0;
-        
+
         if (hasUngotChars() && len > 0) {
             for(int i = 0; i < ungotChars.length(); i++){
                 byte ungotc = (byte) ungotChars.get(i);
@@ -561,7 +561,7 @@ private final int copyBufferedBytes(ByteList dst, int len) {
         int bytesCopied = 0;
 
         dst.ensure(Math.min(len, bufferedInputBytesRemaining()));
-        
+
         if (hasUngotChars() && hasUngotChars()) {
             for(int i = 0; i < ungotChars.length(); i++){
                 byte ungotc = (byte) ungotChars.get(i);
@@ -1208,7 +1208,7 @@ private void invalidateBuffer() throws IOException, BadDescriptorException {
     @Override
     public void finalize() throws Throwable {
         super.finalize();
-        
+
         if (closedExplicitly) return;
 
         if (DEBUG) {

diff --git a/lib/ruby/truffle/jruby+truffle/lib/runner.rb b/lib/ruby/truffle/jruby+truffle/lib/runner.rb
@@ -58,7 +58,7 @@ class JRubyTruffleRunner
                                   '-J-agentlib:jdwp=transport=dt_socket,server=y,address=%d,suspend=y'],
             truffle_bundle_path: ['--truffle-bundle-path NAME', 'Bundle path', assign_new_value, '.jruby+truffle_bundle'],
             interpreter_path:    ['--interpreter-path PATH', "Path to #{BRANDING} interpreter executable", assign_new_value,
-                                  File.expand_path(File.join(File.dirname(__FILE__), '../../../../bin/jruby'))],
+                                  File.expand_path(File.join(File.dirname(__FILE__), '../../../../../bin/jruby'))],
             graal_path:          ['--graal-path PATH', 'Path to Graal', assign_new_value, '../graalvm-jdk1.8.0/bin/java'],
             mock_load_path:      ['--mock-load-path PATH',
                                   'Path of mocks & monkey-patches (prepended in $:, relative to --truffle_bundle_path)',
@@ -241,7 +241,7 @@ def load_gem_configuration
 
     if candidates.size == 1
       gem_name, _ = candidates.first.split('.')
-      yaml_path   = File.dirname(__FILE__) + "/gem_configurations/#{gem_name}.yaml"
+      yaml_path   = File.dirname(__FILE__) + "/../gem_configurations/#{gem_name}.yaml"
     end
 
     apply_yaml_to_configuration(yaml_path)
@@ -440,7 +440,7 @@ def subcommand_clean(rest)
   end
 
   def subcommand_readme(rest)
-    readme_path = File.join File.dirname(__FILE__), 'README.md'
+    readme_path = File.join File.dirname(__FILE__), '../README.md'
     puts File.read(readme_path)
   end
 

diff --git a/maven/jruby/src/it/j2ee_wildfly/pom.rb b/maven/jruby/src/it/j2ee_wildfly/pom.rb
@@ -3,6 +3,7 @@
 
 # default versions will be overwritten by pom.rb from root directory
 properties( 'jruby.plugins.version' => '1.0.10',
+            'wildfly.version' => '9.0.2.Final',
             'project.build.sourceEncoding' => 'utf-8' )
 
 pom( 'org.jruby:jruby', '${jruby.version}' )
@@ -15,7 +16,7 @@
 
 jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
   execute_goal :initialize
-end 
+end
 
 plugin( 'org.wildfly.plugins:wildfly-maven-plugin:1.0.2.Final' ) do
   execute_goals( :start,

diff --git a/mvnw b/mvnw
@@ -57,27 +57,27 @@ case "`uname`" in
            #
            # Look for the Apple JDKs first to preserve the existing behaviour, and then look
            # for the new JDKs provided by Oracle.
-           # 
+           #
            if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
              #
              # Apple JDKs
              #
              export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
            fi
-           
+
            if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
              #
              # Apple JDKs
              #
              export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
            fi
-             
+
            if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
              #
              # Oracle JDKs
              #
              export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
-           fi           
+           fi
 
            if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
              #
@@ -200,11 +200,11 @@ find_maven_basedir() {
   local basedir=$(pwd)
   local wdir=$(pwd)
   while [ "$wdir" != '/' ] ; do
-    wdir=$(cd "$wdir/.."; pwd)
     if [ -d "$wdir"/.mvn ] ; then
       basedir=$wdir
       break
     fi
+    wdir=$(cd "$wdir/.."; pwd)
   done
   echo "${basedir}"
 }
@@ -219,7 +219,7 @@ concat_lines() {
 export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 
-# Provide a "standardized" way to retrieve the CLI args that will 
+# Provide a "standardized" way to retrieve the CLI args that will
 # work with both Windows and non-Windows executions.
 MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
 export MAVEN_CMD_LINE_ARGS
@@ -228,7 +228,7 @@ WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
 exec "$JAVACMD" \
   $MAVEN_OPTS \
-  -classpath "./.mvn/wrapper/maven-wrapper.jar" \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
   "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} "$@"
+  ${WRAPPER_LAUNCHER} $MAVEN_CMD_LINE_ARGS
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.1/apache-maven-3.3.1-bin.zip
		distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip