jruby · Mar 11, 2016 · Mar 11, 2016 · Mar 11, 2016 · Mar 11, 2016 · Mar 11, 2016
diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,6 @@ env:
     - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     - MALLOC_ARENA_MAX=2
   matrix:
-    - JTRCI='lib/ruby/truffle/jruby+truffle/gem_ci/travis.txt'
     - PHASE='-Ptest'
     - PHASE='-Prake -Dtask=test:jruby'
     - PHASE='-Prake -Dtask=test:jruby:fullint'
@@ -81,7 +80,6 @@ matrix:
     - env: JT=check_ambiguous_arguments
       jdk: oraclejdk8
     - env: JT='test mri'
-    - env: JTRCI='lib/ruby/truffle/jruby+truffle/gem_ci/travis.txt'
     - env: PHASE='-Pmain'
       jdk: oraclejdk8
     - env: PHASE='-Pj2ee'

diff --git a/lib/ruby/truffle/jruby+truffle/gem_ci/activesupport.rb b/lib/ruby/truffle/jruby+truffle/gem_ci/activesupport.rb
@@ -1,13 +1,12 @@
 subdir 'activesupport'
 repository_name 'rails'
 
-unless File.exists? repository_dir
-  git_clone 'https://github.com/rails/rails.git', branch: '4-2-stable'
-end
+git_clone 'https://github.com/rails/rails.git' unless File.exists? repository_dir
+git_checkout git_tag('4.2.5.2')
 
 use_only_https_git_paths!
 
 has_to_succeed setup
 
-result run(%w[--require-pattern test/**/*_test.rb -r exclude_tests -- -I test -e nil], raise: false)
+result run(%w[--require-pattern test/**/**/*_test.rb -r exclude_tests -- -I test -e nil], raise: false)
 
diff --git a/lib/ruby/truffle/jruby+truffle/gem_configurations/activesupport.yaml b/lib/ruby/truffle/jruby+truffle/gem_configurations/activesupport.yaml
@@ -54,22 +54,16 @@
                                    LoggerTest:               [:test_buffer_multibyte],
                                    MultibyteCharsExtrasTest: [:test_titleize_should_be_unicode_aware,
                                                               :test_titleize_should_not_affect_characters_that_do_not_case_fold],
-                                   TimeZoneTest:             [:test_now_enforces_spring_dst_rules],
                                    TransliterateTest:        [:test_transliterate_should_allow_a_custom_replacement_char,
                                                               :test_transliterate_should_approximate_ascii,
                                                               :test_transliterate_should_work_with_custom_i18n_rules_and_uncomposed_utf8],
-                                   DurationTest:             [:test_eql],
-                                   ModuleTest:               [:test_delegation_exception_backtrace,
-                                                              :test_delegation_exception_backtrace_with_allow_nil],
                                    StringInflectionsTest:    [:test_string_parameterized_no_separator,
                                                               :test_string_parameterized_normal,
                                                               :test_string_parameterized_underscore,
                                                               :test_titleize],
                                    TimeExtCalculationsTest:  [:test_seconds_since_midnight_at_daylight_savings_time_end,
-                                                              :test_seconds_until_end_of_day_at_daylight_savings_time_end,
-                                                              :test_time_created_with_local_constructor_cannot_represent_times_during_hour_skipped_by_dst],
-                                   TimeWithZoneTest:         [:test_change,
-                                                              :test_no_method_error_has_proper_context] }
+                                                              :test_seconds_until_end_of_day_at_daylight_savings_time_end],
+                                   TimeWithZoneTest:         [:test_no_method_error_has_proper_context] }
 
 
                       undefine = if ENV['TRAVIS']
@@ -104,3 +98,4 @@
     - date
     - bigdecimal
     - pathname
+    - openssl-stubs
diff --git a/lib/ruby/truffle/jruby+truffle/lib/runner.rb b/lib/ruby/truffle/jruby+truffle/lib/runner.rb
@@ -233,8 +233,10 @@ def initialize(argv = ARGV)
     @option_parsers = build_option_parsers
 
     @subcommand, *argv_after_global = @option_parsers[:global].order argv
+    @called_from_dir                = Dir.pwd
+    @options[:global][:dir]         = File.expand_path(@options[:global][:dir] || @called_from_dir)
 
-    Dir.chdir dir do
+    Dir.chdir @options[:global][:dir] do
       puts "pwd: #{Dir.pwd}" if verbose?
 
       load_gem_configuration
@@ -257,7 +259,7 @@ def initialize(argv = ARGV)
   end
 
   def run
-    Dir.chdir dir do
+    Dir.chdir @options[:global][:dir] do
       send "subcommand_#{@subcommand}", @argv_after_subcommand
     end
   end
@@ -271,10 +273,6 @@ def print_options
 
   private
 
-  def dir
-    @options[:global][:dir] || Dir.pwd
-  end
-
   def verbose?
     @options[:global][:verbose]
   end
@@ -495,7 +493,12 @@ def subcommand_ci(rest)
       batch = if path =~ /^in|stdin$/
                 $stdin.read
               else
-                File.read(path)
+                path = Pathname(path)
+                if path.absolute?
+                  File.read(path)
+                else
+                  File.read(Pathname(@called_from_dir).join(path))
+                end
               end
 
       results = batch.each_line.map do |line|
@@ -506,13 +509,13 @@ def subcommand_ci(rest)
         rest          = option_parser.order line.split
 
         gem_name = rest.first
-        CIEnvironment.new(dir, gem_name, rest[1..-1]).success?
+        CIEnvironment.new(@options[:global][:dir], gem_name, rest[1..-1]).success?
       end
 
       results.all?
     else
       gem_name = rest.first
-      ci       = CIEnvironment.new dir, gem_name, rest[1..-1], definition: options[:ci][:definition]
+      ci       = CIEnvironment.new @options[:global][:dir], gem_name, rest[1..-1], definition: options[:ci][:definition]
       ci.success?
     end
   end
@@ -631,7 +634,7 @@ def git_clone(url)
 
     def git_checkout(target)
       return if target.nil?
-      execute_cmd %W[git checkout #{target}], dir: repository_dir, print: true
+      execute_cmd %W[git checkout --force #{target}], dir: repository_dir, print: true
     end
 
     def git_tag(version)

diff --git a/lib/ruby/truffle/shims/openssl-stubs.rb b/lib/ruby/truffle/shims/openssl-stubs.rb
@@ -0,0 +1,94 @@
+# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+#
+# Eclipse Public License version 1.0
+# GNU General Public License version 2
+# GNU Lesser General Public License version 2.1
+
+# This is shimmed specifically for RubySpec's marshal specs, Rails, and ActiveSupport tests
+
+require 'digest'
+
+module OpenSSL
+  module X509
+    class Name
+
+      def to_a
+        raise "not implemented"
+      end
+
+    end
+  end
+
+  module Cipher
+    CipherError = Class.new StandardError
+
+    class Cipher
+      attr_accessor :key, :iv
+
+      def initialize(cipher)
+        @encrypt = nil
+        @iv      = nil
+      end
+
+      def encrypt
+        @encrypt = true
+      end
+
+      def decrypt
+        @encrypt = false
+      end
+
+      def random_iv
+        @iv = (format('%10s', rand(16**10).to_s(16))*4).gsub(' ', '0')
+      end
+
+      def update(data)
+        raise CipherError if @iv.nil?
+
+        data.each_byte.each_with_index.map do |byte, i|
+          iv_i    = i % 20
+          iv_byte = @iv[(iv_i*2)..(iv_i*2+1)].to_i(16)
+          (byte ^ iv_byte).chr
+        end.join
+      end
+
+      def final
+        ''
+      end
+
+    end
+  end
+
+  module PKCS5
+    def self.pbkdf2_hmac_sha1(secret, salt, iterations, key_size)
+      (salt * (key_size / salt.size + 1))[0...key_size]
+    end
+  end
+
+  module Digest
+    %i[SHA1 SHA256 SHA384 SHA512].each do |name|
+      klass = Class.new(::Digest.const_get(name)) do
+        def name
+          self.class.name
+        end
+      end
+
+      const_set name, klass
+    end
+  end
+
+  module HMAC
+    def self.hexdigest(digest, key, data)
+      # AS test data
+      if data == "BAh7BjoIZm9vbzonTWVzc2FnZVZlcmlmaWVyVGVzdDo6QXV0b2xvYWRDbGFzcwY6CUBmb29JIghmb28GOgZFVA=="
+        return "f3ef39a5241c365083770566dc7a9eb5d6ace914"
+      end
+      Digest::SHA1.hexdigest(data)
+    end
+  end
+end
+
+# make it look as openssl is loaded
+$" << __FILE__.gsub(/-stubs\.rb/, '.rb')
diff --git a/lib/ruby/truffle/shims/openssl.rb b/lib/ruby/truffle/shims/openssl.rb
@@ -6,76 +6,11 @@
 # GNU General Public License version 2
 # GNU Lesser General Public License version 2.1
 
-# This is shimmed specifically for RubySpec's marshal specs, Rails, and ActiveSupport tests
+# If loaded directly simulate as it was not found, it can added only
+# explicitly by loading openssl-stubs which makes it look like
+# openssl was loaded.
 
-require 'digest'
+load_error = LoadError.new("cannot load such file -- openssl")
+load_error.instance_variable_set :@path, 'openssl'
+raise load_error
 
-module OpenSSL
-  module X509
-    class Name
-
-      def to_a
-        raise "not implemented"
-      end
-
-    end
-  end
-
-  module Cipher
-    CipherError = Class.new StandardError
-
-    class Cipher
-      attr_accessor :key, :iv
-
-      def initialize(cipher)
-        @encrypt = nil
-        @iv      = nil
-      end
-
-      def encrypt
-        @encrypt = true
-      end
-
-      def decrypt
-        @encrypt = false
-      end
-
-      def random_iv
-        @iv = (format('%10s', rand(16**10).to_s(16))*4).gsub(' ', '0')
-      end
-
-      def update(data)
-        raise CipherError if @iv.nil?
-
-        data.each_byte.each_with_index.map do |byte, i|
-          iv_i    = i % 20
-          iv_byte = @iv[(iv_i*2)..(iv_i*2+1)].to_i(16)
-          (byte ^ iv_byte).chr
-        end.join
-      end
-
-      def final
-        ''
-      end
-
-    end
-  end
-
-  module PKCS5
-    def self.pbkdf2_hmac_sha1(secret, salt, iterations, key_size)
-      (salt * (key_size / salt.size + 1))[0...key_size]
-    end
-  end
-
-  Digest = ::Digest
-
-  module HMAC
-    def self.hexdigest(digest, key, data)
-      # AS test data
-      if data == "BAh7BjoIZm9vbzonTWVzc2FnZVZlcmlmaWVyVGVzdDo6QXV0b2xvYWRDbGFzcwY6CUBmb29JIghmb28GOgZFVA=="
-        return "f3ef39a5241c365083770566dc7a9eb5d6ace914"
-      end
-      Digest::SHA1.hexdigest(data)
-    end
-  end
-end
diff --git a/spec/truffle/truffle.mspec b/spec/truffle/truffle.mspec
@@ -49,6 +49,15 @@ class MSpecScript
     # Load issues with 'delegate'.
     "^spec/ruby/library/delegate/delegate_class/instance_method_spec.rb",
     "^spec/ruby/library/delegate/delegator/protected_methods_spec.rb",
+
+    # Openssl not yet supported
+    "^spec/ruby/library/openssl/cipher_spec.rb",
+    "^spec/ruby/library/openssl/config/freeze_spec.rb",
+    "^spec/ruby/library/openssl/hmac/digest_spec.rb",
+    "^spec/ruby/library/openssl/hmac/hexdigest_spec.rb",
+    "^spec/ruby/library/openssl/random/pseudo_bytes_spec.rb",
+    "^spec/ruby/library/openssl/random/random_bytes_spec.rb",
+    "^spec/ruby/library/openssl/x509/name/parse_spec.rb"
   ]
 
   set :truffle, [

diff --git a/test/pom.rb b/test/pom.rb
@@ -76,7 +76,8 @@
           'showWarnings' =>  'true',
           'showDeprecation' =>  'true',
           'source' =>  '${base.java.version}',
-          'target' =>  '${base.java.version}' )
+          'target' =>  '${base.java.version}',
+          'testExcludes' => ['truffle/**/*.java'] )
   plugin :dependency do
     execute_goals( 'copy',
                    :id => 'copy jars for testing',

diff --git a/test/truffle/integration/backtraces/backtraces.rb b/test/truffle/integration/backtraces/backtraces.rb
@@ -29,14 +29,18 @@ def check(file)
 
   success = true
 
+  print = []
   expected.zip(actual).each do |e, a|
     unless a.end_with?(e)
-      puts "Expected #{e}, actually #{a}"
+      print << "E #{a} Expected: #{e}"
       success = false
+    else
+      print << ". #{a}"
     end
   end
 
   unless success
+    puts print.join("\n")
     exit 1
   end
 end
diff --git a/test/truffle/integration/backtraces/eval.backtrace b/test/truffle/integration/backtraces/eval.backtrace
@@ -1,9 +1,12 @@
-/eval.rb:18:in `<main>'
+(eval):1:in `<main>'
+/eval.rb:22:in `eval'
+/eval.rb:22:in `m3'
+a_m3_calling_source.rb:42:in `<main>'
 /eval.rb:18:in `eval'
 /eval.rb:18:in `m2'
-/eval.rb:14:in `<main>'
+(eval):1:in `<main>'
 /eval.rb:14:in `eval'
 /eval.rb:14:in `m1'
-/eval.rb:22:in `block in <main>'
+/eval.rb:26:in `block in <main>'
 /backtraces.rb:17:in `check'
-/eval.rb:21:in `<main>'
+/eval.rb:25:in `<main>'
diff --git a/test/truffle/integration/backtraces/eval.rb b/test/truffle/integration/backtraces/eval.rb
@@ -15,6 +15,10 @@ def m1
 end
 
 def m2
+  eval 'm3', binding, 'a_m3_calling_source.rb', 42
+end
+
+def m3
   eval "raise 'message'"
 end
 

diff --git a/test/truffle/integration/gem-testing.sh b/test/truffle/integration/gem-testing.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+gem install bundler
+
+mkdir -p test/truffle/integration/gem-testing
+jruby+truffle --dir test/truffle/integration/gem-testing ci --batch lib/ruby/truffle/jruby+truffle/gem_ci/travis.txt
+
diff --git a/test/truffle/integration/rails.sh_excluded → test/truffle/integration/rails.sh b/test/truffle/integration/rails.sh_excluded → test/truffle/integration/rails.sh
diff --git a/test/truffle/integration/rails/.jruby+truffle.yaml b/test/truffle/integration/rails/.jruby+truffle.yaml
@@ -48,4 +48,5 @@
 
 :run:
   :require:
+    - openssl-stubs
     - stubs
diff --git a/tool/travis_runner.sh b/tool/travis_runner.sh
@@ -21,11 +21,3 @@ if [[ -v JT ]]
 then
   ruby tool/jt.rb $JT
 fi
-
-if [[ -v JTRCI ]]
-then
-  gem install bundler
-  mkdir gem-testing
-  cd gem-testing
-  jruby+truffle ci --batch ../$JTRCI
-fi
diff --git a/truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java
@@ -605,7 +605,7 @@ public Object evalNoBindingUncached(VirtualFrame frame, DynamicObject source, No
             final DynamicObject binding = getCallerBinding(frame);
             final MaterializedFrame topFrame = Layouts.BINDING.getFrame(binding);
             RubyArguments.setSelf(topFrame.getArguments(), RubyArguments.getSelf(frame));
-            final CodeLoader.DeferredCall deferredCall = doEvalX(source, binding, "(eval)", true);
+            final CodeLoader.DeferredCall deferredCall = doEvalX(source, binding, "(eval)", 1, true);
             return callNode.call(frame, deferredCall.getCallTarget(), deferredCall.getArguments());
 
         }
@@ -626,7 +626,7 @@ public Object evalNilBinding(VirtualFrame frame, DynamicObject source, DynamicOb
         })
         public Object evalBinding(VirtualFrame frame, DynamicObject source, DynamicObject binding, NotProvided filename,
                                   NotProvided lineNumber, @Cached("create()") IndirectCallNode callNode) {
-            final CodeLoader.DeferredCall deferredCall = doEvalX(source, binding, "(eval)", false);
+            final CodeLoader.DeferredCall deferredCall = doEvalX(source, binding, "(eval)", 1, false);
             return callNode.call(frame, deferredCall.getCallTarget(), deferredCall.getArguments());
         }
 
@@ -665,7 +665,7 @@ public Object evalBindingFilename(VirtualFrame frame, DynamicObject source, Dyna
                 "isRubyString(filename)" })
         public Object evalBindingFilenameLine(VirtualFrame frame, DynamicObject source, DynamicObject binding, DynamicObject filename,
                                               int lineNumber, @Cached("create()") IndirectCallNode callNode) {
-            final CodeLoader.DeferredCall deferredCall = doEvalX(source, binding, filename.toString(), false);
+            final CodeLoader.DeferredCall deferredCall = doEvalX(source, binding, filename.toString(), lineNumber, false);
             return callNode.call(frame, deferredCall.getCallTarget(), deferredCall.getArguments());
         }
 
@@ -679,13 +679,23 @@ public Object evalBadBinding(DynamicObject source, DynamicObject badBinding, Not
         }
 
         @TruffleBoundary
-        private CodeLoader.DeferredCall doEvalX(DynamicObject source, DynamicObject binding, String filename, boolean ownScopeForAssignments) {
-            ByteList code = StringOperations.getByteListReadOnly(source);
-            final Source source1 = Source.fromText(code, filename);
+        private CodeLoader.DeferredCall doEvalX(DynamicObject rubySource,
+                                                DynamicObject binding,
+                                                String filename,
+                                                int line,
+                                                boolean ownScopeForAssignments) {
+            ByteList code = StringOperations.getByteListReadOnly(rubySource);
+
+            // TODO (pitr 15-Oct-2015): fix this ugly hack, required for AS, copy-paste
+            final String space = new String(new char[Math.max(line - 1, 0)]).replace("\0", "\n");
+            final Source source = Source.fromText(space + code, filename);
+
             final MaterializedFrame frame = Layouts.BINDING.getFrame(binding);
             final DeclarationContext declarationContext = RubyArguments.getDeclarationContext(frame);
-            final RubyRootNode rootNode = getContext().getCodeLoader().parse(source1, code.getEncoding(), ParserContext.EVAL, frame, ownScopeForAssignments, this);
-            return getContext().getCodeLoader().prepareExecute(ParserContext.EVAL, declarationContext, rootNode, frame, RubyArguments.getSelf(frame));
+            final RubyRootNode rootNode = getContext().getCodeLoader().parse(
+                    source, code.getEncoding(), ParserContext.EVAL, frame, ownScopeForAssignments, this);
+            return getContext().getCodeLoader().prepareExecute(
+                    ParserContext.EVAL, declarationContext, rootNode, frame, RubyArguments.getSelf(frame));
         }
 
         protected RootNodeWrapper compileSource(VirtualFrame frame, DynamicObject sourceText) {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java
@@ -93,6 +93,7 @@
 import org.jruby.truffle.language.parser.ParserContext;
 import org.jruby.truffle.language.parser.jruby.Translator;
 import org.jruby.truffle.language.yield.YieldNode;
+import org.jruby.util.ByteList;
 import org.jruby.util.IdUtil;
 
 import java.util.ArrayList;
@@ -666,17 +667,17 @@ private Object classEvalSource(VirtualFrame frame, DynamicObject module, Dynamic
         }
 
         @TruffleBoundary
-        private CodeLoader.DeferredCall classEvalSource(DynamicObject module, DynamicObject code, String file, int line) {
-            assert RubyGuards.isRubyString(code);
+        private CodeLoader.DeferredCall classEvalSource(DynamicObject module, DynamicObject rubySource, String file, int line) {
+            assert RubyGuards.isRubyString(rubySource);
+            ByteList code = StringOperations.getByteListReadOnly(rubySource);
 
             final MaterializedFrame callerFrame = getContext().getCallStack().getCallerFrameIgnoringSend()
                     .getFrame(FrameInstance.FrameAccess.MATERIALIZE, true).materialize();
-            Encoding encoding = Layouts.STRING.getRope(code).getEncoding();
+            Encoding encoding = Layouts.STRING.getRope(rubySource).getEncoding();
 
-            CompilerDirectives.transferToInterpreter();
-            // TODO (pitr 15-Oct-2015): fix this ugly hack, required for AS
+            // TODO (pitr 15-Oct-2015): fix this ugly hack, required for AS, copy-paste
             final String space = new String(new char[Math.max(line - 1, 0)]).replace("\0", "\n");
-            Source source = Source.fromText(space + code.toString(), file);
+            Source source = Source.fromText(space + code, file);
 
             final RubyRootNode rootNode = getContext().getCodeLoader().parse(source, encoding, ParserContext.MODULE, callerFrame, true, this);
             return getContext().getCodeLoader().prepareExecute(ParserContext.MODULE, DeclarationContext.CLASS_EVAL, rootNode, callerFrame, module);

diff --git a/truffle/src/main/java/org/jruby/truffle/language/backtrace/BacktraceFormatter.java b/truffle/src/main/java/org/jruby/truffle/language/backtrace/BacktraceFormatter.java
@@ -282,11 +282,17 @@ private boolean isCore(SourceSection sourceSection) {
 
         final String path = source.getPath();
 
-        if (path == null) {
-            return true;
+        if (path != null) {
+            return path.startsWith(SourceLoader.TRUFFLE_SCHEME);
+        }
+
+        final String name = source.getName();
+
+        if (name != null) {
+            return name.startsWith(SourceLoader.TRUFFLE_SCHEME);
         }
 
-        return path.startsWith(SourceLoader.TRUFFLE_SCHEME);
+        return true;
     }
 
     private String formatForeign(Node callNode) {
-Original file line number
+Diff line change
@@ @@ -15,6 +15,10 @@ def m1 @@
     end
     def m2
+      eval 'm3', binding, 'a_m3_calling_source.rb', 42
+    end
+    def m3
       eval "raise 'message'"
     end