jruby · Jan 28, 2015 · Jan 29, 2015 · Jan 29, 2015 · Jan 29, 2015 · Jan 29, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -70,6 +70,7 @@ matrix:
     - env: PHASE='-Prake -Dtask=spec:jrubyc'
     - env: PHASE='-Prake -Dtask=spec:profiler'
     - env: COMMAND=tool/truffle-findbugs.sh
+    - env: PHASE='-Pmain'
 
 branches:
   only:

diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -1494,7 +1494,7 @@ public void setProfilingService( String service )  {
      * Whether native code is enabled for this configuration.
      */
     private boolean _nativeEnabled = NATIVE_ENABLED;
-    private boolean _selfFirstClassLoader = SELF_FIRST_CLASS_LOADER;
+    private boolean _selfFirstClassLoader = Options.SELF_FIRST_CLASS_LOADER.load();
 
     private TraceType traceType =
             TraceType.traceTypeFor(Options.BACKTRACE_STYLE.load());
@@ -1697,7 +1697,6 @@ public boolean shouldPrecompileAll() {
      * Set with the <tt>jruby.native.enabled</tt> system property.
      */
     public static final boolean NATIVE_ENABLED = Options.NATIVE_ENABLED.load();
-    public static final boolean SELF_FIRST_CLASS_LOADER = Options.SELF_FIRST_CLASS_LOADER.load();
 
     @Deprecated
     public final static boolean CEXT_ENABLED = false;

diff --git a/core/src/main/java/org/jruby/embed/ScriptingContainer.java b/core/src/main/java/org/jruby/embed/ScriptingContainer.java
@@ -1858,4 +1858,31 @@ public void finalize() throws Throwable {
         // singleton containers share global runtime, and should not tear it down
         if (scope != LocalContextScope.SINGLETON) terminate();
     }
+
+    /**
+     * Force dynamically-loaded Java classes to load first from the classloader provided by
+     * JRuby before searching parent classloaders. This can be used to isolated dependency
+     * in different runtimes from each other and from parent classloaders. The default
+     * behavior is to defer to parent classloaders if they can provide the requested
+     * classes.
+     *
+     * Note that if different versions of a  library are loaded by both a parent
+     * classloader and the JRuby classloader, those classess would be incompatible
+     * with each other and with other library objects from the opposing classloader.
+     *
+     * @param selfFirstClassloader set whether prefer the JRuby classloader when dynamically loading classes
+     * @since JRuby 9.0.0.0
+     */
+    public void setSelfFirstClassloader(boolean selfFirstClassloader) {
+        getProvider().getRubyInstanceConfig().setSelfFirstClassLoader(selfFirstClassloader);
+    }
+
+    /**
+     * Retrieve the self-first classloader setting.
+     *
+     * @see ScriptingContainer#setSelfFirstClassloader(boolean)
+     */
+    public boolean getSelfFirstClassloader() {
+        return getProvider().getRubyInstanceConfig().isSelfFirstClassLoader();
+    }
 }
diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -156,6 +156,7 @@ public class Options {
     public static final Option<String> TRUFFLE_TRANSLATOR_PRINT_PARSE_TREE = string(TRUFFLE, "truffle.translator.print_parse_trees", "", "Comma delimited list of method names to print the JRuby parse tree of before translation.");
     public static final Option<Integer> TRUFFLE_PASSALOT = integer(TRUFFLE, "truffle.passalot", 0, "Probabilty between 0 and 100 to randomly insert Thread.pass at a given line.");
     public static final Option<Integer> TRUFFLE_STACK_SERVER_PORT = integer(TRUFFLE, "truffle.stack_server_port", 0, "Port number to run an HTTP server on that returns stack traces");
+    public static final Option<Boolean> TRUFFLE_COVERAGE = bool(TRUFFLE, "truffle.coverage", false, "Enable coverage (will be enabled by default in the future - currently has some bugs");
 
     public static final Option<Boolean> NATIVE_ENABLED = bool(NATIVE, "native.enabled", true, "Enable/disable native code, including POSIX features and C exts.");
     public static final Option<Boolean> NATIVE_VERBOSE = bool(NATIVE, "native.verbose", false, "Enable verbose logging of native extension loading.");

diff --git a/core/src/main/ruby/jruby/truffle/core/shims.rb b/core/src/main/ruby/jruby/truffle/core/shims.rb
@@ -119,6 +119,12 @@ def each_value
     end
   end
 
+  def value?(value)
+    values.any? { |v| v == value }
+  end
+
+  alias_method :has_value?, :value?
+
 end
 
 class Regexp

diff --git a/...ete/src/it/bouncycastle-with-bc-gem/src/test/java/org/jruby/its/BouncyCastleTestCase.java b/...ete/src/it/bouncycastle-with-bc-gem/src/test/java/org/jruby/its/BouncyCastleTestCase.java
@@ -11,23 +11,24 @@
 import org.jruby.embed.ScriptingContainer;
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class BouncyCastleTestCase {
 
     @Test
-    public void java(){
-        assertEquals( "BouncyCastle Security Provider v1.47", new BouncyCastleProvider().getInfo() );
+    public void java() {
+        assertEquals("BouncyCastle Security Provider v1.47", new BouncyCastleProvider().getInfo());
     }
 
     @Test
-    public void ruby(){
-	System.setProperty( "jruby.self.first.class.loader", "true" );
+    public void ruby() {
         ScriptingContainer container = new ScriptingContainer();
+        container.setSelfFirstClassloader(true);
         Object result = container.parse( "gem 'bouncy-castle-java', '1.5.0146.1'; require 'bouncy-castle-java'; Java::OrgBouncycastleJceProvider::BouncyCastleProvider.new.info").run();
         assertEquals( "BouncyCastle Security Provider v1.46", result.toString() );
 
-	result = container.parse( "JRuby.runtime.jruby_class_loader").run();
-        assertEquals( "org.jruby.util.SelfFirstJRubyClassLoader", result.toString().replaceFirst( "@.*$", "" ) );
+        result = container.parse("JRuby.runtime.jruby_class_loader").run();
+        assertEquals("org.jruby.util.SelfFirstJRubyClassLoader", result.toString().replaceFirst("@.*$", ""));
     }
 }
diff --git a/.../jruby-complete/src/it/bouncycastle/src/test/java/org/jruby/its/BouncyCastleTestCase.java b/.../jruby-complete/src/it/bouncycastle/src/test/java/org/jruby/its/BouncyCastleTestCase.java
@@ -5,22 +5,23 @@
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.jruby.embed.ScriptingContainer;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class BouncyCastleTestCase {
     @Test
-    public void java(){
-        assertEquals( "BouncyCastle Security Provider v1.47", new BouncyCastleProvider().getInfo() );
+    public void java() {
+        assertEquals("BouncyCastle Security Provider v1.47", new BouncyCastleProvider().getInfo());
     }
 
     @Test
     public void ruby(){
-	System.setProperty( "jruby.self.first.class.loader", "true" );
         ScriptingContainer container = new ScriptingContainer();
+        container.setSelfFirstClassloader(true);
         Object result = container.parse( "require 'openssl'; Java::OrgBouncycastleJceProvider::BouncyCastleProvider.new.info").run();
         assertEquals( "BouncyCastle Security Provider v1.49", result.toString() );
 
-	result = container.parse( "JRuby.runtime.jruby_class_loader").run();
-        assertEquals( "org.jruby.util.SelfFirstJRubyClassLoader", result.toString().replaceFirst( "@.*$", "" ) );
+        result = container.parse("JRuby.runtime.jruby_class_loader").run();
+        assertEquals("org.jruby.util.SelfFirstJRubyClassLoader", result.toString().replaceFirst("@.*$", ""));
     }
 }
diff --git a/...uby/src/it/bouncycastle-with-bc-gem/src/test/java/org/jruby/its/BouncyCastleTestCase.java b/...uby/src/it/bouncycastle-with-bc-gem/src/test/java/org/jruby/its/BouncyCastleTestCase.java
@@ -11,23 +11,24 @@
 import org.jruby.embed.ScriptingContainer;
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class BouncyCastleTestCase {
 
     @Test
-    public void java(){
-        assertEquals( "BouncyCastle Security Provider v1.49", new BouncyCastleProvider().getInfo() );
+    public void java() {
+        assertEquals("BouncyCastle Security Provider v1.49", new BouncyCastleProvider().getInfo());
     }
 
     @Test
     public void ruby(){
-	System.setProperty( "jruby.self.first.class.loader", "true" );
         ScriptingContainer container = new ScriptingContainer();
+        container.setSelfFirstClassloader(true);
         Object result = container.parse( "gem 'bouncy-castle-java', '1.5.0146.1'; require 'bouncy-castle-java'; Java::OrgBouncycastleJceProvider::BouncyCastleProvider.new.info").run();
         assertEquals( "BouncyCastle Security Provider v1.46", result.toString() );
 
-	result = container.parse( "JRuby.runtime.jruby_class_loader").run();
-        assertEquals( "org.jruby.util.SelfFirstJRubyClassLoader", result.toString().replaceFirst( "@.*$", "" ) );
+        result = container.parse("JRuby.runtime.jruby_class_loader").run();
+        assertEquals("org.jruby.util.SelfFirstJRubyClassLoader", result.toString().replaceFirst("@.*$", ""));
     }
 }
diff --git a/maven/jruby/src/it/bouncycastle/src/test/java/org/jruby/its/BouncyCastleTestCase.java b/maven/jruby/src/it/bouncycastle/src/test/java/org/jruby/its/BouncyCastleTestCase.java
@@ -11,28 +11,29 @@
 import org.jruby.embed.ScriptingContainer;
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class BouncyCastleTestCase {
 
     @Before
-    public void setupProvider() throws Exception{
-        Security.addProvider( new BouncyCastleProvider() );
+    public void setupProvider() throws Exception {
+        Security.addProvider(new BouncyCastleProvider());
     }
 
     @Test
-    public void java(){
-        assertEquals( "BouncyCastle Security Provider v1.47", new BouncyCastleProvider().getInfo() );
+    public void java() {
+        assertEquals("BouncyCastle Security Provider v1.47", new BouncyCastleProvider().getInfo());
     }
 
     @Test
     public void ruby(){
-	System.setProperty( "jruby.self.first.class.loader", "true" );
         ScriptingContainer container = new ScriptingContainer();
+        container.setSelfFirstClassloader(true);
         Object result = container.parse( "require 'openssl'; Java::OrgBouncycastleJceProvider::BouncyCastleProvider.new.info").run();
         assertEquals( "BouncyCastle Security Provider v1.49", result.toString() );
 
-	result = container.parse( "JRuby.runtime.jruby_class_loader").run();
-        assertEquals( "org.jruby.util.SelfFirstJRubyClassLoader", result.toString().replaceFirst( "@.*$", "" ) );
+        result = container.parse("JRuby.runtime.jruby_class_loader").run();
+        assertEquals("org.jruby.util.SelfFirstJRubyClassLoader", result.toString().replaceFirst("@.*$", ""));
     }
 }
diff --git a/spec/mspec/lib/mspec/runner/mspec.rb b/spec/mspec/lib/mspec/runner/mspec.rb
@@ -293,7 +293,7 @@ def self.read_tags(keys)
         f.each_line do |line|
           line.chomp!
           next if line.empty?
-          tag = SpecTag.new line.chomp
+          tag = SpecTag.new line
           tags << tag if keys.include? tag.tag
         end
       end
@@ -315,16 +315,17 @@ def self.write_tags(tags)
   # Writes +tag+ to the tag file if it does not already exist.
   # Returns +true+ if the tag is written, +false+ otherwise.
   def self.write_tag(tag)
-    string = tag.to_s
+    tags = read_tags([tag.tag])
+    tags.each do |t|
+      if t.tag == tag.tag and t.description == tag.description
+        return false
+      end
+    end
+
     file = tags_file
     path = File.dirname file
     FileUtils.mkdir_p path unless File.exist? path
-    if File.exist? file
-      File.open(file, "rb") do |f|
-        f.each_line { |line| return false if line.chomp == string }
-      end
-    end
-    File.open(file, "ab") { |f| f.puts string }
+    File.open(file, "ab") { |f| f.puts tag.to_s }
     return true
   end
 

diff --git a/spec/truffle/tags/core/class/inherited_tags.txt b/spec/truffle/tags/core/class/inherited_tags.txt
@@ -1 +1,2 @@
 fails:Class.inherited is invoked with the child Class when self is subclassed
+fails(windows bug):Class.inherited is invoked only once per subclass
diff --git a/spec/truffle/tags/core/encoding/dummy_tags.txt b/spec/truffle/tags/core/encoding/dummy_tags.txt
@@ -1 +1,2 @@
 fails(inherited):Encoding#dummy? returns true for dummy encodings
+fails(windows bug):Encoding#dummy? returns true for dummy encodings
diff --git a/spec/truffle/tags/core/encoding/find_tags.txt b/spec/truffle/tags/core/encoding/find_tags.txt
@@ -10,3 +10,4 @@ fails:Encoding.find supports the 'locale' encoding alias
 fails:Encoding.find returns default external encoding for the 'external' encoding alias
 fails:Encoding.find returns default internal encoding for the 'internal' encoding alias
 fails:Encoding.find uses default external encoding for the 'filesystem' encoding alias
+fails(windows - Encoding.aliases):Encoding.find needs to be reviewed for spec completeness
diff --git a/spec/truffle/tags/core/env/has_value_tags.txt b/spec/truffle/tags/core/env/has_value_tags.txt
@@ -1,2 +1 @@
-fails:ENV.has_value? returns true if ENV has the value
-fails:ENV.has_value? returns false if ENV doesn't have the value
+fails(windows - Hash#has_value?):ENV.has_value? looks up values case-insensitively
diff --git a/spec/truffle/tags/core/env/value_tags.txt b/spec/truffle/tags/core/env/value_tags.txt
@@ -1,2 +1 @@
-fails:ENV.value? returns true if ENV has the value
-fails:ENV.value? returns false if ENV doesn't have the value
+fails(windows - Hash#value?):ENV.value? looks up values case-insensitively
diff --git a/spec/truffle/tags/core/io/close_on_exec_tags.txt b/spec/truffle/tags/core/io/close_on_exec_tags.txt
@@ -8,3 +8,7 @@ fails:IO#close_on_exec= returns nil
 fails:IO#close_on_exec? returns true by default
 fails:IO#close_on_exec? returns true if set
 fails:IO#close_on_exec? raises IOError if called on a closed IO
+fails(windows):IO#close_on_exec= returns false from #respond_to?
+fails(windows):IO#close_on_exec= raises a NotImplementedError when called
+fails(windows):IO#close_on_exec? returns false from #respond_to?
+fails(windows):IO#close_on_exec? raises a NotImplementedError when called
diff --git a/spec/truffle/tags/core/io/read_tags.txt b/spec/truffle/tags/core/io/read_tags.txt
@@ -92,3 +92,5 @@ fails:IO#read with internal encoding specified by encoding: option when passed n
 fails:IO#read with internal encoding specified by encoding: option when passed nil for limit sets the buffer's encoding to the internal encoding
 fails:IO#read with large data reads all the data at once
 fails:IO#read with large data reads only the requested number of bytes
+fails(windows):IO#read on Windows normalizes line endings in text mode
+fails(windows):IO#read on Windows does not normalize line endings in binary mode
diff --git a/spec/truffle/tags/core/io/readlines_tags.txt b/spec/truffle/tags/core/io/readlines_tags.txt
@@ -45,3 +45,5 @@ fails:IO.readlines when passed name, separator, limit, options calls #to_hash to
 fails:IO.readlines encodes lines using the default external encoding
 fails:IO.readlines encodes lines using the default internal encoding, when set
 fails:IO.readlines ignores the default internal encoding if the external encoding is ASCII-8BIT
+fails(windows bug):IO.readlines does not change $_
+fails(windows bug):IO.readlines raises TypeError if the first parameter is nil
diff --git a/spec/truffle/tags/core/io/write_tags.txt b/spec/truffle/tags/core/io/write_tags.txt
@@ -29,3 +29,5 @@ fails:IO#write does not warn if called after IO#read
 fails:IO#write writes to the current position after IO#read
 fails:IO#write advances the file position by the count of given bytes
 fails:IO#write raises IOError on closed stream
+fails(windows):IO#write on Windows normalizes line endings in text mode
+fails(windows):IO#write on Windows does not normalize line endings in binary mode
diff --git a/spec/truffle/tags/core/kernel/eval_tags.txt b/spec/truffle/tags/core/kernel/eval_tags.txt
@@ -9,4 +9,5 @@ fails:Kernel#eval returns from the scope calling #eval when evaluating 'return'
 fails:Kernel#eval unwinds through a Proc-style closure and returns from a lambda-style closure in the closure chain
 slow:Kernel#eval raises a LocalJumpError if there is no lambda-style closure in the chain
 slow:Kernel#eval does not share locals across eval scopes
-
+fails(windows bug):Kernel#eval does not share locals across eval scopes
+fails(windows bug):Kernel#eval raises a LocalJumpError if there is no lambda-style closure in the chain
diff --git a/spec/truffle/tags/core/kernel/fork_tags.txt b/spec/truffle/tags/core/kernel/fork_tags.txt
@@ -5,3 +5,7 @@ fails:Kernel#fork marks threads from the parent as killed
 fails:Kernel.fork returns nil for the child process
 fails:Kernel.fork runs a block in a child process
 fails:Kernel.fork marks threads from the parent as killed
+fails(windows):Kernel#fork returns false from #respond_to?
+fails(windows):Kernel#fork raises a NotImplementedError when called
+fails(windows):Kernel.fork returns false from #respond_to?
+fails(windows):Kernel.fork raises a NotImplementedError when called
diff --git a/spec/truffle/tags/core/kernel/spawn_tags.txt b/spec/truffle/tags/core/kernel/spawn_tags.txt
@@ -139,3 +139,5 @@ fails:Kernel.spawn when passed :chdir changes to the directory passed for :chdir
 fails:Kernel.spawn when passed :chdir calls #to_path to convert the :chdir value
 fails:Kernel#spawn with Integer option keys maps the key to a file descriptor in the child that inherits the file descriptor from the parent specified by the value
 fails:Kernel.spawn with Integer option keys maps the key to a file descriptor in the child that inherits the file descriptor from the parent specified by the value
+fails(windows):Kernel#spawn raises an ArgumentError if given :pgroup option
+fails(windows):Kernel.spawn raises an ArgumentError if given :pgroup option
diff --git a/test/pom.xml b/test/pom.xml
@@ -34,12 +34,19 @@
       <version>2.0.7</version>
       <scope>test</scope>
     </dependency>
+    <!-- FIXME: only depend on lib, ideally -->
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jruby</groupId>
+      <artifactId>jruby-truffle</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>

diff --git a/tool/jt.rb b/tool/jt.rb
@@ -35,10 +35,16 @@ def self.find_graal
 module ShellUtils
   private
 
+  def raw_sh(*args)
+    unless system(*args)
+      $stderr.puts "FAILED (#{$?}): #{args * ' '}"
+      exit $?.exitstatus
+    end
+  end
+
   def sh(*args)
     Dir.chdir(JRUBY_DIR) do
-      system(*args)
-      raise 'failed' unless $? == 0
+      raw_sh(*args)
     end
   end
 
@@ -106,7 +112,7 @@ def run(*args)
       jruby_args += %w[-J-XX:+UnlockDiagnosticVMOptions -J-XX:CompileCommand=print,*::callRoot]
     end
 
-    exec(env_vars, "#{JRUBY_DIR}/bin/jruby", *jruby_args, *args)
+    raw_sh(env_vars, "#{JRUBY_DIR}/bin/jruby", *jruby_args, *args)
   end
 
   def test(*args)

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/DirNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/DirNodes.java
@@ -145,8 +145,11 @@ private static RubyArray glob(final RubyContext context, String glob) {
             // Get the first star
             final int firstStar = absoluteGlob.indexOf('*');
 
-            // If there's no star, there's nothing to glob.  Return an empty result set.
+            // If there's no star, it behaves similarly to [glob if File.exist?(glob)].compact
             if (firstStar == -1) {
+                if (new File(glob).exists()) {
+                    array.slowPush(context.makeString(glob));
+                }
                 return array;
             }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/TrufflePrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/TrufflePrimitiveNodes.java
@@ -92,6 +92,10 @@ public CoverageResultNode(CoverageResultNode prev) {
 
         @Specialization
         public RubyHash coverageResult() {
+            if (getContext().getCoverageTracker() == null) {
+                throw new UnsupportedOperationException("coverage is disabled");
+            }
+
             final Collection<KeyValue> keyValues = new ArrayList<>();
 
             for (Map.Entry<Source, Long[]> source : getContext().getCoverageTracker().getCounts().entrySet()) {
@@ -132,6 +136,10 @@ public CoverageStartNode(CoverageStartNode prev) {
 
         @Specialization
         public RubyNilClass coverageStart() {
+            if (getContext().getCoverageTracker() == null) {
+                throw new UnsupportedOperationException("coverage is disabled");
+            }
+
             getContext().getCoverageTracker().install();
             return getContext().getCoreLibrary().getNilObject();
         }
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		fails:Class.inherited is invoked with the child Class when self is subclassed
		fails(windows bug):Class.inherited is invoked only once per subclass
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		fails(inherited):Encoding#dummy? returns true for dummy encodings
		fails(windows bug):Encoding#dummy? returns true for dummy encodings