- Update cabin

- Use proper way to say "jruby only" in bundler-speak

Gemfile

@@ -1,24 +1,20 @@
 source :rubygems
 
-def jruby?
-  return RUBY_ENGINE == "jruby"
-end
-
 gem "cabin", "0.3.0" # for logging. apache 2 license
 gem "bunny" # for amqp support, MIT-style license
 gem "uuidtools" # for naming amqp queues, License ???
 
 gem "filewatch", "0.3.3"  # for file tailing, BSD License
-gem "jls-grok", "0.10.2" # for grok filter, BSD License
-jruby? and gem "jruby-elasticsearch", "0.0.11" # BSD License
+gem "jls-grok", "0.10.4" # for grok filter, BSD License
+gem "jruby-elasticsearch", "0.0.11", :platforms => :jruby # BSD License
 gem "stomp" # for stomp protocol, Apache 2.0 License
 gem "json" # Ruby license
 gem "awesome_print" # MIT License
-jruby? and gem "jruby-openssl" # For enabling SSL support, CPL/GPL 2.0
+gem "jruby-openssl", :platforms => :jruby # For enabling SSL support, CPL/GPL 2.0
 
 gem "minitest" # License: Ruby
 gem "rack" # License: MIT
-jruby? and gem "mizuno" # License: Apache 2.0
+gem "mizuno", :platforms => :jruby # License: Apache 2.0
 gem "sinatra" # License: MIT-style
 gem "haml" # License: MIT
 gem "sass" # License: MIT

Gemfile.lock

@@ -7,7 +7,7 @@ GEM
     bunny (0.7.8)
     cabin (0.3.0)
       json
-    childprocess (0.3.0)
+    childprocess (0.3.1)
       ffi (~> 1.0.6)
     choice (0.1.4)
     ffi (1.0.11-java)
@@ -18,8 +18,8 @@ GEM
     gelfd (0.2.0)
     gmetric (0.1.3)
     haml (3.1.4)
-    jls-grok (0.10.2)
-      cabin (~> 0.2.2)
+    jls-grok (0.10.4)
+      cabin (~> 0.3.0)
     jruby-elasticsearch (0.0.11)
     jruby-openssl (0.7.5)
       bouncy-castle-java (>= 1.5.0146.1)
@@ -36,7 +36,7 @@ GEM
     rack-protection (1.2.0)
       rack
     redis (2.2.2)
-    sass (3.1.13)
+    sass (3.1.14)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
@@ -61,7 +61,7 @@ DEPENDENCIES
   gelfd (= 0.2.0)
   gmetric (= 0.1.3)
   haml
-  jls-grok (= 0.10.2)
+  jls-grok (= 0.10.4)
   jruby-elasticsearch (= 0.0.11)
   jruby-openssl
   json