JRuby 1.6.0 and Rubinius 1.2.3 have been released

Gemfile

@@ -21,6 +21,7 @@ gem 'less', :group => 'less'
 gem 'liquid', :group => 'liquid'
 gem 'nokogiri', :group => 'nokogiri'
 gem 'slim', :group => 'slim'
+gem 'RedCloth', :group => 'redcloth'
 
 
 if RUBY_VERSION > '1.8.6'
@@ -40,12 +41,6 @@ platforms :ruby_18, :jruby do
   gem 'radius', :group => 'radius'
 end
 
-platforms :mri do
-  # bundler platforms are broken
-  next unless RUBY_ENGINE == 'ruby'
-  gem 'RedCloth', :group => 'redcloth'
-end
-
 platforms :mri_18 do
   # bundler platforms are broken
   next unless RUBY_ENGINE == 'ruby'

README.rdoc

@@ -1710,29 +1710,32 @@ The following Ruby versions are officially supported:
   segmentation faults when using Sinatra.
 
 [ Rubinius ]
-  Rubinius is officially supported (Rubinius >= 1.2.2), with the exception
-  of Textile templates.
+  Rubinius is officially supported (Rubinius >= 1.2.3), everything, including
+  all template languages, works.
 
 [ JRuby ]
-  JRuby is officially supported (JRuby >= 1.5.6). No issues with third party
+  JRuby is officially supported (JRuby >= 1.6.0). No issues with third party
   template libraries are known, however, if you choose to use JRuby, please
-  look into JRuby rack handlers, as the Thin web server is not (yet) supported
-  on JRuby.
+  look into JRuby rack handlers, as the Thin web server is not fully supported
+  on JRuby. JRuby's support for C extensions is still experimental, which only
+  affects RDiscount at the moment.
 
 We also keep an eye on upcoming Ruby versions.
 
 The following Ruby implementations are not officially supported but still are
 known to run Sinatra:
 
 * Older versions of JRuby and Rubinius
-* MacRuby
-* Maglev
-* IronRuby
+* MacRuby, Maglev, IronRuby
 * Ruby 1.9.0 and 1.9.1
 
 Not being officially supported means if things only break there and not on a
 supported platform, we assume it's not our issue but theirs.
 
+We also run our CI against ruby-head (the upcoming 1.9.3), but we can't
+guarantee anything, since it is constantly moving. Expect 1.9.3p0 to be
+supported.
+
 Sinatra should work on any operating system supported by the chosen Ruby
 implementation.
 

test/routing_test.rb

@@ -778,16 +778,11 @@ class RoutingTest < Test::Unit::TestCase
   end
 
   it 'raises an ArgumentError with block arity > 1 and too many values' do
-    if RUBY_ENGINE == "rbx"
-      $stderr.puts "\npending test: #{__method__}, #{__FILE__}:#{__LINE__} "
-      next
-    end
-
-    mock_app {
+    mock_app do
       get '/:foo/:bar/:baz' do |foo, bar|
         'quux'
       end
-    }
+    end
 
     assert_raise(ArgumentError) { get '/a/b/c' }
   end