jruby · Jan 29, 2016 · Jan 29, 2016 · Jan 29, 2016 · Jan 29, 2016 · Jan 29, 2016
diff --git a/core/src/main/java/org/jruby/runtime/BlockBody.java b/core/src/main/java/org/jruby/runtime/BlockBody.java
@@ -58,7 +58,6 @@ public Signature getSignature() {
     }
 
     public void setEvalType(EvalType evalType) {
-        System.err.println("setEvalType unimplemented in " + this.getClass().getName());
     }
 
     public boolean canCallDirect() {

diff --git a/core/src/test/java/org/jruby/embed/ScriptingContainerTest.java b/core/src/test/java/org/jruby/embed/ScriptingContainerTest.java
@@ -160,7 +160,7 @@ public void testGetSupportedRubyVersion() {
         instance.setErrorWriter(writer);
         String expResult = "jruby " + Constants.VERSION;
         String result = instance.getSupportedRubyVersion();
-        assertTrue(result.startsWith(expResult));
+        assertTrue("'"+ result +"' does not start with: " + expResult, result.startsWith(expResult));
         instance.terminate();
     }
 
@@ -2646,8 +2646,8 @@ public void testLoadPathOfScriptingContainer() {
         ScriptingContainer instance = new ScriptingContainer(LocalContextScope.SINGLETHREAD);
         // note that instance.getLoadPath is not the load-path of the runtime !!!
         String[] results = instance.runScriptlet("$LOAD_PATH").toString().split(", ");
-        for(String result : results){
-            assertTrue(result + " containt lib/ruby/", result.contains("lib/ruby/"));
+        for (String result : results){
+            assertTrue(result + " does not contain lib/ruby/", result.contains("lib/ruby/"));
         }
     }
 

diff --git a/lib/pom.rb b/lib/pom.rb
@@ -20,7 +20,8 @@ def initialize( name, version, default_spec = true )
    ImportedGem.new( 'psych', '2.0.15' ),
    ImportedGem.new( 'json', '${json.version}' ),
    ImportedGem.new( 'jar-dependencies', '${jar-dependencies.version}' ),
-   ImportedGem.new( 'racc', '${racc.version}')
+   ImportedGem.new( 'racc', '${racc.version}'),
+   #ImportedGem.new( 'did_you_mean', '1.0.0'),
   ]
 
 project 'JRuby Lib Setup' do
@@ -44,7 +45,7 @@ def initialize( name, version, default_spec = true )
   jar "org.jruby:jruby-core:#{version}", :scope => 'test'
 
   extension 'org.torquebox.mojo:mavengem-wagon:0.2.0'
-  
+
   repository :id => :mavengems, :url => 'mavengem:http://rubygems.org'
 
   plugin( :clean,
@@ -63,8 +64,11 @@ def initialize( name, version, default_spec = true )
 
   default_gemnames = default_gems.collect { |g| g.name }
 
-  # TODO no hardcoded group-ids
-  plugin :dependency, :useRepositoryLayout => true, :outputDirectory => 'ruby/stdlib', :excludeGroupIds => 'rubygems', :includeScope => :provided do
+  plugin :dependency,
+    :useRepositoryLayout => true,
+    :outputDirectory => 'ruby/stdlib',
+    :excludeGroupIds => 'rubygems', # TODO no hardcoded group-ids
+    :includeScope => :provided do
     execute_goal 'copy-dependencies', :phase => 'generate-resources'
   end
 
@@ -117,6 +121,7 @@ def initialize( name, version, default_spec = true )
                                         :wrappers => true,
                                         :ignore_dependencies => true,
                                         :install_dir => ghome )
+        def installer.ensure_required_ruby_version_met; end
         installer.install
       end
     end

diff --git a/maven/jruby-complete/src/it/integrity/verify.bsh b/maven/jruby-complete/src/it/integrity/verify.bsh
@@ -3,27 +3,27 @@ import org.codehaus.plexus.util.FileUtils;
 
 
 String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
-String expected = "rake (10.1.0)";
+String expected = "rake (10.4.2)";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "4.1.2";
+//expected = "4.2.0";
+//if ( !log.contains( expected ) )
+//{
+//    throw new RuntimeException( "log file does not contain '" + expected + "'" );
+//}
+expected = "json (1.8.1 java)";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "json (1.8.0 java)";
-if ( !log.contains( expected ) )
-{
-    throw new RuntimeException( "log file does not contain '" + expected + "'" );
-}
-expected = "rake, version 10.1.0";
-if ( !log.contains( expected ) )
-{
-    throw new RuntimeException( "log file does not contain '" + expected + "'" );
-}
-expected = "rdoc (4.1.2)";
+//expected = "rake, version 10.4.2";
+//if ( !log.contains( expected ) )
+//{
+//    throw new RuntimeException( "log file does not contain '" + expected + "'" );
+//}
+expected = "rdoc (4.2.0)";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );

diff --git a/maven/jruby-dist/src/it/integrity/verify.bsh b/maven/jruby-dist/src/it/integrity/verify.bsh
@@ -3,27 +3,27 @@ import org.codehaus.plexus.util.FileUtils;
 
 
 String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
-String expected = "rake (10.1.0)";
+String expected = "rake (10.4.2)";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "4.1.2";
+//expected = "4.1.2";
+//if ( !log.contains( expected ) )
+//{
+//    throw new RuntimeException( "log file does not contain '" + expected + "'" );
+//}
+expected = "json (1.8.1 java)";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "json (1.8.0 java)";
-if ( !log.contains( expected ) )
-{
-    throw new RuntimeException( "log file does not contain '" + expected + "'" );
-}
-expected = "rake, version 10.1.0";
-if ( !log.contains( expected ) )
-{
-    throw new RuntimeException( "log file does not contain '" + expected + "'" );
-}
-expected = "rdoc (4.1.2";
+//expected = "rake, version 10.1.0";
+//if ( !log.contains( expected ) )
+//{
+//    throw new RuntimeException( "log file does not contain '" + expected + "'" );
+//}
+expected = "rdoc (4.2.0";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );

diff --git a/maven/jruby-jars/src/it/integrity/verify.bsh b/maven/jruby-jars/src/it/integrity/verify.bsh
@@ -3,27 +3,27 @@ import org.codehaus.plexus.util.FileUtils;
 
 
 String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
-String expected = "rake (10.1.0)";
+String expected = "rake (10.4.2)";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "4.1.2";
+//expected = "4.1.2";
+//if ( !log.contains( expected ) )
+//{
+//    throw new RuntimeException( "log file does not contain '" + expected + "'" );
+//}
+expected = "json (1.8.1 java)";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "json (1.8.0 java)";
-if ( !log.contains( expected ) )
-{
-    throw new RuntimeException( "log file does not contain '" + expected + "'" );
-}
-expected = "rake, version 10.1.0";
-if ( !log.contains( expected ) )
-{
-    throw new RuntimeException( "log file does not contain '" + expected + "'" );
-}
-expected = "rdoc (4.1.2)";
+//expected = "rake, version 10.1.0";
+//if ( !log.contains( expected ) )
+//{
+//    throw new RuntimeException( "log file does not contain '" + expected + "'" );
+//}
+expected = "rdoc (4.2.0)";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );

diff --git a/maven/jruby/src/it/integrity/verify.bsh b/maven/jruby/src/it/integrity/verify.bsh
@@ -3,27 +3,27 @@ import org.codehaus.plexus.util.FileUtils;
 
 
 String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
-String expected = "rake (10.1.0)";
+String expected = "rake (10.4.2)";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "4.1.2";
+//expected = "4.1.2";
+//if ( !log.contains( expected ) )
+//{
+//    throw new RuntimeException( "log file does not contain '" + expected + "'" );
+//}
+expected = "json (1.8.1 java)";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
-expected = "json (1.8.0 java)";
-if ( !log.contains( expected ) )
-{
-    throw new RuntimeException( "log file does not contain '" + expected + "'" );
-}
-expected = "rake, version 10.1.0";
-if ( !log.contains( expected ) )
-{
-    throw new RuntimeException( "log file does not contain '" + expected + "'" );
-}
-expected = "rdoc (4.1.2)";
+//expected = "rake, version 10.1.0";
+//if ( !log.contains( expected ) )
+//{
+//    throw new RuntimeException( "log file does not contain '" + expected + "'" );
+//}
+expected = "rdoc (4.2.0)";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );

diff --git a/pom.rb b/pom.rb
@@ -63,8 +63,7 @@
               'polyglot.dump.readonly' => 'true',
               'jruby.plugins.version' => '1.0.10',
 
-              'json.version' => '1.8.0',
-              'krypt.version' => '0.0.2.rc1',
+              'json.version' => '1.8.1',
               'rspec.version' => '3.3.0',
               'rspec-core.version' => '3.3.2',
               'rspec-expectations.version' => '3.3.1',
@@ -76,8 +75,8 @@
               'racc.version' => '1.4.13',
               # versions for default gems with bin executables
               # used in ./lib/pom.rb and ./maven/jruby-stdlib/pom.rb
-              'rdoc.version' => '4.1.2',
-              'rake.version' => '10.1.0',
+              'rdoc.version' => '4.2.0',
+              'rake.version' => '10.4.2',
               'jar-dependencies.version' => '0.2.3',
 
               'jruby-launcher.version' => '1.1.1',

diff --git a/pom.xml b/pom.xml
@@ -114,22 +114,21 @@ DO NOT MODIFIY - GENERATED CODE
     <ant.version>1.9.2</ant.version>
     <diff-lcs.version>1.1.3</diff-lcs.version>
     <jffi.version>1.2.10</jffi.version>
-    <rake.version>10.1.0</rake.version>
+    <rake.version>10.4.2</rake.version>
     <jruby-launcher.version>1.1.1</jruby-launcher.version>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
     <asm.version>5.0.4</asm.version>
     <rspec-expectations.version>3.3.1</rspec-expectations.version>
     <its.osgi>osgi*/pom.xml</its.osgi>
     <base.javac.version>1.7</base.javac.version>
-    <krypt.version>0.0.2.rc1</krypt.version>
     <test-unit.version>3.1.1</test-unit.version>
-    <rdoc.version>4.1.2</rdoc.version>
+    <rdoc.version>4.2.0</rdoc.version>
     <rspec.version>3.3.0</rspec.version>
     <base.java.version>1.7</base.java.version>
     <rspec-mocks.version>3.3.2</rspec-mocks.version>
     <jruby.plugins.version>1.0.10</jruby.plugins.version>
     <invoker.skip>true</invoker.skip>
-    <json.version>1.8.0</json.version>
+    <json.version>1.8.1</json.version>
     <jar-dependencies.version>0.2.3</jar-dependencies.version>
     <power_assert.version>0.2.3</power_assert.version>
     <version.jruby>${project.version}</version.jruby>

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/POSIXDelegator.java b/truffle/src/main/java/org/jruby/truffle/runtime/POSIXDelegator.java
@@ -309,6 +309,11 @@ public int mkdir(String path, int mode) {
         return delegateTo.mkdir(path, mode);
     }
 
+    @Override
+    public int mkfifo(String path, int mode) {
+        return delegateTo.mkfifo(path, mode);
+    }
+
     @Override
     public String readlink(String path) throws IOException {
         return delegateTo.readlink(path);