updated dependencies, jruby 1.7.11 and storm 0.9.1-incubating

.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - jruby-1.7.4
+  - jruby-1.7.11
 before_script: bundle exec rake storm_deps
 script: bundle exec rspec
 notifications:

ivy/storm_dependencies.xml

@@ -2,7 +2,7 @@
 <ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
   <info organisation="redstorm" module="storm-deps"/>
   <dependencies>
-    <dependency org="storm" name="storm" rev="0.9.0-wip16" conf="default" transitive="true" />
+    <dependency org="org.apache.storm" name="storm-core" rev="0.9.1-incubating" conf="default" transitive="true" />
     <override org="org.slf4j" module="slf4j-log4j12" rev="1.6.3"/>
   </dependencies>
 </ivy-module>

ivy/topology_dependencies.xml

@@ -2,11 +2,12 @@
 <ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
   <info organisation="redstorm" module="topology-deps"/>
   <dependencies>
-    <dependency org="org.jruby" name="jruby-core" rev="1.7.4" conf="default" transitive="true"/>
+    <dependency org="org.jruby" name="jruby-core" rev="1.7.11" conf="default" transitive="true"/>
+    <dependency org="org.jruby" name="jruby-stdlib" rev="1.7.11" conf="default" transitive="true"/>
 
     <!-- explicitely specify jffi to also fetch the native jar. make sure to update jffi version matching jruby-core version -->
     <!-- this is the only way I found using Ivy to fetch the native jar -->
-    <dependency org="com.github.jnr" name="jffi" rev="1.2.5" conf="default" transitive="true">
+    <dependency org="com.github.jnr" name="jffi" rev="1.2.7" conf="default" transitive="true">
       <artifact name="jffi" type="jar" />
       <artifact name="jffi" type="jar" m:classifier="native"/>
     </dependency>

lib/red_storm.rb

@@ -1,11 +1,12 @@
-require 'rubygems'
-
 require 'red_storm/version'
 require 'red_storm/environment'
 require 'red_storm/configuration'
 require 'red_storm/configurator'
 require 'red_storm/dsl/bolt'
+require 'red_storm/dsl/batch_bolt'
+require 'red_storm/dsl/batch_committer_bolt'
 require 'red_storm/dsl/spout'
+require 'red_storm/dsl/batch_spout'
 require 'red_storm/dsl/topology'
 require 'red_storm/dsl/drpc_topology'
 require 'red_storm/dsl/tuple'

lib/red_storm/configurator.rb

@@ -1,7 +1,10 @@
 # This hack get rif of the "Use RbConfig instead of obsolete and deprecated Config"
 # deprecation warning that is triggered by "java_import 'backtype.storm.Config'".
-Object.send :remove_const, :Config
-Config = RbConfig
+begin
+  Object.send :remove_const, :Config
+  Config = RbConfig
+rescue NameError
+end
 
 module Backtype
   java_import 'backtype.storm.Config'

lib/red_storm/topology_launcher.rb

@@ -2,8 +2,11 @@ require 'java'
 
 # This hack get rif of the "Use RbConfig instead of obsolete and deprecated Config"
 # deprecation warning that is triggered by "java_import 'backtype.storm.Config'".
-Object.send :remove_const, :Config
-Config = RbConfig
+begin
+  Object.send :remove_const, :Config
+  Config = RbConfig
+rescue NameError
+end
 
 # see https://github.com/colinsurprenant/redstorm/issues/7
 module Backtype