Merge pull request #159 in G/truffleruby from post-install-message to master

* commit '86a809d9b64937ae3228ea408fd647fba321661b':
  Test that the post-install message is printed in Docker tests using gu
  Fix be_close to accept the actual value if it is equal to expected + or - delta
  Update to latest Truffle
  Add a post-install message about the OpenSSL extension when installing with `gu`

Author: nirvdrum

mx.truffleruby/mx_truffleruby.py

@@ -346,6 +346,13 @@ def ruby_testdownstream_sulong(args):
             links=['bin/<exe:ruby>'],
         )
     ],
+    post_install_msg="""
+IMPORTANT NOTE:
+---------------
+The Ruby openssl C extension needs to be recompiled on your system to work with the installed libssl.
+Make sure headers for libssl are installed, see https://github.com/oracle/truffleruby/blob/master/doc/user/installing-libssl.md for details.
+Then run the following command:
+        ${graalvm_home}/jre/languages/ruby/lib/truffle/post_install_hook.sh""",
 ))
 
 mx.update_commands(_suite, {

mx.truffleruby/suite.py

@@ -8,7 +8,7 @@
               # We want tools to be reliably available with TruffleRuby, even with "mx build", so this is a static import.
                 "name": "tools",
                 "subdir": True,
-                "version": "ff6b87789b5990692333bf1fe4f9a6cabbff0bbd",
+                "version": "822da2f5e092931e236885be3cc6e9cac35b5c7a",
                 "urls": [
                     {"url": "https://github.com/graalvm/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

spec/mspec/lib/mspec/matchers/be_close.rb

@@ -8,7 +8,7 @@ def initialize(expected, tolerance)
 
   def matches?(actual)
     @actual = actual
-    (@actual - @expected).abs < @tolerance
+    (@actual - @expected).abs <= @tolerance
   end
 
   def failure_message

spec/mspec/spec/matchers/be_close_spec.rb

@@ -16,12 +16,14 @@
     BeCloseMatcher.new(5.0, 0.5).matches?(4.51).should == true
   end
 
-  it "does not match when actual == (expected + tolerance)" do
-    BeCloseMatcher.new(5.0, 0.5).matches?(5.5).should == false
+  it "matches when actual == (expected + tolerance)" do
+    BeCloseMatcher.new(5.0, 0.5).matches?(5.5).should == true
+    BeCloseMatcher.new(3, 2).matches?(5).should == true
   end
 
-  it "does not match when actual == (expected - tolerance)" do
-    BeCloseMatcher.new(5.0, 0.5).matches?(4.5).should == false
+  it "matches when actual == (expected - tolerance)" do
+    BeCloseMatcher.new(5.0, 0.5).matches?(4.5).should == true
+    BeCloseMatcher.new(3, 2).matches?(1).should == true
   end
 
   it "does not match when actual < (expected - tolerance)" do

tool/jt.rb

@@ -1996,12 +1996,18 @@ def dockerfile(*args)
       graalvm_version = graalvm_version.gsub(/-b\d+\Z/, '')
     end
 
+    check_post_install_message = [
+      "RUN grep 'The Ruby openssl C extension needs to be recompiled on your system to work with the installed libssl' install.log",
+      "RUN grep '/jre/languages/ruby/lib/truffle/post_install_hook.sh' install.log"
+    ]
+
     case install_method
     when :public
       lines.push "RUN curl -OL https://github.com/oracle/graal/releases/download/vm-#{public_version}/graalvm-ce-#{public_version}-linux-amd64.tar.gz"
       lines.push "RUN tar -zxf graalvm-ce-#{public_version}-linux-amd64.tar.gz"
       lines.push "ENV D_GRAALVM_BASE=/test/graalvm-ce-#{public_version}"
-      lines.push "RUN $D_GRAALVM_BASE/bin/gu install org.graalvm.ruby"
+      lines.push "RUN $D_GRAALVM_BASE/bin/gu install org.graalvm.ruby | tee install.log"
+      lines.push(*check_post_install_message)
       lines.push "ENV D_RUBY_BASE=$D_GRAALVM_BASE/jre/languages/ruby"
       lines.push "ENV D_RUBY_BIN=$D_GRAALVM_BASE/bin"
       lines.push "RUN PATH=$D_RUBY_BIN:$PATH $D_RUBY_BASE/lib/truffle/post_install_hook.sh" if run_post_install_hook
@@ -2014,7 +2020,8 @@ def dockerfile(*args)
       lines.push "COPY #{graalvm_component} /test/"
       lines.push "RUN tar -zxf #{graalvm_tarball}"
       lines.push "ENV D_GRAALVM_BASE=/test/graalvm-#{graalvm_version}"
-      lines.push "RUN $D_GRAALVM_BASE/bin/gu install --file /test/#{graalvm_component}"
+      lines.push "RUN $D_GRAALVM_BASE/bin/gu install --file /test/#{graalvm_component} | tee install.log"
+      lines.push(*check_post_install_message)
       lines.push "ENV D_RUBY_BASE=$D_GRAALVM_BASE/jre/languages/ruby"
       lines.push "ENV D_RUBY_BIN=$D_GRAALVM_BASE/bin"
       lines.push "RUN PATH=$D_RUBY_BIN:$PATH $D_RUBY_BASE/lib/truffle/post_install_hook.sh" if run_post_install_hook