jruby · Sep 29, 2015 · Sep 29, 2015 · Sep 29, 2015 · Sep 29, 2015 · Sep 29, 2015
diff --git a/core/src/main/java/org/jruby/exceptions/RaiseException.java b/core/src/main/java/org/jruby/exceptions/RaiseException.java
@@ -203,11 +203,19 @@ private void preRaise(ThreadContext context, StackTraceElement[] javaTrace) {
 
         if (RubyInstanceConfig.LOG_EXCEPTIONS) TraceType.dumpException(exception);
 
-        if (context.exceptionRequiresBacktrace) {
+        if (requiresBacktrace(context)) {
             exception.prepareIntegratedBacktrace(context, javaTrace);
         }
     }
 
+    private boolean requiresBacktrace(ThreadContext context) {
+        IRubyObject debugMode = context.runtime.getGlobalVariables().get("$DEBUG");
+        // We can only omit backtraces of descendents of Standard error for 'foo rescue nil'
+        return context.exceptionRequiresBacktrace ||
+                (debugMode != null && debugMode.isTrue()) ||
+                !exception.kind_of_p(context, context.runtime.getStandardError()).isTrue();
+    }
+
     private void preRaise(ThreadContext context, IRubyObject backtrace) {
         context.runtime.incrementExceptionCount();
         doSetLastError(context);
@@ -216,8 +224,7 @@ private void preRaise(ThreadContext context, IRubyObject backtrace) {
         if (RubyInstanceConfig.LOG_EXCEPTIONS) TraceType.dumpException(exception);
 
         // We can only omit backtraces of descendents of Standard error for 'foo rescue nil'
-        if (!exception.kind_of_p(context, context.runtime.getStandardError()).isTrue() ||
-                context.exceptionRequiresBacktrace) {
+        if (requiresBacktrace(context)) {
             if (backtrace == null) {
                 exception.prepareBacktrace(context, nativeException);
             } else {

diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -3036,7 +3036,7 @@ public Operand buildRescue(RescueNode node) {
 
     private boolean canBacktraceBeRemoved(RescueNode rescueNode) {
         // For now we will only contemplate 'foo rescue nil' cases but simple non-mod rescue forms can be added later.
-        if (!(rescueNode instanceof RescueModNode)) return false;
+        if (RubyInstanceConfig.FULL_TRACE_ENABLED || !(rescueNode instanceof RescueModNode)) return false;
 
         // FIXME: This MIGHT be able to expand to more complicated expressions like Hash or Array if they
         // contain only SideEffectFree nodes.  Constructing a literal out of these should be safe from

diff --git a/core/src/main/java/org/jruby/util/JRubyClassLoader.java b/core/src/main/java/org/jruby/util/JRubyClassLoader.java
@@ -35,8 +35,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.management.ManagementFactory;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.file.Files;
 
 import org.jruby.util.log.Logger;
 import org.jruby.util.log.LoggerFactory;
@@ -60,10 +62,26 @@ public class JRubyClassLoader extends ClassDefiningJRubyClassLoader {
 
     private Runnable unloader;
 
+    private File tempdir;
+
     public JRubyClassLoader(ClassLoader parent) {
         super(parent);
     }
 
+    private File getTempDir() {
+        if (tempdir == null) {
+            String processName = ManagementFactory.getRuntimeMXBean().getName();
+            long pid = Long.parseLong(processName.split("@")[0]);
+            File dir = new File(System.getProperty("java.io.tmpdir"), "jruby-" + pid);
+            if (dir.mkdirs()) {
+                dir.deleteOnExit();
+            }
+            ;
+            tempdir = dir;
+        }
+        return tempdir;
+    }
+
     // Change visibility so others can see it
     @Override
     public void addURL(URL url) {
@@ -74,7 +92,7 @@ public void addURL(URL url) {
             OutputStream out = null;
             try
             {
-                File f = File.createTempFile( "jruby", new File(url.getFile()).getName());
+                File f = File.createTempFile("jruby", new File(url.getFile()).getName(), getTempDir());
                 f.deleteOnExit();
                 out = new BufferedOutputStream( new FileOutputStream( f ) );
                 in = new BufferedInputStream( url.openStream() );

diff --git a/spec/jruby.2.2.mspec b/spec/jruby.2.2.mspec
@@ -21,7 +21,6 @@ class MSpecScript
   # Core library specs
   set :core, [
     SPEC_DIR + '/core',
-    '^' + SPEC_DIR + '/core/continuation'
   ]
 
   set :fast, [
@@ -106,9 +105,6 @@ class MSpecScript
   # This set of files is run by mspec ci
   set :ci_files, get(:language) + get(:core) + get(:command_line) + get(:library)
 
-  # Optional library specs
-  set :ffi, SPEC_DIR + '/optional/ffi'
-
   # A list of _all_ optional library specs
   set :optional, [get(:ffi)]
 

diff --git a/spec/mspec/lib/mspec/helpers/ruby_exe.rb b/spec/mspec/lib/mspec/helpers/ruby_exe.rb
@@ -1,5 +1,6 @@
 require 'mspec/utils/ruby_name'
 require 'mspec/guards/platform'
+require 'mspec/helpers/tmp'
 
 # The ruby_exe helper provides a wrapper for invoking the
 # same Ruby interpreter as the one running the specs and
@@ -124,6 +125,13 @@ def ruby_exe(code, opts = {})
         ENV[key] = value
       end
 
+      escape = opts.delete(:escape)
+      if escape
+        tmpfile = tmp("rubyexe.rb")
+        File.open(tmpfile, "w") { |f| f.write(code) }
+        code = tmpfile
+      end
+
       begin
         platform_is_not :opal do
           `#{ruby_cmd(code, opts)}`
@@ -134,25 +142,20 @@ def ruby_exe(code, opts = {})
           key = key.to_s
           ENV.delete key unless saved_env.key? key
         end
+        File.delete tmpfile if escape
       end
     end
   end
 
   def ruby_cmd(code, opts = {})
     body = code
 
-    if code and not File.exist?(code)
-      if opts[:escape]
-        heredoc_separator = "END_OF_RUBYCODE"
-        lines = code.lines
-        until lines.none? {|line| line.start_with? heredoc_separator }
-          heredoc_separator << heredoc_separator
-        end
+    if opts[:escape]
+      raise "escape: true is no longer supported in ruby_cmd, use ruby_exe or a fixture"
+    end
 
-        body = %Q!-e "$(cat <<'#{heredoc_separator}'\n#{code}\n#{heredoc_separator}\n)"!
-      else
-        body = "-e #{code.inspect}"
-      end
+    if code and not File.exist?(code)
+      body = "-e #{code.inspect}"
     end
 
     [RUBY_EXE, ENV['RUBY_FLAGS'], opts[:options], body, opts[:args]].compact.join(' ')

diff --git a/spec/mspec/lib/mspec/runner/actions/filter.rb b/spec/mspec/lib/mspec/runner/actions/filter.rb
@@ -14,14 +14,14 @@ def initialize(tags=nil, descs=nil)
     @tags = Array(tags)
     descs = Array(descs)
     @sfilter = MatchFilter.new(nil, *descs) unless descs.empty?
+    @tfilter = nil
   end
 
   def ===(string)
     @sfilter === string or @tfilter === string
   end
 
   def load
-    @tfilter = nil
     return if @tags.empty?
 
     desc = MSpec.read_tags(@tags).map { |t| t.description }

diff --git a/spec/mspec/lib/mspec/runner/mspec.rb b/spec/mspec/lib/mspec/runner/mspec.rb
@@ -16,7 +16,9 @@ module MSpec
   @leave   = nil
   @load    = nil
   @unload  = nil
+  @tagged  = nil
   @current = nil
+  @example = nil
   @modes   = []
   @shared  = {}
   @guarded = []

diff --git a/spec/mspec/lib/mspec/runner/tag.rb b/spec/mspec/lib/mspec/runner/tag.rb
@@ -13,13 +13,19 @@ def parse(string)
 
   def unescape(str)
     return unless str
-    str = str[1..-2] if str[0] == ?" and str[-1] == ?"
-    str.gsub(/\\n/, "\n")
+    if str[0] == ?" and str[-1] == ?"
+      str[1..-2].gsub('\n', "\n")
+    else
+      str
+    end
   end
 
   def escape(str)
-    str = %["#{str.gsub(/\n/, '\n')}"] if /\n/ =~ str
-    str
+    if str.include? "\n"
+      %["#{str.gsub("\n", '\n')}"]
+    else
+      str
+    end
   end
 
   def to_s

diff --git a/spec/mspec/spec/helpers/io_spec.rb b/spec/mspec/spec/helpers/io_spec.rb
@@ -52,6 +52,7 @@
 describe Object, "#new_fd" do
   before :each do
     @name = tmp("io_specs")
+    @io = nil
   end
 
   after :each do

diff --git a/spec/mspec/spec/runner/exception_spec.rb b/spec/mspec/spec/runner/exception_spec.rb
@@ -87,6 +87,10 @@
 end
 
 describe ExceptionState, "#message" do
+  before :each do
+    @state = ExampleState.new ContextState.new("C#m"), "works"
+  end
+
   it "returns <No message> if the exception message is empty" do
     exc = ExceptionState.new @state, "", Exception.new("")
     exc.message.should == "<No message>"
@@ -111,6 +115,7 @@
 
 describe ExceptionState, "#backtrace" do
   before :each do
+    @state = ExampleState.new ContextState.new("C#m"), "works"
     begin
       raise Exception
     rescue Exception => @exception

diff --git a/spec/mspec/spec/runner/formatters/method_spec.rb b/spec/mspec/spec/runner/formatters/method_spec.rb
@@ -120,8 +120,8 @@
     @formatter.before state
 
     exc = SpecExpectationNotMetError.new "failed"
-    @formatter.exception ExceptionState.new(@state, nil, exc)
-    @formatter.exception ExceptionState.new(@state, nil, exc)
+    @formatter.exception ExceptionState.new(state, nil, exc)
+    @formatter.exception ExceptionState.new(state, nil, exc)
 
     @formatter.after state
     h = @formatter.methods["Some#method"]

diff --git a/spec/mspec/spec/runner/mspec_spec.rb b/spec/mspec/spec/runner/mspec_spec.rb
@@ -95,7 +95,6 @@
   before :each do
     MSpec.clear_current
     @cs = ContextState.new "C#m"
-    @cs.stub(:state).and_return(@es)
     @cs.parent = MSpec.current
 
     @es = ExampleState.new @cs, "runs"

diff --git a/spec/mspec/spec/runner/tag_spec.rb b/spec/mspec/spec/runner/tag_spec.rb
@@ -109,3 +109,15 @@
     [one].==([two]).should == true
   end
 end
+
+describe SpecTag, "#unescape" do
+  it "replaces \\n by LF when the description is quoted" do
+    tag = SpecTag.new 'tag:"desc with\nnew line"'
+    tag.description.should == "desc with\nnew line"
+  end
+
+  it "does not replaces \\n by LF when the description is not quoted " do
+    tag = SpecTag.new 'tag:desc with\nnew line'
+    tag.description.should == "desc with\\nnew line"
+  end
+end
diff --git a/spec/ruby/command_line/dash_s_spec.rb b/spec/ruby/command_line/dash_s_spec.rb
@@ -3,27 +3,23 @@
 describe "The -s command line option" do
   describe "when using -- to stop parsing" do
     it "sets the value to true without an explicit value" do
-      ruby_exe("p $n", escape: true,
-                          options: "-s",
-                          args: "-- -n").chomp.should == "true"
+      ruby_exe(nil, options: "-s -e 'p $n'",
+                    args: "-- -n").chomp.should == "true"
     end
 
     it "parses single letter args into globals" do
-      ruby_exe("puts $n", escape: true,
-                          options: "-s",
-                          args: "-- -n=blah").chomp.should == "blah"
+      ruby_exe(nil, options: "-s -e 'puts $n'",
+                    args: "-- -n=blah").chomp.should == "blah"
     end
 
     it "parses long args into globals" do
-      ruby_exe("puts $_name", escape: true,
-                          options: "-s",
-                          args: "-- --name=blah").chomp.should == "blah"
+      ruby_exe(nil, options: "-s -e 'puts $_name'",
+                    args: "-- --name=blah").chomp.should == "blah"
     end
 
     it "converts extra dashes into underscores" do
-      ruby_exe("puts $___name__test__", escape: true,
-                          options: "-s",
-                          args: "-- ----name--test--=blah").chomp.should == "blah"
+      ruby_exe(nil, options: "-s -e 'puts $___name__test__'",
+                    args: "-- ----name--test--=blah").chomp.should == "blah"
     end
   end
 

diff --git a/spec/ruby/core/array/any_spec.rb b/spec/ruby/core/array/any_spec.rb
@@ -1,13 +1,13 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Array#any?" do
-  describe 'with no block given (a default block of { |x| x } is implicit)' do 
-    it "is false if the array is empty" do 
+  describe 'with no block given (a default block of { |x| x } is implicit)' do
+    it "is false if the array is empty" do
       empty_array = []
       empty_array.any?.should == false
     end
 
-    it "is false if the array is not empty, but all the members of the array are falsy" do 
+    it "is false if the array is not empty, but all the members of the array are falsy" do
       falsy_array = [false, nil, false]
       falsy_array.any?.should == false
     end
@@ -18,18 +18,18 @@
     end
   end
 
-  describe 'with a block given' do 
-    it 'is false if the array is empty' do 
+  describe 'with a block given' do
+    it 'is false if the array is empty' do
       empty_array = []
       empty_array.any? {|v| 1 == 1 }.should == false
     end
 
-    it 'is true if the block returns true for any member of the array' do 
+    it 'is true if the block returns true for any member of the array' do
       array_with_members = [false, false, true, false]
       array_with_members.any? {|v| v == true }.should == true
     end
 
-    it 'is false if the block returns false for all members of the array' do 
+    it 'is false if the block returns false for all members of the array' do
       array_with_members = [false, false, true, false]
       array_with_members.any? {|v| v == 42 }.should == false
     end

diff --git a/spec/ruby/core/basicobject/__send___spec.rb b/spec/ruby/core/basicobject/__send___spec.rb
@@ -1,7 +1,10 @@
 require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../../shared/basicobject/send', __FILE__)
 
 describe "BasicObject#__send__" do
   it "is a public instance method" do
     BasicObject.should have_public_instance_method(:__send__)
   end
+
+  it_behaves_like(:basicobject_send, :__send__)
 end
diff --git a/spec/ruby/core/basicobject/method_missing_spec.rb b/spec/ruby/core/basicobject/method_missing_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../shared/kernel/method_missing', __FILE__)
+require File.expand_path('../../../shared/basicobject/method_missing', __FILE__)
 
 describe "BasicObject#method_missing" do
   it "is a private method" do
@@ -13,3 +13,27 @@
 describe "BasicObject#method_missing" do
   it_behaves_like :method_missing_instance, nil, BasicObject
 end
+
+describe "BasicObject#method_missing" do
+  it_behaves_like :method_missing_defined_module, nil, KernelSpecs::ModuleMM
+end
+
+describe "BasicObject#method_missing" do
+  it_behaves_like :method_missing_module, nil, KernelSpecs::ModuleNoMM
+end
+
+describe "BasicObject#method_missing" do
+  it_behaves_like :method_missing_defined_class, nil, KernelSpecs::ClassMM
+end
+
+describe "BasicObject#method_missing" do
+  it_behaves_like :method_missing_class, nil, KernelSpecs::ClassNoMM
+end
+
+describe "BasicObject#method_missing" do
+  it_behaves_like :method_missing_defined_instance, nil, KernelSpecs::ClassMM
+end
+
+describe "BasicObject#method_missing" do
+  it_behaves_like :method_missing_instance, nil, KernelSpecs::ClassNoMM
+end